switch global symbol table when calling functions in different global ctx

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -626,7 +626,16 @@ async def call(self, ast_ctx, *args, **kwargs):
                 sym_table[name] = value
             else:
                 sym_table[name] = EvalLocalVar(name)
-        ast_ctx.sym_table_stack.append(ast_ctx.sym_table)
+        if ast_ctx.global_ctx != self.global_ctx:
+            #
+            # switch to the global symbol table in the global context
+            # where the function was defined
+            #
+            prev_sym_table = [ast_ctx.global_sym_table, ast_ctx.sym_table, ast_ctx.sym_table_stack]
+            ast_ctx.global_sym_table = self.global_ctx.get_global_sym_table()
+            ast_ctx.sym_table_stack = [ast_ctx.global_sym_table]
+        else:
+            ast_ctx.sym_table_stack.append(ast_ctx.sym_table)
         ast_ctx.sym_table = sym_table
         code_str, code_list = ast_ctx.code_str, ast_ctx.code_list
         ast_ctx.code_str, ast_ctx.code_list = self.code_str, self.code_list
@@ -644,9 +653,12 @@ async def call(self, ast_ctx, *args, **kwargs):
             val = None
             if ast_ctx.get_exception_obj():
                 break
-        ast_ctx.sym_table = ast_ctx.sym_table_stack.pop()
         ast_ctx.curr_func = prev_func
         ast_ctx.code_str, ast_ctx.code_list = code_str, code_list
+        if ast_ctx.global_ctx != self.global_ctx:
+            ast_ctx.global_sym_table, ast_ctx.sym_table, ast_ctx.sym_table_stack = prev_sym_table
+        else:
+            ast_ctx.sym_table = ast_ctx.sym_table_stack.pop()
         return val