[Resolver] #130 Fixed 'int[string]' resolution.

Author: aBothe

DParser2/Resolver/DType.cs

@@ -266,7 +266,7 @@ public class ArrayType : AssocArrayType
 		public readonly bool IsStaticArray;
 
 		public ArrayType(AbstractType ValueType, ISyntaxRegion td)
-			: base(ValueType, new PrimitiveType(DTokens.Int, 0), td) { FixedLength = -1; }
+			: base(ValueType, null, td) { FixedLength = -1; }
 
 		public ArrayType(AbstractType ValueType, int ArrayLength, ISyntaxRegion td)
 			: this(ValueType, td)
@@ -300,11 +300,8 @@ public class AssocArrayType : DerivedDataType
 		public bool IsString
 		{
 			get{
-				var kt = DResolver.StripMemberSymbols (KeyType);
-				return (kt == null || (kt is PrimitiveType &&
-					((kt as PrimitiveType).TypeToken == DTokens.Int))) &&
-					(kt = DResolver.StripMemberSymbols (ValueType)) is PrimitiveType &&
-					DTokens.IsBasicType_Character((kt as PrimitiveType).TypeToken);
+				var pt = DResolver.StripMemberSymbols(ValueType) as PrimitiveType;
+				return this is ArrayType && pt != null && DTokens.IsBasicType_Character(pt.TypeToken);
 			}
 		}
 

DParser2/Resolver/ResultComparer.cs

@@ -18,6 +18,9 @@ public static class ResultComparer
 		/// </summary>
 		public static bool IsEqual(ISemantic r1, ISemantic r2)
 		{
+			if (r1 == r2)
+				return true;
+
 			if (r1 is TemplateParameterSymbol)
 			{
 				var tps1 = r1 as TemplateParameterSymbol;

DParser2/Resolver/TypeResolution/TypeDeclarationResolver.cs

@@ -302,55 +302,27 @@ public static AbstractType ResolveKey(ArrayDecl ad, out int fixedArrayLength, ou
 		{
 			keyVal = null;
 			fixedArrayLength = -1;
-			AbstractType keyType;
 
 			if (ad.KeyExpression != null)
 			{
-				//TODO: Template instance expressions?
-				var id_x = ad.KeyExpression as IdentifierExpression;
-				if (id_x != null && id_x.IsIdentifier)
-				{
-					var id = new IdentifierDeclaration((string)id_x.Value)
-					{
-						Location = id_x.Location,
-						EndLocation = id_x.EndLocation
-					};
-
-					keyType = TypeDeclarationResolver.ResolveSingle(id, ctxt);
-
-					if (keyType != null)
-					{
-						var tt = keyType as MemberSymbol;
-
-						if (tt == null ||
-							!(tt.Definition is DVariable) ||
-							((DVariable)tt.Definition).Initializer == null)
-							return keyType;
-					}
-				}
+				keyVal = Evaluation.EvaluateValue(ad.KeyExpression, ctxt);
 
-				try
+				if (keyVal != null)
 				{
-					keyVal = Evaluation.EvaluateValue(ad.KeyExpression, ctxt);
-
-					if (keyVal != null)
+					// It should be mostly a number only that points out how large the final array should be
+					var pv = Evaluation.GetVariableContents(keyVal, new StandardValueProvider(ctxt)) as PrimitiveValue;
+					if (pv != null)
 					{
-						// Take the value's type as array key type
-						keyType = keyVal.RepresentedType;
-
-						// It should be mostly a number only that points out how large the final array should be
-						var pv = Evaluation.GetVariableContents(keyVal, new StandardValueProvider(ctxt)) as PrimitiveValue;
-						if (pv != null)
-						{
-							fixedArrayLength = System.Convert.ToInt32(pv.Value);
+						fixedArrayLength = System.Convert.ToInt32(pv.Value);
 
-							if (fixedArrayLength < 0)
-								ctxt.LogError(ad, "Invalid array size: Length value must be greater than 0");
-						}
-						//TODO Is there any other type of value allowed?
+						if (fixedArrayLength < 0)
+							ctxt.LogError(ad, "Invalid array size: Length value must be greater than 0");
 					}
+					//TODO Is there any other type of value allowed?
+					else
+						// Take the value's type as array key type
+						return keyVal.RepresentedType;
 				}
-				catch { }
 			}
 			else if(ad.KeyType != null)
 				return ResolveSingle(ad.KeyType, ctxt);

Tests/ResolutionTests.cs

@@ -685,6 +685,50 @@ enum mye
 			t = ExpressionTypeEvaluation.EvaluateType (x, ctxt);
 			Assert.That (t, Is.Null);
 		}
+
+		[Test]
+		public void ArrayTypes()
+		{
+			var ctxt = CreateCtxt("A", @"module A;");
+
+			ITypeDeclaration td;
+			AssocArrayType aa;
+			ArrayType at;
+
+			td = DParser.ParseBasicType("int[int]");
+			aa = TypeDeclarationResolver.ResolveSingle(td, ctxt) as AssocArrayType;
+			Assert.That(aa, Is.Not.TypeOf(typeof(ArrayType)));
+			Assert.That(aa.KeyType, Is.TypeOf(typeof(PrimitiveType)));
+			Assert.That((aa.KeyType as PrimitiveType).TypeToken, Is.EqualTo(DTokens.Int));
+			Assert.That(aa.ValueType, Is.TypeOf(typeof(PrimitiveType)));
+
+			td = DParser.ParseBasicType("int[short]");
+			aa = TypeDeclarationResolver.ResolveSingle(td, ctxt) as AssocArrayType;
+			Assert.That(aa, Is.Not.TypeOf(typeof(ArrayType)));
+			Assert.That(aa.KeyType, Is.TypeOf(typeof(PrimitiveType)));
+			Assert.That((aa.KeyType as PrimitiveType).TypeToken, Is.EqualTo(DTokens.Short));
+			Assert.That(aa.ValueType, Is.TypeOf(typeof(PrimitiveType)));
+
+			td = DParser.ParseBasicType("int[string]");
+			aa = TypeDeclarationResolver.ResolveSingle(td, ctxt) as AssocArrayType;
+			Assert.That(aa, Is.Not.TypeOf(typeof(ArrayType)));
+			Assert.That(aa.KeyType, Is.TypeOf(typeof(ArrayType)));
+			Assert.That((aa.KeyType as ArrayType).IsString);
+			Assert.That(aa.ValueType, Is.TypeOf(typeof(PrimitiveType)));
+			aa = null;
+
+			td = DParser.ParseBasicType("byte[3]");
+			at = TypeDeclarationResolver.ResolveSingle(td, ctxt) as ArrayType;
+			Assert.That(at.FixedLength, Is.EqualTo(3));
+			Assert.That(at.KeyType, Is.Null);
+			Assert.That(at.ValueType, Is.TypeOf(typeof(PrimitiveType)));
+
+			td = DParser.ParseBasicType("byte[6L]");
+			at = TypeDeclarationResolver.ResolveSingle(td, ctxt) as ArrayType;
+			Assert.That(at.FixedLength, Is.EqualTo(6));
+			Assert.That(at.KeyType, Is.Null);
+			Assert.That(at.ValueType, Is.TypeOf(typeof(PrimitiveType)));
+		}
 
 		[Test]
 		public void ArrayIndexer()