Тест конверсии к строке кастомного представления

Author: EvilBeaver

src/OneScript.Core/Types/BasicTypes.cs

@@ -5,7 +5,6 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
-using System;
 using OneScript.Values;
 
 namespace OneScript.Types

src/OneScript.Core/Values/BslObjectValue.cs

@@ -6,7 +6,6 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using OneScript.Exceptions;
-using OneScript.Execution;
 using OneScript.Localization;
 
 namespace OneScript.Values
@@ -20,11 +19,6 @@ public override int CompareTo(BslValue other)
 
             throw new RuntimeException(msg);
         }
-        
-        public virtual string ConvertToString(IBslProcess process)
-        {
-            return ConvertToString();
-        }
 
         public override bool Equals(BslValue other)
         {

src/OneScript.Core/Values/BslValue.cs

@@ -8,6 +8,7 @@ This Source Code Form is subject to the terms of the
 using System;
 using System.Dynamic;
 using OneScript.Exceptions;
+using OneScript.Execution;
 using OneScript.Types;
 using ScriptEngine.Machine;
 
@@ -16,6 +17,11 @@ namespace OneScript.Values
     public abstract class BslValue : DynamicObject, IComparable<BslValue>, IEquatable<BslValue>, IValue
     {
         protected virtual string ConvertToString() => ToString();
+        
+        public virtual string ConvertToString(IBslProcess process)
+        {
+            return ConvertToString();
+        }
 
         public abstract int CompareTo(BslValue other);
 

src/ScriptEngine/Machine/MachineInstance.cs

@@ -735,7 +735,7 @@ private void Add(int arg)
         {
             var op2 = _operationStack.Pop();
             var op1 = _operationStack.Pop();
-            _operationStack.Push(ValueFactory.Add(op1.GetRawValue(), op2.GetRawValue()));
+            _operationStack.Push(ValueFactory.Add(op1.GetRawValue(), op2.GetRawValue(), _process));
             NextInstruction();
         }
 
@@ -1487,8 +1487,8 @@ private void Number(int arg)
 
         private void Str(int arg)
         {
-            string value = _operationStack.Pop().AsString();
-            _operationStack.Push(ValueFactory.Create(value));
+            var value = (BslValue)_operationStack.Pop().GetRawValue();
+            _operationStack.Push(ValueFactory.Create(value.ConvertToString(_process)));
             NextInstruction();
         }
 

src/ScriptEngine/Machine/ValueFactory.cs

@@ -8,6 +8,7 @@ This Source Code Form is subject to the terms of the
 using System.Diagnostics;
 using OneScript.Contexts;
 using OneScript.Exceptions;
+using OneScript.Execution;
 using OneScript.Types;
 using OneScript.Values;
 
@@ -89,14 +90,14 @@ public static IValue Parse(string presentation, DataType type)
             return result;
         }
 
-        public static IValue Add(IValue op1, IValue op2)
+        public static IValue Add(IValue op1, IValue op2, IBslProcess process)
         {
             // принимаем только RawValue
             Debug.Assert(!(op1 is IVariable || op2 is IVariable));
 
             if (op1 is BslStringValue s)
             {
-                return Create(s + op2.AsString());
+                return Create(s + ((BslValue)op2).ConvertToString(process));
             }
 
             if (op1 is BslDateValue date)

tests/constructor.os

@@ -86,6 +86,7 @@
 	НовыйОбъект = Новый Проверка(1, 2, 3);
 	НовыйОбъект.ПроизвольноеПредставление = "Я специальный объект";
 	Ожидаем.Что(Строка(НовыйОбъект)).Равно("Я специальный объект");
+	Ожидаем.Что("> " + НовыйОбъект).Равно("> Я специальный объект");
 
 КонецПроцедуры