[GR-34916] Intrinsity python_cext - PySet/Bytes/List_XXX.

PullRequest: graalpython/2047

Author: tomasstupka

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

@@ -48,6 +48,14 @@ def _reference_from_string_n(args):
     arg_n = args[1]
     return bytes(arg_str[0:arg_n], "utf-8")
 
+def _reference_from_object(args):
+    obj = args[0]
+    if type(obj) == bytes:
+        return obj
+    if isinstance(obj, (list, tuple, memoryview)) or (not isinstance(obj, str) and hasattr(obj, "__iter__")):
+        return bytes(obj)
+    raise TypeError("cannot convert '%s' object to bytes" % type(obj).__name__)
+
 
 def _as_string_and_size(args):
     arg_bytes = args[0]
@@ -60,6 +68,9 @@ def _reference_format(args):
     fmt_args = tuple(args[1:])
     return (fmt % fmt_args).encode()
 
+class CIter:
+    def __iter__(self):
+        return iter([1, 2, 3])
 
 class TestPyBytes(CPyExtTestCase):
 
@@ -148,10 +159,25 @@ def compile_module(self, name):
         argspec="sssi",
         arguments=["char* fmt", "char* arg0", "char* arg1", "int arg2"],
     )
+    
+    # PyBytes_FromObject
+    test_PyBytes_FromObject = CPyExtFunction(
+        _reference_from_object,
+        lambda: (("hello", ),
+                 (bytes(1), ),
+                 (1, ),
+                 ([1, 2, 4], ),
+                 ((1, 2, 3), ),
+                 (memoryview(b'abc'), ),
+                 (CIter(),)),
+        resultspec="O",
+        argspec="O",
+        cmpfunc=unhandled_error_compare
+    )
 
     # PyBytes_Concat
     test_PyBytes_Concat = CPyExtFunctionOutVars(
-        lambda args: (0, args[0] + args[1]),
+        lambda args: (0, args[0] + args[1]),        
         lambda: tuple([tuple(["hello".encode(), " world".encode()])]),
         code='''int wrap_PyBytes_Concat(PyObject** arg0, PyObject* arg1) {
             if(*arg0) {
@@ -280,6 +306,17 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test__PyBytes_Join = CPyExtFunction(
+        lambda args: args[0].join(args[1]),
+        lambda: ( 
+            (b"hello", b"world"),
+        ),        
+        resultspec="O",
+        argspec="OO",
+        arguments=["PyObject* original", "PyObject* newPart"],
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PyBytes_Resize_NativeStorage = CPyExtFunction(
         lambda args: args[1],
         lambda: (

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

@@ -323,8 +323,7 @@ def compile_module(self, name):
     # PyDict_Next
     test_PyDict_Next = CPyExtFunctionOutVars(
         _reference_next,
-        # lambda: (({'a': "hello"}, 0), ({'a': "hello", 'b': 'world'}, 1), ({'a': "hello"}, 1)),
-        lambda: (({'a': "hello"}, 1),),
+        lambda: (({'a': "hello"}, 1), ({'a': "hello"}, 0), ({'a': "hello", 'b': 'world'}, 1), ({'a': "hello"}, 1)),
         code='''int wrap_PyDict_Next(PyObject* dict, Py_ssize_t* ppos, PyObject** key, PyObject** value) {
             int res = 0;
             Py_ssize_t iterations = *ppos;
@@ -366,7 +365,7 @@ def compile_module(self, name):
             PyObject* value;
             Py_hash_t phash;            
             
-           _PyDict_Next(dict, &ppos, &key, &value, &phash);
+            _PyDict_Next(dict, &ppos, &key, &value, &phash);
             _PyDict_SetItem_KnownHash(result, key, value, phash);
             return result;
         }

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

@@ -42,6 +42,12 @@
 __dir__ = __file__.rpartition("/")[0]
 
 
+def raise_Py6_SystemError():
+    if sys.version_info.minor >= 6:
+        raise SystemError
+    else:
+        return -1
+    
 def _reference_new_list(args):
     n = args[0]
     if n < 0:
@@ -67,6 +73,14 @@ def _reference_setitem(args):
     listObj[pos] = newitem
     return listObj
 
+def _reference_setslice(args):
+    if not isinstance(args[0], list):
+        raise_Py6_SystemError()
+    try:        
+        args[0][args[1]:args[2]] = args[3]
+        return 0;
+    except:
+        return raise_Py6_SystemError()
 
 def _reference_reverse(args):
     args[0].reverse()
@@ -257,6 +271,20 @@ def compile_module(self, name):
         arguments=["PyObject* op", "Py_ssize_t ilow", "Py_ssize_t ihigh"],
         cmpfunc=unhandled_error_compare
     )
