return qualified names for builtin types

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -194,13 +194,19 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     private final String name;
     private final Shape instanceShape;
     private final String publicInModule;
+    private final String qualifiedName;
 
     // initialized in static constructor
     @CompilationFinal private PythonBuiltinClassType base;
 
     PythonBuiltinClassType(String name, String publicInModule) {
         this.name = name;
         this.publicInModule = publicInModule;
+        if (publicInModule != null && publicInModule != BuiltinNames.BUILTINS) {
+            qualifiedName = publicInModule + "." + name;
+        } else {
+            qualifiedName = name;
+        }
         this.instanceShape = com.oracle.graal.python.builtins.objects.object.PythonObject.freshShape(this);
     }
 
@@ -213,6 +219,10 @@ public String getName() {
         return name;
     }
 
+    public String getQualifiedName() {
+        return qualifiedName;
+    }
+
     public PythonBuiltinClassType getBase() {
         return base;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java

@@ -39,7 +39,7 @@ public final class PythonBuiltinClass extends PythonManagedClass {
     private final PythonBuiltinClassType type;
 
     public PythonBuiltinClass(PythonBuiltinClassType builtinClass, PythonAbstractClass base) {
-        super(PythonBuiltinClassType.PythonClass, builtinClass.getName(), base);
+        super(PythonBuiltinClassType.PythonClass, builtinClass.getQualifiedName(), base);
         this.type = builtinClass;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -76,9 +76,9 @@
 import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.TypeBuiltinsFactory.CallNodeFactory;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetMroNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetSubclassesNode;
-import com.oracle.graal.python.builtins.objects.type.TypeBuiltinsFactory.CallNodeFactory;
 import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.IsSameTypeNodeGen;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PGuards;
@@ -809,7 +809,7 @@ private static Object getModuleName(String fqname) {
     abstract static class QualNameNode extends AbstractSlotNode {
         @Specialization(guards = "isNoValue(value)")
         String getName(PythonBuiltinClassType cls, @SuppressWarnings("unused") PNone value) {
-            return cls.getName();
+            return cls.getQualifiedName();
         }
 
         @Specialization(guards = "isNoValue(value)")