Commit99b71ef

authored

gh-129858: Special syntax error forelif block afterelse (#129902)

1 parentc3a7118 commit99b71efCopy full SHA for 99b71ef

File tree

+137

-75

lines changed

+137

-75

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,21 @@ Improved error messages`
`348`	`348`	`^^^^^^^`
`349`	`349`	`ValueError: too many values to unpack (expected3, got4)`
`350`	`350`
	`351`	+*:keyword:`elif` statements that follow an:keyword:`else` block now have a specific error message.
	`352`	+ (Contributed by Steele Farnsworth in:gh:`129902`.)
	`353`	`+`
	`354`	`+ ..code-block::pycon`
	`355`	`+`
	`356`	`+ >>> if who == "me":`
	`357`	`+ ... print("It's me!")`
	`358`	`+ ... else:`
	`359`	`+ ... print("It's not me!")`
	`360`	`+ ... elif who is None:`
	`361`	`+ ... print("Who is it?")`
	`362`	`+ File "<stdin>", line 5`
	`363`	`+ elif who is None:`
	`364`	`+ ^^^^`
	`365`	`+ SyntaxError: 'elif' block follows an 'else' block`
`351`	`366`
`352`	`367`	* If a statement (:keyword:`pass`,:keyword:`del`,:keyword:`return`,
`353`	`368`	:keyword:`yield`,:keyword:`raise`,:keyword:`break`,:keyword:`continue`,

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1422,6 +1422,7 @@ invalid_elif_stmt:`
`1422`	`1422`	`invalid_else_stmt:`
`1423`	`1423`	`\| a='else' ':' NEWLINE !INDENT {`
`1424`	`1424`	`RAISE_INDENTATION_ERROR("expected an indented block after 'else' statement on line %d", a->lineno) }`
	`1425`	`+ \| 'else' ':' block 'elif' { RAISE_SYNTAX_ERROR("'elif' block follows an 'else' block")}`
`1425`	`1426`	`invalid_while_stmt:`
`1426`	`1427`	`\| 'while' named_expression NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }`
`1427`	`1428`	`\| a='while' named_expression ':' NEWLINE !INDENT {`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -948,6 +948,18 @@`
`948`	`948`	`...`
`949`	`949`	`SyntaxError: 'break' outside loop`
`950`	`950`
	`951`	`+elif can't come after an else.`
	`952`	`+`
	`953`	`+ >>> if a % 2 == 0:`
	`954`	`+ ... pass`
	`955`	`+ ... else:`
	`956`	`+ ... pass`
	`957`	`+ ... elif a % 2 == 1:`
	`958`	`+ ... pass`
	`959`	`+ Traceback (most recent call last):`
	`960`	`+ ...`
	`961`	`+ SyntaxError: 'elif' block follows an 'else' block`
	`962`	`+`
`951`	`963`	`Misuse of the nonlocal and global statement can lead to a few unique syntax errors.`
`952`	`964`
`953`	`965`	`>>> def f():`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+``elif`` statements that follow an ``else`` block now have a specific error message.

Comments

(0)