Move ResolveResults to NR.Semantics

ICSharpCode.NRefactory.Demo/CSDemo.cs

@@ -28,8 +28,10 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+
 using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/AttributeTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/CastTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConditionalOperatorTests.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
 using NUnit.Framework;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ConversionsTest.cs

@@ -19,6 +19,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/LocalTypeInferenceTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs

@@ -19,6 +19,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/OverloadResolutionTests.cs

@@ -21,6 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using NUnit.Framework;
 

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs

@@ -21,7 +21,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+
 using ICSharpCode.NRefactory.CSharp.Parser;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/TypeInferenceTests.cs

@@ -21,6 +21,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using NUnit.Framework;

ICSharpCode.NRefactory.Tests/CSharp/Resolver/UnsafeCodeTests.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using NUnit.Framework;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.TestCase.cs

@@ -120,4 +120,11 @@ namespace ICSharpCode.NRefactory.TypeSystem.TestCase
 		[PreserveSig()]
 		int GetNextAssembly(uint dwFlags);
 	}
+	
+	public class ConstantTest
+	{
+		public const int Answer = 42;
+		
+		public const string NullString = null;
+	}
 }

ICSharpCode.NRefactory.Tests/TypeSystem/TypeSystemTests.cs

@@ -20,7 +20,9 @@ using System;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.TypeSystem.TestCase;
 using NUnit.Framework;
@@ -456,5 +458,23 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			Assert.IsTrue(m.IsAbstract);
 			Assert.IsFalse(m.IsVirtual);
 		}
+		
+		[Test]
+		public void ConstantAnswer()
+		{
+			ITypeDefinition type = ctx.GetTypeDefinition(typeof(ConstantTest));
+			IField answer = type.Fields.Single(f => f.Name == "Answer");
+			Assert.IsTrue(answer.IsConst);
+			Assert.AreEqual(42, answer.ConstantValue.Resolve(ctx).ConstantValue);
+		}
+		
+		[Test]
+		public void ConstantNullString()
+		{
+			ITypeDefinition type = ctx.GetTypeDefinition(typeof(ConstantTest));
+			IField answer = type.Fields.Single(f => f.Name == "NullString");
+			Assert.IsTrue(answer.IsConst);
+			Assert.IsNull(answer.ConstantValue.Resolve(ctx).ConstantValue);
+		}
 	}
 }

ICSharpCode.NRefactory/CSharp/Analysis/ControlFlow.cs

@@ -23,6 +23,7 @@ using System.Linq;
 using System.Threading;
 
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Analysis

ICSharpCode.NRefactory/CSharp/Analysis/DefiniteAssignmentAnalysis.cs

@@ -21,7 +21,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.Utils;

ICSharpCode.NRefactory/CSharp/Parser/TypeSystemConvertVisitor.cs

@@ -902,7 +902,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			ConstantValueBuilder b = new ConstantValueBuilder(parentTypeDefinition, parentMethodDefinition, parentUsingScope, false);
 			ConstantExpression c = expression.AcceptVisitor(b, null);
 			if (c == null)
