Complete 'PySequence_*' C API functions.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/abstract.c

@@ -208,3 +208,52 @@ PyObject * PyIter_Next(PyObject *iter) {
 	}
     return to_sulong(result);
 }
+
+int PySequence_Check(PyObject *s) {
+	if (s == NULL) {
+		return 0;
+	}
+	return polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PySequence_Check", to_java(s)));
+}
+
+Py_ssize_t PySequence_Size(PyObject *s) {
+	return polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_Size", to_java(s)));
+}
+
+// taken from CPython "Objects/abstract.c"
+#undef PySequence_Length
+Py_ssize_t PySequence_Length(PyObject *s) {
+    return PySequence_Size(s);
+}
+#define PySequence_Length PySequence_Size
+
+PyObject* PySequence_GetItem(PyObject *s, Py_ssize_t i)
+{
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_GetItem", to_java(s), i, ERROR_MARKER);
+	if(result == ERROR_MARKER) {
+		return NULL;
+	}
+	return to_sulong(result);
+}
+
+int PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o) {
+	return polyglot_as_i32(polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_SetItem", to_java(s), i, to_java(o)));
+}
+
+PyObject* PySequence_Tuple(PyObject *v) {
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PySequence_Tuple", to_java(v), ERROR_MARKER);
+	if(result == ERROR_MARKER) {
+		return NULL;
+	}
+	return to_sulong(result);
+}
+
+PyObject *
+PySequence_Fast(PyObject *v, const char *m)
+{
+	void* result = polyglot_invoke(PY_TRUFFLE_CEXT, "PySequence_Fast", to_java(v), polyglot_from_string(m, "ascii"), ERROR_MARKER);
+	if(result == ERROR_MARKER) {
+		return NULL;
+	}
+	return to_sulong(result);
+}

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

@@ -110,6 +110,15 @@ def __float__(self):
         return 2.71828
 
 
+class DummySequence():
+    def __getitem__(self, idx):
+        return idx * 10
+
+
+class DummyListSubclass(list):
+    pass
+
+
 def _default_bin_arith_args():
     return (
         (0,0),
@@ -531,3 +540,24 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PySequence_Check = CPyExtFunction(
+        lambda args: not isinstance(args[0], dict) and hasattr(args[0], '__getitem__'),
+        lambda: (
+            (tuple(),),
+            ((1,2,3),),
+            ((None,),),
+            ([],),
+            (['a','b','c'],),
+            ([None],),
+            (dict(),),
+            (set(),),
+            ({'a', 'b'},),
+            ({'a':0, 'b':1},),
+            (DummySequence(),),
+            (DummyListSubclass(),),
+        ),
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* sequence"],
+    )
+

graalpython/lib-graalpython/python_cext.py

@@ -462,6 +462,43 @@ def PyIter_Next(itObj, error_marker):
     return error_marker
 
 
+##################### SEQUENCE
+
+
+def PySequence_Tuple(obj, error_marker):
+    typ = val = tb = None
+    try:
+        return tuple(obj)
+    except BaseException:
+        typ, val, tb = sys.exc_info()
+    PyErr_Restore(typ, val, tb)
+    return error_marker
+
+
+def PySequence_Fast(obj, msg, error_marker):
+    typ = val = tb = None
+    if isinstance(obj, tuple) or isinstance(obj, list):
+        return obj
+    try:
+        return list(obj)
+    except TypeError:
+        try:
+            raise TypeError(msg)
+        except TypeError:
+            typ, val, tb = sys.exc_info()
+    except BaseException:
+        typ, val, tb = sys.exc_info()
+    PyErr_Restore(typ, val, tb)
+    return error_marker
+
+
+def PySequence_Check(obj):
+    # dictionaries are explicitly excluded
+    if isinstance(obj, dict):
+        return False
+    return hasattr(obj, '__getitem__')
+
+
 ##################### UNICODE