Merge pull request #1549 from EvilBeaver/latest

EvilBeaver · web-flow · commit 76c7fb760d48 · 2025-06-03T10:05:21.000+03:00
Выпуск версии 1.9.3
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
     agent none
 
     environment {
-        ReleaseNumber = '1.9.2'
+        ReleaseNumber = '1.9.3'
         outputEnc = '65001'
     }
 
@@ -218,10 +218,10 @@ pipeline {
             }
         }
 
-        stage ('Publishing revision') {
+        stage ('Publishing dev-revision') {
             when { anyOf {
                 // TODO сделать автовычисление маркера lts или latest и согласовать его с путём к папке на стр. 250 (TARGET=..._)
-                branch 'release/latest'
+                branch 'latest'
                 }
             }
             
@@ -247,7 +247,7 @@ pipeline {
                     mv $WIN/OneScript*-x86*.zip ./
                     mv $RPM/*.rpm x64/
                     mv $DEB/*.deb x64/
-                    TARGET="/var/www/oscript.io/download/versions/latest/"
+                    TARGET="/var/www/oscript.io/download/versions/latest-dev/"
                     sudo rsync -rv --delete --exclude mddoc*.zip --exclude *.src.rpm . $TARGET
                     '''.stripIndent()
                 }
diff --git a/src/1Script.sln b/src/1Script.sln
@@ -23,6 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		..\Build.csproj = ..\Build.csproj
 		oscommon.targets = oscommon.targets
+		..\Jenkinsfile = ..\Jenkinsfile
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{BBE794A6-B159-422F-B655-B7F03F25F223}"
diff --git a/src/ScriptEngine.HostedScript/Library/Binary/BinaryDataContext.cs b/src/ScriptEngine.HostedScript/Library/Binary/BinaryDataContext.cs
@@ -203,8 +203,11 @@ public override string AsString()
                     return "";
 
                 buffer = new byte[length];
+                
+                var keepPos = _backingFile.Position;
                 _backingFile.Seek(0, SeekOrigin.Begin);
                 _backingFile.Read(buffer, 0, length);
+                _backingFile.Seek(keepPos, SeekOrigin.Begin);
             }
             
             StringBuilder hex = new StringBuilder(length*3);
diff --git a/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiKernel.cs b/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiKernel.cs
@@ -30,7 +30,10 @@ public static IntPtr LoadLibrary(string filename)
 
         public static IntPtr GetProcAddress(IntPtr module, string procName)
         {
-            return IsLinux ? LinuxProc(module, procName) : WindowsProc(module, procName);
+            var pointer = IsLinux ? LinuxProc(module, procName) : WindowsProc(module, procName);
+            return pointer != IntPtr.Zero
+                ? pointer
+                : throw new ApplicationException($"Function pointer for {procName} not obtained.");
         }
 
         public static bool FreeLibrary(IntPtr module)
diff --git a/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiLibrary.cs b/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiLibrary.cs
@@ -37,6 +37,10 @@ public NativeApiLibrary(String filepath, String identifier)
                     _tempfile = Path.GetTempFileName();
                     NativeApiPackage.Extract(stream, _tempfile);
                     Module = NativeApiKernel.LoadLibrary(_tempfile);
+                    if (Module == IntPtr.Zero)
+                    {
+                        File.Delete(_tempfile);
+                    }
                 }
                 else 
                     Module = NativeApiKernel.LoadLibrary(filepath);
diff --git a/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiPackage.cs b/src/ScriptEngine.HostedScript/Library/NativeApi/NativeApiPackage.cs
@@ -26,6 +26,11 @@ public static bool IsZip(Stream stream)
             const int ZIP_LEAD_BYTES = 0x04034b50;
             return (BitConverter.ToInt32(bytes, 0) == ZIP_LEAD_BYTES);
         }
+        
+        private static bool Is64BitProcess()
+        {
+            return IntPtr.Size == 8;
+        }
 
         public static void Extract(Stream stream, String tempfile)
         {
@@ -50,7 +55,7 @@ private static String GetEntryName(ZipFile zip)
                         using (var reader = XmlReader.Create(stream))
                         {
                             var thisOs = NativeApiProxy.IsLinux ? "Linux" : "Windows";
-                            var thisArch = System.Environment.Is64BitOperatingSystem ? "x86_64" : "i386";
+                            var thisArch = Is64BitProcess() ? "x86_64" : "i386";
                             while (reader.ReadToFollowing("component"))
                             {
                                 var attrOs = reader.GetAttribute("os");
diff --git a/src/ScriptEngine.NativeApi/NativeApiProxy.cpp b/src/ScriptEngine.NativeApi/NativeApiProxy.cpp
@@ -326,7 +326,7 @@ DllExport int32_t GetNParams(ProxyComponent* proxy, int32_t lMethodNum)
 	return (int32_t)proxy->Component().GetNParams(lMethodNum);
 }
 
-DllExport bool ADDIN_API HasParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum)
+DllExport bool HasParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum)
 {
 	CHECK_PROXY(false);
 	tVariant variant = { 0 };
@@ -335,7 +335,7 @@ DllExport bool ADDIN_API HasParamDefValue(ProxyComponent* proxy, int32_t lMethod
 	return result;
 }
 
-DllExport bool ADDIN_API GetParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum, VariantFuncRespond respond)
+DllExport bool GetParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum, VariantFuncRespond respond)
 {
 	CHECK_PROXY(false);
 	tVariant variant = { 0 };
@@ -351,15 +351,15 @@ DllExport bool HasRetVal(ProxyComponent* proxy, int32_t lMethodNum)
 	return proxy->Component().HasRetVal(lMethodNum);
 }
 
-DllExport bool ADDIN_API CallAsProc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams)
+DllExport bool CallAsProc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams)
 {
 	CHECK_PROXY(false);
 	auto lSizeArray = GetNParams(proxy, lMethodNum);
 	bool ok = proxy->Component().CallAsProc(lMethodNum, paParams, lSizeArray);
 	return ok;
 }
 
-DllExport bool ADDIN_API CallAsFunc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams, VariantFuncRespond respond)
+DllExport bool CallAsFunc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams, VariantFuncRespond respond)
 {
 	CHECK_PROXY(false);
 	tVariant variant = { 0 };
diff --git a/src/ScriptEngine/Compiler/Compiler.cs b/src/ScriptEngine/Compiler/Compiler.cs
@@ -1111,7 +1111,7 @@ private void BuildTryExceptStatement()
             BuildCodeBatch(Token.EndTry);
 
             var endIndex = AddLineNumber(_lastExtractedLexem.LineNumber, CodeGenerationFlags.CodeStatistics | CodeGenerationFlags.DebugCode);
-            AddCommand(OperationCode.EndTry);
+            AddCommand(OperationCode.EndTry, beginHandler);
             CorrectCommandArgument(jmpIndex, endIndex);
             
             NextToken();
diff --git a/src/ScriptEngine/Machine/Contexts/ContextDiscoverer.cs b/src/ScriptEngine/Machine/Contexts/ContextDiscoverer.cs
@@ -15,8 +15,13 @@ namespace ScriptEngine.Machine.Contexts
     static class ContextDiscoverer
     {
         private const string INSTANCE_RETRIEVER_NAME = "CreateInstance";
+
+        public static void DiscoverClasses(Assembly assembly)
+        {
+            DiscoverClasses(assembly, t => true);
+        }
         
-        public static void DiscoverClasses(System.Reflection.Assembly assembly)
+        public static void DiscoverClasses(Assembly assembly, Func<Type, bool> filter)
         {
             IEnumerable<Type> types;
             try
@@ -37,29 +42,34 @@ public static void DiscoverClasses(System.Reflection.Assembly assembly)
 
             var collection = GetMarkedTypes(types, typeof(ContextClassAttribute));
 
-            foreach (var type in collection)
+            foreach (var type in collection.Where(filter))
             {
                 RegisterSystemType(type);
             }
         }
 
-        public static void DiscoverGlobalContexts(RuntimeEnvironment environment, System.Reflection.Assembly assembly)
+        public static void DiscoverGlobalContexts(RuntimeEnvironment environment, Assembly assembly)
+        {
+            DiscoverGlobalContexts(environment, assembly, t => true);
+        }
+        
+        public static void DiscoverGlobalContexts(RuntimeEnvironment environment, Assembly assembly, Func<Type, bool> filter)
         {
             var allTypes = assembly.GetTypes();
             var enums = GetMarkedTypes(allTypes.AsParallel(), typeof(SystemEnumAttribute));
-            foreach (var item in enums)
+            foreach (var item in enums.Where(filter))
             {
                 RegisterSystemEnum(item, environment);
             }
 
             var simpleEnums = GetMarkedTypes(allTypes.AsParallel(), typeof(EnumerationTypeAttribute));
-            foreach (var item in simpleEnums)
+            foreach (var item in simpleEnums.Where(filter))
             {
                 RegisterSimpleEnum(item, environment);
             }
 
             var contexts = GetMarkedTypes(allTypes.AsParallel(), typeof(GlobalContextAttribute));
-            foreach (var item in contexts)
+            foreach (var item in contexts.Where(filter))
             {
                 RegisterGlobalContext(item, environment);
             }
diff --git a/src/ScriptEngine/Machine/Contexts/ScriptDrivenObject.cs b/src/ScriptEngine/Machine/Contexts/ScriptDrivenObject.cs
@@ -7,6 +7,7 @@ This Source Code Form is subject to the terms of the
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 
 namespace ScriptEngine.Machine.Contexts
 {
diff --git a/src/ScriptEngine/Machine/Contexts/UserScriptContextInstance.cs b/src/ScriptEngine/Machine/Contexts/UserScriptContextInstance.cs
@@ -215,6 +215,8 @@ protected override int GetOwnVariableCount()
                 return _ownProperties.Count;
         }
 
+        public int GetOwnPropCount() => GetOwnVariableCount();
+
         protected override void UpdateState()
         {
         }
@@ -242,7 +244,7 @@ protected override string GetOwnPropName(int index)
 
             return _ownPropertyIndexes.Where(x => x.Value == index).First().Key;
         }
-        
+
         public override int GetMethodsCount()
         {
             return GetOwnMethodCount() + _module.Methods.Length;
diff --git a/src/ScriptEngine/Machine/IRuntimeContextInstance.cs b/src/ScriptEngine/Machine/IRuntimeContextInstance.cs
@@ -8,6 +8,7 @@ This Source Code Form is subject to the terms of the
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using ScriptEngine.Machine.Contexts;
 
 namespace ScriptEngine.Machine
@@ -58,25 +59,28 @@ public static IEnumerable<VariableInfo> GetProperties(this IRuntimeContextInstan
         private static IEnumerable<VariableInfo> GetPropertiesWithPrivate(IRuntimeContextInstance context)
         {
             if (!(context is UserScriptContextInstance userScript))
-                return Array.Empty<VariableInfo>();
+                return GetPropertiesWithoutPrivate(context);
 
-            List<VariableInfo> infos = new List<VariableInfo>();
-            foreach (var variable in userScript.Module.Variables)
+            var infos = new List<VariableInfo>();
+            for (int i = 1; i < userScript.GetOwnPropCount(); i++) // skip ThisObject == _ownProperties[0]
             {
                 infos.Add(new VariableInfo() { 
-                    Identifier = variable.Identifier,
-                    Type = variable.Type,
-                    Index = variable.Index,
-                    Annotations = HackGetAnnotations(context, variable.Index),
-                    IsExport = variable.IsExport
+                    Identifier = userScript.GetPropName(i),
+                    Type = SymbolType.ContextProperty,
+                    Index = i,
+                    Annotations = Array.Empty<AnnotationDefinition>(),
+                    IsExport = false
                 });
             }
 
-            return infos;
+            return infos.Concat(userScript.Module.Variables);
         }
 
         private static IEnumerable<VariableInfo> GetPropertiesWithoutPrivate(IRuntimeContextInstance context)
         {
+            if (context is UserScriptContextInstance userScript)
+                return userScript.Module.Variables.Where(x => x.IsExport).ToList();
+
             VariableInfo[] infos = new VariableInfo[context.GetPropCount()];
             for (int i = 0; i < infos.Length; i++)
             {
@@ -85,26 +89,14 @@ private static IEnumerable<VariableInfo> GetPropertiesWithoutPrivate(IRuntimeCon
                     Identifier = context.GetPropName(i),
                     Type = SymbolType.ContextProperty,
                     Index = i,
-                    Annotations = HackGetAnnotations(context, i),
+                    Annotations = Array.Empty<AnnotationDefinition>(),
                     IsExport = true
                 };
             }
 
             return infos;
         }
 
-        private static AnnotationDefinition[] HackGetAnnotations(IRuntimeContextInstance context, int i)
-        {
-            if (!(context is UserScriptContextInstance userScript)) 
-                return Array.Empty<AnnotationDefinition>();
-            
-            if (i == 0)
-                return Array.Empty<AnnotationDefinition>();
-            
-            var variable = userScript.Module.Variables[i - 1];
-            return variable.Annotations;
-        }
-
         public static IValue GetPropValue(this IRuntimeContextInstance context, string propName)
         {
             int propNum = context.FindProperty(propName);
diff --git a/src/ScriptEngine/Machine/MachineInstance.cs b/src/ScriptEngine/Machine/MachineInstance.cs
@@ -8,6 +8,7 @@ This Source Code Form is subject to the terms of the
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using OneScript.Language;
 using OneScript.Language.LexicalAnalysis;
 using ScriptEngine.Compiler;
@@ -35,6 +36,8 @@ public class MachineInstance
         private IList<ExecutionFrameInfo> _fullCallstackCache;
         private ModuleInformation _debugInfo;
 
+        private CancellationToken _cancellationToken = CancellationToken.None;
+        
         internal MachineInstance() 
         {
             InitCommands();
@@ -43,6 +46,11 @@ internal MachineInstance()
 
         public event EventHandler<MachineStoppedEventArgs> MachineStopped;
 
+        public void SetCancellationToken(CancellationToken token)
+        {
+            _cancellationToken = token;
+        }
+        
         private struct ExceptionJumpInfo
         {
             public int handlerAddress;
@@ -563,6 +571,11 @@ private void MainCommandLoop()
                 {
                     var command = _module.Code[_currentFrame.InstructionPointer];
                     _commands[(int)command.Code](command.Argument);
+
+                    if (_cancellationToken.IsCancellationRequested)
+                    {
+                        throw new ScriptInterruptionException(0x1984);
+                    }
                 }
             }
             catch (RuntimeException)
@@ -1341,8 +1354,12 @@ private void BeginTry(int exceptBlockAddress)
 
         private void EndTry(int arg)
         {
-            if (_exceptionsStack.Count > 0 && _exceptionsStack.Peek().handlerFrame == _currentFrame)
-                _exceptionsStack.Pop();
+            if (_exceptionsStack.Count > 0)
+            {
+                var jmpInfo = _exceptionsStack.Peek();
+                if (jmpInfo.handlerFrame == _currentFrame && arg == jmpInfo.handlerAddress)
+                    _exceptionsStack.Pop();
+            }
             _currentFrame.LastException = null;
             NextInstruction();
         }
diff --git a/src/ScriptEngine/ScriptingEngine.cs b/src/ScriptEngine/ScriptingEngine.cs
@@ -49,6 +49,12 @@ public void AttachAssembly(System.Reflection.Assembly asm, RuntimeEnvironment gl
             ContextDiscoverer.DiscoverClasses(asm);
             ContextDiscoverer.DiscoverGlobalContexts(globalEnvironment, asm);
         }
+        
+        public void AttachAssembly(System.Reflection.Assembly asm, RuntimeEnvironment globalEnvironment, Func<Type, bool> filter)
+        {
+            ContextDiscoverer.DiscoverClasses(asm, filter);
+            ContextDiscoverer.DiscoverGlobalContexts(globalEnvironment, asm, filter);
+        }
 
         public void AttachExternalAssembly(System.Reflection.Assembly asm, RuntimeEnvironment globalEnvironment)
         {
diff --git a/tests/annotations.os b/tests/annotations.os
@@ -13,6 +13,7 @@
 	ВсеТесты.Добавить("ТестДолжен_ПроверитьПолучениеАннотацийПараметров");
 	ВсеТесты.Добавить("ТестДолжен_ПроверитьАннотацииПолейЗагрузитьСценарий");
 	ВсеТесты.Добавить("ТестДолжен_ПроверитьАннотацииПолейЗагрузитьСценарийИзСтроки");
+	ВсеТесты.Добавить("ТестДолжен_ПроверитьАннотацииПолейЗагрузитьСценарийСКонтекстом");
 	
 	Возврат ВсеТесты;
 	
@@ -197,4 +198,16 @@
 
 	КонецЕсли;
 	
+КонецПроцедуры
+
+Процедура ТестДолжен_ПроверитьАннотацииПолейЗагрузитьСценарийСКонтекстом() Экспорт
+
+	ТекстСценария = "
+	|Рефлектор = Новый Рефлектор();
+	|ТаблицаСвойств = Рефлектор.ПолучитьТаблицуСвойств(ЭтотОбъект);
+	|";
+	Контекст = Новый Структура(	"АргументыКоманднойСтроки",	Новый Массив );
+
+	Сценарий = ЗагрузитьСценарийИзСтроки(ТекстСценария, Контекст);
+
 КонецПроцедуры
diff --git a/tests/engine-behaviors.os b/tests/engine-behaviors.os
diff --git a/tests/native-api.os b/tests/native-api.os

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ pipeline {`
`4`	`4`	`agent none`
`5`	`5`
`6`	`6`	`environment {`
`7`		`- ReleaseNumber = '1.9.2'`
	`7`	`+ ReleaseNumber = '1.9.3'`
`8`	`8`	`outputEnc = '65001'`
`9`	`9`	`}`
`10`	`10`
`@@ -218,10 +218,10 @@ pipeline {`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`- stage ('Publishing revision') {`
	`221`	`+ stage ('Publishing dev-revision') {`
`222`	`222`	`when { anyOf {`
`223`	`223`	`// TODO сделать автовычисление маркера lts или latest и согласовать его с путём к папке на стр. 250 (TARGET=..._)`
`224`		`- branch 'release/latest'`
	`224`	`+ branch 'latest'`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`
`@@ -247,7 +247,7 @@ pipeline {`
`247`	`247`	`mv $WIN/OneScript-x86.zip ./`
`248`	`248`	`mv $RPM/*.rpm x64/`
`249`	`249`	`mv $DEB/*.deb x64/`
`250`		`- TARGET="/var/www/oscript.io/download/versions/latest/"`
	`250`	`+ TARGET="/var/www/oscript.io/download/versions/latest-dev/"`
`251`	`251`	`sudo rsync -rv --delete --exclude mddoc.zip --exclude .src.rpm . $TARGET`
`252`	`252`	`'''.stripIndent()`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,10 @@ public static IntPtr LoadLibrary(string filename)`
`30`	`30`
`31`	`31`	`public static IntPtr GetProcAddress(IntPtr module, string procName)`
`32`	`32`	`{`
`33`		`- return IsLinux ? LinuxProc(module, procName) : WindowsProc(module, procName);`
	`33`	`+ var pointer = IsLinux ? LinuxProc(module, procName) : WindowsProc(module, procName);`
	`34`	`+ return pointer != IntPtr.Zero`
	`35`	`+ ? pointer`
	`36`	`+ : throw new ApplicationException($"Function pointer for {procName} not obtained.");`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`public static bool FreeLibrary(IntPtr module)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ public static bool IsZip(Stream stream)`
`26`	`26`	`const int ZIP_LEAD_BYTES = 0x04034b50;`
`27`	`27`	`return (BitConverter.ToInt32(bytes, 0) == ZIP_LEAD_BYTES);`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ private static bool Is64BitProcess()`
	`31`	`+ {`
	`32`	`+ return IntPtr.Size == 8;`
	`33`	`+ }`
`29`	`34`
`30`	`35`	`public static void Extract(Stream stream, String tempfile)`
`31`	`36`	`{`
`@@ -50,7 +55,7 @@ private static String GetEntryName(ZipFile zip)`
`50`	`55`	`using (var reader = XmlReader.Create(stream))`
`51`	`56`	`{`
`52`	`57`	`var thisOs = NativeApiProxy.IsLinux ? "Linux" : "Windows";`
`53`		`- var thisArch = System.Environment.Is64BitOperatingSystem ? "x86_64" : "i386";`
	`58`	`+ var thisArch = Is64BitProcess() ? "x86_64" : "i386";`
`54`	`59`	`while (reader.ReadToFollowing("component"))`
`55`	`60`	`{`
`56`	`61`	`var attrOs = reader.GetAttribute("os");`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ DllExport int32_t GetNParams(ProxyComponent* proxy, int32_t lMethodNum)`
`326`	`326`	`return (int32_t)proxy->Component().GetNParams(lMethodNum);`
`327`	`327`	`}`
`328`	`328`
`329`		`-DllExport bool ADDIN_API HasParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum)`
	`329`	`+DllExport bool HasParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum)`
`330`	`330`	`{`
`331`	`331`	`CHECK_PROXY(false);`
`332`	`332`	`tVariant variant = { 0 };`
`@@ -335,7 +335,7 @@ DllExport bool ADDIN_API HasParamDefValue(ProxyComponent* proxy, int32_t lMethod`
`335`	`335`	`return result;`
`336`	`336`	`}`
`337`	`337`
`338`		`-DllExport bool ADDIN_API GetParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum, VariantFuncRespond respond)`
	`338`	`+DllExport bool GetParamDefValue(ProxyComponent* proxy, int32_t lMethodNum, int32_t lParamNum, VariantFuncRespond respond)`
`339`	`339`	`{`
`340`	`340`	`CHECK_PROXY(false);`
`341`	`341`	`tVariant variant = { 0 };`
`@@ -351,15 +351,15 @@ DllExport bool HasRetVal(ProxyComponent* proxy, int32_t lMethodNum)`
`351`	`351`	`return proxy->Component().HasRetVal(lMethodNum);`
`352`	`352`	`}`
`353`	`353`
`354`		`-DllExport bool ADDIN_API CallAsProc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams)`
	`354`	`+DllExport bool CallAsProc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams)`
`355`	`355`	`{`
`356`	`356`	`CHECK_PROXY(false);`
`357`	`357`	`auto lSizeArray = GetNParams(proxy, lMethodNum);`
`358`	`358`	`bool ok = proxy->Component().CallAsProc(lMethodNum, paParams, lSizeArray);`
`359`	`359`	`return ok;`
`360`	`360`	`}`
`361`	`361`
`362`		`-DllExport bool ADDIN_API CallAsFunc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams, VariantFuncRespond respond)`
	`362`	`+DllExport bool CallAsFunc(ProxyComponent* proxy, int32_t lMethodNum, tVariant* paParams, VariantFuncRespond respond)`
`363`	`363`	`{`
`364`	`364`	`CHECK_PROXY(false);`
`365`	`365`	`tVariant variant = { 0 };`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,13 @@ namespace ScriptEngine.Machine.Contexts`
`15`	`15`	`static class ContextDiscoverer`
`16`	`16`	`{`
`17`	`17`	`private const string INSTANCE_RETRIEVER_NAME = "CreateInstance";`
	`18`	`+`
	`19`	`+ public static void DiscoverClasses(Assembly assembly)`
	`20`	`+ {`
	`21`	`+ DiscoverClasses(assembly, t => true);`
	`22`	`+ }`
`18`	`23`
`19`		`- public static void DiscoverClasses(System.Reflection.Assembly assembly)`
	`24`	`+ public static void DiscoverClasses(Assembly assembly, Func<Type, bool> filter)`
`20`	`25`	`{`
`21`	`26`	`IEnumerable<Type> types;`
`22`	`27`	`try`
`@@ -37,29 +42,34 @@ public static void DiscoverClasses(System.Reflection.Assembly assembly)`
`37`	`42`
`38`	`43`	`var collection = GetMarkedTypes(types, typeof(ContextClassAttribute));`
`39`	`44`
`40`		`- foreach (var type in collection)`
	`45`	`+ foreach (var type in collection.Where(filter))`
`41`	`46`	`{`
`42`	`47`	`RegisterSystemType(type);`
`43`	`48`	`}`
`44`	`49`	`}`
`45`	`50`
`46`		`- public static void DiscoverGlobalContexts(RuntimeEnvironment environment, System.Reflection.Assembly assembly)`
	`51`	`+ public static void DiscoverGlobalContexts(RuntimeEnvironment environment, Assembly assembly)`
	`52`	`+ {`
	`53`	`+ DiscoverGlobalContexts(environment, assembly, t => true);`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ public static void DiscoverGlobalContexts(RuntimeEnvironment environment, Assembly assembly, Func<Type, bool> filter)`
`47`	`57`	`{`
`48`	`58`	`var allTypes = assembly.GetTypes();`
`49`	`59`	`var enums = GetMarkedTypes(allTypes.AsParallel(), typeof(SystemEnumAttribute));`
`50`		`- foreach (var item in enums)`
	`60`	`+ foreach (var item in enums.Where(filter))`
`51`	`61`	`{`
`52`	`62`	`RegisterSystemEnum(item, environment);`
`53`	`63`	`}`
`54`	`64`
`55`	`65`	`var simpleEnums = GetMarkedTypes(allTypes.AsParallel(), typeof(EnumerationTypeAttribute));`
`56`		`- foreach (var item in simpleEnums)`
	`66`	`+ foreach (var item in simpleEnums.Where(filter))`
`57`	`67`	`{`
`58`	`68`	`RegisterSimpleEnum(item, environment);`
`59`	`69`	`}`
`60`	`70`
`61`	`71`	`var contexts = GetMarkedTypes(allTypes.AsParallel(), typeof(GlobalContextAttribute));`
`62`		`- foreach (var item in contexts)`
	`72`	`+ foreach (var item in contexts.Where(filter))`
`63`	`73`	`{`
`64`	`74`	`RegisterGlobalContext(item, environment);`
`65`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ This Source Code Form is subject to the terms of the`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`	`using System.Linq;`
	`10`	`+using System.Threading;`
`10`	`11`
`11`	`12`	`namespace ScriptEngine.Machine.Contexts`
`12`	`13`	`{`