[GR-25788] GraalPython allows to put multiple values for keyword argument.

PullRequest: graalpython/1249

Author: ppisl

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -167,6 +167,8 @@ def f24(*args, a, b=5):
 def f25(*args, a, b=5, **kwds):
     pass
 
+def f26(**kw):
+    return kw
 
 def assert_parses(call_expr):
     raised = False
@@ -234,8 +236,7 @@ def test_parse_args():
 
     assert_parses("f11(a=1, b=2)")
     assert_parses("f11(a=1, b=2, c=3)")
-    # TODO
-    # assert_call_raises(SyntaxError, "f11(a=1, b=2, a=3)")  # SyntaxError: keyword argument repeated
+    assert_call_raises(SyntaxError, "f11(a=1, b=2, a=3)")  # SyntaxError: keyword argument repeated
     assert_call_raises(TypeError, "f11(1, b=2, a=3)")  # TypeError: f11() got multiple values for argument 'a'
 
     assert_parses("f12(1,2)")
@@ -286,8 +287,7 @@ def test_parse_args():
     assert_parses("f20(a=1)")
     assert_parses("f20(a=1, b=2)")
     assert_parses("f20(a=1, b=2, c=3)")
-    # TODO
-    # assert_call_raises(SyntaxError, "f20(a=1, b=2, a=3)")  # SyntaxError: keyword argument repeated
+    assert_call_raises(SyntaxError, "f20(a=1, b=2, a=3)")  # SyntaxError: keyword argument repeated
     assert_call_raises(TypeError, "f20(1, b=2)")  # TypeError: f20() takes 0 positional arguments but 1 positional argument (and 1 keyword-only argument) were given
     assert_call_raises(TypeError, "f20(1)")  # TypeError: f20() takes 0 positional arguments but 1 was given
 
@@ -324,3 +324,41 @@ def test_parse_args():
     assert_call_raises(TypeError, "f25(1,2,3,c=6)")  # TypeError: f25() missing 1 required keyword-only argument: 'a'
     assert_parses("f25(a=4,c=6)")
     assert_parses("f25(a=4)")
+
+def test_multiple_values_for_keyword_argument():
+    assert_call_raises(TypeError, "f26(a=1, **{'a' : 2})") # TypeError: f26() got multiple values for keyword argument 'a'
+    assert_call_raises(TypeError, "f26(**{'a' : 4}, **{'a': 3})")  # TypeError: f26() got multiple values for keyword argument 'a'
+    
+b = 1
+def test_argument_must_be_mapping():    
+    assert_call_raises(TypeError, "f26(a=1, **b)") # TypeError: f26() argument after ** must be a mapping, not int
+    assert_call_raises(TypeError, "f26(**b)") # TypeError: f26() argument after ** must be a mapping, not int
+    class MyDict(dict):
+        pass
+    d = MyDict()
+    assert f26(**d) == {}
+
+fooo = f26
+def test_multiple_values_with_callable_name():
+    def assert_get_message(err, fn, *args, **kwargs):
+        raised = False
+        try:
+            fn(*args, **kwargs)
+        except err as ex:
+            return str(ex)
+        assert raised
+        
+    def assert_call_raises_get_message(exception, call_expr):
+        return assert_get_message(exception, eval, call_expr)
+
+    msg = assert_call_raises_get_message(TypeError, "fooo(a=1, **b)") # TypeError: f26() argument after ** must be a mapping, not int
+    assert msg == "f26() argument after ** must be a mapping, not int"
+    
+    msg = assert_call_raises_get_message(TypeError, "fooo(**{'a' : 4}, **{'a': 3})")  # TypeError: f26() got multiple values for keyword argument 'a'
+    assert msg == "f26() got multiple values for keyword argument 'a'"
+    
+def test_runtime_args():
+    mydict = {'a':1, 'b':2, 'c':3}
+    kw = f26(b = mydict.pop('b', 22), **mydict)
+    assert 'b' in kw
+    assert kw['b'] == 2

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call03.tast

