Merge remote-tracking branch 'origin/latest' into latest

Author: EvilBeaver

src/ScriptEngine.HostedScript/Library/ConsoleColorEnum.cs

@@ -48,15 +48,23 @@ public static ConsoleColorEnum CreateInstance()
 
             instance = new ConsoleColorEnum(type, enumValueType);
 
-            instance.AddValue("Белый", "White", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.White));
             instance.AddValue("Черный", "Black", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Black));
+            instance.AddValue("ТемноСиний", "DarkBlue", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkBlue));
+            instance.AddValue("ТемноЗеленый", "DarkGreen", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkGreen));
+            instance.AddValue("ТемноБирюзовый", "DarkCyan", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkCyan));
+            instance.AddValue("ТемноКрасный", "DarkRed", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkRed));
+            instance.AddValue("ТемноМалиновый", "DarkMagenta", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkMagenta));
+            instance.AddValue("ТемноЖелтый", "DarkYellow", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkYellow));
+            instance.AddValue("Серый", "Gray", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Gray));
+
+            instance.AddValue("ТемноСерый", "DarkGray", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.DarkGray));
             instance.AddValue("Синий", "Blue", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Blue));
-            instance.AddValue("Желтый", "Yellow", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Yellow));
-            instance.AddValue("Красный", "Red", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Red));
             instance.AddValue("Зеленый", "Green", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Green));
             instance.AddValue("Бирюза", "Cyan", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Cyan));
+            instance.AddValue("Красный", "Red", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Red));
             instance.AddValue("Малиновый", "Magenta", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Magenta));
-            instance.AddValue("Серый", "Gray", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Gray));
+            instance.AddValue("Желтый", "Yellow", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.Yellow));
+            instance.AddValue("Белый", "White", new CLREnumValueWrapper<ConsoleColor>(instance, ConsoleColor.White));
 
             return instance;
         }

src/ScriptEngine.HostedScript/Library/TypeDescription/CommonTypes.cs

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+using ScriptEngine.HostedScript.Library.Binary;
+using ScriptEngine.Machine;
+using ScriptEngine.Machine.Values;
+
+namespace ScriptEngine.HostedScript.Library
+{
+    public static class CommonTypes
+    {
+        public static readonly TypeDescriptor BinaryData = TypeManager.GetTypeByFrameworkType(typeof(BinaryDataContext));
+        public static readonly TypeDescriptor Null = TypeManager.GetTypeByFrameworkType(typeof(NullValue));
+        public static readonly TypeDescriptor Boolean = TypeDescriptor.FromDataType(DataType.Boolean);
+        public static readonly TypeDescriptor String = TypeDescriptor.FromDataType(DataType.String);
+        public static readonly TypeDescriptor Date = TypeDescriptor.FromDataType(DataType.Date);
+        public static readonly TypeDescriptor Number = TypeDescriptor.FromDataType(DataType.Number);
+        public static readonly TypeDescriptor Type = TypeDescriptor.FromDataType(DataType.Type);
+        public static readonly TypeDescriptor Undefined = TypeDescriptor.FromDataType(DataType.Undefined);
+
+        public static readonly TypeDescriptor[] Primitives = {
+            CommonTypes.Boolean,
+            CommonTypes.BinaryData,
+            CommonTypes.String,
+            CommonTypes.Date,
+            CommonTypes.Null,
+            CommonTypes.Number,
+            CommonTypes.Type
+        };
+    }
+}

src/ScriptEngine.HostedScript/Library/TypeDescription/TypeComparer.cs

@@ -0,0 +1,56 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+using System.Collections.Generic;
+using ScriptEngine.HostedScript.Library.Binary;
+using ScriptEngine.Machine;
+using ScriptEngine.Machine.Values;
+
+namespace ScriptEngine.HostedScript.Library
+{
+    internal class TypeComparer : IComparer<TypeTypeValue>
+    {
+        public int Compare(TypeTypeValue x, TypeTypeValue y)
+        {
+            if (x == null)
+            {
+                return y == null ? 0 : -1;
+            }
+
+            if (y == null) return 1;
+
+            var primitiveX = PrimitiveIndex(x);
+            var primitiveY = PrimitiveIndex(y);
+                
+            if (primitiveX != -1)
+            {
+                if (primitiveY != -1)
+                    return primitiveX - primitiveY;
+
+                return -1;
+            }
+
+            if (primitiveY != -1)
+                return 1;
+
+            return x.Value.ID.CompareTo(y.Value.ID);
+        }
+
+        private static int PrimitiveIndex(TypeTypeValue type)
+        {
+            var typeDescriptor = TypeManager.GetTypeDescriptorFor(type);
+            for (var primitiveIndex = 0; primitiveIndex < CommonTypes.Primitives.Length; primitiveIndex++)
+            {
+                if (typeDescriptor.Equals(CommonTypes.Primitives[primitiveIndex]))
+                {
+                    return primitiveIndex;
+                }
+            }
+                
+            return -1;
+        }
+    }
+}