mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-18 16:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.5 (#25131)

Browse source
This commit is contained in:
Benjamin Peterson 2015-09-25 22:44:55 -07:00
commit 00d4442979
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/ast.c
View file

@ -2107,6 +2107,7 @@ ast_for_atom(struct compiling *c, const node *n)
* (comp_for | (',' (test ':' test | '**' test))* [','])) |
* ((test | '*' test)
* (comp_for | (',' (test | '*' test))* [','])) ) */
expr_ty res;
ch = CHILD(n, 1);
if (TYPE(ch) == RBRACE) {
/* It's an empty dict. */
@ -2118,12 +2119,12 @@ ast_for_atom(struct compiling *c, const node *n)
(NCH(ch) > 1 &&
TYPE(CHILD(ch, 1)) == COMMA)) {
/* It's a set display. */
return ast_for_setdisplay(c, ch);
res = ast_for_setdisplay(c, ch);
}
else if (NCH(ch) > 1 &&
TYPE(CHILD(ch, 1)) == comp_for) {
/* It's a set comprehension. */
return ast_for_setcomp(c, ch);
res = ast_for_setcomp(c, ch);
}
else if (NCH(ch) > 3 - is_dict &&
TYPE(CHILD(ch, 3 - is_dict)) == comp_for) {
@ -2133,12 +2134,17 @@ ast_for_atom(struct compiling *c, const node *n)
"dict comprehension");
return NULL;
}
return ast_for_dictcomp(c, ch);
res = ast_for_dictcomp(c, ch);
}
else {
/* It's a dictionary display. */
return ast_for_dictdisplay(c, ch);
res = ast_for_dictdisplay(c, ch);
}
if (res) {
res->lineno = LINENO(n);
res->col_offset = n->n_col_offset;
}
return res;
}
}
default: