Browse Source
bpo-43823: Fix location of one of the errors for invalid dictionary literals (GH-25427)
pull/25429/head
Pablo Galindo
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
2 deletions
-
Grammar/python.gram
-
Parser/parser.c
|
|
|
@ -899,6 +899,7 @@ invalid_double_starred_kvpairs: |
|
|
|
| expression ':' a='*' bitwise_or { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot use a starred expression in a dictionary value") } |
|
|
|
| expression a=':' &('}'|',') { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expression expected after dictionary key and ':'") } |
|
|
|
invalid_kvpair: |
|
|
|
| a=expression !(':') { RAISE_SYNTAX_ERROR("':' expected after dictionary key") } |
|
|
|
| a=expression !(':') { |
|
|
|
RAISE_ERROR_KNOWN_LOCATION(p, PyExc_SyntaxError, a->lineno, a->end_col_offset - 1, "':' expected after dictionary key") } |
|
|
|
| expression ':' a='*' bitwise_or { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot use a starred expression in a dictionary value") } |
|
|
|
| expression a=':' {RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expression expected after dictionary key and ':'") } |
|
|
|
@ -19379,7 +19379,7 @@ invalid_kvpair_rule(Parser *p) |
|
|
|
) |
|
|
|
{ |
|
|
|
D(fprintf(stderr, "%*c+ invalid_kvpair[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression !(':')")); |
|
|
|
_res = RAISE_SYNTAX_ERROR ( "':' expected after dictionary key" ); |
|
|
|
_res = RAISE_ERROR_KNOWN_LOCATION ( p , PyExc_SyntaxError , a -> lineno , a -> end_col_offset - 1 , "':' expected after dictionary key" ); |
|
|
|
if (_res == NULL && PyErr_Occurred()) { |
|
|
|
p->error_indicator = 1; |
|
|
|
D(p->level--); |
|
|
|
|