сравнение поднято в базовый класс; уточнены тесты

Author: Mr-Rm

src/OneScript.Core/Exceptions/ComparisonException.cs

@@ -33,7 +33,7 @@ public static ComparisonException NotSupported(string type)
         public static ComparisonException NotSupported(string type1, string type2)
         {
             return new ComparisonException(new BilingualString(
-                $"Сравнение на больше/меньше типов '{type1}' и '{type2}' не поддерживается ",
+                $"Сравнение на больше/меньше типов '{type1}' и '{type2}' не поддерживается",
                 $"Greater-than/Less-than comparison operations are not supported for '{type1}' and '{type2}'"));
         }
     }

src/OneScript.Core/Values/BslBooleanValue.cs

@@ -57,7 +57,6 @@ public override string ToString()
 
         public override bool Equals(BslValue other)
         {
-            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
            return other switch

src/OneScript.Core/Values/BslDateValue.cs

@@ -25,9 +25,6 @@ private BslDateValue(DateTime value)
 
         public override int CompareTo(BslValue other)
         {
-            if (ReferenceEquals(null, other))
-                return -1;
-            
             if(other is BslDateValue d)
                 return _value.CompareTo(d._value);
 

src/OneScript.Core/Values/BslNumericValue.cs

@@ -84,7 +84,6 @@ public bool Equals(BslNumericValue other)
 
         public override bool Equals(BslValue other)
         {
-            if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return other switch

src/OneScript.Core/Values/BslObjectValue.cs

@@ -12,11 +12,6 @@ namespace OneScript.Values
 {
     public abstract class BslObjectValue : BslValue
     {
-        public override int CompareTo(BslValue other)
-        {
-            throw ComparisonException.NotSupported();
-        }
-
         public override bool Equals(BslValue other)
         {
             return ReferenceEquals(this, other);

src/OneScript.Core/Values/BslPrimitiveValue.cs

@@ -5,38 +5,10 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
-using System;
-using OneScript.Exceptions;
-
 namespace OneScript.Values
 {
     public abstract class BslPrimitiveValue : BslValue
     {
-        public override int CompareTo(BslValue other)
-        {
-            if (other == null)
-                return -1;
-
-            string typeOfThis = null;
-            string typeOfOther = null;
-            
-            try
-            {
-                typeOfThis = this.SystemType.Name;
-                typeOfOther = other.SystemType.Name;
-            }
-            catch (InvalidOperationException) // если тип не зарегистрирован
-            {
-                typeOfThis ??= this.GetType().ToString();
-                typeOfOther ??= other.GetType().ToString();
-            }
-            
-            if (typeOfThis == typeOfOther)
-                throw ComparisonException.NotSupported(typeOfThis);
-            else
-                throw ComparisonException.NotSupported(typeOfThis, typeOfOther);
-        }
-
         public override bool Equals(BslValue other) => false;
     }
 }

src/OneScript.Core/Values/BslStringValue.cs

@@ -49,8 +49,8 @@ public override bool Equals(BslValue other)
 
         public override int CompareTo(BslValue other)
         {
-            if (ReferenceEquals(null, other))
-                return -1;
+            if (ReferenceEquals(this, other))
+                return 0;
 
             if (other is BslStringValue s)
                 return String.Compare(_value, s._value, StringComparison.CurrentCulture);

src/OneScript.Core/Values/BslValue.cs

@@ -27,7 +27,30 @@ public virtual string ToString(IBslProcess process)
             return ToString();
         }
 
-        public abstract int CompareTo(BslValue other);
+        public virtual int CompareTo(BslValue other)
+        {
+            if (other is null)
+                return -1;
+
+            string typeOfThis = null;
+            string typeOfOther = null;
+            
+            try
+            {
+                typeOfThis = this.SystemType.Name;
+                typeOfOther = other.SystemType.Name;
+            }
+            catch (InvalidOperationException) // если тип не зарегистрирован
+            {
+                typeOfThis ??= this.GetType().ToString();
+                typeOfOther ??= other.GetType().ToString();
+            }
+            
+            if (typeOfThis == typeOfOther)
+                throw ComparisonException.NotSupported(typeOfThis);
+            else
+                throw ComparisonException.NotSupported(typeOfThis, typeOfOther);
+        }
 
         public abstract bool Equals(BslValue other);
 
@@ -76,7 +99,7 @@ public static explicit operator DateTime(BslValue target) =>
 
         public virtual IValue GetRawValue() => this;
 
-        private BslValue UnwrapReference(IValue v)
+        private static BslValue UnwrapReference(IValue v)
         {
             if (v is IValueReference r)
                 return r.BslValue;

src/OneScript.Core/Values/EnumerationValue.cs

@@ -46,11 +46,6 @@ public override string ToString()
 
         public override IValue GetRawValue() => this;
 
-        public override int CompareTo(BslValue other)
-        {
-            throw ComparisonException.NotSupported();
-        }
-
         public override bool Equals(BslValue other)
         {
             return ReferenceEquals(other?.GetRawValue(), this);

src/ScriptEngine/Machine/Contexts/ContextIValueImpl.cs

@@ -58,15 +58,6 @@ public override TypeDescriptor SystemType
 
         #endregion
 
-        #region IComparable<IValue> Members
-
-        public override int CompareTo(BslValue other)
-        {
-            throw ComparisonException.NotSupported();
-        }
-
-        #endregion
-
         #region IEquatable<IValue> Members
 
         public override bool Equals(BslValue other)