VM: имена свойств и методов в отдельный список

Author: Mr-Rm

src/ScriptEngine/Compiler/ModuleDumpWriter.cs

@@ -129,6 +129,13 @@ private void WriteImage(TextWriter output, StackRuntimeModule module)
                 output.WriteLine(
                     $"{i,-3}:type: {item.SystemType.Alias}, val: {item}");
             }
+            output.WriteLine(".identifiers");
+            for (int i = 0; i < module.Identifiers.Count; i++)
+            {
+                var item = module.Identifiers[i];
+                output.WriteLine(
+                    $"{i,-3}: {item}");
+            }
             output.WriteLine(".code");
             for (int i = 0; i < module.Code.Count; i++)
             {

src/ScriptEngine/Compiler/StackMachineCodeGenerator.cs

@@ -489,7 +489,7 @@ protected override void VisitReturnNode(BslSyntaxNode node)
         protected override void VisitRaiseNode(BslSyntaxNode node)
         {
             int arg = -1;
-            if (node.Children.Any())
+            if (node.Children.Count != 0)
             {
                 VisitExpression(node.Children[0]);
                 arg = 0;
@@ -728,24 +728,17 @@ private void ResolveObjectMethod(BslSyntaxNode callNode, bool asFunction)
 
             PushCallArguments(args);
 
-            var cDef = new ConstDefinition();
-            cDef.Type = DataType.String;
-            cDef.Presentation = name.GetIdentifier();
-            int lastIdentifierConst = GetConstNumber(cDef);
+            int lastIdentifierIndex = GetIdentNumber(name.GetIdentifier());
 
             if (asFunction)
-                AddCommand(OperationCode.ResolveMethodFunc, lastIdentifierConst);
+                AddCommand(OperationCode.ResolveMethodFunc, lastIdentifierIndex);
             else
-                AddCommand(OperationCode.ResolveMethodProc, lastIdentifierConst);
+                AddCommand(OperationCode.ResolveMethodProc, lastIdentifierIndex);
         }
 
         private void ResolveProperty(string identifier)
         {
-            var cDef = new ConstDefinition();
-            cDef.Type = DataType.String;
-            cDef.Presentation = identifier;
-            var identifierConstIndex = GetConstNumber(cDef);
-            AddCommand(OperationCode.ResolveProp, identifierConstIndex);
+            AddCommand(OperationCode.ResolveProp, GetIdentNumber(identifier));
         }
 
         private int PushVariable(TerminalNode node)
@@ -1328,6 +1321,19 @@ private int GetConstNumber(in ConstDefinition cDef)
             return idx;
         }
 
+        private int GetIdentNumber(string ident)
+        {
+            
+            var idx = _module.Identifiers.IndexOf(ident);
+            if (idx < 0)
+            {
+                idx = _module.Identifiers.Count;
+                _module.Identifiers.Add(ident);
+            }
+            return idx;
+        }
+
+
         private int GetMethodRefNumber(in SymbolBinding methodBinding)
         {
             var descriptor = _ctx.GetBinding(methodBinding.ScopeNumber);

src/ScriptEngine/Machine/MachineInstance.cs

@@ -680,8 +680,8 @@ private void PushConst(int arg)
         {
             _operationStack.Push(_module.Constants[arg]);
             NextInstruction();
-        }
-        
+        }
+
         private void PushBool(int arg)
         {
             _operationStack.Push(BslBooleanValue.Create(arg == 1));
@@ -1011,7 +1011,7 @@ private void ResolveProp(int arg)
             var objIValue = _operationStack.Pop();
 
             var context = objIValue.AsObject();
-            var propName = _module.Constants[arg].ToString(_process);
+            var propName = _module.Identifiers[arg];
             var propNum = context.GetPropertyNumber(propName);
 
             var propReference = Variable.CreateContextPropertyReference(context, propNum, "stackvar");
@@ -1048,7 +1048,7 @@ private void PrepareContextCallArguments(int arg, out IRuntimeContextInstance co
 
             var objIValue = _operationStack.Pop();
             context = objIValue.AsObject();
-            var methodName = _module.Constants[arg].ToString(_process);
+            var methodName = _module.Identifiers[arg];
             methodId = context.GetMethodNumber(methodName);
 
             if (context.DynamicMethodSignatures)
@@ -1191,7 +1191,7 @@ private void NewInstance(int argCount)
                     argValues[i] = RawValue(argValue);
             }
 
-            var typeName = PopRawBslValue().ToString(_process);
+            var typeName = _operationStack.Pop().ToString(); // is BslStringValue by code generation
             if (!_typeManager.TryGetType(typeName, out var type))
             {
                 throw RuntimeException.TypeIsNotDefined(typeName);

src/ScriptEngine/Machine/StackRuntimeModule.cs

@@ -26,10 +26,12 @@ public StackRuntimeModule(Type ownerType)
         public int EntryMethodIndex { get; set; } = -1;
 
         public List<BslPrimitiveValue> Constants { get; } = new List<BslPrimitiveValue>();
+
+        internal List<string> Identifiers { get; } = new List<string>();
 
-        internal IList<ModuleSymbolBinding> VariableRefs { get; } = new List<ModuleSymbolBinding>();
+        internal List<ModuleSymbolBinding> VariableRefs { get; } = new List<ModuleSymbolBinding>();
 
-        internal IList<ModuleSymbolBinding> MethodRefs { get; } = new List<ModuleSymbolBinding>();
+        internal List<ModuleSymbolBinding> MethodRefs { get; } = new List<ModuleSymbolBinding>();
 
         #region IExecutableModule members
 
@@ -52,7 +54,7 @@ public BslScriptMethodInfo ModuleBody
 
         public IList<BslScriptMethodInfo> Methods { get; } = new List<BslScriptMethodInfo>();
 
-        public IList<Command> Code { get; } = new List<Command>(512);
+        public List<Command> Code { get; } = new List<Command>(512);
 
         public SourceCode Source { get; set; }