Commit84914ad

authored

gh-133999: Fixexcept parsing regression in 3.14 (#134035)

1 parent7a9d462 commit84914adCopy full SHA for 84914ad

File tree

+43

-12

lines changed

+43

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1418,15 +1418,15 @@ invalid_except_stmt:`
`1418`	`1418`	`RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") }`
`1419`	`1419`	`\| a='except' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }`
`1420`	`1420`	`\| a='except' NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }`
`1421`		`- \| 'except' expression 'as' a=expression {`
	`1421`	`+ \| 'except' expression 'as' a=expression':' block{`
`1422`	`1422`	`RAISE_SYNTAX_ERROR_KNOWN_LOCATION(`
`1423`	`1423`	`a, "cannot use except statement with %s", _PyPegen_get_expr_name(a)) }`
`1424`	`1424`	`invalid_except_star_stmt:`
`1425`	`1425`	`\| 'except' '*' a=expression ',' expressions 'as' NAME ':' {`
`1426`	`1426`	`RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") }`
`1427`	`1427`	`\| a='except' '*' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }`
`1428`	`1428`	`\| a='except' '*' (NEWLINE \| ':') { RAISE_SYNTAX_ERROR("expected one or more exception types") }`
`1429`		`- \| 'except' '*' expression 'as' a=expression {`
	`1429`	`+ \| 'except' '*' expression 'as' a=expression':' block{`
`1430`	`1430`	`RAISE_SYNTAX_ERROR_KNOWN_LOCATION(`
`1431`	`1431`	`a, "cannot use except* statement with %s", _PyPegen_get_expr_name(a)) }`
`1432`	`1432`	`invalid_finally_stmt:`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,23 @@`
`1431`	`1431`	`Traceback (most recent call last):`
`1432`	`1432`	`SyntaxError: cannot use except* statement with literal`
`1433`	`1433`
	`1434`	`+Regression tests for gh-133999:`
	`1435`	`+`
	`1436`	`+ >>> try: pass`
	`1437`	`+ ... except TypeError as name: raise from None`
	`1438`	`+ Traceback (most recent call last):`
	`1439`	`+ SyntaxError: invalid syntax`
	`1440`	`+`
	`1441`	`+ >>> try: pass`
	`1442`	`+ ... except* TypeError as name: raise from None`
	`1443`	`+ Traceback (most recent call last):`
	`1444`	`+ SyntaxError: invalid syntax`
	`1445`	`+`
	`1446`	`+ >>> match 1:`
	`1447`	`+ ... case 1 \| 2 as abc: raise from None`
	`1448`	`+ Traceback (most recent call last):`
	`1449`	`+ SyntaxError: invalid syntax`
	`1450`	`+`
`1434`	`1451`	`Ensure that early = are not matched by the parser as invalid comparisons`
`1435`	`1452`	`>>> f(2, 4, x=34); 1 $ 2`
`1436`	`1453`	`Traceback (most recent call last):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix:exc:`SyntaxError` regression in:keyword:`except` parsing after
	`2`	+:gh:`123440`.

Lines changed: 22 additions & 10 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Comments

(0)