Support macro 'PyIndex_Check'.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_abstract.py

@@ -707,3 +707,23 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyIndex_Check = CPyExtFunction(
+        lambda args: hasattr(args[0], "__index__"),
+        lambda: (
+            (1, ),
+            ("not a number", ),
+            (tuple(), ),
+            (dict(), ),
+            (list(), ),
+            (DummyFloatable(), ),
+            (DummyFloatSubclass(), ),
+            (DummyIntable(), ),
+            (DummyIntSubclass(), ),
+            (NoNumber(), ),
+        ),
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* obj"],
+        cmpfunc=unhandled_error_compare
+    )
+

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapper.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.objects.cext;
+
+import com.oracle.truffle.api.interop.ForeignAccess;
+import com.oracle.truffle.api.interop.TruffleObject;
+
+/**
+ * Wraps a PythonObject to proviate a native view with a shape like {@code PyNumberMethods}.
+ */
+public class PyNumberMethodsWrapper implements TruffleObject {
+
+    private final Object delegate;
+
+    public PyNumberMethodsWrapper(Object delegate) {
+        this.delegate = delegate;
+    }
+
+    public Object getDelegate() {
+        return delegate;
+    }
+
+    static boolean isInstance(TruffleObject o) {
+        return o instanceof PyNumberMethodsWrapper;
+    }
+
+    public ForeignAccess getForeignAccess() {
+        return PyNumberMethodsWrapperMRForeign.ACCESS;
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapperMR.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.objects.cext;
+
+import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
+import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.interop.MessageResolution;
+import com.oracle.truffle.api.interop.Resolve;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.nodes.Node;
+
+@MessageResolution(receiverType = PyNumberMethodsWrapper.class)
+public class PyNumberMethodsWrapperMR {
+
+    @Resolve(message = "READ")
+    abstract static class ReadNode extends Node {
+        @Child private LookupAttributeInMRONode getAttributeNode;
+        @Child private ToSulongNode toSulongNode;
+
+        public Object access(PyNumberMethodsWrapper object, String key) {
+            // translate key to attribute name
+            String attributeName = toAttributeName(key);
+
+            Object execute = getReadArrayItemNode().execute(object.getDelegate(), attributeName);
+            return getToSulongNode().execute(execute);
+        }
+
+        private static String toAttributeName(String numberMethodsMember) {
+            switch (numberMethodsMember) {
+                case "nb_add":
+                    return SpecialMethodNames.__ADD__;
+                case "nb_index":
+                    return SpecialMethodNames.__INDEX__;
+                default:
+                    // TODO extend list
+                    throw UnknownIdentifierException.raise(numberMethodsMember);
+            }
+        }
+
+        private LookupAttributeInMRONode getReadArrayItemNode() {
+            if (getAttributeNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getAttributeNode = insert(LookupAttributeInMRONode.create());
+            }
+            return getAttributeNode;
+        }
+
+        private ToSulongNode getToSulongNode() {
+            if (toSulongNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                toSulongNode = insert(ToSulongNode.create());
+            }
+            return toSulongNode;
+        }
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -187,8 +187,8 @@ Object doTpBase(PythonClass object, @SuppressWarnings("unused") String key) {
 
         @Specialization(guards = "eq(TP_AS_NUMBER, key)")
         Object doTpAsNumber(PythonClass object, @SuppressWarnings("unused") String key) {
-            // TODO
-            return getToSulongNode().execute(object);
+            // TODO check for type and return 'NULL'
+            return new PyNumberMethodsWrapper(object);
         }
 
         @Specialization(guards = "eq(OB_ITEM, key)")