типы конструкторов - в идентификаторы, вызов как у методов

Author: Mr-Rm

src/ScriptEngine/Compiler/StackMachineCodeGenerator.cs

@@ -856,11 +856,13 @@ private void GlobalCall(CallNode call, bool asFunction)
             else
             {
                 // can be defined later
-                var forwarded = new ForwardedMethodDecl();
-                forwarded.identifier = identifier;
-                forwarded.asFunction = asFunction;
-                forwarded.location = identifierNode.Location;
-                forwarded.factArguments = argList;
+                var forwarded = new ForwardedMethodDecl
+                {
+                    identifier = identifier,
+                    asFunction = asFunction,
+                    location = identifierNode.Location,
+                    factArguments = argList
+                };
 
                 PushCallArguments(call.ArgumentList);
 
@@ -878,17 +880,17 @@ private void PushCallArguments(BslSyntaxNode argList)
 
         private void PushArgumentsList(BslSyntaxNode argList)
         {
-            for (int i = 0; i < argList.Children.Count; i++)
+            var arguments = argList.Children;
+            for (int i = 0; i < arguments.Count; i++)
             {
-                var passedArg = argList.Children[i];
-                VisitCallArgument(passedArg);
+                VisitCallArgument(arguments[i]);
             }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void VisitCallArgument(BslSyntaxNode passedArg)
         {
-            if (passedArg.Children.Count > 0)
+            if (passedArg.Children.Count != 0)
             {
                 VisitExpression(passedArg.Children[0]);
             }
@@ -1061,21 +1063,17 @@ private void MakeNewObjectDynamic(NewObjectNode node)
 
         private void MakeNewObjectStatic(NewObjectNode node)
         {
-            var cDef = new ConstDefinition()
-            {
-                Type = DataType.String,
-                Presentation = node.TypeNameNode.GetIdentifier()
-            };
-            AddCommand(OperationCode.PushConst, GetConstNumber(cDef));
-
-            var callArgs = 0;
             if (node.ConstructorArguments != default)
             {
-                PushArgumentsList(node.ConstructorArguments);
-                callArgs = node.ConstructorArguments.Children.Count;
+                PushCallArguments(node.ConstructorArguments);
+            }
+            else
+            {
+                AddCommand(OperationCode.ArgNum, 0);
             }
 
-            AddCommand(OperationCode.NewInstance, callArgs);
+            var idNum = GetIdentNumber(node.TypeNameNode.GetIdentifier());
+            AddCommand(OperationCode.NewInstance, idNum);
         }
 
         private void ExitTryBlocks()
@@ -1322,8 +1320,7 @@ private int GetConstNumber(in ConstDefinition cDef)
         }
 
         private int GetIdentNumber(string ident)
-        {
-            
+        {
             var idx = _module.Identifiers.IndexOf(ident);
             if (idx < 0)
             {

src/ScriptEngine/Machine/MachineInstance.cs

@@ -1180,23 +1180,14 @@ private void Inc(int arg)
             NextInstruction();
         }
 
-        private void NewInstance(int argCount)
-        {
-            IValue[] argValues = new IValue[argCount];
-            // fact args
-            for (int i = argCount - 1; i >= 0; i--)
-            {
-                var argValue = _operationStack.Pop();
-                if(!argValue.IsSkippedArgument())
-                    argValues[i] = RawValue(argValue);
-            }
-
-            var typeName = _operationStack.Pop().ToString(); // is BslStringValue by code generation
+        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
@@ -1205,8 +1196,18 @@ private void NewInstance(int argCount)
                 TypeManager = _typeManager,
                 Services = _process.Services,
                 CurrentProcess = _process
-            };
-            
+            };
+
+            int argCount = (int)_operationStack.Pop().AsNumber();
+            IValue[] argValues = new IValue[argCount];
+            // fact args
+            for (int i = argCount - 1; i >= 0; i--)
+            {
+                var argValue = _operationStack.Pop();
+                if(!argValue.IsSkippedArgument())
+                    argValues[i] = RawValue(argValue);
+            }
+
             var instance = (IValue)factory.Activate(context, argValues);
             _operationStack.Push(instance);
             NextInstruction();