mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.5 (issue #24791)

Browse source
This commit is contained in:
Yury Selivanov 2015-08-05 17:55:12 -04:00
commit dca249b17c
5 changed files with 42 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Python/ast.c
View file

@ -2664,45 +2664,44 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
expr_ty e;
node *chch = CHILD(ch, 0);
if (NCH(ch) == 1) {
if (TYPE(chch) == star_expr) {
/* an iterable argument unpacking */
expr_ty starred;
/* a positional argument */
if (nkeywords) {
if (ndoublestars) {
ast_error(c, chch,
"iterable argument unpacking follows "
"positional argument follows "
"keyword argument unpacking");
return NULL;
}
e = ast_for_expr(c, CHILD(chch, 1));
if (!e)
return NULL;
starred = Starred(e, Load, LINENO(chch),
chch->n_col_offset,
c->c_arena);
if (!starred)
return NULL;
asdl_seq_SET(args, nargs++, starred);
}
else {
/* a positional argument */
if (nkeywords) {
if (ndoublestars) {
ast_error(c, chch,
"positional argument follows "
"keyword argument unpacking");
}
else {
ast_error(c, chch,
"positional argument follows "
"keyword argument");
}
return NULL;
else {
ast_error(c, chch,
"positional argument follows "
"keyword argument");
}
e = ast_for_expr(c, chch);
if (!e)
return NULL;
asdl_seq_SET(args, nargs++, e);
return NULL;
}
e = ast_for_expr(c, chch);
if (!e)
return NULL;
asdl_seq_SET(args, nargs++, e);
}
else if (TYPE(chch) == STAR) {
/* an iterable argument unpacking */
expr_ty starred;
if (ndoublestars) {
ast_error(c, chch,
"iterable argument unpacking follows "
"keyword argument unpacking");
return NULL;
}
e = ast_for_expr(c, CHILD(ch, 1));
if (!e)
return NULL;
starred = Starred(e, Load, LINENO(chch),
chch->n_col_offset,
c->c_arena);
if (!starred)
return NULL;
asdl_seq_SET(args, nargs++, starred);
}
else if (TYPE(chch) == DOUBLESTAR) {
/* a keyword argument unpacking */

2
Python/graminit.c
View file

@ -1744,7 +1744,7 @@ static state states_77[3] = {
static arc arcs_78_0[3] = {
{26, 1},
{34, 2},
{50, 3},
{33, 2},
};
static arc arcs_78_1[3] = {
{164, 3},