[GR-9750] dict creation from dict and kwargs

PullRequest: graalpython-open/38

Author: cosminbasca

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

@@ -35,6 +35,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
     try:
@@ -278,3 +279,9 @@ def test_in_dict_keys():
     d = {'a': 1, 'b': 2, 'c': 3}
     keys = d.keys()
     assert 'a' in keys
+
+
+def test_create_seq_and_kw():
+    d = dict({'a': 1, 'b': 2, 'c': 3}, d=4)
+    for k in ['a', 'b', 'c', 'd']:
+        assert k in d

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -295,11 +295,18 @@ protected boolean hasKeysAttribute(PythonObject o) {
             return lookupKeysAttributeNode.execute(o, KEYS) != PNone.NO_VALUE;
         }
 
-        @Specialization(guards = {"!isNoValue(iterable)"})
+        @Specialization(guards = {"!isNoValue(iterable)", "isEmpty(kwargs)"})
         public void doPDict(PDict self, PDict iterable, @SuppressWarnings("unused") PKeyword[] kwargs) {
             self.setDictStorage(iterable.getDictStorage().copy(HashingStorage.DEFAULT_EQIVALENCE));
         }
 
+        @Specialization(guards = {"!isNoValue(iterable)", "!isEmpty(kwargs)"})
+        public void doPDictKwargs(PDict self, PDict iterable, PKeyword[] kwargs) {
+            HashingStorage dictStorage = iterable.getDictStorage().copy(HashingStorage.DEFAULT_EQIVALENCE);
+            dictStorage.addAll(new KeywordsStorage(kwargs));
+            self.setDictStorage(dictStorage);
+        }
+
         @Specialization(guards = {"!isNoValue(mapping)", "!isPDict(mapping)", "hasKeysAttribute(mapping)"})
         public void doMapping(PDict self, PythonObject mapping, @SuppressWarnings("unused") PKeyword[] kwargs,
                         @Cached("create(KEYS)") LookupAndCallUnaryNode callKeysNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -90,8 +90,8 @@ private HashingStorageNodes.InitNode getInitNode() {
         }
 
         @Specialization(guards = "args.length == 1")
-        public Object doVarargs(PDict self, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs) {
-            getInitNode().execute(self, args[0], PKeyword.EMPTY_KEYWORDS);
+        public Object doVarargs(PDict self, Object[] args, PKeyword[] kwargs) {
+            getInitNode().execute(self, args[0], kwargs);
             return PNone.NONE;
         }