YieldNode fix: set active after executing the expression (fixes nested yields)

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/test_generators.py

@@ -235,26 +235,33 @@ def f():
             next(g)
 
 
-    # def test_return_tuple(self):
-    #     def g():
-    #         return (yield 1)
-
-    #     gen = g()
-    #     self.assertEqual(next(gen), 1)
-    #     with self.assertRaises(StopIteration) as cm:
-    #         gen.send((2,))
-    #     self.assertEqual(cm.exception.value, (2,))
-
-    # def test_return_stopiteration(self):
-    #     def g():
-    #         return (yield 1)
-
-    #     gen = g()
-    #     self.assertEqual(next(gen), 1)
-    #     with self.assertRaises(StopIteration) as cm:
-    #         gen.send(StopIteration(2))
-    #     self.assertTrue(isinstance(cm.exception.value, StopIteration))
-    #     self.assertEqual(cm.exception.value.value, 2)
+    def test_return_tuple(self):
+        def g():
+            return (yield 1)
+
+        gen = g()
+        self.assertEqual(next(gen), 1)
+        with self.assertRaises(StopIteration) as cm:
+            gen.send((2,))
+        self.assertEqual(cm.exception.value, (2,))
+
+    def test_return_stopiteration(self):
+        def g():
+            return (yield 1)
+
+        gen = g()
+        self.assertEqual(next(gen), 1)
+        with self.assertRaises(StopIteration) as cm:
+            gen.send(StopIteration(2))
+        self.assertTrue(isinstance(cm.exception.value, StopIteration))
+        self.assertEqual(cm.exception.value.value, 2)
+
+    def test_yield_expr_value_without_send(self):
+        def fn():
+            yield (1,(yield 42))
+        g = fn()
+        self.assertEqual(next(g), 42)
+        self.assertEqual(next(g), (1,None))
 
     def test_generator_caller_frame(self):
         def gen():

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/YieldNode.java

@@ -68,9 +68,10 @@ public Object execute(VirtualFrame frame) {
                 return specialArgument;
             }
         } else {
+            Object result = right.execute(frame);
             access.setActive(frame, flagSlot, true);
             access.setLastYieldIndex(frame, yieldIndex);
-            throw new YieldException(right.execute(frame));
+            throw new YieldException(result);
         }
     }
 }