привязка методов контекста к создаваемому экземпляру

Author: Mr-Rm

src/OneScript.Core/Compilation/Binding/ScopeBindingDescriptor.cs

@@ -41,8 +41,8 @@ private ScopeBindingDescriptor(ScopeBindingKind kind, IAttachableContext target,
         public static ScopeBindingDescriptor Static(IAttachableContext target)
             => new ScopeBindingDescriptor(ScopeBindingKind.Static, target, -1);
 
-        public static ScopeBindingDescriptor ThisScope()
-            => new ScopeBindingDescriptor(ScopeBindingKind.ThisScope, null, -1);
+        public static ScopeBindingDescriptor ThisScope(IAttachableContext target=null)
+            => new ScopeBindingDescriptor(ScopeBindingKind.ThisScope, target, -1);
 
         public static ScopeBindingDescriptor FrameScope(int index)
             => new ScopeBindingDescriptor(ScopeBindingKind.FrameScope, null, index);

src/OneScript.Core/Compilation/CompilerFrontendBase.cs

@@ -4,16 +4,17 @@ This Source Code Form is subject to the terms of the
 was not distributed with this file, You can obtain one
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
-using System;
-using System.Collections.Generic;
 using OneScript.Compilation.Binding;
+using OneScript.Contexts;
 using OneScript.DependencyInjection;
 using OneScript.Execution;
 using OneScript.Language;
 using OneScript.Language.LexicalAnalysis;
 using OneScript.Language.SyntaxAnalysis;
 using OneScript.Language.SyntaxAnalysis.AstNodes;
 using OneScript.Sources;
+using System;
+using System.Collections.Generic;
 
 namespace OneScript.Compilation
 {
@@ -64,6 +65,17 @@ public IExecutableModule Compile(SourceCode source, IBslProcess process, Type cl
             return CompileInternal(symbols, parsedModule, classType, process);
         }
 
+        public IExecutableModule Compile<T>(SourceCode source, IBslProcess process, T target)
+            where T : IAttachableContext
+        {
+            var lexer = CreatePreprocessor(source);
+            var symbols = PrepareSymbols(target);
+            var parsedModule = ParseSyntaxConstruction(lexer, source, p => p.ParseStatefulModule());
+
+            return CompileInternal(symbols, parsedModule, typeof(T), process);
+        }
+
+
         public IExecutableModule CompileExpression(SourceCode source)
         {
             var lexer = new DefaultLexer
@@ -91,7 +103,7 @@ public IExecutableModule CompileBatch(SourceCode source)
 
         protected abstract IExecutableModule CompileBatchInternal(SymbolTable symbols, ModuleNode parsedModule);
 
-        private SymbolTable PrepareSymbols()
+        private SymbolTable PrepareSymbols(IAttachableContext target = null)
         {
             var actualTable = new SymbolTable();
             if (SharedSymbols != default)
@@ -104,7 +116,7 @@ private SymbolTable PrepareSymbols()
             }
 
             ModuleSymbols ??= new SymbolScope();
-            actualTable.PushScope(ModuleSymbols, ScopeBindingDescriptor.ThisScope());
+            actualTable.PushScope(ModuleSymbols, ScopeBindingDescriptor.ThisScope(target));
 
             return actualTable;
         }

src/OneScript.Core/Compilation/ICompilerFrontend.cs

@@ -4,12 +4,13 @@ This Source Code Form is subject to the terms of the
 was not distributed with this file, You can obtain one
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
-using System;
-using System.Collections.Generic;
 using OneScript.Compilation.Binding;
+using OneScript.Contexts;
 using OneScript.Execution;
 using OneScript.Language;
 using OneScript.Sources;
+using System;
+using System.Collections.Generic;
 
 namespace OneScript.Compilation
 {
@@ -27,9 +28,13 @@ public interface ICompilerFrontend
 
         IErrorSink ErrorSink { get; }
 
-        IExecutableModule Compile(SourceCode source, IBslProcess process, Type classType = null);
-        
-        IExecutableModule CompileExpression(SourceCode source);
+        IExecutableModule Compile(SourceCode source, IBslProcess process, Type classType = null);
+        
+        public IExecutableModule Compile<T>(SourceCode source, IBslProcess process, T target)
+             where T : IAttachableContext;
+ 
+
+         IExecutableModule CompileExpression(SourceCode source);
 
         IExecutableModule CompileBatch(SourceCode source);
     }

src/ScriptEngine.HostedScript/LibraryLoader.cs

@@ -5,19 +5,20 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
-using ScriptEngine.Machine;
-using ScriptEngine.Machine.Contexts;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using OneScript.Commons;
 using OneScript.Compilation;
 using OneScript.Contexts;
 using OneScript.Exceptions;
 using OneScript.Execution;
+using OneScript.Sources;
 using OneScript.Values;
 using ScriptEngine.Libraries;
+using ScriptEngine.Machine;
+using ScriptEngine.Machine.Contexts;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
 namespace ScriptEngine.HostedScript
 {
@@ -28,7 +29,7 @@ public class LibraryLoader : AutoScriptDrivenObject<LibraryLoader>
         private readonly ScriptingEngine _engine;
 
         private readonly bool _customized;
-        private readonly Stack<LibraryLoadingContext> _librariesInProgress = new Stack<LibraryLoadingContext>();
+        private readonly Stack<LibraryLoadingContext> _librariesInProgress = [];
 
         private struct DelayLoadedScriptData
         {
@@ -70,17 +71,30 @@ private LibraryLoader(IRuntimeEnvironment env,
             _libManager = libManager;
             _engine = engine;
             _customized = false;
-        }
-        
+        }
+
+        private LibraryLoader(ScriptingEngine engine) : base(EmptyModule.Instance,true)
+        {
+            _env = engine.Environment;
+            _libManager = engine.LibraryManager;
+            _engine = engine;
+            _customized = true;
+        }
+
         #region Static part
-        
+
         public static LibraryLoader Create(ScriptingEngine engine, string processingScript, IBslProcess process)
         {
             var compiler = engine.GetCompilerService();
             var code = engine.Loader.FromFile(processingScript);
-            var module = CompileModule(compiler, code, typeof(LibraryLoader), process);
-            
-            return new LibraryLoader(module, engine.Environment, engine.LibraryManager, engine, process);
+
+            var loader = new LibraryLoader(engine);
+            CompileModule(compiler, code, loader, process);
+
+            loader.InitOwnData();
+            loader._engine.InitializeSDO(loader, process);
+
+            return loader;
         }
 
         public static LibraryLoader Create(ScriptingEngine engine, IBslProcess process)
@@ -200,7 +214,7 @@ private bool CustomizedProcessing(string libraryPath, IBslProcess process)
                 return DefaultProcessing(libraryPath, process);
             }
 
-            CallScriptMethod(eventIdx, new[] { libPathValue, defaultLoading, cancelLoading }, process);
+            CallScriptMethod(eventIdx, [libPathValue, defaultLoading, cancelLoading], process);
 
             if (cancelLoading.AsBoolean()) // Отказ = Ложь
                 return false;
@@ -209,7 +223,6 @@ private bool CustomizedProcessing(string libraryPath, IBslProcess process)
                 return DefaultProcessing(libraryPath, process);
 
             return true;
-
         }
 
         private bool DefaultProcessing(string libraryPath, IBslProcess process)

src/ScriptEngine/Machine/Contexts/AutoScriptDrivenObject.cs

@@ -152,6 +152,15 @@ public static IExecutableModule CompileModule(ICompilerFrontend compiler, Source
             compiler.FillSymbols(typeof(AutoScriptDrivenObject<T>));
             return compiler.Compile(src, process, type);
         }
+
+        public static IExecutableModule CompileModule(ICompilerFrontend compiler, SourceCode src, T instance, IBslProcess process)
+        {
+            compiler.FillSymbols(typeof(AutoScriptDrivenObject<T>));
+
+            var module = compiler.Compile<T>(src, process, instance);
+            instance.SetModule(module);
+            return module;
+        }
     }
 
 }

src/ScriptEngine/Machine/Contexts/ScriptDrivenObject.cs

@@ -45,7 +45,7 @@ protected ScriptDrivenObject()
         {
         }
 
-        protected void SetModule(StackRuntimeModule module)
+        protected void SetModule(IExecutableModule module)
         {
             _module = module;
         }