fix __qualname__ related specs in test.test_funcattrs

isaiah · isaiah · commit c75d98aa57c2 · 2016-10-25T17:59:10.000+02:00
diff --git a/src/org/python/compiler/CodeCompiler.java b/src/org/python/compiler/CodeCompiler.java
@@ -527,7 +527,7 @@ private Object compileFunction(String internalName, java.util.List<expr> decs, j
                 sig(PyDictionary.class, String[].class, PyObject[].class));
 
         scope.setup_closure();
-        scope.dump();
+//        scope.dump();
         module.codeConstant(new Suite(node, body), name, true, className, false,
                 false, node.getLine(), scope, cflags).get(code);
 
@@ -537,7 +537,7 @@ private Object compileFunction(String internalName, java.util.List<expr> decs, j
         } else {
             code.aconst_null();
         }
-        code.ldc(className + "." + name);
+        code.ldc(scope.qualname);
 
         if (!makeClosure(scope)) {
             code.invokespecial(p(PyFunction.class), "<init>",
@@ -2536,6 +2536,9 @@ public Object visitLambda(Lambda node) throws Exception {
                     "<init>",
                     sig(Void.TYPE, PyObject.class, PyObject[].class, PyDictionary.class, PyCode.class, PyObject[].class));
         }
+        code.dup();
+        code.ldc(scope.qualname);
+        code.putfield(p(PyFunction.class), "__qualname__", ci(String.class));
         return null;
     }
 
