Порядок и количество квалификаторов в конструкторе ОписанияТипов - сделано совместимо

Mr-Rm · Mr-Rm · commit cab43278a967 · 2021-11-19T16:54:13.000+04:00
diff --git a/src/ScriptEngine.HostedScript/Library/TypeDescription/TypeDescription.cs b/src/ScriptEngine.HostedScript/Library/TypeDescription/TypeDescription.cs
@@ -27,6 +27,7 @@ public TypeDescription(IEnumerable<TypeTypeValue> types = null,
 			{
 				_types.AddRange(types);
 			}
+
 			NumberQualifiers = numberQualifiers ?? new NumberQualifiers();
 			StringQualifiers = stringQualifiers ?? new StringQualifiers();
 			DateQualifiers = dateQualifiers ?? new DateQualifiers();
@@ -186,71 +187,122 @@ public static TypeDescription BooleanType()
 			return new TypeDescription(new TypeTypeValue[] { TypeBoolean() });
 		}
 
+
+		private class TypeQualifiersSet
+		{
+			public readonly NumberQualifiers numberQualifiers = null;
+			public readonly StringQualifiers stringQualifiers = null;
+			public readonly DateQualifiers dateQualifiers = null;
+			public readonly BinaryDataQualifiers binaryDataQualifiers = null;
+
+			public TypeQualifiersSet(IValue p2, IValue p3, IValue p4, IValue p5, IValue p6, IValue p7)
+			{
+				int nParam = 1;
+				foreach (var qual in new[] { p2, p3, p4, p5, p6, p7 })
+				{
+					nParam++;
+
+					if (qual == null)
+						continue;
+
+					var rawQual = qual.GetRawValue();
+
+					if (rawQual is NumberQualifiers)
+					{
+						numberQualifiers = (NumberQualifiers)rawQual;
+					}
+					else if (rawQual is StringQualifiers)
+					{
+						stringQualifiers = (StringQualifiers)rawQual;
+					}
+					else if (rawQual is DateQualifiers)
+					{
+						dateQualifiers = (DateQualifiers)rawQual;
+					}
+					else if (rawQual is BinaryDataQualifiers)
+					{
+						binaryDataQualifiers = (BinaryDataQualifiers)rawQual;
+					}
+					else
+					{
+						throw RuntimeException.InvalidNthArgumentType(nParam);
+					}
+				}
+			}
+		}
+
 		[ScriptConstructor]
 		public static TypeDescription Constructor(
 			IValue source = null,
-			IValue p1 = null,
 			IValue p2 = null,
 			IValue p3 = null,
 			IValue p4 = null,
 			IValue p5 = null,
-			IValue p6 = null)
+			IValue p6 = null,
+			IValue p7 = null)
 		{
 			var rawSource = source?.GetRawValue();
 
 			if (rawSource == null || rawSource.DataType == DataType.Undefined)
 			{
-				// первый параметр имеет право быть не задан только в таком конструкторе
-				return ConstructByOtherDescription(null, p1, p2, p3, p4, p5, p6);
+				// пустой первый параметр - нет объекта-основания
+				// добавляемые/вычитаемые типы не допускаются, квалификаторы игнорируются
+
+				// только для контроля типов
+				var _ = new TypeQualifiersSet(p2, p3, p4, p5, p6, p7);
+
+				return new TypeDescription();
 			}
 
 			if (rawSource is TypeDescription)
 			{
-				return ConstructByOtherDescription(rawSource, p1, p2, p3, p4, p5, p6);
+				return ConstructByOtherDescription(rawSource, p2, p3, p4, p5, p6, p7);
 			}
 
 			if (rawSource.DataType == DataType.String || rawSource is ArrayImpl)
 			{
-				// TODO: проверить, что p5 и p6 не заданы
-				return ConstructByQualifiers(rawSource, p1, p2, p3, p4);
+				return ConstructByQualifiers(rawSource, p2, p3, p4, p5, p6, p7);
 			}
 
 			throw RuntimeException.InvalidArgumentValue();
 		}
 
 		public static TypeDescription ConstructByQualifiers(
 			IValue types,
-			IValue numberQualifiers = null,
-			IValue stringQualifiers = null,
-			IValue dateQualifiers = null,
-			IValue binaryDataQualifiers = null)
+			IValue p2 = null,
+			IValue p3 = null,
+			IValue p4 = null,
+			IValue p5 = null,
+			IValue p6 = null,
+			IValue p7 = null)
 		{
 			var _types = ConstructTypeList(types);
 			if (_types == null)
-				throw RuntimeException.InvalidArgumentType(nameof(types));
+				throw RuntimeException.InvalidNthArgumentType(2);
 
-			var paramNumberQ = numberQualifiers?.GetRawValue() as NumberQualifiers;
-			var paramStringQ = stringQualifiers?.GetRawValue() as StringQualifiers;
-			var paramDateQ = dateQualifiers?.GetRawValue() as DateQualifiers;
-			var paramBinaryDataQ = binaryDataQualifiers?.GetRawValue() as BinaryDataQualifiers;
+			var qualSet = new TypeQualifiersSet(p2,p3,p4,p5,p6,p7);
 
-			return new TypeDescription(_types, paramNumberQ, paramStringQ, paramDateQ, paramBinaryDataQ);
+			return new TypeDescription(_types,
+				qualSet.numberQualifiers,
+				qualSet.stringQualifiers,
+				qualSet.dateQualifiers,
+				qualSet.binaryDataQualifiers);
 		}
 
 		public static TypeDescription ConstructByOtherDescription(
 			IValue typeDescription = null,
 			IValue addTypes = null,
 			IValue removeTypes = null,
-			IValue numberQualifiers = null,
-			IValue stringQualifiers = null,
-			IValue dateQualifiers = null,
-			IValue binaryDataQualifiers = null)
+			IValue p4 = null,
+			IValue p5 = null,
+			IValue p6 = null,
+			IValue p7 = null)
 		{
 			var td = typeDescription as TypeDescription;
 
 			var removeTypesList = ConstructTypeList(removeTypes);
 			if (removeTypesList == null)
-				throw RuntimeException.InvalidArgumentType(nameof(removeTypes));
+				throw RuntimeException.InvalidNthArgumentType(3);
 
 
 			var _types = new List<TypeTypeValue>();
@@ -271,12 +323,13 @@ public static TypeDescription ConstructByOtherDescription(
 				throw RuntimeException.InvalidArgumentType(nameof(addTypes));
 			_types.AddRange(addTypesList);
 
-			var paramNumberQ = numberQualifiers?.AsObject() as NumberQualifiers ?? td?.NumberQualifiers;
-			var paramStringQ = stringQualifiers?.AsObject() as StringQualifiers ?? td?.StringQualifiers;
-			var paramDateQ = dateQualifiers?.AsObject() as DateQualifiers ?? td?.DateQualifiers;
-			var paramBinaryDataQ = binaryDataQualifiers?.AsObject() as BinaryDataQualifiers ?? td?.BinaryDataQualifiers;
+			var qualSet = new TypeQualifiersSet(null, null, p4, p5, p6, p7);
 
-			return new TypeDescription(_types, paramNumberQ, paramStringQ, paramDateQ, paramBinaryDataQ);
+			return new TypeDescription(_types,
+				qualSet.numberQualifiers,
+				qualSet.stringQualifiers,
+				qualSet.dateQualifiers,
+				qualSet.binaryDataQualifiers);
 		}
 	}
 }
