[3.11] gh-109120: Fix syntax error in handlinh of incorrect star expressions… (#117464)

grigoriev-semyon · web-flow · commit 3bc0d2b851bf · 2024-04-03T11:37:39.000+01:00
gh-109120: Fix syntax error in handlinh of incorrect star expressions (#117444) (cherry picked from commit c97d3af)
diff --git a/Grammar/python.gram b/Grammar/python.gram
@@ -955,6 +955,7 @@ kwargs[asdl_seq*]:
 
 starred_expression[expr_ty]:
     | '*' a=expression { _PyAST_Starred(a, Load, EXTRA) }
+    | '*' { RAISE_SYNTAX_ERROR("Invalid star expression") }
 
 kwarg_or_starred[KeywordOrStarred*]:
     | invalid_kwarg
@@ -1075,8 +1076,8 @@ func_type_comment[Token*]:
 
 # From here on, there are rules for invalid syntax with specialised error messages
 invalid_arguments:
-    | ((','.(starred_expression | ( assignment_expression | expression !':=') !'=')+ ',' kwargs) | kwargs) ',' b='*' {
-        RAISE_SYNTAX_ERROR_KNOWN_LOCATION(b, "iterable argument unpacking follows keyword argument unpacking") }
+    | ((','.(starred_expression | ( assignment_expression | expression !':=') !'=')+ ',' kwargs) | kwargs) a=',' ','.(starred_expression !'=')+ {
+        RAISE_SYNTAX_ERROR_STARTING_FROM(a, "iterable argument unpacking follows keyword argument unpacking") }
     | a=expression b=for_if_clauses ',' [args | expression for_if_clauses] {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, _PyPegen_get_last_comprehension_item(PyPegen_last_item(b, comprehension_ty)), "Generator expression must be parenthesized") }
     | a=NAME b='=' expression for_if_clauses {
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
@@ -1725,22 +1725,22 @@
     >>> A[*(1:2)]
     Traceback (most recent call last):
         ...
-    SyntaxError: invalid syntax
+    SyntaxError: Invalid star expression
     >>> A[*(1:2)] = 1
     Traceback (most recent call last):
         ...
-    SyntaxError: invalid syntax
+    SyntaxError: Invalid star expression
     >>> del A[*(1:2)]
     Traceback (most recent call last):
         ...
-    SyntaxError: invalid syntax
+    SyntaxError: Invalid star expression
 
 A[*:] and A[:*]
 
     >>> A[*:]
     Traceback (most recent call last):
         ...
-    SyntaxError: invalid syntax
+    SyntaxError: Invalid star expression
     >>> A[:*]
     Traceback (most recent call last):
         ...
@@ -1751,7 +1751,7 @@
     >>> A[*]
     Traceback (most recent call last):
         ...
-    SyntaxError: invalid syntax
+    SyntaxError: Invalid star expression
 
 A[**]
 
@@ -1833,11 +1833,23 @@ def f(x: *b)
 
    >>> f(**x, *)
    Traceback (most recent call last):
-   SyntaxError: iterable argument unpacking follows keyword argument unpacking
+   SyntaxError: Invalid star expression
 
    >>> f(x, *:)
    Traceback (most recent call last):
-   SyntaxError: invalid syntax
+   SyntaxError: Invalid star expression
+
+   >>> f(x, *)
+   Traceback (most recent call last):
+   SyntaxError: Invalid star expression
+
+   >>> f(x = 5, *)
+   Traceback (most recent call last):
+   SyntaxError: Invalid star expression
+
+   >>> f(x = 5, *:)
+   Traceback (most recent call last):
+   SyntaxError: Invalid star expression
 """
 
 import re
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-04-02-06-16-49.gh-issue-109120.X485oN.rst b/Misc/NEWS.d/next/Core and Builtins/2024-04-02-06-16-49.gh-issue-109120.X485oN.rst
@@ -0,0 +1,2 @@
+Added handle of incorrect star expressions, e.g ``f(3, *)``. Patch by
+Grigoryev Semyon
diff --git a/Parser/parser.c b/Parser/parser.c

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Added handle of incorrect star expressions, e.g ``f(3, *)``. Patch by
	`2`	`+Grigoryev Semyon`