commit 1f7ce62bd61488d5d721896a36a1b43befab88b5
author Nick Coghlan <ncoghlan@gmail.com> Fri Jan 13 21:43:40 2012 +1000
committer Nick Coghlan <ncoghlan@gmail.com> Fri Jan 13 21:43:40 2012 +1000
tree e7c92d4429ce431c78d0b7816c93862629590223
parent e51757f6de9db71b7ee0a6cbf7dde62e9f146804

Implement PEP 380 - 'yield from' (closes #11682)

Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 849f487..4d91f50 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -840,6 +840,7 @@
         case IMPORT_STAR:
             return -1;
         case YIELD_VALUE:
+        case YIELD_FROM:
             return 0;
 
         case POP_BLOCK:
@@ -3318,7 +3319,12 @@
         else {
             ADDOP_O(c, LOAD_CONST, Py_None, consts);
         }
-        ADDOP(c, YIELD_VALUE);
+        if (e->v.Yield.is_from) {
+            ADDOP(c, YIELD_FROM);
+        }
+        else {
+            ADDOP(c, YIELD_VALUE);
+        }
         break;
     case Compare_kind:
         return compiler_compare(c, e);