Merge branch 'refs/heads/feature/bsl-process' into develop

# Conflicts:
#	src/OneScript.Web.Server/WebServer.cs

Author: EvilBeaver

src/OneScript.Core/Commons/Utils.cs

@@ -5,9 +5,7 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OneScript.Commons
 {

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

@@ -5,7 +5,6 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
 using OneScript.Contexts;
 

src/OneScript.Core/Compilation/CompilerFrontendBase.cs

@@ -55,13 +55,13 @@ public SymbolScope FillSymbols(Type targetType)
 
         private SymbolScope ModuleSymbols { get; set; }
 
-        public IExecutableModule Compile(SourceCode source, Type classType = null)
+        public IExecutableModule Compile(SourceCode source, IBslProcess process, Type classType = null)
         {
             var lexer = CreatePreprocessor(source);
             var symbols = PrepareSymbols();
             var parsedModule = ParseSyntaxConstruction(lexer, source, p => p.ParseStatefulModule());
 
-            return CompileInternal(symbols, parsedModule, classType);
+            return CompileInternal(symbols, parsedModule, classType, process);
         }
 
         public IExecutableModule CompileExpression(SourceCode source)
@@ -85,7 +85,7 @@ public IExecutableModule CompileBatch(SourceCode source)
             return CompileBatchInternal(symbols, parsedModule);
         }
 
-        protected abstract IExecutableModule CompileInternal(SymbolTable symbols, ModuleNode parsedModule, Type classType);
+        protected abstract IExecutableModule CompileInternal(SymbolTable symbols, ModuleNode parsedModule, Type classType, IBslProcess process);
 
         protected abstract IExecutableModule CompileExpressionInternal(SymbolTable symbols, ModuleNode parsedModule);
 

src/OneScript.Core/Compilation/ICompileTimeDependencyResolver.cs

@@ -5,6 +5,7 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
+using OneScript.Execution;
 using OneScript.Sources;
 
 namespace OneScript.Compilation
@@ -16,6 +17,7 @@ public interface ICompileTimeDependencyResolver
         /// </summary>
         /// <param name="module">Модуль в котором объявлен импорт</param>
         /// <param name="libraryName">имя библиотеки</param>
-        void Resolve(SourceCode module, string libraryName);
+        /// <param name="process"></param>
+        void Resolve(SourceCode module, string libraryName, IBslProcess process);
     }
 }

src/OneScript.Core/Compilation/ICompilerBackend.cs

@@ -21,6 +21,6 @@ public interface ICompilerBackend
 
         public SymbolTable Symbols { get; set; }
 
-        IExecutableModule Compile(ModuleNode parsedModule, Type classType);
+        IExecutableModule Compile(ModuleNode parsedModule, Type classType, IBslProcess process);
     }
 }

src/OneScript.Core/Compilation/ICompilerFrontend.cs

@@ -27,7 +27,7 @@ public interface ICompilerFrontend
 
         IErrorSink ErrorSink { get; }
 
-        IExecutableModule Compile(SourceCode source, Type classType = null);
+        IExecutableModule Compile(SourceCode source, IBslProcess process, Type classType = null);
 
         IExecutableModule CompileExpression(SourceCode source);
 

src/OneScript.Core/Contexts/BslFieldBuilder.cs

@@ -63,7 +63,7 @@ public BslFieldBuilder SetDispatchingIndex(int index)
             return this;
         }
 
-        public BslFieldInfo Build()
+        public BslScriptFieldInfo Build()
         {
             var scriptField = _member as BslScriptFieldInfo;
             Debug.Assert(scriptField != null);

src/OneScript.Core/Contexts/BslMethodInfo.cs

@@ -6,10 +6,8 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using OneScript.Localization;
 
 namespace OneScript.Contexts
 {

src/OneScript.Core/Contexts/ContextClassAttribute.cs

@@ -37,8 +37,5 @@ public string GetAlias()
         {
             return _alias;
         }
-
-        public string TypeUUID { get; set; }
-
     }
 }

src/OneScript.Core/Contexts/ContextMethodInfo.cs

@@ -10,6 +10,7 @@ This Source Code Form is subject to the terms of the
 using System.Linq;
 using System.Reflection;
 using OneScript.Commons;
+using OneScript.Execution;
 
 namespace OneScript.Contexts
 {
@@ -39,6 +40,7 @@ public ContextMethodInfo(MethodInfo realMethod, ContextMethodAttribute binding)
         {
             _realMethod = realMethod;
             _scriptMark = binding;
+            InjectsProcess = _realMethod.GetParameters().FirstOrDefault()?.ParameterType == typeof(IBslProcess);
         }
 
         public override Type ReturnType => _realMethod.ReturnType;
@@ -101,6 +103,8 @@ public override MethodInfo GetBaseDefinition()
 
         public object UnderlyingObject => _realMethod;
 
+        public bool InjectsProcess { get; }
+
         public MethodInfo GetWrappedMethod() => _realMethod;
     }
 }