вынесено создание объекта по имени типа

Author: Mr-Rm

src/ScriptEngine/Compiler/StackMachineCodeGenerator.cs

@@ -1051,7 +1051,7 @@ private void MakeNewObjectDynamic(NewObjectNode node)
             var argsPassed = node.ConstructorArguments.Children.Count;
             if (argsPassed == 1)
             {
-                PushArgumentsList(node.ConstructorArguments);
+                VisitCallArgument(node.ConstructorArguments.Children[0]); ;
             }
             else if (argsPassed > 1)
             {

src/ScriptEngine/Machine/MachineInstance.cs

@@ -24,6 +24,7 @@ This Source Code Form is subject to the terms of the
 using OneScript.Values;
 using ScriptEngine.Compiler;
 using ScriptEngine.Machine.Debugger;
+using System.Dynamic;
 
 namespace ScriptEngine.Machine
 {
@@ -1182,22 +1183,6 @@ private void Inc(int arg)
 
         private void NewInstance(int arg)
         {
-            var typeName = _module.Identifiers[arg];
-            if (!_typeManager.TryGetType(typeName, out var type))
-            {
-                throw RuntimeException.TypeIsNotDefined(typeName);
-            }
-
-            // TODO убрать cast после рефакторинга ITypeFactory
-            var factory = (TypeFactory)_typeManager.GetFactoryFor(type);
-            var context = new TypeActivationContext
-            {
-                TypeName = typeName,
-                TypeManager = _typeManager,
-                Services = _process.Services,
-                CurrentProcess = _process
-            };
-
             int argCount = (int)_operationStack.Pop().AsNumber();
             IValue[] argValues = new IValue[argCount];
             // fact args
@@ -1206,10 +1191,10 @@ private void NewInstance(int arg)
                 var argValue = _operationStack.Pop();
                 if(!argValue.IsSkippedArgument())
                     argValues[i] = RawValue(argValue);
-            }
-
-            var instance = (IValue)factory.Activate(context, argValues);
-            _operationStack.Push(instance);
+            }
+
+            var typeName = _module.Identifiers[arg];
+            _operationStack.Push(CreateInstance(typeName, argValues));
             NextInstruction();
         }
 
@@ -2396,13 +2381,19 @@ private void NewFunc(int argCount)
                 else
                     argValues = Array.Empty<IValue>();
             }
-            
+
             var typeName = PopRawBslValue().ToString(_process);
+            _operationStack.Push(CreateInstance(typeName, argValues));
+            NextInstruction();
+        }
+
+        private IValue CreateInstance(string typeName, IValue[] args)
+        {
             if (!_typeManager.TryGetType(typeName, out var type))
             {
                 throw RuntimeException.TypeIsNotDefined(typeName);
             }
-            
+
             // TODO убрать cast после рефакторинга ITypeFactory
             var factory = (TypeFactory)_typeManager.GetFactoryFor(type);
             var context = new TypeActivationContext
@@ -2411,17 +2402,14 @@ private void NewFunc(int argCount)
                 TypeManager = _typeManager,
                 Services = _process.Services,
                 CurrentProcess = _process
-            };
-
-            var instance = factory.Activate(context, argValues);
-            _operationStack.Push(instance);
-            NextInstruction();
+            };
+            return factory.Activate(context, args);
         }
 
         #endregion
-
+
         #endregion
-
+
         private StackRuntimeModule CompileExpressionModule(string expression)
         {
             var entryId = CurrentCodeEntry().ToString();