Commit3d18034

authored

gh-110696: Fix incorrect syntax error message for incorrect argument unpacking (#110706)

1 parentec5622d commit3d18034Copy full SHA for 3d18034

File tree

+1539

-1173

lines changed

+1539

-1173

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1128,7 +1128,8 @@ func_type_comment[Token*]:`
`1128`	`1128`
`1129`	`1129`	`# From here on, there are rules for invalid syntax with specialised error messages`
`1130`	`1130`	`invalid_arguments:`
`1131`		`- \| a=args ',' '*' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "iterable argument unpacking follows keyword argument unpacking") }`
	`1131`	`+ \| ((','.(starred_expression \| ( assignment_expression \| expression !':=') !'=')+ ',' kwargs) \| kwargs) ',' b='*' {`
	`1132`	`+ RAISE_SYNTAX_ERROR_KNOWN_LOCATION(b, "iterable argument unpacking follows keyword argument unpacking") }`
`1132`	`1133`	`\| a=expression b=for_if_clauses ',' [args \| expression for_if_clauses] {`
`1133`	`1134`	`RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, _PyPegen_get_last_comprehension_item(PyPegen_last_item(b, comprehension_ty)), "Generator expression must be parenthesized") }`
`1134`	`1135`	`\| a=NAME b='=' expression for_if_clauses {`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1955,6 +1955,17 @@ def f(x: *b)`
`1955`	`1955`	`...`
`1956`	`1956`	`SyntaxError: yield expression cannot be used within the definition of a generic`
`1957`	`1957`
	`1958`	`+ >>> f(*x, y)`
	`1959`	`+ Traceback (most recent call last):`
	`1960`	`+ SyntaxError: iterable argument unpacking follows keyword argument unpacking`
	`1961`	`+`
	`1962`	`+ >>> f(*x, )`
	`1963`	`+ Traceback (most recent call last):`
	`1964`	`+ SyntaxError: iterable argument unpacking follows keyword argument unpacking`
	`1965`	`+`
	`1966`	`+ >>> f(x, *:)`
	`1967`	`+ Traceback (most recent call last):`
	`1968`	`+ SyntaxError: invalid syntax`
`1958`	`1969`	`"""`
`1959`	`1970`
`1960`	`1971`	`importre`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix incorrect error message for invalid argument unpacking. Patch by Pablo`
	`2`	`+Galindo`

Comments

(0)