Visitar URL original
bpo-40334: Produce better error messages on invalid targets by lysnikolaou · Pull Request #20106 · python/cpython · GitHub
Skip to content

bpo-40334: Produce better error messages on invalid targets #20106

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
pablogsal merged 24 commits into from
Jun 18, 2020
Merged

bpo-40334: Produce better error messages on invalid targets #20106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0dfaa22
bpo-40334: Produce better error messages on invalid targets
lysnikolaou May 15, 2020
d4a9dd6
Fix test_exceptions
lysnikolaou May 15, 2020
72a1339
📜🤖 Added by blurb_it.
blurb-it[bot] May 15, 2020
1b6cf0b
Produce the same error messages with the old parser for with and for …
lysnikolaou May 15, 2020
1ad3819
Add invalid_group rule
lysnikolaou May 15, 2020
6f30315
Update Grammar/python.gram
lysnikolaou May 16, 2020
f750aba
Update Parser/pegen/pegen.c
lysnikolaou May 16, 2020
132178f
Address Guido's feedback
lysnikolaou May 16, 2020
17cc4bc
Inline _PyPegen_get_invalid_for_target
lysnikolaou May 17, 2020
def0f3d
Revert inlining
lysnikolaou May 17, 2020
ee3524b
Merge remote-tracking branch 'upstream/master' into targets-errors
pablogsal May 17, 2020
4959a12
Fix searching for invalid for targets, by visiting Compare nodes in _…
lysnikolaou May 17, 2020
dd1d8c8
Call RAISE_SYNTAX_ERROR instead of returning NULL, when no invalid fo…
lysnikolaou May 17, 2020
24d63fb
Merge branch 'master' into targets-errors
lysnikolaou May 18, 2020
c1cf8e6
Replace is_del and is_for args with an enum
lysnikolaou May 18, 2020
06798ff
Only return an invalid target, when the comparison is an In comparison
lysnikolaou May 20, 2020
ef7fe3a
Fix bug
lysnikolaou May 20, 2020
efabcc9
Merge branch 'master' into targets-errors
lysnikolaou May 23, 2020
6d41c55
Merge branch 'master' into targets-errors
lysnikolaou May 26, 2020
82486c1
Minor refactoring
lysnikolaou May 26, 2020
705d55b
Merge branch 'master' into targets-errors
lysnikolaou Jun 10, 2020
f0f934d
Merge branch 'master' into targets-errors
lysnikolaou Jun 10, 2020
ede107e
Merge branch 'master' into targets-errors
lysnikolaou Jun 18, 2020
55b5327
Add CHECK* checks to GET_INVALID_*TARGET macros
lysnikolaou Jun 18, 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
Produce the same error messages with the old parser for with and for … 
…targets
  • Loading branch information
@lysnikolaou
lysnikolaou committed May 15, 2020
commit 1b6cf0b327f024dc53ab548bbfb2bca55064c31c
4 changes: 2 additions & 2 deletions Grammar/python.gram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ invalid_with_target:
| ASYNC? 'with' expression 'as' a=expressions ':' {
Comment thread
lysnikolaou marked this conversation as resolved.
Outdated
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
GET_INVALID_TARGET(a),
"'%s' is an illegal 'with' target", _PyPegen_get_expr_name(GET_INVALID_TARGET(a))
"cannot assign to %s", _PyPegen_get_expr_name(GET_INVALID_TARGET(a))
) }

# Comparison is used here, because the `a() in b` in `for a() in b: pass` is parsed
Expand All @@ -694,5 +694,5 @@ invalid_for_target:
| ASYNC? 'for' a=comparison {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
GET_INVALID_TARGET(a->v.Compare.left),
"'%s' is an illegal 'for' target", _PyPegen_get_expr_name(GET_INVALID_TARGET(a->v.Compare.left))
"cannot assign to %s", _PyPegen_get_expr_name(GET_INVALID_TARGET(a->v.Compare.left))
) }
20 changes: 10 additions & 10 deletions Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,43 +153,43 @@

>>> for a() in b: pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'for' target
SyntaxError: cannot assign to function call

>>> for (a, b()) in b: pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'for' target
SyntaxError: cannot assign to function call

>>> for [a, b()] in b: pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'for' target
SyntaxError: cannot assign to function call

>>> for (*a, b, c+1) in b: pass
Traceback (most recent call last):
SyntaxError: 'operator' is an illegal 'for' target
SyntaxError: cannot assign to operator

>>> for (x, *(y, z.d())) in b: pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'for' target
SyntaxError: cannot assign to function call

>>> with a as b(): pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'with' target
SyntaxError: cannot assign to function call

>>> with a as (b, c()): pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'with' target
SyntaxError: cannot assign to function call

>>> with a as [b, c()]: pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'with' target
SyntaxError: cannot assign to function call

>>> with a as (*b, c, d+1): pass
Traceback (most recent call last):
SyntaxError: 'operator' is an illegal 'with' target
SyntaxError: cannot assign to operator

>>> with a as (x, *(y, z.d())): pass
Traceback (most recent call last):
SyntaxError: 'function call' is an illegal 'with' target
SyntaxError: cannot assign to function call

Comment thread
lysnikolaou marked this conversation as resolved.
From compiler_complex_args():

Expand Down
1 change: 0 additions & 1 deletion Misc/NEWS.d/next/Core and Builtins/2020-05-15-13-38-54.bpo-40334.eQqslk.rst
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Parser/pegen/parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11189,7 +11189,7 @@ invalid_with_target_rule(Parser *p)
(_literal = _PyPegen_expect_token(p, 11)) // token=':'
)
{
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( GET_INVALID_TARGET ( a ) , "'%s' is an illegal 'with' target" , _PyPegen_get_expr_name ( GET_INVALID_TARGET ( a ) ) );
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( GET_INVALID_TARGET ( a ) , "cannot assign to %s" , _PyPegen_get_expr_name ( GET_INVALID_TARGET ( a ) ) );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
return NULL;
Expand Down Expand Up @@ -11225,7 +11225,7 @@ invalid_for_target_rule(Parser *p)
(a = comparison_rule(p)) // comparison
)
{
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( GET_INVALID_TARGET ( a -> v . Compare . left ) , "'%s' is an illegal 'for' target" , _PyPegen_get_expr_name ( GET_INVALID_TARGET ( a -> v . Compare . left ) ) );
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( GET_INVALID_TARGET ( a -> v . Compare . left ) , "cannot assign to %s" , _PyPegen_get_expr_name ( GET_INVALID_TARGET ( a -> v . Compare . left ) ) );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
return NULL;
Expand Down