fix EvilBeaver#1451: обновление глобального скоупа при загрузке внешн…

…его модуля
Mr-Rm · Oct 21, 2024 · 2d33f8a · 2d33f8a
1 parent 4131be1
commit 2d33f8a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/OneScript.Core/Contexts/AttachedContext.cs b/src/OneScript.Core/Contexts/AttachedContext.cs
@@ -15,13 +15,18 @@ namespace OneScript.Contexts
     /// </summary>
     public sealed class AttachedContext
     {
-        private readonly IVariable[] _variables;
-        private readonly BslMethodInfo[] _methods;
+        private IVariable[] _variables;
+        private BslMethodInfo[] _methods;
 
         public AttachedContext(IAttachableContext source)
         {
-            source.OnAttach(out _variables, out _methods);
             Instance = source;
+            Attach();
+        }
+
+        public void Attach()
+        {
+            Instance.OnAttach(out _variables, out _methods);
         }
 
         public AttachedContext(IAttachableContext target, IVariable[] vars)

diff --git a/src/ScriptEngine.HostedScript/LibraryLoader.cs b/src/ScriptEngine.HostedScript/LibraryLoader.cs
@@ -113,6 +113,7 @@ public void AddModule(string file, string moduleName)
                                 $"en = 'Load module ={moduleName}= in to context from file {file}'")    
                 );
                 _env.InjectGlobalProperty(null, moduleName, true);
+                MachineInstance.Current.UpdateGlobals();
             }
             catch (InvalidOperationException e)
 	        {

diff --git a/src/ScriptEngine/Machine/MachineInstance.cs b/src/ScriptEngine/Machine/MachineInstance.cs
@@ -69,6 +69,11 @@ public void SetMemory(ExecutionContext memory)
             _globalContexts = _mem.GlobalNamespace.AttachedContexts.Select(x => new AttachedContext(x))
                 .ToArray();
         }
+
+        public void UpdateGlobals() 
+        {
+            _globalContexts.ForEach(x => x.Attach());
+        }
 
         public bool IsRunning => _callStack.Count != 0;