MethodBuiltins: add __qualname__ and __name__ builtins

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java

@@ -31,6 +31,8 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FUNC__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__KWDEFAULTS__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REDUCE__;
@@ -46,8 +48,10 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
@@ -60,6 +64,8 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.util.CannotCastException;
+import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -133,7 +139,7 @@ public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization(limit = "3")
         Object reprMethod(VirtualFrame frame, PMethod self,
                         @CachedLibrary("self.getSelf()") PythonObjectLibrary lib,
-                        @Cached("createGetAttributeNode()") GetAttributeNode getNameAttrNode,
+                        @Cached("create(__QUALNAME__)") GetAttributeNode getNameAttrNode,
                         @Cached GetNameNode getTypeNameNode) {
             String typeName = getTypeNameNode.execute(lib.getLazyPythonClass(self.getSelf()));
             return strFormat("<bound method %s of %s object at 0x%x>", getNameAttrNode.executeObject(frame, self.getFunction()), typeName, PythonAbstractObject.systemHashCode(self.getSelf()));
@@ -143,10 +149,6 @@ Object reprMethod(VirtualFrame frame, PMethod self,
         private static String strFormat(String fmt, Object... objects) {
             return String.format(fmt, objects);
         }
-
-        protected static GetAttributeNode createGetAttributeNode() {
-            return GetAttributeNode.create(SpecialAttributeNames.__QUALNAME__, null);
-        }
     }
 
     @Builtin(name = __DEFAULTS__, minNumOfPositionalArgs = 1, isGetter = true)
@@ -194,4 +196,47 @@ PMethod doGeneric(@SuppressWarnings("unused") PMethod self, Object obj, @Suppres
             return factory().createMethod(obj, self.getFunction());
         }
     }
+
+    @Builtin(name = __NAME__, minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    public abstract static class MethodName extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object getName(VirtualFrame frame, PMethod method,
+                       @Cached("create(__NAME__)") GetAttributeNode getNameAttrNode) {
+            return getNameAttrNode.executeObject(frame, method.getFunction());
+        }
+    }
+
+    @Builtin(name = __QUALNAME__, minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    public abstract static class MethodQualName extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object getQualName(VirtualFrame frame, PMethod method,
+                        @Cached("create(__QUALNAME__)") GetAttributeNode getQualNameAttrNode,
+                        @Cached("create(__NAME__)") GetAttributeNode getNameAttrNode,
+                        @Cached TypeNodes.IsTypeNode isTypeNode,
+                        @Cached CastToJavaStringNode castToJavaStringNode,
+                        @CachedLibrary("method.getSelf()") PythonObjectLibrary pol) {
+            Object self = method.getSelf();
+            String selfName = castToJavaStringNode.execute(getNameAttrNode.executeObject(frame, self));
+            if (self instanceof PythonModule) {
+                return selfName;
+            }
+
+            Object type = isTypeNode.execute(self) ? self: pol.getLazyPythonClass(self);
+            String typeQualName;
+            try {
+                typeQualName = castToJavaStringNode.execute(getQualNameAttrNode.executeObject(frame, type));
+            } catch (CannotCastException e) {
+                throw raise(PythonBuiltinClassType.TypeError, ErrorMessages.IS_NOT_A, __QUALNAME__, "unicode object");
+            }
+
+            return getQualNameGeneric(typeQualName, selfName);
+        }
+
+        @TruffleBoundary
+        private static Object getQualNameGeneric(String typeQualName, String name) {
+            return String.format("%s.%s", typeQualName, name);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -299,6 +299,7 @@ public abstract class ErrorMessages {
     public static final String INVALID_USE_OF_W_FORMAT_CHAR = "invalid use of 'w' format character";
     public static final String IS_EMPTY = "%s is empty";
     public static final String IS_NOT_IN_RANGE = "%s is not in range";
+    public static final String IS_NOT_A = "%s is not a %s";
     public static final String D_IS_NOT_IN_RANGE = "%d is not in range";
     public static final String INIT_TAKES_ONE_ARG = "%N.__init__() takes exactly one argument (the instance to initialize)";
     public static final String INIT_TAKES_ONE_ARG_OBJECT = "object.__init__() takes exactly one argument (the instance to initialize)";