-				return null;
+				return new ErrorConstantValue(targetType);
 			PrimitiveConstantExpression pc = c as PrimitiveConstantExpression;
 			if (pc != null && pc.Type == targetType) {
 				// Save memory by directly using a SimpleConstantValue.

ICSharpCode.NRefactory/CSharp/Refactoring/ContextAction/RemoveBackingStore.cs

@@ -24,9 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {

ICSharpCode.NRefactory/CSharp/Refactoring/RefactoringContext.cs

@@ -26,6 +26,7 @@
 using System;
 using System.Linq;
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory/CSharp/Refactoring/TypeSystemAstBuilder.cs

@@ -5,7 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.Utils;
@@ -514,16 +516,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		AstNode ConvertField(IField field)
 		{
 			FieldDeclaration decl = new FieldDeclaration();
-			Modifiers m = GetMemberModifiers(field);
+			if (ShowModifiers) {
-			if (field.IsConst) {
+				Modifiers m = GetMemberModifiers(field);
-				m &= ~Modifiers.Static;
+				if (field.IsConst) {
-				m |= Modifiers.Const;
+					m &= ~Modifiers.Static;
-			} else if (field.IsReadOnly) {
+					m |= Modifiers.Const;
-				m |= Modifiers.Readonly;
+				} else if (field.IsReadOnly) {
-			} else if (field.IsVolatile) {
+					m |= Modifiers.Readonly;
-				m |= Modifiers.Volatile;
+				} else if (field.IsVolatile) {
-			}
+					m |= Modifiers.Volatile;
-			decl.Modifiers = m;
+				}
+				decl.Modifiers = m;
+			}
 			decl.ReturnType = ConvertTypeReference(field.ReturnType);
 			Expression initializer = null;
 			if (field.IsConst && this.ShowConstantValues)

ICSharpCode.NRefactory/CSharp/Resolver/AliasNamespaceReference.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/CSharpAttribute.cs

@@ -21,6 +21,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory/CSharp/Resolver/CSharpResolver.cs

@@ -24,6 +24,8 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.Utils;

ICSharpCode.NRefactory/CSharp/Resolver/CompositeResolveVisitorNavigator.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/ConstantValues.cs

@@ -19,7 +19,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
 using ICSharpCode.NRefactory.CSharp.Analysis;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.NRefactory.Utils;
@@ -131,6 +133,27 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver.ConstantValues
 		}
 	}
 	
+	/// <summary>
+	/// Used for constants that could not be converted to IConstantValue.
+	/// </summary>
+	[Serializable]
+	public sealed class ErrorConstantValue : Immutable, IConstantValue
+	{
+		ITypeReference type;
+		
+		public ErrorConstantValue(ITypeReference type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			this.type = type;
+		}
+		
+		public ResolveResult Resolve(ITypeResolveContext context)
+		{
+			return new ErrorResolveResult(type.Resolve(context));
+		}
+	}
+	
 	/// <summary>
 	/// Increments an integer <see cref="IConstantValue"/> by a fixed amount without changing the type.
 	/// </summary>

ICSharpCode.NRefactory/CSharp/Resolver/Conversions.cs

@@ -20,6 +20,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
 

ICSharpCode.NRefactory/CSharp/Resolver/DetectSkippableNodesNavigator.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/ErrorResolveResult.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/FindReferencedEntities.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/FindReferences.cs

@@ -20,7 +20,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+
 using ICSharpCode.Editor;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
 

ICSharpCode.NRefactory/CSharp/Resolver/IResolveVisitorNavigator.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/ITypeOrNamespaceReference.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/LambdaResolveResult.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/MemberLookup.cs

@@ -21,6 +21,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/MemberTypeOrNamespaceReference.cs

@@ -19,6 +19,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
 

ICSharpCode.NRefactory/CSharp/Resolver/NodeListResolveVisitorNavigator.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/OperatorResolveResult.cs

@@ -19,6 +19,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
 
@@ -104,62 +106,4 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 			return new [] { Condition, True, False };
 		}
 	}
