Fix return statements to allow unpacking without parenthesis.

dacut · jChapman · commit 53ffbddcbe81 · 2018-09-15T21:22:00.000-04:00
diff --git a/Grammar/Grammar b/Grammar/Grammar
@@ -50,7 +50,7 @@ pass_stmt: 'pass'
 flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
 break_stmt: 'break'
 continue_stmt: 'continue'
-return_stmt: 'return' [testlist]
+return_stmt: 'return' [testlist_star_expr]
 yield_stmt: yield_expr
 raise_stmt: 'raise' [test ['from' test]]
 import_stmt: import_name | import_from
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
@@ -824,11 +824,17 @@ def test_inner(extra_burning_oil = 1, count=0):
         test_inner()
 
     def test_return(self):
-        # 'return' [testlist]
+        # 'return' [testlist_star_expr]
         def g1(): return
         def g2(): return 1
+        def g3():
+            z = [2, 3]
+            return 1, *z
+
         g1()
         x = g2()
+        y = g3()
+        self.assertEqual(y, (1, 2, 3), "unparenthesized star expr return")
         check_syntax_error(self, "class foo:return 1")
 
     def test_break_in_finally(self):
diff --git a/Python/graminit.c b/Python/graminit.c
@@ -613,7 +613,7 @@ static arc arcs_25_0[1] = {
     {75, 1},
 };
 static arc arcs_25_1[2] = {
-    {9, 2},
+    {47, 2},
     {0, 1},
 };
 static arc arcs_25_2[1] = {
