mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-27 21:24:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #1531113: Fix augmented assignment with yield expressions.

Browse source 
Also fix a SystemError when trying to assign to yield expressions.
This commit is contained in:
Neal Norwitz 2006-07-30 06:53:31 +00:00
parent 33c3e29fce
commit 0d62a06206
5 changed files with 52 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/ast.c
View file

@ -387,6 +387,9 @@ set_context(expr_ty e, expr_context_ty ctx, const node *n)
case GeneratorExp_kind:
expr_name = "generator expression";
break;
case Yield_kind:
expr_name = "yield expression";
break;
case ListComp_kind:
expr_name = "list comprehension";
break;
@ -1928,12 +1931,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
operator_ty newoperator;
node *ch = CHILD(n, 0);
if (TYPE(ch) == testlist)
expr1 = ast_for_testlist(c, ch);
else
expr1 = Yield(ast_for_expr(c, CHILD(ch, 0)), LINENO(ch), n->n_col_offset,
c->c_arena);
expr1 = ast_for_testlist(c, ch);
if (!expr1)
return NULL;
/* TODO(nas): Remove duplicated error checks (set_context does it) */
@ -1942,6 +1940,10 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
ast_error(ch, "augmented assignment to generator "
"expression not possible");
return NULL;
case Yield_kind:
ast_error(ch, "augmented assignment to yield "
"expression not possible");
return NULL;
case Name_kind: {
const char *var_name = PyString_AS_STRING(expr1->v.Name.id);
if (var_name[0] == 'N' && !strcmp(var_name, "None")) {
@ -1964,7 +1966,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
if (TYPE(ch) == testlist)
expr2 = ast_for_testlist(c, ch);
else
expr2 = Yield(ast_for_expr(c, ch), LINENO(ch), ch->n_col_offset, c->c_arena);
expr2 = ast_for_expr(c, ch);
if (!expr2)
return NULL;