inner functions and classes added to global sym table if declared as global

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -961,7 +961,11 @@ async def ast_while(self, arg):
     async def ast_classdef(self, arg):
         """Evaluate class definition."""
         bases = [(await self.aeval(base)) for base in arg.bases]
-        self.sym_table[arg.name] = EvalLocalVar(arg.name)
+        if self.curr_func and arg.name in self.curr_func.global_names:
+            sym_table_assign = self.global_sym_table
+        else:
+            sym_table_assign = self.sym_table
+        sym_table_assign[arg.name] = EvalLocalVar(arg.name)
         sym_table = {}
         self.sym_table_stack.append(self.sym_table)
         self.sym_table = sym_table
@@ -977,7 +981,7 @@ async def ast_classdef(self, arg):
         if "__init__" in sym_table:
             sym_table["__init__evalfunc_wrap__"] = sym_table["__init__"]
             del sym_table["__init__"]
-        self.sym_table[arg.name].set(type(arg.name, tuple(bases), sym_table))
+        sym_table_assign[arg.name].set(type(arg.name, tuple(bases), sym_table))
 
     async def ast_functiondef(self, arg):
         """Evaluate function definition."""
@@ -1020,10 +1024,14 @@ async def ast_functiondef(self, arg):
         else:
             func_var = func
 
-        if name in self.sym_table and isinstance(self.sym_table[name], EvalLocalVar):
-            self.sym_table[name].set(func_var)
+        if self.curr_func and name in self.curr_func.global_names:
+            sym_table = self.global_sym_table
+        else:
+            sym_table = self.sym_table
+        if name in sym_table and isinstance(sym_table[name], EvalLocalVar):
+            sym_table[name].set(func_var)
         else:
-            self.sym_table[name] = func_var
+            sym_table[name] = func_var
 
     async def ast_lambda(self, arg):
         """Evaluate lambda definition."""

docs/new_features.rst

@@ -53,3 +53,5 @@ Bug fixes since 1.1.0 include:
   the service, reported by @wsw70 (#121)
 - Added error message for invalid ``@time_active`` argument, by @dlashua (#118).
 - The ``scripts`` subdirectory is now recursively traversed for ``requirements.txt`` files.
+- Inner functions and classes (defined inside a function) are added to global symbol table
+  if declared as global.

tests/test_decorators.py

@@ -153,8 +153,7 @@ def func4():
 
 @state_trigger("pyscript.var1 == '5'")
 def func5(value=None):
-    global seq_num
-    global startup_test_save
+    global seq_num, startup_test
 
     seq_num += 1
     pyscript.done = [seq_num, int(value)]
@@ -166,8 +165,6 @@ def startup_test():
         seq_num += 1
         pyscript.done = [seq_num, int(value)]
 
-    startup_test_save = startup_test
-
 def add_state_trig(value):
     def dec_add_state_trig(func):
         nonlocal value

tests/test_unit_eval.py

@@ -657,6 +657,31 @@ def foo2():
     ],
     [
         """
+def foo():
+    global f_bar
+    def f_bar():
+        return "hello"
+
+foo()
+f_bar()
+""",
+        "hello",
+    ],
+    [
+        """
+def foo():
+    global inner_class
+    class inner_class:
+        def method1():
+            return 1234
+
+foo()
+inner_class.method1()
+""",
+        1234,
+    ],
+    [
+        """
 def foo(x=30, *args, y = 123, **kwargs):
     return [x, y, args, kwargs]
 [foo(a = 10, b = 3), foo(40, 7, 8, 9, a = 10, y = 3), foo(x=42)]