[pypy-commit] pypy py3.5: Allow unpack for keyword args in dict or set in Grammar

[raffael_t]

Author: Raffael Tfirst <raffael.tfirst at gmail.com>
Branch: py3.5
Changeset: r84630:e5e789aeea5b
Date: 2016-05-23 19:03 +0200
http://bitbucket.org/pypy/pypy/changeset/e5e789aeea5b/

Log:	Allow unpack for keyword args in dict or set in Grammar

diff --git a/pypy/interpreter/pyparser/data/Grammar3.5 b/pypy/interpreter/pyparser/data/Grammar3.5
--- a/pypy/interpreter/pyparser/data/Grammar3.5
+++ b/pypy/interpreter/pyparser/data/Grammar3.5
@@ -119,12 +119,12 @@
 sliceop: ':' [test]
 exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
 testlist: test (',' test)* [',']
-dictorsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) |
-                  (test (comp_for | (',' test)* [','])) )
-#dictorsetmaker: ( ((test ':' test | '**' expr)
-#                   (comp_for | (',' (test ':' test | '**' expr))* [','])) |
-#                  ((test | star_expr)
-#                   (comp_for | (',' (test | star_expr))* [','])) )
+#dictorsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) |
+#                  (test (comp_for | (',' test)* [','])) )
+dictorsetmaker: ( ((test ':' test | '**' expr)
+                   (comp_for | (',' (test ':' test | '**' expr))* [','])) |
+                  ((test | star_expr)
+                   (comp_for | (',' (test | star_expr))* [','])) )
 
 classdef: 'class' NAME ['(' [arglist] ')'] ':' suite