mirror of
https://github.com/python/cpython.git
synced 2025-08-01 23:53:15 +00:00
bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521)
(cherry picked from commit 208a7e957b
)
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
This commit is contained in:
parent
76903ff9ce
commit
35035bc35a
3 changed files with 17 additions and 6 deletions
|
@ -18180,7 +18180,7 @@ expression_without_invalid_rule(Parser *p)
|
|||
return _res;
|
||||
}
|
||||
|
||||
// invalid_legacy_expression: NAME star_expressions
|
||||
// invalid_legacy_expression: NAME !'(' star_expressions
|
||||
static void *
|
||||
invalid_legacy_expression_rule(Parser *p)
|
||||
{
|
||||
|
@ -18191,21 +18191,23 @@ invalid_legacy_expression_rule(Parser *p)
|
|||
}
|
||||
void * _res = NULL;
|
||||
int _mark = p->mark;
|
||||
{ // NAME star_expressions
|
||||
{ // NAME !'(' star_expressions
|
||||
if (p->error_indicator) {
|
||||
D(p->level--);
|
||||
return NULL;
|
||||
}
|
||||
D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME star_expressions"));
|
||||
D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions"));
|
||||
expr_ty a;
|
||||
expr_ty b;
|
||||
if (
|
||||
(a = _PyPegen_name_token(p)) // NAME
|
||||
&&
|
||||
_PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 7) // token='('
|
||||
&&
|
||||
(b = star_expressions_rule(p)) // star_expressions
|
||||
)
|
||||
{
|
||||
D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME star_expressions"));
|
||||
D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions"));
|
||||
_res = _PyPegen_check_legacy_stmt ( p , a ) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "Missing parentheses in call to '%U'. Did you mean %U(...)?" , a -> v . Name . id , a -> v . Name . id ) : NULL;
|
||||
if (_res == NULL && PyErr_Occurred()) {
|
||||
p->error_indicator = 1;
|
||||
|
@ -18216,7 +18218,7 @@ invalid_legacy_expression_rule(Parser *p)
|
|||
}
|
||||
p->mark = _mark;
|
||||
D(fprintf(stderr, "%*c%s invalid_legacy_expression[%d-%d]: %s failed!\n", p->level, ' ',
|
||||
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME star_expressions"));
|
||||
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME !'(' star_expressions"));
|
||||
}
|
||||
_res = NULL;
|
||||
done:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue