Add ConstructedType.

ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj

@@ -149,6 +149,7 @@
     <Compile Include="TypeSystem\Implementation\AbstractTypeReference.cs" />
     <Compile Include="TypeSystem\Implementation\ArrayType.cs" />
     <Compile Include="TypeSystem\Implementation\BitVector16.cs" />
+    <Compile Include="TypeSystem\Implementation\ConstructedType.cs" />
     <Compile Include="TypeSystem\Implementation\DefaultExplicitInterfaceImplementation.cs" />
     <Compile Include="TypeSystem\Implementation\DefaultParameter.cs" />
     <Compile Include="TypeSystem\Implementation\DynamicType.cs" />

ICSharpCode.NRefactory/TypeSystem/INamedElement.cs

@@ -13,7 +13,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// Gets the fully qualified name of the class the return type is pointing to.
 		/// </summary>
 		/// <returns>
-		/// "System.Int32" for int[]<br/>
+		/// "System.Int32[]" for int[]<br/>
 		/// "System.Collections.Generic.List" for List&lt;string&gt;
 		/// </returns>
 		string FullName {
@@ -24,7 +24,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// Gets the short name of the class the return type is pointing to.
 		/// </summary>
 		/// <returns>
-		/// "Int32" or "int" (depending how the return type was created) for int[]<br/>
+		/// "Int32[]" for int[]<br/>
 		/// "List" for List&lt;string&gt;
 		/// </returns>
 		string Name {
@@ -43,12 +43,12 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		}
 		
 		/// <summary>
-		/// Gets the full dotnet name of the return type. The DotnetName is used for the
-		/// documentation tags.
+		/// Gets the full reflection name of the element.
 		/// </summary>
 		/// <returns>
-		/// "System.Int[]" for int[]<br/>
-		/// "System.Collections.Generic.List{System.String}" for List&lt;string&gt;
+		/// "System.Int32[]" for int[]<br/>
+		/// "System.Int32[][,]" for C# int[,][]<br/>
+		/// "System.Collections.Generic.List`1[[System.String]]" for List&lt;string&gt;
 		/// </returns>
 		string DotNetName {
 			get;

ICSharpCode.NRefactory/TypeSystem/Implementation/ArrayType.cs

@@ -57,10 +57,20 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		{
 			if (elementType == null)
 				throw new ArgumentNullException("elementType");
+			if (dimensions <= 0)
+				throw new ArgumentOutOfRangeException("dimensions", dimensions, "dimensions must be positive");
 			this.elementType = elementType;
 			this.dimensions = dimensions;
 		}
 		
+		public ITypeReference ElementType {
+			get { return elementType; }
+		}
+		
+		public int Dimensions {
+			get { return dimensions; }
+		}
+		
 		public override IType Resolve(ITypeResolveContext context)
 		{
 			return new ArrayType(elementType.Resolve(context), dimensions);

ICSharpCode.NRefactory/TypeSystem/Implementation/ConstructedType.cs

@@ -0,0 +1,230 @@
+// Copyright (c) 2010 AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.NRefactory.TypeSystem.Implementation
+{
+	/// <summary>
+	/// ConstructedType represents an instance of a generic type.
+	/// Example: List&lt;string&gt;
+	/// </summary>
+	/// <remarks>
+	/// When getting the Members, this type modifies the lists in such a way that the
+	/// <see cref="GenericReturnType"/>s are replaced with the return types in the
+	/// type arguments collection.
+	/// </remarks>
+	public class ConstructedType : Immutable, IType
+	{
+		readonly ITypeDefinition genericType;
+		readonly IType[] typeArguments;
+		
+		public ConstructedType(ITypeDefinition genericType, IEnumerable<IType> typeArguments)
+		{
+			if (genericType == null)
+				throw new ArgumentNullException("genericType");
+			if (typeArguments == null)
+				throw new ArgumentNullException("typeArguments");
+			this.genericType = genericType;
+			this.typeArguments = typeArguments.ToArray(); // copy input array to ensure it isn't modified
+			if (this.typeArguments.Length == 0)
+				throw new ArgumentException("Cannot use ConstructedType with 0 type arguments.");
+			if (genericType.TypeParameterCount != this.typeArguments.Length)
+				throw new ArgumentException("Number of type arguments must match the type definition's number of type parameters");
+			for (int i = 0; i < this.typeArguments.Length; i++) {
+				if (this.typeArguments[i] == null)
+					throw new ArgumentNullException("typeArguments[" + i + "]");
+			}
+		}
+		
+		/// <summary>
+		/// Fast internal version of the constructor. (no safety checks)
+		/// Keeps the array that was passed and assumes it won't be modified.
+		/// </summary>
+		internal ConstructedType(ITypeDefinition genericType, IType[] typeArguments)
+		{
+			Debug.Assert(genericType.TypeParameterCount == typeArguments.Length);
+			this.genericType = genericType;
+			this.typeArguments = typeArguments;
+		}
+		
+		public bool? IsReferenceType {
+			get { return genericType.IsReferenceType; }
+		}
+		
+		public IType DeclaringType {
+			get { return genericType.DeclaringType; }
+		}
+		
+		public int TypeParameterCount {
+			get { return genericType.TypeParameterCount; }
+		}
+		
+		public string FullName {
+			get { return genericType.FullName; }
+		}
+		
+		public string Name {
+			get { return genericType.Name; }
+		}
+		
+		public string Namespace {
+			get { return genericType.Namespace;}
+		}
+		
+		public string DotNetName {
+			get {
+				StringBuilder b = new StringBuilder(genericType.DotNetName);
+				b.Append('[');
+				for (int i = 0; i < typeArguments.Length; i++) {
+					if (i > 0)
+						b.Append(',');
+					b.Append('[');
+					b.Append(typeArguments[i].DotNetName);
+					b.Append(']');
+				}
+				b.Append(']');
+				return b.ToString();
+			}
+		}
+		
+		public IType GetElementType()
+		{
+			throw new NotSupportedException();
+		}
+		
+		public ReadOnlyCollection<IType> TypeArguments {
+			get {
+				return Array.AsReadOnly(typeArguments);
+			}
+		}
+		
+		public ITypeDefinition GetDefinition()
+		{
+			return genericType;
+		}
+		
+		public IType Resolve(ITypeResolveContext context)
+		{
+			return this;
+		}
+		
+		public IType GetBaseType(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public IList<IType> GetNestedTypes(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public IList<IMethod> GetMethods(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public IList<IProperty> GetProperties(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public IList<IField> GetFields(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public IList<IEvent> GetEvents(ITypeResolveContext context)
+		{
+			throw new NotImplementedException();
+		}
+		
+		public override bool Equals(object obj)
+		{
+			return Equals(obj as IType);
+		}
+		
+		public bool Equals(IType other)
+		{
+			ConstructedType c = other as ConstructedType;
+			if (c == null || typeArguments.Length != c.typeArguments.Length)
+				return false;
+			if (genericType.Equals(c.genericType)) {
+				for (int i = 0; i < typeArguments.Length; i++) {
+					if (!typeArguments[i].Equals(c.typeArguments[i]))
+						return false;
+				}
+			}
+			return true;
+		}
+		
+		public override int GetHashCode()
+		{
+			int hashCode = genericType.GetHashCode();
+			unchecked {
+				foreach (var ta in typeArguments) {
+					hashCode *= 1000000007;
+					hashCode += 1000000009 * ta.GetHashCode();
+				}
+			}
+			return hashCode;
+		}
+	}
+	
+	/// <summary>
+	/// ConstructedTypeReference is a reference to generic class that specifies the type parameters.
+	/// Example: List&lt;string&gt;
+	/// </summary>
+	public class ConstructedTypeReference : AbstractTypeReference
+	{
+		readonly ITypeReference genericType;
+		readonly ITypeReference[] typeArguments;
+		
+		public ConstructedTypeReference(ITypeReference genericType, IEnumerable<ITypeReference> typeArguments)
+		{
+			if (genericType == null)
+				throw new ArgumentNullException("genericType");
+			if (typeArguments == null)
+				throw new ArgumentNullException("typeArguments");
+			this.genericType = genericType;
+			this.typeArguments = typeArguments.ToArray();
+			for (int i = 0; i < this.typeArguments.Length; i++) {
+				if (this.typeArguments[i] == null)
+					throw new ArgumentNullException("typeArguments[" + i + "]");
+			}
+		}
+		
+		public ITypeReference GenericType {
+			get { return genericType; }
+		}
+		
+		public ReadOnlyCollection<ITypeReference> TypeArguments {
+			get {
+				return Array.AsReadOnly(typeArguments);
+			}
+		}
+		
+		public override IType Resolve(ITypeResolveContext context)
+		{
+			ITypeDefinition baseTypeDef = genericType.Resolve(context).GetDefinition();
+			if (baseTypeDef == null)
+				return SharedTypes.UnknownType;
+			int tpc = baseTypeDef.TypeParameterCount;
+			if (tpc == 0)
+				return baseTypeDef;
+			IType[] resolvedTypes = new IType[tpc];
+			for (int i = 0; i < resolvedTypes.Length; i++) {
+				if (i < typeArguments.Length)
+					resolvedTypes[i] = typeArguments[i].Resolve(context);
+				else
+					resolvedTypes[i] = SharedTypes.UnknownType;
+			}
+			return new ConstructedType(baseTypeDef, resolvedTypes);
+		}
+	}
+}

ICSharpCode.NRefactory/TypeSystem/Implementation/PointerType.cs

@@ -35,7 +35,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 	
 	public class PointerTypeReference : AbstractTypeReference
 	{
-		ITypeReference elementType;
+		readonly ITypeReference elementType;
 		
 		public PointerTypeReference(ITypeReference elementType)
 		{
@@ -44,6 +44,10 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			this.elementType = elementType;
 		}
 		
+		public ITypeReference ElementType {
+			get { return elementType; }
+		}
+		
 		public override IType Resolve(ITypeResolveContext context)
 		{
 			return new PointerType(elementType.Resolve(context));

NRefactory.sln

@@ -2,15 +2,16 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 # SharpDevelop 4.0.0.6362
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DC98210E-1646-483B-819A-2BB8272461E4}"
 	ProjectSection(SolutionItems) = postProject
 		README = README
+		doc\TODO = doc\TODO
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

doc/TODO

@@ -0,0 +1,13 @@
+TypeSystem API:
+* ITypeReference extends IFreezable?
+	either:
+	- make sure all ITypeReference implementations correctly freeze their contained types
+	or:
+	- remove IFreezable from type references
+
+* For clarity: move all ITypeReference members except for Resolve() to IType?
+
+* Decide on the fate of ISupportsInterning
+
+* Try to build SharedTypes for void, int, etc.
+	Take care of equality with the real System.Void, System.Int32 etc.