diff --git a/Grammar/python.gram b/Grammar/python.gram index 8a21056d2a8..91d8a694d1e 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -1083,6 +1083,7 @@ invalid_expression: # Soft keywords need to also be ignored because they can be parsed as NAME NAME | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") } + | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") } invalid_named_expression: | a=expression ':=' expression { diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 6e1531e8b25..d5a52ba628a 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -140,6 +140,18 @@ SyntaxError: cannot assign to expression Traceback (most recent call last): SyntaxError: cannot assign to conditional expression +>>> a = 42 if True +Traceback (most recent call last): +SyntaxError: expected 'else' after 'if' expression + +>>> a = (42 if True) +Traceback (most recent call last): +SyntaxError: expected 'else' after 'if' expression + +>>> a = [1, 42 if True, 4] +Traceback (most recent call last): +SyntaxError: expected 'else' after 'if' expression + >>> True = True = 3 Traceback (most recent call last): SyntaxError: cannot assign to True diff --git a/Misc/ACKS b/Misc/ACKS index ac10be97ae3..97a360c8ecf 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -227,6 +227,7 @@ Tom Bridgman Anthony Briggs Keith Briggs Tobias Brink +Miguel Brito Dillon Brock Richard Brodie Michael Broghton diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst new file mode 100644 index 00000000000..2e9000d09ee --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst @@ -0,0 +1 @@ +Improve syntax errors for if expressions. Patch by Miguel Brito diff --git a/Parser/parser.c b/Parser/parser.c index 7a106a437bc..5db7c3a4a2f 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -18207,6 +18207,7 @@ invalid_legacy_expression_rule(Parser *p) // invalid_expression: // | invalid_legacy_expression // | !(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid +// | disjunction 'if' disjunction !'else' static void * invalid_expression_rule(Parser *p) { @@ -18265,6 +18266,38 @@ invalid_expression_rule(Parser *p) D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ', p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "!(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid")); } + { // disjunction 'if' disjunction !'else' + if (p->error_indicator) { + D(p->level--); + return NULL; + } + D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'")); + Token * _keyword; + expr_ty a; + expr_ty b; + if ( + (a = disjunction_rule(p)) // disjunction + && + (_keyword = _PyPegen_expect_token(p, 510)) // token='if' + && + (b = disjunction_rule(p)) // disjunction + && + _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 518) // token='else' + ) + { + D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'")); + _res = RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "expected 'else' after 'if' expression" ); + if (_res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + D(p->level--); + return NULL; + } + goto done; + } + p->mark = _mark; + D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ', + p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !'else'")); + } _res = NULL; done: D(p->level--);