mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-39235: Fix end location for genexp in call args (GH-17925)

Browse source 
The fix changes copy_location() to require an extra node from which to extract the end location, and fixing all 5 call sites.


https://bugs.python.org/issue39235
This commit is contained in:
Guido van Rossum 2020-01-09 11:18:47 -08:00 • committed by Miss Islington (bot)
parent 2f65aa4658
commit a796d8ef9d
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2020-01-09-10-01-18.bpo-39235.RYwjoc.rst Normal file
View file

@ -0,0 +1,2 @@
Fix AST end location for lone generator expression in function call, e.g.
f(i for i in a).

16
Python/ast.c
View file

@ -1028,13 +1028,13 @@ forbidden_name(struct compiling *c, identifier name, const node *n,
} }
static expr_ty static expr_ty
copy_location(expr_ty e, const node *n) copy_location(expr_ty e, const node *n, const node *end)
{ {
if (e) { if (e) {
e->lineno = LINENO(n); e->lineno = LINENO(n);
e->col_offset = n->n_col_offset; e->col_offset = n->n_col_offset;
e->end_lineno = n->n_end_lineno; e->end_lineno = end->n_end_lineno;
e->end_col_offset = n->n_end_col_offset; e->end_col_offset = end->n_end_col_offset;
} }
return e; return e;
} }
@ -2464,10 +2464,10 @@ ast_for_atom(struct compiling *c, const node *n)
} }
if (TYPE(CHILD(ch, 1)) == comp_for) { if (TYPE(CHILD(ch, 1)) == comp_for) {
return copy_location(ast_for_genexp(c, ch), n); return copy_location(ast_for_genexp(c, ch), n, n);
} }
else { else {
return copy_location(ast_for_testlist(c, ch), n); return copy_location(ast_for_testlist(c, ch), n, n);
} }
case LSQB: /* list (or list comprehension) */ case LSQB: /* list (or list comprehension) */
ch = CHILD(n, 1); ch = CHILD(n, 1);
@ -2486,7 +2486,7 @@ ast_for_atom(struct compiling *c, const node *n)
n->n_end_lineno, n->n_end_col_offset, c->c_arena); n->n_end_lineno, n->n_end_col_offset, c->c_arena);
} }
else { else {
return copy_location(ast_for_listcomp(c, ch), n); return copy_location(ast_for_listcomp(c, ch), n, n);
} }
case LBRACE: { case LBRACE: {
/* dictorsetmaker: ( ((test ':' test | '**' test) /* dictorsetmaker: ( ((test ':' test | '**' test)
@ -2527,7 +2527,7 @@ ast_for_atom(struct compiling *c, const node *n)
/* It's a dictionary display. */ /* It's a dictionary display. */
res = ast_for_dictdisplay(c, ch); res = ast_for_dictdisplay(c, ch);
} }
return copy_location(res, n); return copy_location(res, n, n);
} }
} }
default: default:
@ -3146,7 +3146,7 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func,
} }
else if (TYPE(CHILD(ch, 1)) == comp_for) { else if (TYPE(CHILD(ch, 1)) == comp_for) {
/* the lone generator expression */ /* the lone generator expression */
e = copy_location(ast_for_genexp(c, ch), maybegenbeg); e = copy_location(ast_for_genexp(c, ch), maybegenbeg, closepar);
if (!e) if (!e)
return NULL; return NULL;
asdl_seq_SET(args, nargs++, e); asdl_seq_SET(args, nargs++, e);