From ecc3c8e4216958d85385bf2467441c975128f26c Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 27 Jul 2021 21:30:32 +0100 Subject: bpo-34013: Move the Python 2 hints from the exception constructor to the parser (GH-27392) --- Parser/parser.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Parser/parser.c') diff --git a/Parser/parser.c b/Parser/parser.c index 8cd9e72a43..d01d2b8d85 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -18158,7 +18158,7 @@ expression_without_invalid_rule(Parser *p) return _res; } -// invalid_legacy_expression: NAME expression_without_invalid +// invalid_legacy_expression: NAME star_expressions static void * invalid_legacy_expression_rule(Parser *p) { @@ -18169,22 +18169,22 @@ invalid_legacy_expression_rule(Parser *p) } void * _res = NULL; int _mark = p->mark; - { // NAME expression_without_invalid + { // 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 expression_without_invalid")); + 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 && - (b = expression_without_invalid_rule(p)) // expression_without_invalid + (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 expression_without_invalid")); - _res = _PyPegen_check_legacy_stmt ( p , a ) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "Missing parentheses in call to '%U'." , a -> v . Name . id ) : NULL; + 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; D(p->level--); @@ -18194,7 +18194,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 expression_without_invalid")); + p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME star_expressions")); } _res = NULL; done: -- cgit v1.2.3