-	
-	/// <summary>
-	/// Resolve result representing an array access.
-	/// </summary>
-	public class ArrayAccessResolveResult : ResolveResult
-	{
-		public readonly ResolveResult Array;
-		public readonly ResolveResult[] Indices;
-		
-		public ArrayAccessResolveResult(IType elementType, ResolveResult array, ResolveResult[] indices) : base(elementType)
-		{
-			if (array == null)
-				throw new ArgumentNullException("array");
-			if (indices == null)
-				throw new ArgumentNullException("indices");
-			this.Array = array;
-			this.Indices = indices;
-		}
-		
-		public override IEnumerable<ResolveResult> GetChildResults()
-		{
-			return new [] { Array }.Concat(Indices);
-		}
-	}
-	
-	/// <summary>
-	/// Resolve result representing an array creation.
-	/// </summary>
-	public class ArrayCreateResolveResult : ResolveResult
-	{
-		/// <summary>
-		/// Gets the size arguments.
-		/// </summary>
-		public readonly ResolveResult[] SizeArguments;
-		
-		/// <summary>
-		/// Gets the initializer elements.
-		/// This field may be null if no initializer was specified.
-		/// </summary>
-		public readonly ResolveResult[] InitializerElements;
-		
-		readonly object[] constantArray;
-		
-		public ArrayCreateResolveResult(IType arrayType, ResolveResult[] sizeArguments, ResolveResult[] initializerElements)
-			: base(arrayType)
-		{
-			this.SizeArguments = sizeArguments;
-			this.InitializerElements = initializerElements;
-		}
-		
-		public override IEnumerable<ResolveResult> GetChildResults()
-		{
-			if (SizeArguments != null && InitializerElements != null)
-				return SizeArguments.Concat(InitializerElements);
-			else
-				return SizeArguments ?? InitializerElements ?? EmptyList<ResolveResult>.Instance;
-		}
-	}
 }

ICSharpCode.NRefactory/CSharp/Resolver/OverloadResolution.cs

@@ -22,6 +22,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory/CSharp/Resolver/ResolveAtLocation.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Threading;
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp.Resolver

ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs

@@ -22,6 +22,8 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory/CSharp/Resolver/SimpleTypeOrNamespaceReference.cs

@@ -19,6 +19,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Utils;
 

ICSharpCode.NRefactory/CSharp/Resolver/TypeInference.cs

@@ -20,6 +20,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+
+using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 

ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj

@@ -105,17 +105,14 @@
     <Compile Include="CSharp\Resolver\FindReferencedEntities.cs" />
     <Compile Include="CSharp\Resolver\FindReferences.cs" />
     <Compile Include="CSharp\Resolver\FindReferenceSearchScope.cs" />
+    <Compile Include="CSharp\Resolver\LambdaResolveResult.cs" />
     <Compile Include="CSharp\Resolver\Log.cs" />
-    <Compile Include="CSharp\Resolver\OperatorResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\ConversionResolveResult.cs" />
     <Compile Include="CSharp\Resolver\CSharpAttribute.cs" />
     <Compile Include="CSharp\Resolver\ConstantValues.cs" />
-    <Compile Include="CSharp\Resolver\InvocationResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\LambdaResolveResult.cs" />
     <Compile Include="CSharp\Resolver\MapTypeIntoNewContext.cs" />
+    <Compile Include="CSharp\Resolver\OperatorResolveResult.cs" />
     <Compile Include="CSharp\Resolver\ResolveAtLocation.cs" />
     <Compile Include="CSharp\Resolver\SimpleNameLookupMode.cs" />
-    <Compile Include="CSharp\Resolver\TypeOfResolveResult.cs" />
     <Compile Include="Documentation\IDStringProvider.cs" />
     <Compile Include="PatternMatching\BacktrackingInfo.cs" />
     <Compile Include="PatternMatching\Choice.cs" />
@@ -192,32 +189,37 @@
     <Compile Include="CSharp\Parser\ParsedFile.cs" />
     <Compile Include="CSharp\Parser\TypeSystemConvertVisitor.cs" />
     <Compile Include="CSharp\Resolver\AliasNamespaceReference.cs" />
-    <Compile Include="CSharp\Resolver\AmbiguousResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\ByReferenceResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\ConstantResolveResult.cs" />
     <Compile Include="CSharp\Resolver\Conversions.cs" />
     <Compile Include="CSharp\Resolver\CSharpResolver.cs" />
     <Compile Include="CSharp\Resolver\ErrorResolveResult.cs" />
     <Compile Include="CSharp\Resolver\IResolveVisitorNavigator.cs" />
     <Compile Include="CSharp\Resolver\ITypeOrNamespaceReference.cs" />
     <Compile Include="CSharp\Resolver\MemberLookup.cs" />
-    <Compile Include="CSharp\Resolver\MemberResolveResult.cs" />
     <Compile Include="CSharp\Resolver\MemberTypeOrNamespaceReference.cs" />
-    <Compile Include="CSharp\Resolver\MethodGroupResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\NamespaceResolveResult.cs" />
     <Compile Include="CSharp\Resolver\NodeListResolveVisitorNavigator.cs" />
     <Compile Include="CSharp\Resolver\OverloadResolution.cs" />
     <Compile Include="CSharp\Resolver\OverloadResolutionErrors.cs" />
-    <Compile Include="CSharp\Resolver\ResolveResult.cs" />
     <Compile Include="CSharp\Resolver\ResolveVisitor.cs" />
     <Compile Include="CSharp\Resolver\SimpleTypeOrNamespaceReference.cs" />
     <Compile Include="CSharp\Resolver\TypeInference.cs" />
-    <Compile Include="CSharp\Resolver\TypeResolveResult.cs" />
-    <Compile Include="CSharp\Resolver\UnknownMemberResolveResult.cs" />
     <Compile Include="CSharp\Resolver\UsingScope.cs" />
-    <Compile Include="CSharp\Resolver\LocalResolveResult.cs" />
     <Compile Include="Documentation\XmlDocumentationProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Semantics\AmbiguousResolveResult.cs" />
+    <Compile Include="Semantics\ArrayAccessResolveResult.cs" />
+    <Compile Include="Semantics\ArrayCreateResolveResult.cs" />
+    <Compile Include="Semantics\ByReferenceResolveResult.cs" />
+    <Compile Include="Semantics\ConstantResolveResult.cs" />
+    <Compile Include="Semantics\ConversionResolveResult.cs" />
+    <Compile Include="Semantics\InvocationResolveResult.cs" />
+    <Compile Include="Semantics\LocalResolveResult.cs" />
+    <Compile Include="Semantics\MemberResolveResult.cs" />
+    <Compile Include="Semantics\MethodGroupResolveResult.cs" />
+    <Compile Include="Semantics\NamespaceResolveResult.cs" />
+    <Compile Include="Semantics\ResolveResult.cs" />
+    <Compile Include="Semantics\TypeOfResolveResult.cs" />
+    <Compile Include="Semantics\TypeResolveResult.cs" />
+    <Compile Include="Semantics\UnknownMemberResolveResult.cs" />
     <Compile Include="TypeSystem\Accessibility.cs" />
     <Compile Include="TypeSystem\ArrayType.cs" />
     <Compile Include="TypeSystem\ByReferenceType.cs" />
@@ -424,6 +426,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="CSharp\" />
+    <Folder Include="Semantics" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">

ICSharpCode.NRefactory/Semantics/AmbiguousResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents an ambiguous type resolve result.

ICSharpCode.NRefactory/Semantics/ArrayAccessResolveResult.cs

@@ -0,0 +1,50 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Utils;
+
+namespace ICSharpCode.NRefactory.Semantics
+{
+	/// <summary>
+	/// Resolve result representing an array access.
+	/// </summary>
+	public class ArrayAccessResolveResult : ResolveResult
+	{
+		public readonly ResolveResult Array;
+		public readonly ResolveResult[] Indices;
+		
+		public ArrayAccessResolveResult(IType elementType, ResolveResult array, ResolveResult[] indices) : base(elementType)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+			if (indices == null)
+				throw new ArgumentNullException("indices");
+			this.Array = array;
+			this.Indices = indices;
+		}
+		
+		public override IEnumerable<ResolveResult> GetChildResults()
+		{
+			return new [] { Array }.Concat(Indices);
+		}
+	}
+}

ICSharpCode.NRefactory/Semantics/ArrayCreateResolveResult.cs

