Skip to content

bpo-40631: Improve error message when deleting single starred element #24015

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 1 commit into from
Closed

bpo-40631: Improve error message when deleting single starred element #24015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Grammar/python.gram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,8 @@ invalid_for_target:
RAISE_SYNTAX_ERROR_INVALID_TARGET(FOR_TARGETS, a) }

invalid_group:
| '(' a=star_expression ')' {
RAISE_SYNTAX_ERROR_INVALID_TARGET(DEL_TARGETS, a) }
| '(' a=starred_expression ')' {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "can't use starred expression here") }
invalid_import_from_targets:
Expand Down
5 changes: 4 additions & 1 deletion Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,7 @@ def _check_error(self, code, errtext,
try:
compile(code, filename, mode)
except SyntaxError as err:
print(err)
if subclass and not isinstance(err, subclass):
self.fail("SyntaxError is not a %s" % subclass.__name__)
mo = re.search(errtext, str(err))
Expand Down Expand Up @@ -821,7 +822,9 @@ def test_assign_del(self):
self._check_error("del (1, 2)", "delete literal")
self._check_error("del None", "delete None")
self._check_error("del *x", "delete starred")
self._check_error("del (*x)", "use starred expression")
self._check_error("del (*x)", "delete starred")
self._check_error("del (*x, *y)", "delete starred")
self._check_error("del (x, *y)", "delete starred")
self._check_error("del (*x,)", "delete starred")
self._check_error("del [*x,]", "delete starred")
self._check_error("del f()", "delete function call")
Expand Down
32 changes: 31 additions & 1 deletion Parser/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15777,7 +15777,7 @@ invalid_for_target_rule(Parser *p)
return _res;
}

// invalid_group: '(' starred_expression ')'
// invalid_group: '(' star_expression ')' | '(' starred_expression ')'
static void *
invalid_group_rule(Parser *p)
{
Expand All @@ -15788,6 +15788,36 @@ invalid_group_rule(Parser *p)
}
void * _res = NULL;
int _mark = p->mark;
{ // '(' star_expression ')'
if (p->error_indicator) {
D(p->level--);
return NULL;
}
D(fprintf(stderr, "%*c> invalid_group[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' star_expression ')'"));
Token * _literal;
Token * _literal_1;
expr_ty a;
if (
(_literal = _PyPegen_expect_token(p, 7)) // token='('
&&
(a = star_expression_rule(p)) // star_expression
&&
(_literal_1 = _PyPegen_expect_token(p, 8)) // token=')'
)
{
D(fprintf(stderr, "%*c+ invalid_group[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' star_expression ')'"));
_res = RAISE_SYNTAX_ERROR_INVALID_TARGET ( DEL_TARGETS , a );
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_group[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' star_expression ')'"));
}
{ // '(' starred_expression ')'
if (p->error_indicator) {
D(p->level--);
Expand Down