Skip to content

bpo-40334: produce specialised errors for del #19911

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

Merged
gvanrossum merged 12 commits into from
May 11, 2020
Merged

bpo-40334: produce specialised errors for del #19911

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c2219f7
pegen: produce specialised messages for del
May 4, 2020
343ccb5
pegen: further improve del error messages
May 4, 2020
4029ee5
del: add more tests
May 4, 2020
f6b219f
pegen: fix del error messages for binary ops and others
May 5, 2020
9b11bed
pegen: add doctest back in
May 5, 2020
8b4ead5
grammar: reorder and add comment
May 5, 2020
fa21224
del: add even more tests
May 5, 2020
d101ac1
pegen: fix more del test cases
May 5, 2020
850ba88
grammar: reuse del_target_end in invalid_del_target
May 5, 2020
461fe85
grammar: add ENDMARKER to del_target_end
May 5, 2020
d462df9
Revert "grammar: add ENDMARKER to del_target_end"
May 11, 2020
566745e
make regen-pegen
May 11, 2020
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
Prev Previous commit
Next Next commit
pegen: fix more del test cases
  • Loading branch information
hauntsaninja committed May 11, 2020
commit d101ac1a5091cff66b6c8850e9233be06e8410ca
11 changes: 6 additions & 5 deletions Grammar/python.gram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,18 +583,19 @@ ann_assign_subscript_attribute_target[expr_ty]:
| a=t_primary '[' b=slices ']' !t_lookahead { _Py_Subscript(a, b, Store, EXTRA) }

del_targets[asdl_seq*]: a=','.del_target+ [','] { a }
# The lookaheads to del_target_end ensure that we don't match expressions where a prefix of the
# expression matches our rule, thereby letting these cases fall through to invalid_del_target.
del_target[expr_ty] (memo):
| a=t_primary '.' b=NAME !t_lookahead { _Py_Attribute(a, b->v.Name.id, Del, EXTRA) }
| a=t_primary '[' b=slices ']' !t_lookahead { _Py_Subscript(a, b, Del, EXTRA) }
| a=t_primary '.' b=NAME &del_target_end { _Py_Attribute(a, b->v.Name.id, Del, EXTRA) }
| a=t_primary '[' b=slices ']' &del_target_end { _Py_Subscript(a, b, Del, EXTRA) }
| del_t_atom
del_t_atom[expr_ty]:
# The lookahead here ensures that we don't match expressions where a prefix of the expression is
# a name (like `del a + b`), thereby letting these cases fall through to invalid_del_target.
| a=NAME &(')' | ']' | ',' | ';' | NEWLINE) { _PyPegen_set_expr_context(p, a, Del) }
| a=NAME &del_target_end { _PyPegen_set_expr_context(p, a, Del) }
| '(' a=del_target ')' { _PyPegen_set_expr_context(p, a, Del) }
| '(' a=[del_targets] ')' { _Py_Tuple(a, Del, EXTRA) }
| '[' a=[del_targets] ']' { _Py_List(a, Del, EXTRA) }
| invalid_del_target
del_target_end: ')' | ']' | ',' | ';' | NEWLINE
Comment thread
hauntsaninja marked this conversation as resolved.
Outdated

targets[asdl_seq*]: a=','.target+ [','] { a }
target[expr_ty] (memo):
Expand Down