Moved the internal mcs to it's own namespace.

That avoids namespace clashes if NR5 is used in conjunction with
Mono.CSharp

2 files changed, 55 insertions, 55 deletions

diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
index d86a26e2..1f286039 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ValueParameterNotUsedIssueTests.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using Mono.CSharp;
+using ICSharpCode.NRefactory.MonoCSharp;
 using NUnit.Framework;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.NRefactory.CSharp.CodeActions;
diff --git a/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs b/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
index 398d7b0e..0c0345ef 100644
--- a/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
+++ b/ICSharpCode.NRefactory.Tests/IndentationTests/TestFiles/CSharpParser.cs
@@ -28,7 +28,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.IO;
 using ICSharpCode.NRefactory.Editor;
-using Mono.CSharp;
+using ICSharpCode.NRefactory.MonoCSharp;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.NRefactory.CSharp
@@ -186,7 +186,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			AstType ConvertToType(Mono.CSharp.Expression typeName)
+			AstType ConvertToType(ICSharpCode.NRefactory.MonoCSharp.Expression typeName)
 			{
 				if (typeName == null) // may happen in typeof(Generic<,,,,>)
 					return new SimpleType();
@@ -269,7 +269,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return new SimpleType("unknown");
 			}
 
-			IEnumerable<Attribute> GetAttributes(IEnumerable<Mono.CSharp.Attribute> optAttributes)
+			IEnumerable<Attribute> GetAttributes(IEnumerable<ICSharpCode.NRefactory.MonoCSharp.Attribute> optAttributes)
 			{
 				if (optAttributes == null)
 					yield break;
@@ -328,7 +328,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 
-			AttributeSection ConvertAttributeSection(IEnumerable<Mono.CSharp.Attribute> optAttributes)
+			AttributeSection ConvertAttributeSection(IEnumerable<ICSharpCode.NRefactory.MonoCSharp.Attribute> optAttributes)
 			{
 				if (optAttributes == null)
 					return null;
@@ -639,7 +639,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				AddType(newType);
 			}
 
-			public override void Visit(Mono.CSharp.Delegate d)
+			public override void Visit(ICSharpCode.NRefactory.MonoCSharp.Delegate d)
 			{
 				var newDelegate = new DelegateDeclaration();
 				var location = LocationsBag.GetMemberLocation(d);
@@ -685,7 +685,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 
-			public override void Visit(Mono.CSharp.Enum e)
+			public override void Visit(ICSharpCode.NRefactory.MonoCSharp.Enum e)
 			{
 				var newType = new TypeDeclaration();
 				newType.ClassType = ClassType.Enum;
@@ -1058,27 +1058,27 @@ namespace ICSharpCode.NRefactory.CSharp
 				typeStack.Peek().AddChild(newMethod, Roles.TypeMemberRole);
 			}
 
-			static readonly Dictionary<Mono.CSharp.Modifiers, Modifiers> modifierTable = new Dictionary<Mono.CSharp.Modifiers, Modifiers>();
+			static readonly Dictionary<ICSharpCode.NRefactory.MonoCSharp.Modifiers, Modifiers> modifierTable = new Dictionary<ICSharpCode.NRefactory.MonoCSharp.Modifiers, Modifiers>();
 			static readonly string[] keywordTable;
 
 			static ConversionVisitor()
 			{
-				modifierTable [Mono.CSharp.Modifiers.NEW] = Modifiers.New;
-				modifierTable [Mono.CSharp.Modifiers.PUBLIC] = Modifiers.Public;
-				modifierTable [Mono.CSharp.Modifiers.PROTECTED] = Modifiers.Protected;
-				modifierTable [Mono.CSharp.Modifiers.PRIVATE] = Modifiers.Private;
-				modifierTable [Mono.CSharp.Modifiers.INTERNAL] = Modifiers.Internal;
-				modifierTable [Mono.CSharp.Modifiers.ABSTRACT] = Modifiers.Abstract;
-				modifierTable [Mono.CSharp.Modifiers.VIRTUAL] = Modifiers.Virtual;
-				modifierTable [Mono.CSharp.Modifiers.SEALED] = Modifiers.Sealed;
-				modifierTable [Mono.CSharp.Modifiers.STATIC] = Modifiers.Static;
-				modifierTable [Mono.CSharp.Modifiers.OVERRIDE] = Modifiers.Override;
-				modifierTable [Mono.CSharp.Modifiers.READONLY] = Modifiers.Readonly;
-				modifierTable [Mono.CSharp.Modifiers.PARTIAL] = Modifiers.Partial;
-				modifierTable [Mono.CSharp.Modifiers.EXTERN] = Modifiers.Extern;
-				modifierTable [Mono.CSharp.Modifiers.VOLATILE] = Modifiers.Volatile;
-				modifierTable [Mono.CSharp.Modifiers.UNSAFE] = Modifiers.Unsafe;
-				modifierTable [Mono.CSharp.Modifiers.ASYNC] = Modifiers.Async;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.NEW] = Modifiers.New;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.PUBLIC] = Modifiers.Public;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.PROTECTED] = Modifiers.Protected;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.PRIVATE] = Modifiers.Private;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.INTERNAL] = Modifiers.Internal;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.ABSTRACT] = Modifiers.Abstract;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.VIRTUAL] = Modifiers.Virtual;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.SEALED] = Modifiers.Sealed;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.STATIC] = Modifiers.Static;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.OVERRIDE] = Modifiers.Override;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.READONLY] = Modifiers.Readonly;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.PARTIAL] = Modifiers.Partial;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.EXTERN] = Modifiers.Extern;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.VOLATILE] = Modifiers.Volatile;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.UNSAFE] = Modifiers.Unsafe;
+				modifierTable [ICSharpCode.NRefactory.MonoCSharp.Modifiers.ASYNC] = Modifiers.Async;
 				
 				keywordTable = new string[255];
 				for (int i = 0; i < keywordTable.Length; i++)
