Убрана завязка на константы образа.

Author: dmpas

src/OneScript.Core/Contexts/BslAnnotationAttribute.cs

@@ -47,6 +47,5 @@ public BslAnnotationParameter(string name, BslPrimitiveValue value = null)
 
         public BslPrimitiveValue Value { get; }
 
-        public int ConstantValueIndex { get; set; } = -1;
     }
 }

src/OneScript.Core/Values/BslAnnotationValue.cs

@@ -47,10 +47,8 @@ public override string ToString()
                 foreach (var parameter in Parameters)
                 {
                     sb.Append(prefix);
+                    sb.Append(parameter);
                     prefix = ",";
-                    sb.Append(parameter.Name);
-                    sb.Append("=");
-                    sb.Append(parameter.ConstantValueIndex);
                 }
                 sb.Append(")");
             }

src/ScriptEngine/Compiler/StackMachineCodeGenerator.cs

@@ -1171,73 +1171,44 @@ private IEnumerable<BslAnnotationParameter> GetAnnotationParameters(AnnotationNo
 
         private BslAnnotationParameter MakeAnnotationParameter(AnnotationParameterNode param)
         {
-            var constValue = MakeAnnotationParameterValueConstant(param);
-            return new BslAnnotationParameter(param.Name, constValue.runtimeValue) { ConstantValueIndex = constValue.constNumber };
+            var runtimeValue = MakeAnnotationParameterValueConstant(param);
+            return new BslAnnotationParameter(param.Name, runtimeValue);
         }
 
-        private (BslPrimitiveValue runtimeValue, int constNumber) MakeAnnotationParameterValueConstant(AnnotationParameterNode param)
+        private BslPrimitiveValue MakeAnnotationParameterValueConstant(AnnotationParameterNode param)
         {
             if (param.AnnotationNode != null)
             {
-                var constNumber = CreateAnnotationConstDefinition(param.AnnotationNode);
-                var runtimeValue = _module.Constants[constNumber];
-                return (runtimeValue, constNumber);
+                var runtimeValue = new BslAnnotationValue(param.AnnotationNode.Name);
+                foreach (var child in param.AnnotationNode.Children)
+                {
+                    var parameter = (AnnotationParameterNode)child;
+                    var parameterValue = MakeAnnotationParameterValueConstant(parameter);
+                    runtimeValue.Parameters.Add(new BslAnnotationParameter(parameter.Name, parameterValue));
+                }
+                var constNumber = CreateAnnotationConstDefinition(runtimeValue);
+                return runtimeValue;
             }
             else
             if (param.Value.Type != LexemType.NotALexem)
             {
                 var constDef = CreateConstDefinition(param.Value);
                 var constNumber = GetConstNumber(constDef);
                 var runtimeValue = _module.Constants[constNumber];
-                return (runtimeValue, constNumber);
+                return runtimeValue;
             }
             else
             {
-                return (null, -1);
+                return null;
             }
         }
 
-        private int CreateAnnotationConstDefinition(AnnotationNode annotationNode)
+        private int CreateAnnotationConstDefinition(BslAnnotationValue runtimeValue)
         {
-            var runtimeValue = new BslAnnotationValue(annotationNode.Name);
-            var presentation = AnnotationConstPresentation(annotationNode, runtimeValue);
-            ConstDefinition cDef = new ConstDefinition() {
-                Type = DataType.Annotation,
-                Presentation = presentation
-            };
-            var result = RegisterAnnotationConst(cDef, runtimeValue);
+            var result = RegisterAnnotationConst(runtimeValue);
             return result;
         }
 
-        private string AnnotationConstPresentation(AnnotationNode annotationNode, BslAnnotationValue annotationRuntimeValue)
-        {
-            var sb = new StringBuilder("&");
-            sb.Append(annotationNode.Name);
-            if (annotationNode.Children.Count > 0)
-            {
-                var prefix = "(";
-                foreach (var child in annotationNode.Children)
-                {
-                    sb.Append(prefix);
-                    prefix = ",";
-
-                    var parameter = (AnnotationParameterNode)child;
-                    var constValue = MakeAnnotationParameterValueConstant(parameter);
-                    sb.Append(parameter.Name);
-                    sb.Append("=");
-                    sb.Append(constValue.constNumber);
-
-                    var parameterValue = constValue.constNumber != -1
-                        ? new BslAnnotationParameter(parameter.Name, _module.Constants[constValue.constNumber]) { ConstantValueIndex = constValue.constNumber }
-                        : new BslAnnotationParameter(parameter.Name);
-                    annotationRuntimeValue.Parameters.Add(parameterValue);
-                }
-                sb.Append(")");
-            }
-
-            return sb.ToString();
-        }
-
         private IEnumerable<BslAnnotationAttribute> GetAnnotations(AnnotatableNode parent)
         {
             return parent.Annotations.Select(a =>
@@ -1297,11 +1268,10 @@ private int GetConstNumber(in ConstDefinition cDef)
             return idx;
         }
 
-        private int RegisterAnnotationConst(in ConstDefinition cDef, BslAnnotationValue value)
+        private int RegisterAnnotationConst(BslAnnotationValue value)
         {
-            var idx = _constMap.Count;
-            _constMap.Add(cDef);
-            _module.Constants.Add(value);
+            var idx = _module.AnnotationValues.Count;
+            _module.AnnotationValues.Add(value);
             return idx;
         }
 

src/ScriptEngine/Machine/AnnotationParameter.cs

@@ -5,31 +5,33 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 using System;
+using System.Collections.Generic;
 
 namespace ScriptEngine.Machine
 {
     [Serializable]
     public struct AnnotationParameter
     {
         public string Name;
-        public int ValueIndex;
 
         [NonSerialized]
         public IValue RuntimeValue;
 
         public const int UNDEFINED_VALUE_INDEX = -1;
 
+        
         public override string ToString()
         {
-            if (string.IsNullOrEmpty(Name))
+            var list = new List<string>();
+            if (!string.IsNullOrEmpty(Name))
             {
-                return string.Format("[{0}]", ValueIndex);
+                list.Add(Name);
             }
-            if (ValueIndex == UNDEFINED_VALUE_INDEX && RuntimeValue == null)
+            if (RuntimeValue != null)
             {
-                return Name;
+                list.Add(RuntimeValue.ToString());
             }
-            return string.Format("{0}=[{1}]", Name, RuntimeValue.ToString());
+            return string.Join("=", list);
         }
     }
 }

src/ScriptEngine/Machine/Core.cs

@@ -161,8 +161,7 @@ public enum DataType
         Number,
         Date,
         Boolean,
-        Null,
-        Annotation
+        Null
     }
 
     [Serializable]

src/ScriptEngine/Machine/StackRuntimeAdoptionExtensions.cs

@@ -52,7 +52,6 @@ public static AnnotationParameter ToMachineDefinition(this BslAnnotationParamete
             return new AnnotationParameter
             {
                 Name = parameter.Name,
-                ValueIndex = parameter.ConstantValueIndex,
                 RuntimeValue = parameter.Value,
             };
         }
@@ -82,10 +81,7 @@ public static BslAnnotationAttribute MakeBslAttribute(this in AnnotationDefiniti
             if (annotation.ParamCount > 0)
             {
                 attribute.SetParameters(annotation.Parameters.Select(p => 
-                    new BslAnnotationParameter(p.Name, (BslPrimitiveValue) p.RuntimeValue)
-                    {
-                        ConstantValueIndex = p.ValueIndex
-                    }));
+                    new BslAnnotationParameter(p.Name, (BslPrimitiveValue) p.RuntimeValue)));
             }
 
             return attribute;

src/ScriptEngine/Machine/StackRuntimeModule.cs

@@ -31,6 +31,8 @@ public StackRuntimeModule(Type ownerType)
         internal IList<SymbolBinding> VariableRefs { get; } = new List<SymbolBinding>();
 
         internal IList<SymbolBinding> MethodRefs { get; } = new List<SymbolBinding>();
+
+        internal IList<BslAnnotationValue> AnnotationValues { get; } = new List<BslAnnotationValue>();
 
         #region IExecutableModule members
 

src/Tests/OneScript.Core.Tests/CodeGenerationTests.cs

@@ -64,9 +64,7 @@ Процедура Процедура1() Экспорт
             КонецПроцедуры";
             var image = BuildModule(code, Mock.Of<IBslProcess>());
             image.Should().NotBeNull();
-            // В константах будет только значение первого уровня: &ТожеАннотация.
-            // Внутри нее уже будет сериализованное значение
-            image.Constants.Should().HaveCount(3);
+            image.Constants.Should().HaveCount(0);
             image.Methods.Should().HaveCount(1);
             image.Fields.Should().BeEmpty();