+    
+    test_PyList_SetSlice = CPyExtFunction(
+        _reference_setslice,
+        lambda: (
+            ([1,2,3,4],0,4,[5,6,7,8]),    
+            ([],1,2, [5,6]),
+            ([1,2,3,4],10,20,[5,6,7,8]),
+            (DummyClass(),10,20, [1]),
+        ),
+        resultspec="i",
+        argspec='OnnO',
+        arguments=["PyObject* op", "Py_ssize_t ilow", "Py_ssize_t ihigh", "PyObject* v"],
+        cmpfunc=unhandled_error_compare
+    )
 
     test_PyList_Size = CPyExtFunction(
         lambda args: len(args[0]),

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

@@ -63,6 +63,38 @@ def _reference_clear(args):
     return args[0]
 
 
+def _reference_next(args):
+    try:
+        s = args[0]
+        i = 0
+        for k in s:
+            if i == args[1]:
+                return (1, k, hash(k))
+            i = i + 1
+        return (0, None, 0)
+    except:
+        return (0, None, 0)
+
+def _reference_pop(args):
+    try:
+        s = args[0]    
+        return s.pop()
+    except AttributeError:
+        return raise_Py6_SystemError()
+    
+def _reference_discard(args):
+    try:
+        s = args[0]
+        if not (isinstance(s, set)):
+            raise SystemError
+        
+        if args[1] in s:
+            s.discard(args[1])
+            return 1
+        return 0
+    except AttributeError:
+        return raise_Py6_SystemError()
+    
 class FrozenSetSubclass(frozenset):
     pass
 
@@ -229,3 +261,71 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PySet_NextEntry = CPyExtFunctionOutVars(
+        _reference_next,
+        lambda: ((set(),1),
+            (set([1, 2, 3]),1),
+            (set({'a', 'b'}),1),
+            (frozenset([1, 2, 3]),1),
+            (frozenset({'a', 'b'}),1),
+            (frozenset([None]),1),
+            (FrozenSetSubclass(),1),
+            (SetSubclass([None]),1),),
+        code='''int wrap_PySet_NextEntry(PyObject* set, Py_ssize_t* ppos, PyObject **key, Py_hash_t* hash) {
+            int res = 0;
+            Py_ssize_t iterations = *ppos;
+            Py_ssize_t i;
+            *ppos = 0;
+            for(i=0; i < iterations; i++) {
+                _PySet_NextEntry(set, ppos, key, hash);
+            }
+            res = _PySet_NextEntry(set, ppos, key, hash);
+            if (!res) {
+                // avoid problems when building the result value
+                *key = set;
+                *hash = 0;     
+                Py_INCREF(set);
+            }
+            return res;
+        }
+        ''',
+        resultspec="iOn",
+        argspec='On',
+        arguments=("PyObject* set", "Py_ssize_t ppos"),
+        resulttype="int",
+        argumentnames=("set, &ppos"),
+        resultvars=("PyObject* key", "Py_hash_t hash"),
+        callfunction="wrap_PySet_NextEntry",
+        cmpfunc=lambda x, y: type(x) == tuple and type(y) == tuple and len(x) == 3 and len(y) == 3 and (x[0] == 0 and y[0] == 0 or x == y)
+    )
+
+    # PySet_Pop
+    test_PySet_Pop = CPyExtFunction(
+        _reference_pop,
+        lambda: ((set(),),
+            (set([1, 2, 3]),),
+            (set({'a', 'b'}),),
+            (frozenset([1, 2, 3]),),
+            (FrozenSetSubclass(),),
+            (SetSubclass([None]),),),
+        resultspec="O",
+        argspec='O',
+        cmpfunc=unhandled_error_compare
+    )
+    
+    # PySet_Discard
+    test_PySet_Discard = CPyExtFunction(
+        _reference_discard,
+        lambda: ((set(),1),
+            (set([1, 2, 3]),1),
+            (set([1, 2, 3]),None),
+            (set({'a', 'b'}),1),
+            (frozenset([1, 2, 3]),1),
+            (FrozenSetSubclass(),1),
+            (SetSubclass([None]),1)),
+        resultspec="i",
+        argspec='OO',
+        arguments=("PyObject* set", "PyObject* key"),
+        argumentnames=("set, key"),
+        cmpfunc=unhandled_error_compare
+    )

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

@@ -966,7 +966,7 @@ protected static boolean isSubtypeOfFloat(VirtualFrame frame, IsSubtypeNode isSu
     // frozenset([iterable])
     @Builtin(name = FROZENSET, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, constructsClass = PythonBuiltinClassType.PFrozenSet)
     @GenerateNodeFactory
-    public abstract static class FrozenSetNode extends PythonBuiltinNode {
+    public abstract static class FrozenSetNode extends PythonBinaryBuiltinNode {
 
         @Specialization(guards = "isNoValue(arg)")
         public PFrozenSet frozensetEmpty(Object cls, @SuppressWarnings("unused") PNone arg) {
@@ -3168,7 +3168,7 @@ Object initArgs(Object cls, Object[] args, @SuppressWarnings("unused") PKeyword[
 
     @Builtin(name = "mappingproxy", constructsClass = PythonBuiltinClassType.PMappingproxy, isPublic = false, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class MappingproxyNode extends PythonBuiltinNode {
+    public abstract static class MappingproxyNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "!isNoValue(obj)")
         Object doMapping(Object klass, Object obj,
                         @Cached PyMappingCheckNode mappingCheckNode) {