@@ -0,0 +1,60 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Utils;
+
+namespace ICSharpCode.NRefactory.Semantics
+{
+	/// <summary>
+	/// Resolve result representing an array creation.
+	/// </summary>
+	public class ArrayCreateResolveResult : ResolveResult
+	{
+		/// <summary>
+		/// Gets the size arguments.
+		/// </summary>
+		public readonly ResolveResult[] SizeArguments;
+		
+		/// <summary>
+		/// Gets the initializer elements.
+		/// This field may be null if no initializer was specified.
+		/// </summary>
+		public readonly ResolveResult[] InitializerElements;
+		
+		readonly object[] constantArray;
+		
+		public ArrayCreateResolveResult(IType arrayType, ResolveResult[] sizeArguments, ResolveResult[] initializerElements)
+			: base(arrayType)
+		{
+			this.SizeArguments = sizeArguments;
+			this.InitializerElements = initializerElements;
+		}
+		
+		public override IEnumerable<ResolveResult> GetChildResults()
+		{
+			if (SizeArguments != null && InitializerElements != null)
+				return SizeArguments.Concat(InitializerElements);
+			else
+				return SizeArguments ?? InitializerElements ?? EmptyList<ResolveResult>.Instance;
+		}
+	}
+}

ICSharpCode.NRefactory/Semantics/ByReferenceResolveResult.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents the resolve result of an 'ref x' or 'out x' expression.

ICSharpCode.NRefactory/Semantics/ConstantResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// ResolveResult representing a compile-time constant.

ICSharpCode.NRefactory/Semantics/ConversionResolveResult.cs

@@ -18,9 +18,10 @@
 
 using System;
 using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	public class ConversionResolveResult : ResolveResult
 	{

ICSharpCode.NRefactory/Semantics/InvocationResolveResult.cs

@@ -20,10 +20,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
+using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents the result of a method invocation.

ICSharpCode.NRefactory/Semantics/LocalResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents a local variable.

ICSharpCode.NRefactory/Semantics/MemberResolveResult.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents the result of a member invocation.

ICSharpCode.NRefactory/Semantics/MethodGroupResolveResult.cs

@@ -22,9 +22,11 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+
+using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	public class MethodListWithDeclaringType : List<IParameterizedMember>
 	{

ICSharpCode.NRefactory/Semantics/NamespaceResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents that an expression resolved to a namespace.

ICSharpCode.NRefactory/Semantics/ResolveResult.cs

@@ -22,7 +22,7 @@ using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents the result of resolving an expression.

ICSharpCode.NRefactory/Semantics/TypeOfResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents the 'typeof'.

ICSharpCode.NRefactory/Semantics/TypeResolveResult.cs

@@ -19,7 +19,7 @@
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// The resolved expression refers to a type name.

ICSharpCode.NRefactory/Semantics/UnknownMemberResolveResult.cs

@@ -22,7 +22,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
 
-namespace ICSharpCode.NRefactory.CSharp.Resolver
+namespace ICSharpCode.NRefactory.Semantics
 {
 	/// <summary>
 	/// Represents an unknown member.

ICSharpCode.NRefactory/TypeSystem/IAttribute.cs

@@ -19,7 +19,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 
 namespace ICSharpCode.NRefactory.TypeSystem
 {

ICSharpCode.NRefactory/TypeSystem/IConstantValue.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Diagnostics.Contracts;
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 
 namespace ICSharpCode.NRefactory.TypeSystem
 {

ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultAttribute.cs

@@ -21,7 +21,9 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
+
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 
 namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 {

ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleConstantValue.cs

@@ -18,6 +18,7 @@
 
 using System;
 using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.Semantics;
 
 namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 {

NRefactory.sln

@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Demo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Editor", "ICSharpCode.Editor\ICSharpCode.Editor.csproj", "{F054A788-B591-4561-A8BA-AE745BBEB817}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -76,6 +78,14 @@ Global
 		{F054A788-B591-4561-A8BA-AE745BBEB817}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F054A788-B591-4561-A8BA-AE745BBEB817}.Release|x86.ActiveCfg = Release|Any CPU
 		{F054A788-B591-4561-A8BA-AE745BBEB817}.Release|x86.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|x86
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE