оптимизация ОписанияТипов

Author: Mr-Rm

src/OneScript.StandardLibrary/TypeDescriptions/TypeComparer.cs

@@ -14,7 +14,7 @@ namespace OneScript.StandardLibrary.TypeDescriptions
     internal class TypeComparer : IComparer<BslTypeValue>
     {
         private const string TYPE_BINARYDATA_NAME = "ДвоичныеДанные";
-        private static readonly IDictionary<TypeDescriptor, int> primitives = new Dictionary<TypeDescriptor, int>();
+        private static readonly Dictionary<TypeDescriptor, int> primitives = new Dictionary<TypeDescriptor, int>();
 
         public int Compare(BslTypeValue x, BslTypeValue y)
         {

src/OneScript.StandardLibrary/TypeDescriptions/TypeDescription.cs

@@ -154,26 +154,34 @@ public IValue AdjustValue(IValue value = null)
 
 		public static TypeDescription StringType(int length = 0,
 			AllowedLengthEnum allowedLength = AllowedLengthEnum.Variable)
-		{
-			return TypeDescriptionBuilder.OfType(BasicTypes.String)
-				.SetStringQualifiers(new StringQualifiers(length, allowedLength))
-				.Build();
+		{
+            return new TypeDescription(new[] { new BslTypeValue(BasicTypes.String) },
+				new NumberQualifiers(),
+                new StringQualifiers(length, allowedLength),
+				new DateQualifiers(),
+				new BinaryDataQualifiers());
 		}
 
 		public static TypeDescription IntegerType(int length = 10,
 			AllowedSignEnum allowedSign = AllowedSignEnum.Any)
-		{
-			return TypeDescriptionBuilder.OfType(BasicTypes.Number)
-				.SetNumberQualifiers(new NumberQualifiers(length, 0, allowedSign))
-				.Build();
+		{
+            return new TypeDescription(new[] { new BslTypeValue(BasicTypes.Number) },
+                 new NumberQualifiers(length, 0, allowedSign),
+                 new StringQualifiers(),
+                 new DateQualifiers(),
+                 new BinaryDataQualifiers());
 		}
 
 		public static TypeDescription BooleanType()
-		{
-			return TypeDescriptionBuilder.OfType(BasicTypes.Boolean).Build();
-		}
-
-		[ScriptConstructor]
+		{
+            return new TypeDescription(new[] { new BslTypeValue(BasicTypes.Boolean) },
+                  new NumberQualifiers(),
+                  new StringQualifiers(),
+                  new DateQualifiers(),
+                  new BinaryDataQualifiers());
+        }
+
+        [ScriptConstructor]
 		public static TypeDescription Constructor(
 			TypeActivationContext context,
 			BslValue source = null,

src/OneScript.StandardLibrary/TypeDescriptions/TypeDescriptionBuilder.cs

@@ -21,8 +21,9 @@ internal class TypeDescriptionBuilder
 
         private const string TYPE_BINARYDATA_NAME = "ДвоичныеДанные";
 
-        private List<BslTypeValue> _types = new List<BslTypeValue>();
-        
+        private static readonly TypeComparer _comparer = new TypeComparer();
+        private readonly SortedSet<BslTypeValue> _types = new SortedSet<BslTypeValue>(_comparer);
+
         internal TypeDescriptionBuilder()
         {
         }
@@ -38,13 +39,20 @@ public TypeDescriptionBuilder SourceDescription(TypeDescription source)
 
         public TypeDescriptionBuilder AddTypes(IEnumerable<BslTypeValue> types)
         {
-            _types.AddRange(types);
+            foreach (var type in types)
+            {
+                if (type.TypeValue.ImplementingClass != typeof(BslUndefinedValue))
+                    _types.Add(type);
+            }
             return this;
         }
 
         public TypeDescriptionBuilder RemoveTypes(IEnumerable<BslTypeValue> types)
         {
-            _types.RemoveAll(types.Contains);
+            foreach (var type in types)
+            {
+                _types.Remove(type);
+            }
             return this;
         }
 
@@ -74,14 +82,11 @@ public TypeDescriptionBuilder SetBinaryDataQualifiers(BinaryDataQualifiers bq)
 
         public TypeDescription Build()
         {
-            _types = new List<BslTypeValue>(_types.Distinct());
-            _types.RemoveAll(type => type.TypeValue.ImplementingClass == typeof(BslUndefinedValue));
-            _types.Sort(new TypeComparer());
             var hasNumber = _types.Any(type => type.TypeValue == BasicTypes.Number);
-            var hasString =_types.Any(type => type.TypeValue == BasicTypes.String);
+            var hasString = _types.Any(type => type.TypeValue == BasicTypes.String);
             var hasDate = _types.Any(type => type.TypeValue == BasicTypes.Date);
-            var hasBinaryData = _types.Any(x => x.TypeValue.Name == TYPE_BINARYDATA_NAME);
-            
+            var hasBinaryData = _types.Any(x => x.TypeValue.Name == TYPE_BINARYDATA_NAME);
+
             if (!hasNumber || _numberQualifiers == null) _numberQualifiers = new NumberQualifiers();
             if (!hasString || _stringQualifiers == null) _stringQualifiers = new StringQualifiers();
             if (!hasDate || _dateQualifiers == null) _dateQualifiers = new DateQualifiers();