Merge pull request #867 from BPYap/fix-nested-generator

Fixed #866 RunTimeError when generator is nested in more than 1 level of function definition

tests/structures/test_function.py

@@ -256,6 +256,20 @@ def nested_func():
             func2()
             """)
 
+    def test_define_nested_generator(self):
+        self.assertCodeExecution("""
+            def wrapper():
+                def func():
+                    def gen():
+                        yield 'Hello World'
+
+                    print(next(gen()))
+
+                func()
+
+            wrapper()
+            """)
+
     def test_noarg_unexpected_extra_arg(self):
         self.assertCodeExecution("""
             def myfunc():

voc/python/methods.py

@@ -1119,7 +1119,7 @@ def transpile_wrapper(self):
             JavaOpcodes.LDC_W(self.generator),
 
             # p2: The actual generator method
-            java.Class.forName(self.klass.class_name),
+            java.Class.forName(self.class_descriptor.replace('/', '.')),
 
             JavaOpcodes.LDC_W(self.method_name + "$generator"),
             java.Array(1, 'java/lang/Class'),