aways add None to the co_consts

Author: isaiah

src/org/python/compiler/CodeCompiler.java

@@ -460,7 +460,7 @@ public boolean makeClosure(ScopeInfo scope) throws Exception {
             for (int j = 1; j < scope.distance; j++) {
                 loadf_back();
             }
-            SymInfo symInfo = upTbl.get(scope.freevars.elementAt(i));
+            SymInfo symInfo = upTbl.get(scope.freevars.get(i));
             code.iconst(symInfo.env_index);
             code.invokevirtual(p(PyFrame.class), "getclosure", sig(PyObject.class, Integer.TYPE));
             code.aastore();

src/org/python/compiler/Module.java

@@ -305,7 +305,7 @@ class PyCodeConstant extends Constant implements ClassConstants, Opcodes {
 
         // !classdef only
         if (!classBody) {
-            varnames = toNameAr(scope.names, false);
+            varnames = toNameAr(scope.varNames, false);
         } else {
             varnames = null;
         }
@@ -698,31 +698,27 @@ public void error(String msg, boolean err, PythonTree node) throws Exception {
     }
 
     public int makeConstArray(Code code, java.util.List<? extends PythonTree> nodes) throws IOException {
-        final int n;
+        int n = 1;
 
-        if (nodes == null) {
-            n = 0;
-        } else {
-            n = nodes.size();
+        if (nodes != null) {
+            n += nodes.size();
         }
 
         int array = code.getLocal(ci(PyObject[].class));
-        if (n == 0) {
-            code.getstatic(p(Py.class), "EmptyObjects", ci(PyObject[].class));
-            code.astore(array);
-        } else {
-            code.iconst(n);
-            code.anewarray(p(PyObject.class));
-            code.astore(array);
-
-            for (int i = 0; i < n; i++) {
-                constant(nodes.get(i)).get(code);
-                code.aload(array);
-                code.swap();
-                code.iconst(i);
-                code.swap();
-                code.aastore();
-            }
+
+        code.iconst(n);
+        code.anewarray(p(PyObject.class));
+        code.astore(array);
+        code.aload(array);
+        code.iconst(0);
+        code.getstatic(p(Py.class), "None", ci(PyObject.class));
+        code.aastore();
+
+        for (int i = 1; i < n; i++) {
+            code.aload(array);
+            code.iconst(i);
+            constant(nodes.get(i - 1)).get(code);
+            code.aastore();
         }
         return array;
     }

src/org/python/compiler/ScopeInfo.java

@@ -71,7 +71,7 @@ public ScopeInfo(String name, PythonTree node, int level, int kind,
     public ArgListCompiler ac;
 
     public Map<String, SymInfo> tbl = new LinkedHashMap<String, SymInfo>();
-    public List<String> names = new ArrayList<>();
+    public List<String> varNames = new ArrayList<>();
 
     public int addNonlocal(String name) {
         SymInfo info = tbl.get(name);
@@ -102,7 +102,7 @@ public int addGlobal(String name) {
     public void addParam(String name) {
 //System.out.println("addParam " + name);
         tbl.put(name, new SymInfo(PARAM|BOUND,local++));
-        names.add(name);
+        varNames.add(name);
     }
 
     public void markFromParam() {
@@ -137,11 +137,10 @@ public void addConst(PythonTree node) {
 
     public Hashtable<String,Object> inner_free = new Hashtable<String,Object>();
 
-    // FIXME: names should be varnames, globalNames is names, for corresponding fields in code object
-    public List<String> globalNames = new ArrayList<>();
+    public List<String> globalNames = new ArrayList<>(); // co_names
     public List<PythonTree> constants = new ArrayList<>(); // co_consts
-    public List<String> freevars = new ArrayList<>();
-    public List<String> cellvars = new ArrayList<>();
+    public List<String> freevars = new ArrayList<>(); // co_freevars
+    public List<String> cellvars = new ArrayList<>(); // co_cellvars
     public List<String> jy_paramcells = new ArrayList<>();
 
     public int jy_npurecell;
@@ -195,7 +194,7 @@ public void cook(ScopeInfo up, int distance, CompilationContext ctxt) throws Exc
             if ((flags&(GLOBAL|PARAM|CELL)) == 0) {
                 if ((flags&BOUND) != 0) { // ?? only func
                     // System.err.println("local: "+name);
-                    names.add(name);
+                    varNames.add(name);
                     info.locals_index = local++;
                     continue;
                 }
@@ -207,7 +206,7 @@ public void cook(ScopeInfo up, int distance, CompilationContext ctxt) throws Exc
         if ((jy_npurecell = purecells.size()) > 0) {
             int sz = purecells.size();
             for (int i = 0; i < sz; i++) {
-                names.add(purecells.elementAt(i));
+                varNames.add(purecells.get(i));
             }
         }
 

src/org/python/core/PyTableCode.java

@@ -10,6 +10,8 @@
 import org.python.expose.ExposedType;
 import org.python.modules._systemrestart;
 
+import java.util.ArrayList;
+
 @Untraversable
 @ExposedType(name = "code", base = PyObject.class, doc = BuiltinDocs.code_doc)
 public class PyTableCode extends PyBaseCode