[GH-27] PythonBuiltinClass is not PythonCallable

PullRequest: graalpython/308

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java

@@ -37,10 +37,12 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.function.PythonCallable;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.BuiltinNames;
+import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.call.InvokeNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.test.PythonTests;
@@ -75,7 +77,8 @@ public void builtinsMinTest() {
     public void builtinsIntTest() {
         final PythonModule builtins = context.getBuiltins();
         PythonBuiltinClass intClass = (PythonBuiltinClass) builtins.getAttribute(BuiltinNames.INT);
-        Object returnValue = InvokeNode.create(intClass).execute(null, createWithUserArguments(intClass, "42"), PKeyword.EMPTY_KEYWORDS);
+        PythonCallable intNew = (PythonCallable) intClass.getAttribute(SpecialAttributeNames.__NEW__);
+        Object returnValue = InvokeNode.create(intNew).execute(null, createWithUserArguments(intClass, "42"), PKeyword.EMPTY_KEYWORDS);
         assertEquals(42, returnValue);
     }
 

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

@@ -25,20 +25,17 @@
  */
 package com.oracle.graal.python.builtins.objects.type;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.function.Arity;
-import com.oracle.graal.python.builtins.objects.function.PythonCallable;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.object.HiddenKey;
 
 /**
  * A Python built-in class that is immutable.
  */
-public final class PythonBuiltinClass extends PythonClass implements PythonCallable {
+public final class PythonBuiltinClass extends PythonClass {
     private final PythonBuiltinClassType type;
 
     public PythonBuiltinClass(PythonBuiltinClassType builtinClass, PythonClass base) {
@@ -64,12 +61,6 @@ public void setAttributeUnsafe(Object name, Object value) {
         super.setAttribute(name, value);
     }
 
-    @Override
-    public Arity getArity() {
-        PythonCallable init = (PythonCallable) getAttribute(__NEW__);
-        return init.getArity();
-    }
-
     public PythonBuiltinClassType getType() {
         return type;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java

@@ -25,8 +25,6 @@
  */
 package com.oracle.graal.python.nodes.call;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.function.Arity;
@@ -38,7 +36,6 @@
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.argument.ApplyKeywordsNode;
 import com.oracle.graal.python.nodes.argument.ArityCheckNode;
@@ -82,9 +79,6 @@ protected static RootCallTarget getCallTarget(PythonCallable callee) {
             PBuiltinMethod method = (PBuiltinMethod) callee;
             PBuiltinFunction internalFunc = method.getFunction();
             callTarget = internalFunc.getCallTarget();
-        } else if (actualCallee instanceof PythonBuiltinClass) {
-            actualCallee = (PythonCallable) ((PythonBuiltinClass) actualCallee).getAttribute(__NEW__);
-            callTarget = actualCallee.getCallTarget();
         } else {
             throw new UnsupportedOperationException("Unsupported callee type " + actualCallee);
         }
@@ -113,15 +107,11 @@ protected final void optionallySetClassBodySpecial(Object[] arguments, CallTarge
 
     @TruffleBoundary
     protected static Arity getArity(PythonCallable callee) {
-        if (callee instanceof PythonBuiltinClass) {
-            return ((PythonCallable) ((PythonBuiltinClass) callee).getAttribute(__NEW__)).getArity();
-        } else {
-            return callee.getArity();
-        }
+        return callee.getArity();
     }
 
     protected static boolean isBuiltin(PythonCallable callee) {
-        return callee instanceof PBuiltinFunction || callee instanceof PBuiltinMethod || callee instanceof PythonBuiltinClass;
+        return callee instanceof PBuiltinFunction || callee instanceof PBuiltinMethod;
     }
 }