Merge pull request #998 from Thirumalai-Shaktivel/fix_dict

Author: Thirumalai-Shaktivel

src/lpython/parser/parser.yy

@@ -782,6 +782,7 @@ expr_list
 dict
     : expr ":" expr { $$ = DICT_EXPR_01($1, $3, @$); }
     | expr ":" type_comment expr { $$ = DICT_EXPR_02($1, $3, $4, @$); }
+    | "**" expr { $$ = DICT_EXPR_01(NONE(@$), $2, @$); }
     ;
 
 dict_list

src/runtime/lpython_parser.py

@@ -78,6 +78,8 @@ def generic_visit(self, node):
                     else:
                         if type(item) == str:
                             new_list.append(item)
+                        elif item is None:
+                            new_list.append(self.visit(python_ast.ConstantNone()))
                 d[field] = new_list
             elif field in ["vararg", "kwarg"]:
                 if value is None:

tests/parser/dictionary1.py

@@ -23,5 +23,10 @@ def test():
           Text
           """
         }
+    x = { **x,
+          y: "Text",
+          **z,
+          None: "None",
+        }
 
 test()

tests/reference/ast_new-dictionary1-445e718.json

@@ -2,11 +2,11 @@
     "basename": "ast_new-dictionary1-445e718",
     "cmd": "lpython --show-ast --new-parser --no-color {infile} -o {outfile}",
     "infile": "tests/parser/dictionary1.py",
-    "infile_hash": "78286c2c3a7c6d9117f44c91c603e6fb1c853ca3d67a4cdb18febb9a",
+    "infile_hash": "68922e77dbabe06c271463150653684880d3c28d88caa44109b2e202",
     "outfile": null,
     "outfile_hash": null,
     "stdout": "ast_new-dictionary1-445e718.stdout",
-    "stdout_hash": "cb5ae051657fc4158ecfed7d4af3d3f249e58cec2bada5b75863c336",
+    "stdout_hash": "e9aefdd2d9d42dfe673563ff13d1f91ce6dcd672d1237506f540cb90",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0

tests/reference/ast_new-dictionary1-445e718.stdout

@@ -1,3 +1,3 @@
 (Module [(FunctionDef test ([] [] [] [] [] [] []) [(Assign [(Name x Store)] (Dict [] []) ()) (Assign [(Name dict Store)] (Dict [(ConstantStr "brand" ()) (ConstantStr "electric" ()) (ConstantStr "year" ()) (ConstantStr "colors" ())] [(ConstantStr "Ford" ()) (ConstantBool .false. ()) (ConstantInt 1964 ()) (List [(ConstantStr "red" ()) (ConstantStr "white" ())] Load)]) ()) (Assign [(Name num Store)] (Dict [(ConstantInt 1 ()) (ConstantInt 2 ())] [(ConstantInt 2 ()) (ConstantInt 3 ())]) ()) (AnnAssign (Name y Store) (Subscript (Name dict Load) (Tuple [(Name str Load) (Name i32 Load)] Load) Load) () 1) (Assign [(Name y Store)] (Dict [(ConstantStr "a" ()) (ConstantStr "b" ())] [(UnaryOp USub (ConstantInt 1 ())) (UnaryOp USub (ConstantInt 2 ()))]) ()) (Assign [(Name y Store)] (Dict [(ConstantStr "a" ()) (ConstantStr "b" ())] [(UnaryOp USub (ConstantInt 1 ())) (UnaryOp USub (ConstantInt 2 ()))]) ()) (Assign [(Subscript (Name y Load) (ConstantStr "a" ()) Store)] (ConstantInt 123 ()) ()) (Assign [(Name a Store)] (Dict [(ConstantStr "a" ()) (ConstantStr "b" ())] [(ConstantInt 1 ()) (ConstantInt 2 ())]) ()) (Assign [(Name x Store)] (Dict [(ConstantStr "markdown2.tpl" ())] [(ConstantStr "\
           Text
-          " ())]) ())] [] () ()) (Expr (Call (Name test Load) [] []))] [(TypeIgnore 0 "")])
+          " ())]) ()) (Assign [(Name x Store)] (Dict [(ConstantNone ()) (Name y Load) (ConstantNone ()) (ConstantNone ())] [(Name x Load) (ConstantStr "Text" ()) (Name z Load) (ConstantStr "None" ())]) ())] [] () ()) (Expr (Call (Name test Load) [] []))] [(TypeIgnore 0 "")])