Skip to content

bpo-42997: Improve error message for missing : before suites #24293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pablogsal wants to merge 2 commits into from
Closed

bpo-42997: Improve error message for missing : before suites #24293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47ba0b3
bpo-42997: Improve error message for missing : before suites
pablogsal Jan 22, 2021
83d92f4
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 52 additions & 2 deletions Grammar/python.gram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,20 @@ if_stmt[stmt_ty]:
| 'if' a=named_expression ':' b=block c=elif_stmt {
_Py_If(a, b, CHECK(asdl_stmt_seq*, _PyPegen_singleton_seq(p, c)), EXTRA) }
| 'if' a=named_expression ':' b=block c=[else_block] { _Py_If(a, b, c, EXTRA) }
| invalid_if_stmt
elif_stmt[stmt_ty]:
| 'elif' a=named_expression ':' b=block c=elif_stmt {
_Py_If(a, b, CHECK(asdl_stmt_seq*, _PyPegen_singleton_seq(p, c)), EXTRA) }
| 'elif' a=named_expression ':' b=block c=[else_block] { _Py_If(a, b, c, EXTRA) }
else_block[asdl_stmt_seq*]: 'else' ':' b=block { b }
| invalid_elif_stmt
else_block[asdl_stmt_seq*]: 'else' ':' b=block { b } | invalid_else_block

while_stmt[stmt_ty]:
| 'while' a=named_expression ':' b=block c=[else_block] { _Py_While(a, b, c, EXTRA) }
| invalid_while_stmt

for_stmt[stmt_ty]:
| invalid_for_stmt
| 'for' t=star_targets 'in' ~ ex=star_expressions ':' tc=[TYPE_COMMENT] b=block el=[else_block] {
_Py_For(t, ex, b, el, NEW_TYPE_COMMENT(p, tc), EXTRA) }
| ASYNC 'for' t=star_targets 'in' ~ ex=star_expressions ':' tc=[TYPE_COMMENT] b=block el=[else_block] {
Expand All @@ -190,6 +194,8 @@ with_stmt[stmt_ty]:
CHECK_VERSION(stmt_ty, 5, "Async with statements are", _Py_AsyncWith(a, b, NULL, EXTRA)) }
| ASYNC 'with' a[asdl_withitem_seq*]=','.with_item+ ':' tc=[TYPE_COMMENT] b=block {
CHECK_VERSION(stmt_ty, 5, "Async with statements are", _Py_AsyncWith(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA)) }
| invalid_with_stmt

with_item[withitem_ty]:
| e=expression 'as' t=star_target &(',' | ')' | ':') { _Py_withitem(e, t, p->arena) }
| invalid_with_item
Expand All @@ -198,11 +204,13 @@ with_item[withitem_ty]:
try_stmt[stmt_ty]:
| 'try' ':' b=block f=finally_block { _Py_Try(b, NULL, NULL, f, EXTRA) }
| 'try' ':' b=block ex[asdl_excepthandler_seq*]=except_block+ el=[else_block] f=[finally_block] { _Py_Try(b, ex, el, f, EXTRA) }
| invalid_try_stmt
except_block[excepthandler_ty]:
| 'except' e=expression t=['as' z=NAME { z }] ':' b=block {
_Py_ExceptHandler(e, (t) ? ((expr_ty) t)->v.Name.id : NULL, b, EXTRA) }
| 'except' ':' b=block { _Py_ExceptHandler(NULL, NULL, b, EXTRA) }
finally_block[asdl_stmt_seq*]: 'finally' ':' a=block { a }
| invalid_except_block
finally_block[asdl_stmt_seq*]: 'finally' ':' a=block { a } | invalid_finally_block

return_stmt[stmt_ty]:
| 'return' a=[star_expressions] { _Py_Return(a, EXTRA) }
Expand All @@ -229,6 +237,7 @@ function_def_raw[stmt_ty]:
(params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA)
) }
| invalid_function_def_raw
func_type_comment[Token*]:
| NEWLINE t=TYPE_COMMENT &(NEWLINE INDENT) { t } # Must be followed by indented block
| invalid_double_type_comments
Expand Down Expand Up @@ -305,6 +314,7 @@ class_def_raw[stmt_ty]:
(b) ? ((expr_ty) b)->v.Call.args : NULL,
(b) ? ((expr_ty) b)->v.Call.keywords : NULL,
c, NULL, EXTRA) }
| invalid_class_def_raw

block[asdl_stmt_seq*] (memo):
| NEWLINE INDENT a=statements DEDENT { a }
Expand Down Expand Up @@ -716,8 +726,12 @@ invalid_double_type_comments:
| TYPE_COMMENT NEWLINE TYPE_COMMENT NEWLINE INDENT {
RAISE_SYNTAX_ERROR("Cannot have two type comments on def") }
invalid_with_item:
| e=expression 'as' !(a=t_primary {(void*)a}) t=star_target !(',' | ')' | ':') {
RAISE_SYNTAX_ERROR("expected one of: ':' ','")}
| expression 'as' a=expression {
RAISE_SYNTAX_ERROR_INVALID_TARGET(STAR_TARGETS, a) }
| e=expression !(',' | ')' | ':') {
RAISE_SYNTAX_ERROR("expected one of: ':' ','")}

invalid_for_target:
| ASYNC? 'for' a=star_expressions {
Expand All @@ -729,3 +743,39 @@ invalid_group:
invalid_import_from_targets:
| import_from_as_names ',' {
RAISE_SYNTAX_ERROR("trailing comma not allowed without surrounding parentheses") }

invalid_for_stmt:
| 'for' star_targets 'in' star_expressions !':' { RAISE_SYNTAX_ERROR("expected ':'") }
| ASYNC 'for' t=star_targets 'in' ~ ex=star_expressions !':'{ RAISE_SYNTAX_ERROR("expected ':'") }

invalid_while_stmt:
| 'while' named_expression !':' { RAISE_SYNTAX_ERROR("expected ':'") }

invalid_try_stmt:
| 'try' !':'{ RAISE_SYNTAX_ERROR("expected ':'") }

invalid_class_def_raw:
| 'class' NAME ['(' z=[arguments] ')' { z }] !':' { RAISE_SYNTAX_ERROR("expected ':'") }

invalid_function_def_raw:
| 'def' NAME '(' [params] ')' ['->' z=expression { z }] !':' {
RAISE_SYNTAX_ERROR("expected ':'") }
| ASYNC 'def' NAME '(' [params] ')' ['->' z=expression { z }] !':' {
RAISE_SYNTAX_ERROR("expected ':'") }

invalid_except_block:
| 'except' expression ['as' z=NAME { z }] !':' {
RAISE_SYNTAX_ERROR("expected ':'") }
| 'except' !':' {
RAISE_SYNTAX_ERROR("expected ':'") }

invalid_finally_block:
| 'finally' !':' { RAISE_SYNTAX_ERROR("expected ':'") }

invalid_if_stmt: 'if' named_expression !':' { RAISE_SYNTAX_ERROR("expected ':'") }
invalid_elif_stmt: 'elif' named_expression !':' { RAISE_SYNTAX_ERROR("expected ':'") }
invalid_else_block: 'else' !':' { RAISE_SYNTAX_ERROR("expected ':'") }

invalid_with_stmt:
| 'with' '(' ','.with_item+ ','? ')' !':' { RAISE_SYNTAX_ERROR("expected ':'") }
| 'with' ','.with_item+ ','? !':'{ RAISE_SYNTAX_ERROR("expected ':'") }
107 changes: 104 additions & 3 deletions Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@

>>> with a as b
Traceback (most recent call last):
SyntaxError: invalid syntax
SyntaxError: expected one of: ':' ','

>>> p = p =
Traceback (most recent call last):
Expand Down Expand Up @@ -316,7 +316,7 @@
>>> class C(x for x in L):
... pass
Traceback (most recent call last):
SyntaxError: invalid syntax
SyntaxError: expected ':'

>>> def g(*args, **kwargs):
... print(args, sorted(kwargs.items()))
Expand Down Expand Up @@ -693,6 +693,107 @@
...
SyntaxError: cannot assign to function call

Missing ':' before suites:

>>> def f()
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> class A
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> if 1
... pass
... elif 1:
... pass
... else:
... x() = 1
Traceback (most recent call last):
SyntaxError: expected ':'

>>> if 1:
... pass
... elif 1
... pass
... else:
... x() = 1
Traceback (most recent call last):
SyntaxError: expected ':'

>>> if 1:
... pass
... elif 1:
... pass
... else
... x() = 1
Traceback (most recent call last):
SyntaxError: expected ':'

>>> for x in range(10)
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> while True
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> with blech as something
... pass
Traceback (most recent call last):
SyntaxError: expected one of: ':' ','

>>> with blech
... pass
Traceback (most recent call last):
SyntaxError: expected one of: ':' ','

>>> with blech, block as something
... pass
Traceback (most recent call last):
SyntaxError: expected one of: ':' ','

>>> with blech, block as something, bluch
... pass
Traceback (most recent call last):
SyntaxError: expected one of: ':' ','

>>> with (blech as something)
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> with (blech)
... pass
Traceback (most recent call last):
SyntaxError: expected one of: ':' ','

>>> with (blech, block as something)
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> with (blech, block as something, bluch)
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> try
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

>>> try:
... pass
... except
... pass
Traceback (most recent call last):
SyntaxError: expected ':'

Make sure that the old "raise X, Y[, Z]" form is gone:
>>> raise X, Y
Traceback (most recent call last):
Expand Down Expand Up @@ -977,7 +1078,7 @@ def func2():
finally:
pass
"""
self._check_error(code, "invalid syntax")
self._check_error(code, "expected ':'")

def test_invalid_line_continuation_left_recursive(self):
# Check bpo-42218: SyntaxErrors following left-recursive rules
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2021-01-26-13-15-14.bpo-42997.QUOPgP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve error message for missing ":" before blocks. Patch by Pablo Galindo.
Loading