intrinsified python_cext.PyDict_XXX

Author: tomasstupka

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

@@ -48,7 +48,18 @@ def _reference_get_item(args):
         return d.get(args[1])
     except Exception:
         return None
-
+    
+def _reference_values(args):
+    d = args[0]
+    return list(d.values())
+    
+def _reference_pop(args):
+    d = args[0]
+    if(len(args) == 2):
+        return d.pop(args[1])
+    else:
+        return d.pop(args[1], args[2])
+        
 
 def _reference_get_item_with_error(args):
     d = args[0]
@@ -119,14 +130,20 @@ def _reference_clear(args):
 
 
 def _reference_merge(args):
-    a, b, override = args
-    if override:
-        a.update(b)
-    else:
-        for k in b:
-            if not k in a:
-                a[k] = b[k]
-    return 0
+    try:
+        a, b, override = args
+        if override:
+            a.update(b)
+        else:
+            for k in b.keys():
+                if not k in a:
+                    a[k] = b[k]
+        return 0
+    except:        
+        if sys.version_info.minor >= 6:
+            raise SystemError
+        else:
+            return -1
 
 class SubDict(dict):
     pass
@@ -151,13 +168,28 @@ def __eq__(self, other):
     def __hash__(self):
         return hash(self.s)
 
-
+class MappingObj:
+    def keys(self):
+        return "ab"
+    def __getitem__(self, key):
+        return key
+        
 class TestPyDict(CPyExtTestCase):
 
     def compile_module(self, name):
         type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
         super(TestPyDict, self).compile_module(name)
 
+    # PyDict_Pop
+    test__PyDict_Pop = CPyExtFunction(
+        _reference_pop,
+        lambda: (({}, "a", "42"), ({'a': "hello"}, "a", "42"), ({'a': "hello"}, "b", "42"), ({BadEq('a'): "hello"}, "a", "42" )),
+        resultspec="O",
+        argspec='OOO',
+        arguments=("PyObject* dict", "PyObject* key", "PyObject* deflt"),
+        cmpfunc=unhandled_error_compare
+    )
+    
     # PyDict_SetItem
     test_PyDict_SetItem = CPyExtFunction(
         _reference_set_item,
@@ -191,7 +223,7 @@ def compile_module(self, name):
         callfunction="wrap_PyDict_GetItem",
         cmpfunc=unhandled_error_compare
     )
-
+    
     # PyDict_GetItemWithError
     test_PyDict_GetItemWithError = CPyExtFunction(
         _reference_get_item_with_error,
@@ -332,12 +364,10 @@ def compile_module(self, name):
             Py_ssize_t ppos = 0;
             PyObject* key;
             PyObject* value;
-            Py_hash_t phash;
-            
-            int res = 0;
+            Py_hash_t phash;            
             
            _PyDict_Next(dict, &ppos, &key, &value, &phash);
-            res = _PyDict_SetItem_KnownHash(result, key, value, phash);
+            _PyDict_SetItem_KnownHash(result, key, value, phash);
             return result;
         }
         ''',
@@ -466,9 +496,22 @@ def compile_module(self, name):
             (dict(), {"b": 2}, 0),
             (dict({"a": 1}), {"a": 2}, 0),
             (dict({"a": 1}), {"a": 2}, 1),
+            (dict({"a": 1}), MappingObj(), 0),
+            (dict({"a": 1}), MappingObj(), 1),
+            (dict({"a": 1}), 1, 1),
+            (dict({"a": 1}), 1, 1),
         ),
         resultspec="i",
         argspec="OOi",
         arguments=["PyObject* a", "PyObject* b", "int override"],
         cmpfunc=unhandled_error_compare
     )
+    
+    # PyDict_Values
+    test_PyDict_Values = CPyExtFunction(
+        _reference_values,
+        lambda: (({},), ({'a': "hello"},)),
+        resultspec="O",
+        argspec="O",
+        cmpfunc=unhandled_error_compare
+    )

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

@@ -85,7 +85,6 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
-import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.parser.sst.SerializationUtils;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
@@ -107,9 +106,6 @@ public class ImpModuleBuiltins extends PythonBuiltins {
 
     static final String HPY_SUFFIX = ".hpy.so";
 
-    // the full module name for package imports
-    public String pyPackageContext;
-
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return ImpModuleBuiltinsFactory.getFactories();
@@ -441,26 +437,27 @@ Object run() {
         }
     }
 
-    @Builtin(name = "create_dynamic", minNumOfPositionalArgs = 2, declaresExplicitSelf = true, parameterNames = {"$self", "moduleSpec", "fileName"})
+    @Builtin(name = "create_dynamic", minNumOfPositionalArgs = 1, parameterNames = {"moduleSpec", "fileName"})
     @GenerateNodeFactory
-    public abstract static class CreateDynamicNode extends PythonTernaryBuiltinNode {
+    public abstract static class CreateDynamicNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "isNoValue(fileName)")
-        Object runNoFileName(VirtualFrame frame, PythonModule self, PythonObject moduleSpec, @SuppressWarnings("unused") PNone fileName,
+        Object runNoFileName(VirtualFrame frame, PythonObject moduleSpec, @SuppressWarnings("unused") PNone fileName,
+                        @Cached PyObjectStrAsJavaStringNode asStrignNode,
                         @Cached CreateDynamic createDynamicNode) {
-            return run(frame, self, moduleSpec, PNone.NONE, createDynamicNode);
+            return run(frame, moduleSpec, PNone.NONE, asStrignNode, createDynamicNode);
         }
 
         @Specialization(guards = "!isNoValue(fileName)")
-        Object run(VirtualFrame frame, PythonModule self, PythonObject moduleSpec, Object fileName,
+        Object run(VirtualFrame frame, PythonObject moduleSpec, Object fileName,
+                        @Cached PyObjectStrAsJavaStringNode asStrignNode,
                         @Cached CreateDynamic createDynamicNode) {
-            ImpModuleBuiltins impBuiltins = (ImpModuleBuiltins) self.getBuiltins();
-            String oldPackageContext = impBuiltins.pyPackageContext;
-            impBuiltins.pyPackageContext = PyObjectStrAsJavaStringNode.getUncached().execute(frame,
-                            PyObjectLookupAttr.getUncached().execute(frame, moduleSpec, "name"));
+            PythonContext ctx = getContext();
+            String oldPackageContext = ctx.getPyPackageContext();
+            ctx.setPyPackageContext(asStrignNode.execute(frame, PyObjectLookupAttr.getUncached().execute(frame, moduleSpec, "name")));
             try {
                 return createDynamicNode.execute(frame, moduleSpec, fileName);
             } finally {
-                impBuiltins.pyPackageContext = oldPackageContext;
+                ctx.setPyPackageContext(oldPackageContext);
             }
         }
     }