@@ -8,12 +8,11 @@ ModuleRootNode Name: <module 'call03'> SourceSection: [0,12]`foo(arg = 1)`
     PythonCallNodeGen SourceSection: [0,12]`foo(arg = 1)`
       CallNodeGen SourceSection: None
       KeywordArgumentsNodeGen SourceSection: None
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [10,11]`1`
-            Value: 1
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          EmptyNode SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [10,11]`1`
+              Value: 1
+        EmptyNode SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call06.tast

@@ -8,15 +8,14 @@ ModuleRootNode Name: <module 'call06'> SourceSection: [0,23]`foo(arg1 = 1, arg2
     PythonCallNodeGen SourceSection: [0,23]`foo(arg1 = 1, arg2 =...`
       CallNodeGen SourceSection: None
       KeywordArgumentsNodeGen SourceSection: None
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [11,12]`1`
-            Value: 1
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [21,22]`2`
-            Value: 2
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          EmptyNode SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [11,12]`1`
+              Value: 1
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [21,22]`2`
+              Value: 2
+        EmptyNode SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call07.tast

@@ -9,15 +9,14 @@ ModuleRootNode Name: <module 'call07'> SourceSection: [0,31]`foo('ahoj', arg1 =
       CallNodeGen SourceSection: None
       StringLiteralNode SourceSection: [4,10]`'ahoj'`
       KeywordArgumentsNodeGen SourceSection: None
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [19,20]`1`
-            Value: 1
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [29,30]`2`
-            Value: 2
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          EmptyNode SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [19,20]`1`
+              Value: 1
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [29,30]`2`
+              Value: 2
+        EmptyNode SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call08.tast

@@ -9,15 +9,14 @@ ModuleRootNode Name: <module 'call08'> SourceSection: [0,31]`foo('ahoj', arg1 =
       CallNodeGen SourceSection: None
       StringLiteralNode SourceSection: [4,10]`'ahoj'`
       KeywordArgumentsNodeGen SourceSection: None
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [19,20]`1`
-            Value: 1
-        KeywordLiteralNode SourceSection: None
-          IntegerLiteralNode SourceSection: [29,30]`2`
-            Value: 2
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          EmptyNode SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [19,20]`1`
+              Value: 1
+          KeywordLiteralNode SourceSection: None
+            IntegerLiteralNode SourceSection: [29,30]`2`
+              Value: 2
+        EmptyNode SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call11.tast

@@ -8,12 +8,11 @@ ModuleRootNode Name: <module 'call11'> SourceSection: [0,13]`foo(**mydict)`
     PythonCallNodeGen SourceSection: [0,13]`foo(**mydict)`
       CallNodeGen SourceSection: None
       KeywordArgumentsNodeGen SourceSection: None
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          ReadNameNodeGen SourceSection: [6,12]`mydict`
-            Identifier: mydict
-            IsBuiltinClassProfile SourceSection: None
-              CachedDispatchFirst SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+        ReadNameNodeGen SourceSection: [6,12]`mydict`
+          Identifier: mydict
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call12.tast

@@ -8,17 +8,16 @@ ModuleRootNode Name: <module 'call12'> SourceSection: [0,25]`foo(**mydict1, **my
     PythonCallNodeGen SourceSection: [0,25]`foo(**mydict1, **myd...`
       CallNodeGen SourceSection: None
       KeywordArgumentsNodeGen SourceSection: None
-        CompactKeywordsNodeGen SourceSection: None
-        ExecuteKeywordStarargsNodeGen SourceSection: None
-          DictConcatNodeGen SourceSection: None
-            ReadNameNodeGen SourceSection: [6,13]`mydict1`
-              Identifier: mydict1
-              IsBuiltinClassProfile SourceSection: None
-                CachedDispatchFirst SourceSection: None
-            ReadNameNodeGen SourceSection: [17,24]`mydict2`
-              Identifier: mydict2
-              IsBuiltinClassProfile SourceSection: None
-                CachedDispatchFirst SourceSection: None
+        ExecuteKeywordArgumentsNode SourceSection: None
+        ConcatKeywordsNodeGen SourceSection: None
+          ReadNameNodeGen SourceSection: [6,13]`mydict1`
+            Identifier: mydict1
+            IsBuiltinClassProfile SourceSection: None
+              CachedDispatchFirst SourceSection: None
+          ReadNameNodeGen SourceSection: [17,24]`mydict2`
+            Identifier: mydict2
+            IsBuiltinClassProfile SourceSection: None
+              CachedDispatchFirst SourceSection: None
       ReadNameNodeGen SourceSection: [0,3]`foo`
         Identifier: foo
         IsBuiltinClassProfile SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call17.tast

@@ -38,12 +38,11 @@ ModuleRootNode Name: <module 'call17'> SourceSection: [0,22]`def fn(): foo(arg =
                         PythonCallNodeGen SourceSection: [10,22]`foo(arg = 1)`
                           CallNodeGen SourceSection: None
                           KeywordArgumentsNodeGen SourceSection: None
-                            KeywordLiteralNode SourceSection: None
-                              IntegerLiteralNode SourceSection: [20,21]`1`
-                                Value: 1
-                            CompactKeywordsNodeGen SourceSection: None
-                            ExecuteKeywordStarargsNodeGen SourceSection: None
-                              EmptyNode SourceSection: None
+                            ExecuteKeywordArgumentsNode SourceSection: None
+                              KeywordLiteralNode SourceSection: None
+                                IntegerLiteralNode SourceSection: [20,21]`1`
+                                  Value: 1
+                            EmptyNode SourceSection: None
                           ReadGlobalOrBuiltinNodeGen SourceSection: [10,13]`foo`
                             Identifier: foo
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call18.tast

@@ -51,14 +51,13 @@ ModuleRootNode Name: <module 'call18'> SourceSection: [0,35]`def fn(arg = [1,2])
                         PythonCallNodeGen SourceSection: [21,35]`foo(arg = [1])`
                           CallNodeGen SourceSection: None
                           KeywordArgumentsNodeGen SourceSection: None
-                            KeywordLiteralNode SourceSection: None
-                              ListLiteralNode SourceSection: [31,34]`[1]`
-                                IntegerLiteralNode SourceSection: [32,33]`1`
-                                  Value: 1
-                                PythonObjectFactoryNodeGen SourceSection: None
-                            CompactKeywordsNodeGen SourceSection: None
-                            ExecuteKeywordStarargsNodeGen SourceSection: None
-                              EmptyNode SourceSection: None
+                            ExecuteKeywordArgumentsNode SourceSection: None
+                              KeywordLiteralNode SourceSection: None
+                                ListLiteralNode SourceSection: [31,34]`[1]`
+                                  IntegerLiteralNode SourceSection: [32,33]`1`
+                                    Value: 1
+                                  PythonObjectFactoryNodeGen SourceSection: None
+                            EmptyNode SourceSection: None
                           ReadGlobalOrBuiltinNodeGen SourceSection: [21,24]`foo`
                             Identifier: foo
                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/call19.tast

@@ -38,11 +38,10 @@ ModuleRootNode Name: <module 'call19'> SourceSection: [0,33]`def fn(): "in".form
                         PythonCallNodeGen SourceSection: [10,33]`"in".format(name="Ba...`
                           CallNodeGen SourceSection: None
                           KeywordArgumentsNodeGen SourceSection: None
-                            KeywordLiteralNode SourceSection: None
-                              StringLiteralNode SourceSection: [27,32]`"Baf"`
-                            CompactKeywordsNodeGen SourceSection: None
-                            ExecuteKeywordStarargsNodeGen SourceSection: None
-                              EmptyNode SourceSection: None
+                            ExecuteKeywordArgumentsNode SourceSection: None
+                              KeywordLiteralNode SourceSection: None
+                                StringLiteralNode SourceSection: [27,32]`"Baf"`
+                            EmptyNode SourceSection: None
                           GetCallAttributeNodeGen SourceSection: None
                             StringLiteralNode SourceSection: [10,14]`"in"`
                   Return Expresssion: ReadLocalVariableNode SourceSection: None