@@ -1356,7 +1356,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			#region Statements
 
-			public override object Visit(Mono.CSharp.Statement stmt)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Statement stmt)
 			{
 				Console.WriteLine("unknown statement:" + stmt);
 				return null;
@@ -1445,14 +1445,14 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.EmptyStatement emptyStatement)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.EmptyStatement emptyStatement)
 			{
 				var result = new EmptyStatement();
 				result.Location = Convert(emptyStatement.loc);
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.ErrorExpression errorExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.ErrorExpression errorExpression)
 			{
 				return new ErrorExpression(Convert(errorExpression.Location));
 			}
@@ -1528,7 +1528,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			void AddStatementOrList(ForStatement forStatement, Mono.CSharp.Statement init, Role<Statement> role)
+			void AddStatementOrList(ForStatement forStatement, ICSharpCode.NRefactory.MonoCSharp.Statement init, Role<Statement> role)
 			{
 				if (init == null)
 					return;
@@ -1537,7 +1537,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					foreach (var stmt in stmtList.Statements) {
 						forStatement.AddChild((Statement)stmt.Accept(this), role);
 					}
-				} else if (init is Mono.CSharp.EmptyStatement) {
+				} else if (init is ICSharpCode.NRefactory.MonoCSharp.EmptyStatement) {
 					
 				} else {
 					forStatement.AddChild((Statement)init.Accept(this), role);
@@ -1721,7 +1721,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			public UsingStatement CreateUsingStatement(Block blockStatement)
 			{
 				var usingResult = new UsingStatement();
-				Mono.CSharp.Statement cur = blockStatement.Statements [0];
+				ICSharpCode.NRefactory.MonoCSharp.Statement cur = blockStatement.Statements [0];
 				var u = cur as Using;
 				if (u != null) {
 					usingResult.AddChild(new CSharpTokenNode(Convert(u.loc), UsingStatement.UsingKeywordRole), UsingStatement.UsingKeywordRole);
@@ -1773,7 +1773,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				if (convertTypeSystemMode) {
 					return;
 				}
-				foreach (Mono.CSharp.Statement stmt in blockStatement.Statements) {
+				foreach (ICSharpCode.NRefactory.MonoCSharp.Statement stmt in blockStatement.Statements) {
 					if (stmt == null)
 						continue;
 					/*					if (curLocal < localVariables.Count && IsLower (localVariables[curLocal].Location, stmt.loc)) {
@@ -2109,7 +2109,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			#region Expression
 
-			public override object Visit(Mono.CSharp.Expression expression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Expression expression)
 			{
 				Console.WriteLine("Visit unknown expression:" + expression);
 				Console.WriteLine(Environment.StackTrace);
@@ -2198,7 +2198,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return booleanExpression.Expr.Accept(this);
 			}
 
-			public override object Visit(Mono.CSharp.ParenthesizedExpression parenthesizedExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.ParenthesizedExpression parenthesizedExpression)
 			{
 				var result = new ParenthesizedExpression();
 				var location = LocationsBag.GetLocations(parenthesizedExpression);
@@ -2344,7 +2344,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.DefaultValueExpression defaultValueExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.DefaultValueExpression defaultValueExpression)
 			{
 				var result = new DefaultValueExpression();
 				result.AddChild(new CSharpTokenNode(Convert(defaultValueExpression.Location), DefaultValueExpression.DefaultKeywordRole), DefaultValueExpression.DefaultKeywordRole);
@@ -2429,7 +2429,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Nullable.NullCoalescingOperator nullCoalescingOperator)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Nullable.NullCoalescingOperator nullCoalescingOperator)
 			{
 				var result = new BinaryOperatorExpression();
 				result.Operator = BinaryOperatorType.NullCoalescing;
@@ -3200,7 +3200,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.AnonymousMethodExpression anonymousMethodExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.AnonymousMethodExpression anonymousMethodExpression)
 			{
 				var result = new AnonymousMethodExpression();
 				var location = LocationsBag.GetLocations(anonymousMethodExpression);
@@ -3224,7 +3224,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.LambdaExpression lambdaExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.LambdaExpression lambdaExpression)
 			{
 				var result = new LambdaExpression();
 				var location = LocationsBag.GetLocations(lambdaExpression);
@@ -3292,7 +3292,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 			QueryOrderClause currentQueryOrderClause;
 
-			public override object Visit(Mono.CSharp.Linq.QueryExpression queryExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.QueryExpression queryExpression)
 			{
 				var oldQueryOrderClause = currentQueryOrderClause;
 				try {
@@ -3321,7 +3321,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 
-			public override object Visit(Mono.CSharp.Linq.QueryStartClause queryExpression)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.QueryStartClause queryExpression)
 			{
 				if (queryExpression.Expr == null) {
 					var intoClause = new QueryContinuationClause();
@@ -3348,7 +3348,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return fromClause;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.SelectMany selectMany)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.SelectMany selectMany)
 			{
 				var fromClause = new QueryFromClause();
 
@@ -3368,7 +3368,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return fromClause;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.Select select)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.Select select)
 			{
 				var result = new QuerySelectClause();
 				result.AddChild(new CSharpTokenNode(Convert(select.Location), QuerySelectClause.SelectKeywordRole), QuerySelectClause.SelectKeywordRole);
@@ -3377,7 +3377,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.GroupBy groupBy)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.GroupBy groupBy)
 			{
 				var result = new QueryGroupClause();
 				var location = LocationsBag.GetLocations(groupBy);
@@ -3394,7 +3394,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.Let let)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.Let let)
 			{
 				var result = new QueryLetClause();
 				var location = LocationsBag.GetLocations(let);
@@ -3408,7 +3408,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.Where where)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.Where where)
 			{
 				var result = new QueryWhereClause();
 				result.AddChild(new CSharpTokenNode(Convert(where.Location), QueryWhereClause.WhereKeywordRole), QueryWhereClause.WhereKeywordRole);
@@ -3417,7 +3417,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.Join join)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.Join join)
 			{
 				var result = new QueryJoinClause();
 				var location = LocationsBag.GetLocations(join);
@@ -3454,7 +3454,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.GroupJoin groupJoin)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.GroupJoin groupJoin)
 			{
 				var result = new QueryJoinClause();
 				var location = LocationsBag.GetLocations(groupJoin);
@@ -3490,7 +3490,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return result;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.OrderByAscending orderByAscending)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.OrderByAscending orderByAscending)
 			{
 				currentQueryOrderClause = new QueryOrderClause();
 				var location2 = LocationsBag.GetLocations(orderByAscending.block);
@@ -3508,7 +3508,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return currentQueryOrderClause;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.OrderByDescending orderByDescending)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.OrderByDescending orderByDescending)
 			{
 				currentQueryOrderClause = new QueryOrderClause();
 				
@@ -3524,7 +3524,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return currentQueryOrderClause;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.ThenByAscending thenByAscending)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.ThenByAscending thenByAscending)
 			{
 				var ordering = new QueryOrdering();
 				if (thenByAscending.Expr != null)
@@ -3538,7 +3538,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return null;
 			}
 
-			public override object Visit(Mono.CSharp.Linq.ThenByDescending thenByDescending)
+			public override object Visit(ICSharpCode.NRefactory.MonoCSharp.Linq.ThenByDescending thenByDescending)
 			{
 				var ordering = new QueryOrdering();
 				if (thenByDescending.Expr != null)
@@ -3825,7 +3825,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 
 		/// <summary>
-		/// Converts a Mono.CSharp syntax tree into an NRefactory syntax tree.
+		/// Converts a ICSharpCode.NRefactory.MonoCSharp syntax tree into an NRefactory syntax tree.
 		/// </summary>
 		public SyntaxTree Parse(CompilerCompilationUnit top, string fileName)
 		{
@@ -3838,7 +3838,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			if (CompilationUnitCallback != null) {
 				CompilationUnitCallback(top);
 			}
-			var expr = top.LastYYValue as Mono.CSharp.Expression;
+			var expr = top.LastYYValue as ICSharpCode.NRefactory.MonoCSharp.Expression;
 			if (expr != null)
 				conversionVisitor.Unit.TopExpression = expr.Accept(conversionVisitor) as AstNode;
 
@@ -3868,7 +3868,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 
 		/// <summary>
-		/// Callback that gets called with the Mono.CSharp syntax tree whenever some code is parsed.
+		/// Callback that gets called with the ICSharpCode.NRefactory.MonoCSharp syntax tree whenever some code is parsed.
 		/// </summary>
 		public Action<CompilerCompilationUnit> CompilationUnitCallback {
 			get;
@@ -4034,7 +4034,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		*/
 		public DocumentationReference ParseDocumentationReference(string cref)
 		{
-			// see Mono.CSharp.DocumentationBuilder.HandleXrefCommon
+			// see ICSharpCode.NRefactory.MonoCSharp.DocumentationBuilder.HandleXrefCommon
 			if (cref == null)
 				throw new ArgumentNullException("cref");
 			
@@ -4054,7 +4054,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				var report = new Report(ctx, errorReportPrinter);
 				var session = new ParserSession();
 				session.LocationsBag = new LocationsBag();
-				var parser = new Mono.CSharp.CSharpParser(reader, source_file, report, session);
+				var parser = new ICSharpCode.NRefactory.MonoCSharp.CSharpParser(reader, source_file, report, session);
 				parser.Lexer.Line += initialLocation.Line - 1;
 				parser.Lexer.Column += initialLocation.Column - 1;
 				parser.Lexer.putback_char = Tokenizer.DocumentationXref;