@@ -2590,7 +2593,7 @@ public Object visitClassDef(ClassDef node) throws Exception {
         if (scope.needs_class_closure) {
             scope.needs_class_closure = false;
 //            inner = "<inner" + clsName + ">";
-            String outer = "<outer" + clsName + ">";
+            String outer = scope.scope_name;
             code.new_(p(PyFunction.class));
             code.dup();
             loadFrame();
@@ -2678,6 +2681,7 @@ public Object visitClassDef(ClassDef node) throws Exception {
         int baseArray = makeArray(node.getInternalBases());
 
         code.ldc(inner);
+        code.ldc(scope.qualname);
 
         code.aload(baseArray);
         if (node.getInternalKeywords() != null && node.getInternalKeywords().size() > 0) {
@@ -2698,12 +2702,12 @@ public Object visitClassDef(ClassDef node) throws Exception {
         // Make class out of name, bases, and code
         if (!makeClosure(scope)) {
             code.invokestatic(p(Py.class), "makeClass",
-                    sig(PyObject.class, String.class, PyObject[].class, PyObject.class, PyCode.class));
+                    sig(PyObject.class, String.class, String.class, PyObject[].class, PyObject.class, PyCode.class));
         } else {
             code.invokestatic(
                     p(Py.class),
                     "makeClass",
-                    sig(PyObject.class, String.class, PyObject[].class, PyObject.class, PyCode.class,
+                    sig(PyObject.class, String.class, String.class, PyObject[].class, PyObject.class, PyCode.class,
                             PyObject[].class));
         }
 
diff --git a/src/org/python/compiler/Module.java b/src/org/python/compiler/Module.java
@@ -425,6 +425,7 @@ public class Module implements Opcodes, ClassConstants, CompilationContext {
 
     ClassFile classfile;
     Constant filename;
+    String name;
     String sfilename;
     Constant mainCode;
     boolean linenumbers;
@@ -444,6 +445,7 @@ public Module(String name, String filename, boolean linenumbers) {
     }
 
     public Module(String name, String filename, boolean linenumbers, long mtime) {
+        this.name = name;
         this.linenumbers = linenumbers;
         this.mtime = mtime;
         classfile =
diff --git a/src/org/python/compiler/ScopeInfo.java b/src/org/python/compiler/ScopeInfo.java
@@ -2,11 +2,15 @@
 
 package org.python.compiler;
 
+import com.google.common.base.Joiner;
 import org.python.antlr.PythonTree;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -18,6 +22,7 @@ public class ScopeInfo extends Object implements ScopeConstants {
     public int func_level;
     public boolean needs_class_closure;
     public boolean async;
+    public String qualname;
 
     public void dump() { // for debugging
         if (org.python.core.Options.verbose < org.python.core.Py.DEBUG)
@@ -280,6 +285,12 @@ public void setup_closure(ScopeInfo up){
 
     }
 
+    // check if specified name is defined as global
+    public boolean isGlobal(String name) {
+        SymInfo info = tbl.get(name);
+        return info != null && (info.flags & NGLOBAL) != 0;
+    }
+
     @Override
     public String toString() {
         return "ScopeInfo[" + scope_name + " " + kind + "]@" +
diff --git a/src/org/python/compiler/ScopesCompiler.java b/src/org/python/compiler/ScopesCompiler.java
@@ -41,7 +41,29 @@ public void beginScope(String name, int kind, PythonTree node,
         if (kind == FUNCSCOPE) {
             func_level++;
         }
+        String qualname;
+        if ((cur != null && cur.isGlobal(name)) || level == 1) {
+            qualname = name;
+        } else if (level > 1) {
+            qualname = cur.qualname;
+            if (cur.kind == FUNCSCOPE && kind != CLASSSCOPE) { // ignore the __class__ closure
+                 qualname += ".<locals>";
+            }
+            if (kind == CLASSSCOPE) {
+                int dot = qualname.lastIndexOf(".");
+                if (dot != -1) {
+                    qualname = qualname.substring(0, dot + 1) + name; // remove the __class__ closure
+                } else {
+                    qualname = name;
+                }
+            } else {
+                qualname += "." + name;
+            }
+        } else {
+            qualname = "";
+        }
         cur = new ScopeInfo(name, node, level++, kind, func_level, ac);
+        cur.qualname = qualname;
         nodeScopes.put(node, cur);
     }
 
diff --git a/src/org/python/core/Py.java b/src/org/python/core/Py.java
@@ -2027,14 +2027,24 @@ protected static void setAdapter(ExtensiblePyObjectAdapter adapter) {
     // XXX: The following two makeClass overrides are *only* for the
     // old compiler, they should be removed when the newcompiler hits
     public static PyObject makeClass(String name, PyObject[] bases, PyObject metaclass, PyCode code) {
-        return makeClass(name, bases, metaclass, code, null);
+        return makeClass(name, name, bases, metaclass, code, null);
+    }
+
+    public static PyObject makeClass(String name, String qualname, PyObject[] bases, PyObject metaclass, PyCode code) {
+        return makeClass(name, qualname, bases, metaclass, code, null);
     }
 
     public static PyObject makeClass(String name, PyObject[] bases, PyObject metaclass, PyCode code,
                                      PyObject[] closure_cells) {
+        return makeClass(name, name, bases, metaclass, code, closure_cells);
+    }
+
+    public static PyObject makeClass(String name, String qualname, PyObject[] bases, PyObject metaclass, PyCode code,
+                                     PyObject[] closure_cells) {
         ThreadState state = getThreadState();
         PyObject dict = code.call(state, Py.EmptyObjects, Py.NoKeywords,
                 state.frame.f_globals, Py.EmptyObjects, new PyDictionary(), new PyTuple(closure_cells));
+        dict.__setitem__("__qualname__", new PyUnicode(qualname));
         return makeClass(name, bases, dict, metaclass);
     }
     public static PyObject makeClass(String name, PyObject base, PyObject dict) {
diff --git a/src/org/python/core/PyBuiltinCallable.java b/src/org/python/core/PyBuiltinCallable.java
@@ -14,6 +14,8 @@ public abstract class PyBuiltinCallable extends PyObject {
 
     protected String doc;
 
+    protected boolean isStatic;
+
     protected PyBuiltinCallable(PyType type, Info info) {
         super(type);
         this.info = info;
@@ -36,11 +38,15 @@ public PyObject fastGetName() {
     @ExposedGet(name = "__qualname__")
     public PyObject getQualname() {
         PyObject self = getSelf();
-        String qualname;
-        if (self == null || self.getType().__findattr__("__name__") == null) {
-            qualname = info.getName();
-        } else {
-            qualname = self.getType().__getattr__("__name__") + "." + info.getName();
+        String qualname = info.getName();
+        if (self != null && self != Py.None) {
+            if (!isStatic) {
+                self = self.getType();
+            }
+            PyObject name = self.__getattr__("__name__");
+            if (name != null) {
+                qualname = name + "." + info.getName();
+            }
         }
         return new PyUnicode(qualname);
     }
diff --git a/src/org/python/core/PyCell.java b/src/org/python/core/PyCell.java
@@ -38,6 +38,19 @@ public String toString() {
                              ob_ref.getType().getName(), Py.idstr(ob_ref));
     }
 
+    @Override
+    public PyObject richCompare(PyObject other, CompareOp op) {
+        if (!(other instanceof PyCell)) {
+            return Py.NotImplemented;
+        }
+        PyObject a = ob_ref;
+        PyObject b = ((PyCell) other).ob_ref;
+        if (a != null && b != null) {
+            return a.richCompare(b, op);
+        }
+        int result = (a == null ? 0 : 1) - (b == null ? 0 : 1);
+        return op.bool(result);
+    }
 
     /* Traverseproc implementation */
     @Override
diff --git a/src/org/python/core/PyFunction.java b/src/org/python/core/PyFunction.java
@@ -30,6 +30,7 @@ public class PyFunction extends PyObject implements InvocationHandler, Traversep
 
     /** The qualified name */
     @ExposedGet
+    @ExposedSet
     public String __qualname__;
 
     /** The writable doc string. */
@@ -115,6 +116,8 @@ public PyFunction(PyObject globals, PyObject[] defaults, PyDictionary kw_default
     public PyFunction(PyObject globals, PyObject[] defaults, PyDictionary kw_defaults, PyCode code, PyObject doc) {
         this(globals, defaults, kw_defaults, code, doc, null);
     }
+
+    // used by visitLambda
     public PyFunction(PyObject globals, PyObject[] defaults, PyDictionary kw_defaults, PyCode code) {
         this(globals, defaults, kw_defaults, code, null, null);
     }
@@ -273,23 +276,23 @@ public void delDict() {
 
     @ExposedSet(name = "__globals__")
     public void setGlobals(PyObject value) {
-        throw Py.TypeError("readonly attribute");
+        throw Py.AttributeError("readonly attribute");
     }
 
     @ExposedDelete(name = "__globals__")
     public void delGlobals() {
-        throw Py.TypeError("readonly attribute");
+        throw Py.AttributeError("readonly attribute");
     }
 
 
     @ExposedSet(name = "__closure__")
     public void setClosure(PyObject value) {
-        throw Py.TypeError("readonly attribute");
+        throw Py.AttributeError("readonly attribute");
     }
 
     @ExposedDelete(name = "__closure__")
     public void delClosure() {
-        throw Py.TypeError("readonly attribute");
+        throw Py.AttributeError("readonly attribute");
     }
 
     private void ensureDict() {
@@ -410,7 +413,12 @@ public PyObject __call__(ThreadState state, PyObject arg1, PyObject[] args,
 
     @Override
     public String toString() {
-        return String.format("<function %s at %s>", __name__, Py.idstr(this));
+        return String.format("<function %s at %s>", __qualname__, Py.idstr(this));
+    }
+
+    @ExposedDelete(name = "__qualname__")
+    public void deleteQualname() {
+        throw Py.TypeError("__qualname__ must be set to a string object");
     }
 
     @Override
diff --git a/src/org/python/core/PyObject.java b/src/org/python/core/PyObject.java
@@ -240,7 +240,7 @@ final PyUnicode object__str__() {
     }
 
     public PyUnicode __repr__() {
-        return new PyUnicode(toString());
+        return object___repr__();
     }
 
     @ExposedMethod(names = "__repr__", doc = BuiltinDocs.object___repr___doc)
@@ -1000,7 +1000,7 @@ public void readonlyAttributeError(String name) {
         // XXX: Should be an AttributeError but CPython throws TypeError for read only
         // member descriptors (in structmember.c::PyMember_SetOne), which is expected by a
         // few tests. fixed in py3k: http://bugs.python.org/issue1687163
-        throw Py.TypeError("readonly attribute");
+        throw Py.AttributeError("readonly attribute");
     }
 
     /**
diff --git a/src/org/python/expose/generate/ClassMethodExposer.java b/src/org/python/expose/generate/ClassMethodExposer.java
@@ -23,7 +23,8 @@ public ClassMethodExposer(Type onType,
               asNames,
               defaults,
               PyBuiltinClassMethodNarrow.class,
-              doc);
+              doc,
+              true);
         actualArgs = Type.getArgumentTypes(desc);
     }
 
diff --git a/src/org/python/expose/generate/FunctionExposer.java b/src/org/python/expose/generate/FunctionExposer.java
@@ -21,7 +21,8 @@ public FunctionExposer(Type onType,
               asNames,
               defaults,
               isWide(desc) ? PyBuiltinMethod.class : PyBuiltinClassMethodNarrow.class,
-              doc);
+              doc,
+              true);
         if ((access & ACC_STATIC) == 0) {
             throwInvalid("@ExposedFunction can't be applied to non-static methods");
         }
diff --git a/src/org/python/expose/generate/MethodExposer.java b/src/org/python/expose/generate/MethodExposer.java
@@ -18,6 +18,22 @@ public abstract class MethodExposer extends Exposer {
 
     protected final String doc;
 
+    // whether it's a function or method
+    protected boolean isStatic;
+    public MethodExposer(Type onType,
+                         String methodName,
+                         Type[] args,
+                         Type returnType,
+                         String typeName,
+                         String[] asNames,
+                         String[] defaults,
+                         Class superClass,
+                         String doc,
+                         boolean isStatic) {
+        this(onType, methodName, args, returnType, typeName, asNames, defaults, superClass, doc);
+        this.isStatic = isStatic;
+    }
+
     public MethodExposer(Type onType,
                          String methodName,
                          Type[] args,
@@ -45,6 +61,7 @@ public MethodExposer(Type onType,
         this.asNames = asNames;
         this.returnType = returnType;
         this.defaults = defaults;
+        this.isStatic = false;
         for(String name : getNames()) {
             if(name.equals("__new__")) {
                 throwInvalid("@ExposedNew must be used to create __new__, not @ExposedMethod");
@@ -97,6 +114,12 @@ private void generateFullConstructor() {
                           BUILTIN_FUNCTION.getInternalName(),
                           "doc",
                           STRING.getDescriptor());
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitLdcInsn(isStatic);
+        mv.visitFieldInsn(PUTFIELD,
+                BUILTIN_FUNCTION.getInternalName(),
+                "isStatic",
+                BOOLEAN.getDescriptor());
         endConstructor();
     }
 
@@ -117,6 +140,12 @@ private void generateNamedConstructor() {
                           BUILTIN_FUNCTION.getInternalName(),
                           "doc",
                           STRING.getDescriptor());
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitLdcInsn(isStatic);
+        mv.visitFieldInsn(PUTFIELD,
+                BUILTIN_FUNCTION.getInternalName(),
+                "isStatic",
+                BOOLEAN.getDescriptor());
         endConstructor();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ final PyUnicode object__str__() {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`public PyUnicode __repr__() {`
`243`		`- return new PyUnicode(toString());`
	`243`	`+ return object___repr__();`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`@ExposedMethod(names = "__repr__", doc = BuiltinDocs.object___repr___doc)`
`@@ -1000,7 +1000,7 @@ public void readonlyAttributeError(String name) {`
`1000`	`1000`	`// XXX: Should be an AttributeError but CPython throws TypeError for read only`
`1001`	`1001`	`// member descriptors (in structmember.c::PyMember_SetOne), which is expected by a`
`1002`	`1002`	`// few tests. fixed in py3k: http://bugs.python.org/issue1687163`
`1003`		`- throw Py.TypeError("readonly attribute");`
	`1003`	`+ throw Py.AttributeError("readonly attribute");`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`	`1006`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public ClassMethodExposer(Type onType,`
`23`	`23`	`asNames,`
`24`	`24`	`defaults,`
`25`	`25`	`PyBuiltinClassMethodNarrow.class,`
`26`		`- doc);`
	`26`	`+ doc,`
	`27`	`+ true);`
`27`	`28`	`actualArgs = Type.getArgumentTypes(desc);`
`28`	`29`	`}`
`29`	`30`