add test for method type constructor and fix it

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_methods.py

@@ -70,3 +70,22 @@ def test_call_builtin_method():
 def test_call_builtin_unbound_method():
     x = {1: 2}
     assert dict.__getitem__.__call__(x, 1) == 2
+
+
+def test_make_method():
+    method_type = type(X().foo)
+
+    class A():
+        def __init__(self, *args):
+            pass
+
+        def __call__(self, x, y):
+            assert isinstance(x, str)
+            assert isinstance(self, A)
+            return "A" + str(x) + str(y)
+
+    method1 = method_type(A, A)
+    method2 = method_type(A(), " is ")
+
+    assert isinstance(method1(), A)
+    assert method2(1) == "A is 1", method2(1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -140,6 +140,7 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
+import com.oracle.graal.python.nodes.datamodel.IsCallableNode;
 import com.oracle.graal.python.nodes.datamodel.IsIndexNode;
 import com.oracle.graal.python.nodes.datamodel.IsSequenceNode;
 import com.oracle.graal.python.nodes.expression.CastToListNode;
@@ -2378,13 +2379,23 @@ public Object generator(Object args, Object kwargs) {
     @GenerateNodeFactory
     public abstract static class MethodTypeNode extends PythonTernaryBuiltinNode {
         @Specialization
-        Object method(LazyPythonClass cls, Object self, PFunction func) {
+        Object method(LazyPythonClass cls, PFunction func, Object self) {
             return factory().createMethod(cls, self, func);
         }
 
-        @Specialization(guards = "isPythonBuiltinClass(cls)")
-        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object self, PBuiltinFunction func) {
-            return factory().createBuiltinMethod(self, func);
+        @Specialization
+        Object methodBuiltin(@SuppressWarnings("unused") LazyPythonClass cls, PBuiltinFunction func, Object self) {
+            return factory().createMethod(self, func);
+        }
+
+        @Specialization
+        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object func, Object self,
+                             @Cached("create()") IsCallableNode isCallable) {
+            if (isCallable.execute(func)) {
+                return factory().createMethod(self, func);
+            } else {
+                throw raise(TypeError, "first argument must be callable");
+            }
         }
     }