Merge remote-tracking branch 'florian/fa/numpy-building' into tim/numpy-building

timfel · timfel · commit 0c6ed34eb8e1 · 2018-05-15T13:35:38.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -96,6 +96,7 @@ static void initialize_capi() {
     initialize_type_structure(&PyCFunction_Type, "function");
     initialize_type_structure(&PyFrozenSet_Type, "frozenset");
     initialize_type_structure(&PySet_Type, "set");
+    initialize_type_structure(&PyEllipsis_Type, "ellipsis");
 
     // initialize global variables like '_Py_NoneStruct', etc.
     initialize_globals();
@@ -381,4 +382,3 @@ int PyTruffle_Debug(void *arg) {
 	truffle_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Debug", arg);
 	return 0;
 }
-
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h
@@ -74,6 +74,7 @@ POLYGLOT_DECLARE_TYPE(PyBytesObject);
 POLYGLOT_DECLARE_STRUCT(_longobject);
 POLYGLOT_DECLARE_TYPE(PyCapsule);
 POLYGLOT_DECLARE_TYPE(PyMemoryViewObject);
+POLYGLOT_DECLARE_TYPE(PySetObject);
 
 
 extern void* to_java(PyObject* obj);
diff --git a/graalpython/com.oracle.graal.python.cext/src/object.c b/graalpython/com.oracle.graal.python.cext/src/object.c
@@ -129,11 +129,6 @@ PyObject _Py_NoneStruct = {
   1, &_PyNone_Type
 };
 
-PyObject _Py_EllipsisObject = {
-  _PyObject_EXTRA_INIT
-  1, &_PyNone_Type
-};
-
 PyTypeObject _PyNotImplemented_Type = PY_TRUFFLE_TYPE("NotImplementedType", &PyType_Type, Py_TPFLAGS_DEFAULT);
 
 PyObject _Py_NotImplementedStruct = {
@@ -167,6 +162,15 @@ Py_ssize_t PyObject_Size(PyObject *o) {
     return truffle_invoke_i(PY_TRUFFLE_CEXT, "PyObject_Size", to_java(o));
 }
 
+static int add_subclass(PyTypeObject *base, PyTypeObject *type) {
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Add_Subclass", to_java(base->tp_subclasses), to_java(PyLong_FromVoidPtr(type)), to_java((PyObject*)type));
+	if (result == ERROR_MARKER) {
+		return -1;
+	}
+	base->tp_subclasses = to_sulong(result);
+	return 0;
+}
+
 int PyType_Ready(PyTypeObject* cls) {
 #define ADD_IF_MISSING(attr, def) if (!(attr)) { attr = def; }
 #define ADD_METHOD(m) ADD_METHOD_OR_SLOT(m.ml_name, m.ml_meth, m.ml_flags, m.ml_doc)
@@ -210,13 +214,29 @@ int PyType_Ready(PyTypeObject* cls) {
         cls->tp_doc = "";
     }
 
+    /* Initialize tp_bases */
+    PyObject* bases = cls->tp_bases;
+    if (bases == NULL) {
+        if (base == NULL) {
+            bases = PyTuple_New(0);
+        } else {
+            bases = PyTuple_Pack(1, base);
+        }
+        if (bases == NULL) {
+        	cls->tp_flags &= ~Py_TPFLAGS_READYING;
+        	return -1;
+        }
+        cls->tp_bases = bases;
+    }
+
+
     PyTypeObject* javacls = truffle_invoke(PY_TRUFFLE_CEXT,
                                            "PyType_Ready",
                                            // no conversion of cls here, because we
                                            // store this into the PyTypeObject
                                            cls,
                                            to_java_type(metaclass),
-                                           to_java_type(base),
+                                           to_java(bases),
                                            truffle_read_string(cls->tp_name),
                                            truffle_read_string(cls->tp_doc ? cls->tp_doc : ""));
     if (polyglot_is_value(javacls)) {
@@ -387,6 +407,18 @@ int PyType_Ready(PyTypeObject* cls) {
         // TODO ...
     }
 
+    /* Link into each base class's list of subclasses */
+    bases = cls->tp_bases;
+    Py_ssize_t n = PyTuple_GET_SIZE(bases);
+    Py_ssize_t i;
+    for (i = 0; i < n; i++) {
+        PyTypeObject *b = polyglot_as__typeobject(PyTuple_GET_ITEM(bases, i));
+        if (PyType_Check(b) && add_subclass((PyTypeObject *)b, cls) < 0) {
+        	cls->tp_flags &= ~Py_TPFLAGS_READYING;
+        	return -1;
+        }
+    }
+
     // done
     cls->tp_flags = cls->tp_flags & ~Py_TPFLAGS_READYING;
     cls->tp_flags = cls->tp_flags | Py_TPFLAGS_READY;
@@ -471,7 +503,7 @@ PyObject* PyObject_CallFunctionObjArgs(PyObject *callable, ...) {
 PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char* fmt, ...) {
     PyObject* args;
     CALL_WITH_VARARGS(args, Py_BuildValue, 3, fmt);
-    return to_sulong(truffle_invoke(PY_TRUFFLE_CEXT, "PyObject_CallMethod", to_java(object), truffle_read_string(method), args));
+    return to_sulong(truffle_invoke(PY_TRUFFLE_CEXT, "PyObject_CallMethod", to_java(object), truffle_read_string(method), to_java(args)));
 }
 
 PyObject* PyObject_Type(PyObject* obj) {
diff --git a/graalpython/com.oracle.graal.python.cext/src/setobject.c b/graalpython/com.oracle.graal.python.cext/src/setobject.c
@@ -40,3 +40,19 @@
 
 PyTypeObject PySet_Type = PY_TRUFFLE_TYPE("set", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC);
 PyTypeObject PyFrozenSet_Type = PY_TRUFFLE_TYPE("frozenset", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC);
+
+PyObject * PySet_New(PyObject *iterable) {
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PySet_New", to_java(iterable));
+	if (result == ERROR_MARKER) {
+		return NULL;
+	}
+	return to_sulong(result);
+}
+
+PyObject * PyFrozenSet_New(PyObject *iterable) {
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyFrozenSet_New", to_java(iterable));
+	if (result == ERROR_MARKER) {
+		return NULL;
+	}
+	return to_sulong(result);
+}
diff --git a/graalpython/com.oracle.graal.python.cext/src/sliceobject.c b/graalpython/com.oracle.graal.python.cext/src/sliceobject.c
@@ -38,4 +38,10 @@
  */
 #include "capi.h"
 
+PyTypeObject PyEllipsis_Type = PY_TRUFFLE_TYPE("ellipsis", &PyType_Type, Py_TPFLAGS_DEFAULT);
 PyTypeObject PySlice_Type = PY_TRUFFLE_TYPE("slice", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC);
+
+PyObject _Py_EllipsisObject = {
+    _PyObject_EXTRA_INIT
+    1, &PyEllipsis_Type
+};
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_misc.py b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_misc.py
@@ -0,0 +1,77 @@
+# 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.
+
+import sys
+from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
+__dir__ = __file__.rpartition("/")[0]
+
+class TestMisc(CPyExtTestCase):
+    def compile_module(self, name):
+        type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
+        super(TestMisc, self).compile_module(name)
+
+    test_PyEllipsis_isSingleton = CPyExtFunction(
+        lambda args: 1,
+        lambda: (
+            (...,),
+        ),
+        callfunction="CheckPyEllipsis",
+        code="""
+        static int CheckPyEllipsis(PyObject* ellipsis_singleton) {
+            return ellipsis_singleton == &_Py_EllipsisObject;
+        }
+        """,
+        resultspec="i",
+        argspec="O",
+        arguments=["PyObject* ellipsis_singleton"],
+    )
+
+    test_PyEllipsis_type = CPyExtFunction(
+        lambda args: 1,
+        lambda: (
+            (...,),
+        ),
+        callfunction="CheckPyEllipsisType",
+        code="""
+        static int CheckPyEllipsisType(PyObject* ellipsis_singleton) {
+            return Py_TYPE(&_Py_EllipsisObject) == &PyEllipsis_Type;
+        }
+        """,
+        resultspec="i",
+        argspec="O",
+        arguments=["PyObject* ellipsis_singleton"],
+    )
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_set.py b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_set.py
@@ -0,0 +1,146 @@
+# 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.
+
+import sys
+from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
+__dir__ = __file__.rpartition("/")[0]
+
+
+class FrozenSetSubclass(frozenset):
+    pass
+
+
+class SetSubclass(set):
+    pass
+
+
+default_typecheck_args = lambda: (
+            (set(),), 
+            (set([1,2,3]),), 
+            (set({'a', 'b'}),), 
+            (set([None]),), 
+            (frozenset(),), 
+            (frozenset([1,2,3]),), 
+            (frozenset({'a', 'b'}),), 
+            (frozenset([None]),), 
+            (FrozenSetSubclass(),), 
+            (SetSubclass([None]),), 
+            ({'a': "hello", 'b': "world"},),
+            ('a',),
+            (1,),
+            (None,),
+        )
+
+class TestPySet(CPyExtTestCase):
+    def compile_module(self, name):
+        type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
+        super(TestPySet, self).compile_module(name)
+
+    test_PySet_New = CPyExtFunction(
+        lambda args: set(args[0]),
+        lambda: (
+            ([1, 2, 3],), 
+            ({'a': "hello", 'b': "world"},),
+            ({'a', 'b'},),
+            ('a',),
+            (1,),
+        ),
+        resultspec="O",
+        argspec='O',
+        arguments=["PyObject* iterable"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    test_PyFrozenSet_New = CPyExtFunction(
+        lambda args: frozenset(args[0]),
+        lambda: (
+            ([1, 2, 3],), 
+            ({'a': "hello", 'b': "world"},),
+            ({'a', 'b'},),
+            ('a',),
+            (1,),
+        ),
+        resultspec="O",
+        argspec='O',
+        arguments=["PyObject* iterable"],
+        cmpfunc=unhandled_error_compare
+    )
+    
+    test_PyFrozenSet_Check = CPyExtFunction(
+        lambda args: isinstance(args[0], frozenset),
+        default_typecheck_args,
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    test_PyFrozenSet_CheckExact = CPyExtFunction(
+        lambda args: type(args[0]) is frozenset,
+        default_typecheck_args,
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    test_PyAnySet_CheckExact = CPyExtFunction(
+        lambda args: type(args[0]) is set or type(args[0]) is frozenset,
+        default_typecheck_args,
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
+    
+    test_PyAnySet_Check = CPyExtFunction(
+        lambda args: isinstance(args[0], set) or isinstance(args[0], frozenset),
+        default_typecheck_args,
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
+    
+    test_PySet_Check = CPyExtFunction(
+        lambda args: isinstance(args[0], set),
+        default_typecheck_args,
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -493,15 +493,21 @@ abstract static class PyType_ReadyNode extends PythonBuiltinNode {
         @Child WriteAttributeToObjectNode writeNode = WriteAttributeToObjectNode.create();
 
         @Specialization
-        PythonClass run(TruffleObject typestruct, PythonClass metaClass, PythonClass baseClass, String name, String doc) {
-            PythonClass cclass = factory().createNativeClassWrapper(typestruct, metaClass, name, new PythonClass[]{baseClass});
+        PythonClass run(TruffleObject typestruct, PythonClass metaClass, PTuple baseClasses, String name, String doc) {
+            Object[] array = baseClasses.getArray();
+            PythonClass[] bases = new PythonClass[array.length];
+            for (int i = 0; i < array.length; i++) {
+                bases[i] = (PythonClass) array[i];
+            }
+
+            PythonClass cclass = factory().createNativeClassWrapper(typestruct, metaClass, name, bases);
             writeNode.execute(cclass, SpecialAttributeNames.__DOC__, doc);
             return cclass;
         }
 
         @Specialization
-        PythonClass run(TruffleObject typestruct, PythonClass metaClass, PythonClass baseClass, PString name, PString doc) {
-            return run(typestruct, metaClass, baseClass, name.getValue(), doc.getValue());
+        PythonClass run(TruffleObject typestruct, PythonClass metaClass, PTuple baseClasses, PString name, PString doc) {
+            return run(typestruct, metaClass, baseClasses, name.getValue(), doc.getValue());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
diff --git a/graalpython/lib-graalpython/python_cext.py b/graalpython/lib-graalpython/python_cext.py
