diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-11-25 14:37:43 +0000 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-11-25 14:37:43 +0000 |
| commit | 073f0673697380a00dc2067ab3a999354893df51 (patch) | |
| tree | ea7fc1d821d1aeaf0d8f7ca68ac22545ab63925f /Python/compile.c | |
| parent | ab56710989745ff11c10205ea993c2e423c22f75 (diff) | |
| parent | ded35aeb9d5ae1671174f10c0ae8a7166693b17c (diff) | |
| download | cpython-git-073f0673697380a00dc2067ab3a999354893df51.tar.gz | |
Issue #16546: merge fix from 3.3
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Python/compile.c b/Python/compile.c index 5016f99af3..3cf71ef09e 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3341,27 +3341,24 @@ compiler_visit_expr(struct compiler *c, expr_ty e) case DictComp_kind: return compiler_dictcomp(c, e); case Yield_kind: - case YieldFrom_kind: { - expr_ty value; if (c->u->u_ste->ste_type != FunctionBlock) return compiler_error(c, "'yield' outside function"); - value = (e->kind == YieldFrom_kind) ? e->v.YieldFrom.value : e->v.Yield.value; - if (value) { - VISIT(c, expr, value); + if (e->v.Yield.value) { + VISIT(c, expr, e->v.Yield.value); } else { ADDOP_O(c, LOAD_CONST, Py_None, consts); } - if (e->kind == YieldFrom_kind) { - ADDOP(c, GET_ITER); - ADDOP_O(c, LOAD_CONST, Py_None, consts); - ADDOP(c, YIELD_FROM); - } - else { - ADDOP(c, YIELD_VALUE); - } + ADDOP(c, YIELD_VALUE); + break; + case YieldFrom_kind: + if (c->u->u_ste->ste_type != FunctionBlock) + return compiler_error(c, "'yield' outside function"); + VISIT(c, expr, e->v.YieldFrom.value); + ADDOP(c, GET_ITER); + ADDOP_O(c, LOAD_CONST, Py_None, consts); + ADDOP(c, YIELD_FROM); break; - } case Compare_kind: return compiler_compare(c, e); case Call_kind: |