handle invalid dict c-tor arguments

Author: tomasstupka

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

@@ -165,6 +165,18 @@ def test_init3():
         assert False, "expected ValueError"
     except ValueError as e:
         assert "dictionary update sequence element #4 has length 1; 2 is required" == str(e), "invalid error message"
+        
+    try:
+        dict("5")
+        assert False, "expected ValueError"
+    except ValueError as e:
+        assert "dictionary update sequence element #0 has length 1; 2 is required" == str(e), "invalid error message"
+        
+    try:
+        dict([("a", 1), ("b", 2), ("c", 3), ("d", 4), "5"])
+        assert False, "expected ValueError"
+    except ValueError as e:
+        assert "dictionary update sequence element #4 has length 1; 2 is required" == str(e), "invalid error message"
 
 
 def test_init4():
@@ -198,7 +210,13 @@ def __len__(self):
     assert set(d.keys()) == key_set, "unexpected keys: %s" % str(d.keys())
     assert set(d.values()) == {97, 98, 99, 100}, "unexpected values: %s" % str(d.values())
 
-
+def test_init6():
+    try:
+        dict(1)
+        assert False, "expected TypeError"
+    except TypeError as e:
+        assert "'int' object is not iterable" == str(e), "invalid error message"
+        
 def test_init_kwargs():
     kwargs = {'ONE': 'one', 'TWO': 'two'}
     d = dict([(1, 11), (2, 22)], **kwargs)

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

@@ -73,6 +73,7 @@
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__MISSING__;
@@ -92,6 +93,7 @@
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
@@ -134,13 +136,28 @@ private HashingStorage.InitNode getInitNode() {
             return initNode;
         }
 
-        @Specialization(guards = "args.length == 1")
+        @Specialization(guards = {"args.length == 1", "firstArgIterable(args, lib)", "!firstArgString(args)"})
         Object doVarargs(VirtualFrame frame, PDict self, Object[] args, PKeyword[] kwargs,
-                        @Cached SetDictStorageNode setStorage) {
+                        @Cached SetDictStorageNode setStorage,
+                        @SuppressWarnings("unused") @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
             setStorage.execute(self, getInitNode().execute(frame, args[0], kwargs));
             return PNone.NONE;
         }
 
+        @SuppressWarnings("unused")
+        @Specialization(guards = {"args.length == 1", "!firstArgIterable(args, lib)"})
+        Object doVarargsNotIterable(Object self, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs,
+                        @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
+            throw raise(TypeError, ErrorMessages.OBJ_NOT_ITERABLE, args[0]);
+        }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = {"args.length == 1", "firstArgString(args)"})
+        Object doString(Object self, Object[] args, PKeyword[] kwargs,
+                        @Cached PRaiseNode raise) {
+            throw raise.raise(ValueError, ErrorMessages.DICT_UPDATE_SEQ_ELEM_HAS_LENGTH_2_REQUIRED, 0, 1);
+        }
+
         @Specialization(guards = "args.length == 0")
         Object doKeywords(VirtualFrame frame, PDict self, @SuppressWarnings("unused") Object[] args, PKeyword[] kwargs,
                         @Cached SetDictStorageNode setStorage) {
@@ -152,6 +169,14 @@ Object doKeywords(VirtualFrame frame, PDict self, @SuppressWarnings("unused") Ob
         Object doGeneric(@SuppressWarnings("unused") PDict self, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs) {
             throw raise(TypeError, ErrorMessages.EXPECTED_AT_MOST_D_ARGS_GOT_D, "dict", 1, args.length);
         }
+
+        protected boolean firstArgIterable(Object[] args, PythonObjectLibrary lib) {
+            return lib.isIterable(args[0]);
+        }
+
+        protected boolean firstArgString(Object[] args) {
+            return PGuards.isString(args[0]);
+        }
     }
 
     // setdefault(key[, default])