let's mark classmethods and staticmethods directly on the builtins now

Author: timfel

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

@@ -59,6 +59,10 @@
 
     boolean isPublic() default true;
 
+    boolean isClassmethod() default false;
+
+    boolean isStaticmethod() default false;
+
     /**
      * By default the caller frame bit is set on-demand, but for some builtins it might be useful to
      * always force passing the caller frame.

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

@@ -207,7 +207,6 @@ private static final String[] initializeCoreFiles() {
                         "_codecs",
                         "bytes",
                         "bytearray",
-                        "float",
                         "time",
                         "unicodedata",
                         "_locale",

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

@@ -73,6 +73,7 @@ public void initialize(PythonCore core) {
             RootCallTarget callTarget = core.getLanguage().builtinCallTargetCache.computeIfAbsent(factory.getNodeClass(),
                             (b) -> Truffle.getRuntime().createCallTarget(new BuiltinFunctionRootNode(core.getLanguage(), builtin, factory, declaresExplicitSelf)));
             if (builtin.constructsClass().length > 0) {
+                assert !builtin.isGetter() && !builtin.isSetter() && !builtin.isClassmethod() && !builtin.isStaticmethod();
                 PBuiltinFunction newFunc = core.factory().createBuiltinFunction(__NEW__, null, createArity(builtin, declaresExplicitSelf), callTarget);
                 for (PythonBuiltinClassType type : builtin.constructsClass()) {
                     PythonBuiltinClass builtinClass = core.lookupType(type);
@@ -84,9 +85,15 @@ public void initialize(PythonCore core) {
                 function.setAttribute(__DOC__, builtin.doc());
                 BoundBuiltinCallable<?> callable = function;
                 if (builtin.isGetter() || builtin.isSetter()) {
+                    assert !builtin.isClassmethod() && !builtin.isStaticmethod();
                     PythonCallable get = builtin.isGetter() ? function : null;
                     PythonCallable set = builtin.isSetter() ? function : null;
                     callable = core.factory().createGetSetDescriptor(get, set, builtin.name(), null);
+                } else if (builtin.isClassmethod()) {
+                    assert !builtin.isStaticmethod();
+                    callable = core.factory().createClassmethod(function);
+                } else if (builtin.isStaticmethod()) {
+                    callable = core.factory().createStaticmethod(function);
                 }
                 setBuiltinFunction(builtin.name(), callable);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

@@ -515,7 +515,7 @@ PNotImplemented doGeneric(Object left, Object right) {
         }
     }
 
-    @Builtin(name = "fromhex", fixedNumOfPositionalArgs = 2)
+    @Builtin(name = "fromhex", fixedNumOfPositionalArgs = 2, isClassmethod = true)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class FromHexNode extends PythonBuiltinNode {
@@ -1154,7 +1154,7 @@ int trunc(PFloat pValue,
 
     }
 
-    @Builtin(name = __GETFORMAT__, fixedNumOfPositionalArgs = 2)
+    @Builtin(name = __GETFORMAT__, fixedNumOfPositionalArgs = 2, isClassmethod = true)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class GetFormatNode extends PythonBinaryBuiltinNode {

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

@@ -40,13 +40,16 @@
  */
 package com.oracle.graal.python.builtins.objects.method;
 
+import com.oracle.graal.python.builtins.BoundBuiltinCallable;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 
 /**
  * Storage for both classmethods and staticmethods
  */
-public class PDecoratedMethod extends PythonBuiltinObject {
+public class PDecoratedMethod extends PythonBuiltinObject implements BoundBuiltinCallable<Object> {
     private Object callable;
 
     public PDecoratedMethod(LazyPythonClass cls) {
@@ -65,4 +68,8 @@ public Object getCallable() {
     public void setCallable(Object callable) {
         this.callable = callable;
     }
+
+    public Object boundToObject(PythonBuiltinClassType binding, PythonObjectFactory factory) {
+        return this;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -398,15 +398,15 @@ public PDecoratedMethod createClassmethod(LazyPythonClass cls) {
         return trace(new PDecoratedMethod(cls));
     }
 
-    public Object createClassmethod(Object callable) {
+    public PDecoratedMethod createClassmethod(Object callable) {
         return trace(new PDecoratedMethod(PythonBuiltinClassType.PClassmethod, callable));
     }
 
     public PDecoratedMethod createStaticmethod(LazyPythonClass cls) {
         return trace(new PDecoratedMethod(cls));
     }
 
-    public Object createStaticmethod(Object callable) {
+    public PDecoratedMethod createStaticmethod(Object callable) {
         return trace(new PDecoratedMethod(PythonBuiltinClassType.PStaticmethod, callable));
     }