diff --git a/ICSharpCode.Decompiler/CSharp/Analysis/AnnotationNames.cs b/ICSharpCode.Decompiler/CSharp/Analysis/AnnotationNames.cs
index 94d19e4b6..5103bddce 100644
--- a/ICSharpCode.Decompiler/CSharp/Analysis/AnnotationNames.cs
+++ b/ICSharpCode.Decompiler/CSharp/Analysis/AnnotationNames.cs
@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
namespace ICSharpCode.NRefactory.CSharp
{
diff --git a/ICSharpCode.Decompiler/CSharp/Annotations.cs b/ICSharpCode.Decompiler/CSharp/Annotations.cs
index 9f2b9213d..9fb9a8e14 100644
--- a/ICSharpCode.Decompiler/CSharp/Annotations.cs
+++ b/ICSharpCode.Decompiler/CSharp/Annotations.cs
@@ -16,11 +16,8 @@
// 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;
using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
@@ -37,7 +34,7 @@ namespace ICSharpCode.Decompiler.CSharp
// * AddCheckedBlocks.CheckedAnnotation / AddCheckedBlocks.UnCheckedAnnotation is used on checked/unchecked integer arithmetic
// TODO: here the info is also redundant, we could peek at the BinaryNumericInstruction instead
// but on the other hand, some unchecked casts are not backed by any BinaryNumericInstruction
-
+
///
/// Currently unused; we'll probably use the LdToken ILInstruction as annotation instead when LdToken support gets reimplemented.
///
diff --git a/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs b/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
index e5b2cb67d..5e8232e2c 100644
--- a/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
+++ b/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
@@ -24,7 +24,6 @@ using System.Threading;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
using Mono.Cecil;
using ICSharpCode.Decompiler.CSharp.Transforms;
using ICSharpCode.Decompiler.IL;
diff --git a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
index f738972db..4b5a254d7 100644
--- a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
+++ b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
@@ -29,8 +29,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
using ExpressionType = System.Linq.Expressions.ExpressionType;
using PrimitiveType = ICSharpCode.Decompiler.CSharp.Syntax.PrimitiveType;
diff --git a/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs b/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs
index b3b26f8ad..af2cce2b5 100644
--- a/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs
+++ b/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs
@@ -18,8 +18,7 @@
using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp
{
@@ -57,7 +56,7 @@ namespace ICSharpCode.Decompiler.CSharp
return new NamedNode(patternGroupName, node);
}
- public static void AddNamedArgument(this NRefactory.CSharp.Attribute attribute, string name, Expression argument)
+ public static void AddNamedArgument(this Syntax.Attribute attribute, string name, Expression argument)
{
attribute.Arguments.Add(new AssignmentExpression(new IdentifierExpression(name), argument));
}
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
index c3def2f73..7697e6414 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
@@ -20,7 +20,6 @@ using System;
using System.IO;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
index c04bd663d..e08287035 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -22,10 +22,9 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
+using Attribute = ICSharpCode.Decompiler.CSharp.Syntax.Attribute;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
@@ -2276,7 +2275,7 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
#endregion
#region Pattern Nodes
- public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
+ public virtual void VisitPatternPlaceholder(AstNode placeholder, Pattern pattern)
{
StartNode(placeholder);
VisitNodeInPattern(pattern);
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs
index 8d6b166af..e4a52108f 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs
@@ -19,7 +19,6 @@
using System;
using System.IO;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs
index 21500156d..203e29c43 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs
@@ -19,7 +19,6 @@
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs
index 5dff3ad23..43b1bc7d1 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs
@@ -18,7 +18,6 @@
using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs
index 70fbff709..3070708b0 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs
@@ -18,7 +18,6 @@
using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs
index de58c2dea..e108ee256 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs
@@ -19,7 +19,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
index f21863206..c34fb7e29 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
@@ -21,7 +21,6 @@ using System.Globalization;
using System.IO;
using System.Text;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs
index 9e552ffd9..d923ae9ab 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs
@@ -23,7 +23,6 @@ using System.Text;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
@@ -169,10 +168,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
get { return EmptyList.Instance; }
}
- NRefactory.Documentation.DocumentationComment IEntity.Documentation {
- get { return null; }
- }
-
Accessibility IHasAccessibility.Accessibility {
get { return Accessibility.Public; }
}
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs
index 7bed28a15..9e64ae0ad 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs
@@ -26,8 +26,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs
index b3827d8a5..6f495dfbc 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs
@@ -20,7 +20,6 @@ using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs
index 4e53b98c9..c83510b1d 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs
index f8d06d204..577f316ac 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs
@@ -21,7 +21,6 @@ using System.Globalization;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs b/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs
index 0d646decf..d0d969837 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs
@@ -20,7 +20,6 @@ using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs
index 53b9a8c30..4191d1c8d 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs
@@ -19,7 +19,6 @@
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs
index 7457b4e6f..b2579ea7d 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs
@@ -22,9 +22,7 @@ using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
index df90f0ee9..77419f3a7 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs
index 6956413e0..a1bb428e9 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs
@@ -24,7 +24,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs b/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs
index 2a5dbabce..58bb9909b 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs
@@ -329,12 +329,6 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver
}
}
- public ICSharpCode.NRefactory.Documentation.DocumentationComment Documentation {
- get {
- return baseMethod.Documentation;
- }
- }
-
public bool IsStatic {
get {
return false;
diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs b/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs
index 7add45d5d..6b75095ab 100644
--- a/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs
+++ b/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs
@@ -24,7 +24,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{
diff --git a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
index 5575ed155..4e0d90137 100644
--- a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
+++ b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
@@ -18,8 +18,6 @@
using System.Diagnostics;
using ICSharpCode.Decompiler.IL;
-using ICSharpCode.NRefactory.CSharp;
-using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
@@ -92,14 +90,14 @@ namespace ICSharpCode.Decompiler.CSharp
var value = exprBuilder.Translate(inst.Value);
var stmt = new SwitchStatement() { Expression = value };
foreach (var section in inst.Sections) {
- var astSection = new ICSharpCode.NRefactory.CSharp.SwitchSection();
+ var astSection = new Syntax.SwitchSection();
astSection.CaseLabels.AddRange(section.Labels.Values.Select(i => CreateTypedCaseLabel(i, value.Type)));
ConvertSwitchSectionBody(astSection, section.Body);
stmt.SwitchSections.Add(astSection);
}
if (inst.DefaultBody.OpCode != OpCode.Nop) {
- var astSection = new ICSharpCode.NRefactory.CSharp.SwitchSection();
+ var astSection = new Syntax.SwitchSection();
astSection.CaseLabels.Add(new CaseLabel());
ConvertSwitchSectionBody(astSection, inst.DefaultBody);
stmt.SwitchSections.Add(astSection);
@@ -109,7 +107,7 @@ namespace ICSharpCode.Decompiler.CSharp
return stmt;
}
- private void ConvertSwitchSectionBody(NRefactory.CSharp.SwitchSection astSection, ILInstruction bodyInst)
+ private void ConvertSwitchSectionBody(Syntax.SwitchSection astSection, ILInstruction bodyInst)
{
var body = Convert(bodyInst);
astSection.Statements.Add(body);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs
index abd0a52f3..794a9f928 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs
@@ -30,9 +30,8 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -73,7 +72,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitNullNode(this, data);
}
- protected internal override bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch (AstNode other, PatternMatching.Match match)
{
return other == null || other.IsNull;
}
@@ -81,16 +80,16 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
#endregion
#region PatternPlaceholder
- public static implicit operator AstNode (NRefactory.PatternMatching.Pattern pattern)
+ public static implicit operator AstNode (PatternMatching.Pattern pattern)
{
return pattern != null ? new PatternPlaceholder (pattern) : null;
}
sealed class PatternPlaceholder : AstNode, INode
{
- readonly NRefactory.PatternMatching.Pattern child;
+ readonly PatternMatching.Pattern child;
- public PatternPlaceholder (NRefactory.PatternMatching.Pattern child)
+ public PatternPlaceholder (PatternMatching.Pattern child)
{
this.child = child;
}
@@ -114,12 +113,12 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitPatternPlaceholder (this, child, data);
}
- protected internal override bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch (AstNode other, PatternMatching.Match match)
{
return child.DoMatch (other, match);
}
- bool NRefactory.PatternMatching.INode.DoMatchCollection (Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
+ bool PatternMatching.INode.DoMatchCollection (Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
{
return child.DoMatchCollection (role, pos, match, backtrackingInfo);
}
@@ -650,29 +649,29 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
#region Pattern Matching
protected static bool MatchString (string pattern, string text)
{
- return NRefactory.PatternMatching.Pattern.MatchString(pattern, text);
+ return PatternMatching.Pattern.MatchString(pattern, text);
}
- protected internal abstract bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match);
+ protected internal abstract bool DoMatch (AstNode other, PatternMatching.Match match);
- bool NRefactory.PatternMatching.INode.DoMatch (NRefactory.PatternMatching.INode other, NRefactory.PatternMatching.Match match)
+ bool PatternMatching.INode.DoMatch (PatternMatching.INode other, PatternMatching.Match match)
{
AstNode o = other as AstNode;
// try matching if other is null, or if other is an AstNode
return (other == null || o != null) && DoMatch (o, match);
}
- bool NRefactory.PatternMatching.INode.DoMatchCollection (Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
+ bool PatternMatching.INode.DoMatchCollection (Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
{
AstNode o = pos as AstNode;
return (pos == null || o != null) && DoMatch (o, match);
}
- NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.NextSibling {
+ PatternMatching.INode PatternMatching.INode.NextSibling {
get { return nextSibling; }
}
- NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.FirstChild {
+ PatternMatching.INode PatternMatching.INode.FirstChild {
get { return firstChild; }
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs
index bba990689..46b30e93a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs
@@ -21,7 +21,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs
index 68c641268..fde2677ca 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs
@@ -19,9 +19,8 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Resolver;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -56,7 +55,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitNullNode(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return other == null || other.IsNull;
}
@@ -69,16 +68,16 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
#endregion
#region PatternPlaceholder
- public static implicit operator AstType(NRefactory.PatternMatching.Pattern pattern)
+ public static implicit operator AstType(PatternMatching.Pattern pattern)
{
return pattern != null ? new PatternPlaceholder(pattern) : null;
}
sealed class PatternPlaceholder : AstType, INode
{
- readonly NRefactory.PatternMatching.Pattern child;
+ readonly PatternMatching.Pattern child;
- public PatternPlaceholder(NRefactory.PatternMatching.Pattern child)
+ public PatternPlaceholder(PatternMatching.Pattern child)
{
this.child = child;
}
@@ -107,12 +106,12 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
throw new NotSupportedException();
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return child.DoMatch(other, match);
}
- bool NRefactory.PatternMatching.INode.DoMatchCollection(Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
+ bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
{
return child.DoMatchCollection(role, pos, match, backtrackingInfo);
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs
index fc13db37d..d0f6c15fa 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs
@@ -27,7 +27,6 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -54,7 +53,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return GetModifierName (Modifier);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
CSharpModifierToken o = other as CSharpModifierToken;
return o != null && this.modifier == o.modifier;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs
index c3706d0d8..5e18c5d3f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -65,7 +64,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitNullNode(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return other == null || other.IsNull;
}
@@ -123,7 +122,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitCSharpTokenNode (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
CSharpTokenNode o = other as CSharpTokenNode;
return o != null && !o.IsNull && !(o is CSharpModifierToken);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs
index ced86a5da..0cb4555cd 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs
@@ -24,8 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
+
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs
index d44cf6fd8..67c16913f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs
@@ -30,7 +30,6 @@ using System.Text;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -117,7 +116,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitComposedType (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
ComposedType o = other as ComposedType;
return o != null
@@ -247,7 +246,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitArraySpecifier(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
ArraySpecifier o = other as ArraySpecifier;
return o != null && this.Dimensions == o.Dimensions;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs
index f44747046..f0a49e0ef 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs
@@ -24,8 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -628,7 +626,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
VisitChildren(errorNode);
}
- public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
+ public virtual void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern)
{
VisitChildren (placeholder);
}
@@ -1235,7 +1233,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return VisitChildren(errorNode);
}
- public virtual T VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
+ public virtual T VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern)
{
return VisitChildren (placeholder);
}
@@ -1842,7 +1840,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return VisitChildren(errorNode, data);
}
- public virtual S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern, T data)
+ public virtual S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern, T data)
{
return VisitChildren (placeholder, data);
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs
index 5b89bc2c6..85a2b4319 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -110,7 +109,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
get { return GetChildrenByRole (Roles.Parameter); }
}
- protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
DocumentationReference o = other as DocumentationReference;
if (!(o != null && this.SymbolKind == o.SymbolKind && this.HasParameterList == o.HasParameterList))
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs
index a7bf6a6ac..0af49997b 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -75,7 +74,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitErrorNode(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
var o = other as ErrorNode;
return o != null;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs
index ea6215bde..683f56860 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs
@@ -26,9 +26,8 @@
using System.Collections.Generic;
using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// [async] delegate(Parameters) {Body}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs
index e0fb338eb..2bf075aa2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs
@@ -23,11 +23,9 @@
// 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 ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// new { [ExpressionList] }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs
index d36dd3f81..464b61895 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs
@@ -16,11 +16,8 @@
// 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 ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// new Type[Dimensions]
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs
index 55bbb7505..1332ee227 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// { Elements }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs
index 7e4dacbd4..99d9f9b72 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Expression as TypeReference
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs
index 0f408701c..4798d8e58 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs
@@ -27,9 +27,8 @@
using System;
using System.Linq.Expressions;
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Left Operator= Right
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs
index a8a9e8ee5..8e99ec074 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// base
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs
index b4214d3d3..5ba90bd73 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs
@@ -27,9 +27,8 @@
using System;
using System.Linq.Expressions;
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Left Operator Right
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs
index 63c1a2c6e..4214cb145 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// (CastTo)Expression
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs
index faf0510ef..64dde7ba2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// checked(Expression)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs
index 65772d3ff..da348c5ae 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Condition ? TrueExpression : FalseExpression
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs
index 1ba6fbc8b..93e33d4a6 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// default(Type)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs
index e20b56fe6..d8913219d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum FieldDirection
{
@@ -49,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
}
public CSharpTokenNode FieldDirectionToken {
- get { return FieldDirection == ICSharpCode.NRefactory.CSharp.FieldDirection.Ref ? GetChildByRole (RefKeywordRole) : GetChildByRole (OutKeywordRole); }
+ get { return FieldDirection == FieldDirection.Ref ? GetChildByRole (RefKeywordRole) : GetChildByRole (OutKeywordRole); }
}
public Expression Expression {
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs
index adaa492d2..f5e700ca2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
[Obsolete("This class is obsolete. Remove all referencing code.")]
public class EmptyExpression : AstNode
@@ -48,7 +47,7 @@ namespace ICSharpCode.NRefactory.CSharp
throw new NotImplementedException();
}
- protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
throw new NotImplementedException();
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs
index 0218a081b..b2349a9c3 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs
@@ -18,9 +18,8 @@
using System;
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Base class for expressions.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs
index 6c8af5611..fd3690ed2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs
@@ -23,10 +23,8 @@
// 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.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class IdentifierExpression : Expression
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs
index b8999bfc2..e800ac993 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Target[Arguments]
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs
index 7b3f856a9..c2d11fcb3 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Target(Arguments)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs
index e77b690a3..cf159082f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Expression is Type
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs
index 3106ae284..ba1449c7b 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs
@@ -23,11 +23,8 @@
// 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.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// [async] Parameters => Body
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs
index 0215f83e5..d3085736a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Target.MemberName
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs
index bd79a825c..a15e4d774 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs
@@ -16,10 +16,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Represents a named argument passed to a method or attribute.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs
index e56669993..25eec4caa 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs
@@ -24,11 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// name = expression
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs
index e19ab7b04..ae3db7e80 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// null
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs
index 5cb476277..8ffb1fdf5 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// new Type(Arguments) { Initializer }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs
index 9ba439089..1619fb619 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// ( Expression )
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs
index a13dca5aa..83d19b9cd 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Target->MemberName
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs
index 11bf1adeb..1d9582347 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs
@@ -25,9 +25,9 @@
// THE SOFTWARE.
using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.NRefactory.Editor;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Represents a literal value.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs
index 81d59cfce..d9d21f5b5 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs
@@ -16,12 +16,9 @@
// 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.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class QueryExpression : Expression
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs
index 0868ff2be..77746e759 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// sizeof(Type)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs
index a53942e65..4b9feb5d4 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// stackalloc Type[Count]
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs
index ab8aaac67..aa3352cd1 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// this
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs
index dea22554b..5cce240d3 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// typeof(Type)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs
index e86831b3f..2ed0b651a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs
@@ -16,10 +16,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Represents an AstType as an expression.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs
index 8c39ae912..5bc91eb76 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs
@@ -26,9 +26,8 @@
using System;
using System.Linq.Expressions;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Operator Expression
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs
index 5c91d3f81..eef0fd6ba 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// unchecked(Expression)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs
index 6a12672a6..647bf3fc7 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum UndocumentedExpressionType
{
@@ -55,14 +53,14 @@ namespace ICSharpCode.NRefactory.CSharp
public CSharpTokenNode UndocumentedToken {
get {
switch (UndocumentedExpressionType) {
- case ICSharpCode.NRefactory.CSharp.UndocumentedExpressionType.ArgListAccess:
- case ICSharpCode.NRefactory.CSharp.UndocumentedExpressionType.ArgList:
+ case UndocumentedExpressionType.ArgListAccess:
+ case UndocumentedExpressionType.ArgList:
return GetChildByRole (ArglistKeywordRole);
- case ICSharpCode.NRefactory.CSharp.UndocumentedExpressionType.RefValue:
+ case UndocumentedExpressionType.RefValue:
return GetChildByRole (RefvalueKeywordRole);
- case ICSharpCode.NRefactory.CSharp.UndocumentedExpressionType.RefType:
+ case UndocumentedExpressionType.RefType:
return GetChildByRole (ReftypeKeywordRole);
- case ICSharpCode.NRefactory.CSharp.UndocumentedExpressionType.MakeRef:
+ case UndocumentedExpressionType.MakeRef:
return GetChildByRole (MakerefKeywordRole);
}
return CSharpTokenNode.Null;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs
index f2b262c69..66dc64211 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs
@@ -24,11 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Attribute(Arguments)
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs
index bac41958f..5b91b2126 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs
@@ -24,12 +24,8 @@
// 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.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// [AttributeTarget: Attributes]
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs
index 39824eaa2..1901bac58 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum CommentType
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs
index dca7fe645..1bd6b59a2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// where TypeParameter : BaseTypes
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs
index b71211c84..0dba88b1d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs
@@ -24,10 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// delegate ReturnType Name<TypeParameters>(Parameters) where Constraints;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs
index 4e0d80b83..e0b10c17f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// extern alias ;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs
index 624f19bf0..1ba5df668 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs
@@ -24,12 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// namespace Name { Members }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs
index d6a32f979..79866b03d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs
@@ -1,8 +1,8 @@
using System;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.NRefactory.Editor;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
@@ -85,7 +85,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitNewLine (this, data);
}
- protected internal override bool DoMatch(AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return other is NewLineNode;
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs
index 4a3ccdcd1..b3de1f90e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs
@@ -23,12 +23,9 @@
// 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.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum PreProcessorDirectiveType : byte
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs
index aa01eef15..191d15c45 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// A text node contains text without syntactic or semantic information.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs
index 97dcc693b..78179a43f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs
@@ -24,12 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum ClassType
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs
index ef8f7ce22..e342d775e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs
@@ -16,11 +16,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// [in|out] Name
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs
index e00aac0dd..dbe6beda5 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// using Alias = Import;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs
index f00b6c1a8..e68acc3ee 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs
@@ -24,13 +24,10 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using System.Linq;
using System.Text;
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// using Import;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs
index 2554c9209..937ad7e60 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// A Whitespace node contains only whitespaces.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs
index 91fa6b57e..00cf42c83 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs
@@ -16,8 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -150,7 +148,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
void VisitNullNode(AstNode nullNode);
void VisitErrorNode(AstNode errorNode);
- void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern);
+ void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern);
}
///
@@ -282,7 +280,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
S VisitNullNode(AstNode nullNode);
S VisitErrorNode(AstNode errorNode);
- S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern);
+ S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern);
}
///
@@ -414,6 +412,6 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
S VisitNullNode(AstNode nullNode, T data);
S VisitErrorNode(AstNode errorNode, T data);
- S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern, T data);
+ S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern, T data);
}
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs
index 392a43be6..256c22201 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs
@@ -54,7 +54,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitNullNode(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return other == null || other.IsNull;
}
@@ -164,7 +164,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitIdentifier (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
Identifier o = other as Identifier;
return o != null && !o.IsNull && MatchString(this.Name, o.Name);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs
index 7854fb51c..856d39dc0 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs
@@ -18,14 +18,13 @@
using System;
using System.Linq;
-using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Matches identifier expressions that have the same identifier as the referenced variable/type definition/method definition.
///
- public class IdentifierExpressionBackreference : Pattern
+ public class IdentifierExpressionBackreference : PatternMatching.Pattern
{
readonly string referencedGroupName;
@@ -40,9 +39,9 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
this.referencedGroupName = referencedGroupName;
}
- public override bool DoMatch(INode other, Match match)
+ public override bool DoMatch(PatternMatching.INode other, PatternMatching.Match match)
{
- NRefactory.CSharp.IdentifierExpression ident = other as NRefactory.CSharp.IdentifierExpression;
+ IdentifierExpression ident = other as IdentifierExpression;
if (ident == null || ident.TypeArguments.Any())
return false;
AstNode referenced = (AstNode)match.Get(referencedGroupName).Last();
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs
index c20e78012..26dfa9213 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs
@@ -28,7 +28,6 @@ using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -111,7 +110,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitMemberType (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
MemberType o = other as MemberType;
return o != null && this.IsDoubleColon == o.IsDoubleColon
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs
index 6ce2a07bb..0248d26f6 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs
@@ -25,8 +25,6 @@
// THE SOFTWARE.
using System;
-using ICSharpCode.NRefactory.CSharp;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -852,7 +850,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
Visit(EnterNamedExpression, LeaveNamedExpression, namedExpression);
}
- void IAstVisitor.VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
+ void IAstVisitor.VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern)
{
}
}
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs
index f212ba9d4..2488355bb 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs
@@ -16,9 +16,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Matches any node.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs
index 092897a4e..b8fe2ed6d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Matches any node.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs
index eaf17b445..845dd6123 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs
@@ -19,7 +19,7 @@
using System;
using System.Linq;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Matches the last entry in the specified named group.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs
index 6a0d3ee8e..3e3629230 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs
@@ -16,11 +16,9 @@
// 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;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Container for the backtracking info.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs
index ff5e4764e..95d0c69ca 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs
@@ -20,7 +20,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Matches one of several alternatives.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs
index a8b114a97..3e0a9b73f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs
@@ -17,9 +17,8 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// AST node that supports pattern matching.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs
index 1a9a9f666..3f63b57ff 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs
@@ -16,11 +16,9 @@
// 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;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Represents the result of a pattern matching operation.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs
index 464c9a6f4..aab6cf4e4 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs
@@ -18,7 +18,7 @@
using System;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Represents a named node within a pattern.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs
index a86b2fc61..871ad489c 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs
@@ -17,11 +17,8 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
public class OptionalNode : Pattern
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs
index 612f866e6..d6c57e2ab 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs
@@ -16,13 +16,10 @@
// 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.Diagnostics;
-using System.IO;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Base class for all patterns.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs
index 30f59bca8..fdb9258b7 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs
@@ -17,11 +17,9 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.PatternMatching
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
{
///
/// Represents an optional node.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs
index 2beeb1bd3..31e408b54 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs
@@ -29,7 +29,6 @@ using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -100,7 +99,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitPrimitiveType (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
PrimitiveType o = other as PrimitiveType;
return o != null && MatchString(this.Keyword, o.Keyword);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs
index aa35babf4..98405c4ab 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs
@@ -24,8 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -35,18 +33,18 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
// some pre defined constants for common roles
public static readonly Role Identifier = new Role ("Identifier", Syntax.Identifier.Null);
- public static readonly Role Body = new Role ("Body", NRefactory.CSharp.BlockStatement.Null);
+ public static readonly Role Body = new Role ("Body", BlockStatement.Null);
public static readonly Role Parameter = new Role ("Parameter");
- public static readonly Role Argument = new Role ("Argument", NRefactory.CSharp.Expression.Null);
+ public static readonly Role Argument = new Role ("Argument", Syntax.Expression.Null);
public static readonly Role Type = new Role ("Type", AstType.Null);
- public static readonly Role Expression = new Role ("Expression", NRefactory.CSharp.Expression.Null);
- public static readonly Role TargetExpression = new Role ("Target", NRefactory.CSharp.Expression.Null);
- public readonly static Role Condition = new Role ("Condition", NRefactory.CSharp.Expression.Null);
+ public static readonly Role Expression = new Role ("Expression", Syntax.Expression.Null);
+ public static readonly Role TargetExpression = new Role ("Target", Syntax.Expression.Null);
+ public readonly static Role Condition = new Role ("Condition", Syntax.Expression.Null);
public static readonly Role TypeParameter = new Role ("TypeParameter");
public static readonly Role TypeArgument = new Role ("TypeArgument", AstType.Null);
public readonly static Role Constraint = new Role ("Constraint");
public static readonly Role Variable = new Role ("Variable", VariableInitializer.Null);
- public static readonly Role EmbeddedStatement = new Role ("EmbeddedStatement", NRefactory.CSharp.Statement.Null);
+ public static readonly Role EmbeddedStatement = new Role ("EmbeddedStatement", Statement.Null);
public readonly static Role TypeMemberRole = new Role ("TypeMember");
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs
index bf9fddcd6..e0798a83a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs
@@ -28,7 +28,6 @@ using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -60,7 +59,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitNullNode(this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
return other == null || other.IsNull;
}
@@ -140,7 +139,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return visitor.VisitSimpleType (this, data);
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
SimpleType o = other as SimpleType;
return o != null && MatchString(this.Identifier, o.Identifier) && this.TypeArguments.DoMatch(o.TypeArguments, match);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs
index b7b094457..bb5c89eac 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs
@@ -25,9 +25,8 @@
// THE SOFTWARE.
using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// { Statements }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs
index 32e5b83c7..a1a3a1feb 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// break;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs
index 25270fc3f..89d7ed1aa 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// checked BodyBlock
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs
index 5117658f8..b527bdf1e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// continue;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs
index ac0064428..bc25ec3f2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// "do EmbeddedStatement while(Condition);"
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs
index 394d42ef4..d85adaf2e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// ;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs
index 0df9c53d7..c9a1d320d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Expression;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs
index 16e7a8157..6a0aee6ef 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// fixed (Type Variables) EmbeddedStatement
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs
index d0a2b780c..decdaf46a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// for (Initializers; Condition; Iterators) EmbeddedStatement
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs
index bf12df024..4c1d037c2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// foreach (Type VariableName in InExpression) EmbeddedStatement
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs
index f7aacb6fb..9bddbe9eb 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// "goto Label;"
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs
index 096af1803..38184981b 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// if (Condition) TrueStatement else FalseStatement
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs
index a5957a81f..57dd6d6da 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Label:
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs
index 720c1a12b..b40293c09 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// lock (Expression) EmbeddedStatement;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs
index f2366bc7d..60c8d1790 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// return Expression;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs
index 79028d388..218bbb0de 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs
@@ -17,9 +17,8 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Base class for statements.
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs
index 356f9aff7..57bfabfa1 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs
@@ -24,11 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// switch (Expression) { SwitchSections }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs
index f959d96d8..6531f9507 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// throw Expression;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs
index 6d0bd3f73..33f16e283 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs
@@ -24,11 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// try TryBlock CatchClauses finally FinallyBlock
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs
index 6b2050d54..a947d733a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// unchecked BodyBlock
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs
index 4b69f65af..751981417 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// unsafe { Body }
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs
index 9b35e55ed..814819e8d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// using (ResourceAcquisition) EmbeddedStatement
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs
index ec28dd401..3ab595ce6 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs
@@ -24,11 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class VariableDeclarationStatement : Statement
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs
index d229383c4..57211a096 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// "while (Condition) EmbeddedStatement"
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs
index 282148b63..8cb158c7b 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// yield break;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs
index 999dcdaf9..3ee6dd50f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// yield return Expression;
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs
index 9f2a0278d..858446041 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs
@@ -18,7 +18,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs
index e521d5e20..1ce3e13ae 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs
@@ -27,8 +27,6 @@
using System.Collections.Generic;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
@@ -122,7 +120,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
}
- protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{
SyntaxTree o = other as SyntaxTree;
return o != null && this.Members.DoMatch(o.Members, match);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs
index ef4f5ff65..b49bbf7dd 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs
@@ -19,7 +19,6 @@
using System;
using System.ComponentModel;
using System.Globalization;
-using ICSharpCode.NRefactory.Editor;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs
index 8917d1600..dd41e83b7 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs
@@ -24,11 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// get/set/add/remove
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs
index 0b40dcaa4..1a9b1cc3b 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs
@@ -24,10 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class ConstructorDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs
index 61c77d187..f2c25829e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs
@@ -24,10 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class DestructorDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs
index 4bde2f067..2bca3eb50 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs
@@ -16,13 +16,11 @@
// 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.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public abstract class EntityDeclaration : AstNode
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs
index e802d6594..ab7b8191e 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs
@@ -24,11 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class EnumMemberDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs
index d9dbaa239..a0c13e2d7 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs
@@ -25,12 +25,10 @@
// THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.ComponentModel;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class EventDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs
index 2add610bc..6a2dca997 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs
@@ -26,10 +26,9 @@
using System;
using System.ComponentModel;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class FieldDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs
index dfb4ef652..b9c2f3d20 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs
@@ -23,11 +23,9 @@
// 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 ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class FixedFieldDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs
index 095ecb5a7..f4a826bcb 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs
@@ -24,10 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
///
/// Name [ CountExpression ]
@@ -96,7 +94,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitFixedVariableInitializer (this, data);
}
- protected internal override bool DoMatch (AstNode other, ICSharpCode.NRefactory.PatternMatching.Match match)
+ protected internal override bool DoMatch (AstNode other, PatternMatching.Match match)
{
var o = other as FixedVariableInitializer;
return o != null && MatchString (this.Name, o.Name) && this.CountExpression.DoMatch (o.CountExpression, match);
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs
index 8ee17a57a..e5ce84ba1 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs
@@ -26,10 +26,9 @@
using System;
using System.ComponentModel;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class IndexerDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs
index 4141cd137..ee91ad37d 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs
@@ -24,10 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class MethodDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs
index b20d8cd67..c7777db8f 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs
@@ -26,10 +26,9 @@
using System;
using System.ComponentModel;
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum OperatorType
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs
index 69e52279e..fad67c387 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs
@@ -24,12 +24,8 @@
// 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.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public enum ParameterModifier {
None,
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs
index c2a82ccea..4b6030381 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs
@@ -24,10 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class PropertyDeclaration : EntityDeclaration
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs
index 4caf747a4..91eeafd76 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs
@@ -24,9 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.Decompiler.CSharp.Syntax;
-namespace ICSharpCode.NRefactory.CSharp
+namespace ICSharpCode.Decompiler.CSharp.Syntax
{
public class VariableInitializer : AstNode
{
diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
index a50c2bd53..9f9a949f2 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
@@ -26,9 +26,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
-using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs b/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs
index 7ba94ddb5..c0ee1c56a 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs
@@ -16,10 +16,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs b/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs
index ef6927dff..477074c8e 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs
@@ -16,12 +16,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs b/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs
index efa174ffa..b9cb4b9df 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs
@@ -16,14 +16,12 @@
// 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.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp.Transforms
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs b/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs
index 887cc6b5f..910256740 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs
@@ -18,10 +18,8 @@
using System;
using System.Linq;
-using System.Reflection;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp.Transforms
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs
index 93398cccb..1d8ce6a56 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs
@@ -16,11 +16,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs b/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs
index fe43041f7..fdf327e4f 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs
@@ -16,18 +16,15 @@
// 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.Diagnostics;
using System.Linq;
-using System.Threading;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs b/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs
index ce2af1cfa..91eaa7e7b 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs
@@ -16,11 +16,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs b/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs
index 505bc0f40..1c903d924 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs
@@ -16,13 +16,11 @@
// 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.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs
index f743bba27..b933a48f8 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs
@@ -16,10 +16,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using System.Threading;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs
index 83f1cd851..04504b4b7 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs
@@ -16,10 +16,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
index 8bea7c0ba..c2514e599 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs
@@ -24,8 +24,6 @@ using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
@@ -174,7 +172,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
return;
}
// HACK : ignore type names in attributes (TypeSystemAstBuilder doesn't handle them correctly)
- if (simpleType.Parent is NRefactory.CSharp.Attribute) {
+ if (simpleType.Parent is Syntax.Attribute) {
base.VisitSimpleType(simpleType);
return;
}
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs
index b79d743cc..fb55b5b2e 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs
@@ -21,11 +21,10 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory.PatternMatching;
using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp.Transforms
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs b/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs
index 16082f96e..3ce28339e 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs
@@ -16,16 +16,12 @@
// 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 System.Reflection;
using ICSharpCode.Decompiler.CSharp.Syntax;
+using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.PatternMatching;
using Mono.Cecil;
-using Ast = ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Transforms
{
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
index b8b085cfb..5c898b033 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Threading;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs b/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs
index 36ca422f4..b1805ac86 100644
--- a/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs
+++ b/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs
@@ -22,7 +22,6 @@ using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.Transforms;
-using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/CSharp/TranslationContext.cs b/ICSharpCode.Decompiler/CSharp/TranslationContext.cs
index 7b492201b..19c510f98 100644
--- a/ICSharpCode.Decompiler/CSharp/TranslationContext.cs
+++ b/ICSharpCode.Decompiler/CSharp/TranslationContext.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.CSharp
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs
index 5fafb46a7..004216e7d 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs
@@ -23,7 +23,6 @@ using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs
index a08a3591b..2e2e18fbd 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs
@@ -19,17 +19,16 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Resolver;
+using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
// Contains representations for constant C# expressions.
// We use these instead of storing the full AST to reduce the memory usage.
-
+
[Serializable]
public abstract class ConstantExpression : IConstantValue
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
index b09db3d14..e00bede0e 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs
@@ -23,7 +23,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs
index 786de505e..89f1c88d8 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs
@@ -22,7 +22,6 @@ using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs
index fac4346e9..707972dfa 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs
@@ -22,12 +22,11 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using ICSharpCode.Decompiler.CSharp.Resolver;
+using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs
index 96232e1e6..f3d950bdb 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs
@@ -23,7 +23,6 @@ using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs
index 1a1ab1820..47a91c34f 100644
--- a/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs
+++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs
@@ -18,10 +18,10 @@
using System;
using System.Collections.Generic;
+using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
index 9288fb9c6..73b56baad 100644
--- a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
+++ b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
@@ -29,7 +29,6 @@ using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.Transforms;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory.CSharp;
using Mono.Cecil;
namespace ICSharpCode.Decompiler.CSharp
diff --git a/ICSharpCode.Decompiler/DecompilerSettings.cs b/ICSharpCode.Decompiler/DecompilerSettings.cs
index 090465b3a..091026c7a 100644
--- a/ICSharpCode.Decompiler/DecompilerSettings.cs
+++ b/ICSharpCode.Decompiler/DecompilerSettings.cs
@@ -19,7 +19,6 @@
using System;
using System.ComponentModel;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler
{
diff --git a/ICSharpCode.Decompiler/Disassembler/ILStructure.cs b/ICSharpCode.Decompiler/Disassembler/ILStructure.cs
index 34d63e808..92a21e922 100644
--- a/ICSharpCode.Decompiler/Disassembler/ILStructure.cs
+++ b/ICSharpCode.Decompiler/Disassembler/ILStructure.cs
@@ -16,7 +16,6 @@
// 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.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs b/ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs
index 16d35fe5d..534bfe9d1 100644
--- a/ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs
+++ b/ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs
@@ -18,10 +18,7 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Threading;
-
-using ICSharpCode.Decompiler;
using Mono.Cecil;
using Mono.Cecil.Cil;
diff --git a/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs b/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
index 523bc8203..d03bdfd51 100644
--- a/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
+++ b/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
@@ -18,9 +18,6 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
using System.Threading;
using Mono.Cecil;
using Mono.Collections.Generic;
diff --git a/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs b/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs
deleted file mode 100644
index b1013b6c2..000000000
--- a/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2010-2013 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 ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.Editor;
-
-namespace ICSharpCode.NRefactory.Documentation
-{
- ///
- /// Represents a documentation comment.
- ///
- public class DocumentationComment
- {
- ITextSource xml;
- protected readonly ITypeResolveContext context;
-
- ///
- /// Gets the XML code for this documentation comment.
- ///
- public ITextSource Xml {
- get { return xml; }
- }
-
- ///
- /// Creates a new DocumentationComment.
- ///
- /// The XML text.
- /// Context for resolving cref attributes.
- public DocumentationComment(ITextSource xml, ITypeResolveContext context)
- {
- if (xml == null)
- throw new ArgumentNullException("xml");
- if (context == null)
- throw new ArgumentNullException("context");
- this.xml = xml;
- this.context = context;
- }
-
- ///
- /// Creates a new DocumentationComment.
- ///
- /// The XML text.
- /// Context for resolving cref attributes.
- public DocumentationComment(string xml, ITypeResolveContext context)
- {
- if (xml == null)
- throw new ArgumentNullException("xml");
- if (context == null)
- throw new ArgumentNullException("context");
- this.xml = new StringTextSource(xml);
- this.context = context;
- }
-
- ///
- /// Resolves the given cref value to an entity.
- /// Returns null if the entity is not found, or if the cref attribute is syntactically invalid.
- ///
- public virtual IEntity ResolveCref(string cref)
- {
- try {
- return IdStringProvider.FindEntity(cref, context);
- } catch (ReflectionNameParseException) {
- return null;
- }
- }
-
- public override string ToString ()
- {
- return Xml.Text;
- }
-
- public static implicit operator string (DocumentationComment documentationComment)
- {
- if (documentationComment != null)
- return documentationComment.ToString ();
- return null;
- }
- }
-}
diff --git a/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs b/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs
deleted file mode 100644
index be944095c..000000000
--- a/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2010-2013 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.IO;
-using ICSharpCode.Decompiler.TypeSystem;
-
-namespace ICSharpCode.NRefactory.Documentation
-{
- ///
- /// Provides XML documentation for entities.
- ///
- public interface IDocumentationProvider
- {
- ///
- /// Gets the XML documentation for the specified entity.
- ///
- DocumentationComment GetDocumentation(IEntity entity);
- }
-
- ///
- /// Provides XML documentation for entities.
- ///
- public interface IUnresolvedDocumentationProvider
- {
- ///
- /// Gets the XML documentation for the specified entity.
- ///
- string GetDocumentation(IUnresolvedEntity entity);
-
- ///
- /// Gets the XML documentation for the specified entity.
- ///
- DocumentationComment GetDocumentation(IUnresolvedEntity entity, IEntity resolvedEntity);
- }
-}
diff --git a/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs b/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs
index 44d57920d..415297ad6 100644
--- a/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs
+++ b/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Linq;
using System.Collections.Generic;
using System.Text;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs b/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs
index a79a052ba..c7495d094 100644
--- a/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs
+++ b/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs
@@ -38,7 +38,7 @@ namespace ICSharpCode.NRefactory.Documentation
/// If the .xml file is changed, the index will automatically be recreated.
///
[Serializable]
- public class XmlDocumentationProvider : IDocumentationProvider, IDeserializationCallback
+ public class XmlDocumentationProvider : IDeserializationCallback
{
#region Cache
sealed class XmlDocumentationCache
@@ -377,19 +377,6 @@ namespace ICSharpCode.NRefactory.Documentation
}
#endregion
- #region GetDocumentation for entity
- ///
- public DocumentationComment GetDocumentation(IEntity entity)
- {
- string xmlDoc = GetDocumentation(IdStringProvider.GetIdString(entity));
- if (xmlDoc != null) {
- return new DocumentationComment(new StringTextSource(xmlDoc), new SimpleTypeResolveContext(entity));
- } else {
- return null;
- }
- }
- #endregion
-
#region Load / Read XML
string LoadDocumentation(string key, int positionInFile)
{
diff --git a/ICSharpCode.Decompiler/Editor/IDocumentLine.cs b/ICSharpCode.Decompiler/Editor/IDocumentLine.cs
index e10dc4ebb..c1200d1f9 100644
--- a/ICSharpCode.Decompiler/Editor/IDocumentLine.cs
+++ b/ICSharpCode.Decompiler/Editor/IDocumentLine.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
namespace ICSharpCode.NRefactory.Editor
{
diff --git a/ICSharpCode.Decompiler/Editor/ISegment.cs b/ICSharpCode.Decompiler/Editor/ISegment.cs
index 58a84fea4..53e9d3477 100644
--- a/ICSharpCode.Decompiler/Editor/ISegment.cs
+++ b/ICSharpCode.Decompiler/Editor/ISegment.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
namespace ICSharpCode.NRefactory.Editor
{
diff --git a/ICSharpCode.Decompiler/Editor/UnicodeNewline.cs b/ICSharpCode.Decompiler/Editor/UnicodeNewline.cs
index 5fa8a6b62..4986cbf79 100644
--- a/ICSharpCode.Decompiler/Editor/UnicodeNewline.cs
+++ b/ICSharpCode.Decompiler/Editor/UnicodeNewline.cs
@@ -25,7 +25,7 @@
// THE SOFTWARE.
using System;
-namespace ICSharpCode.NRefactory
+namespace ICSharpCode.NRefactory.Editor
{
public enum UnicodeNewline {
Unknown,
diff --git a/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs b/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs
index a95b88922..f9aaabb30 100644
--- a/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs
+++ b/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs
@@ -19,7 +19,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
namespace ICSharpCode.Decompiler.FlowAnalysis
{
diff --git a/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs b/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs
index 3d897a970..a219e9ff6 100644
--- a/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs
+++ b/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs b/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs
index 8037d8611..48eae66cf 100644
--- a/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs
+++ b/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs
@@ -16,7 +16,6 @@
// 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.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs b/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs
index 409c269b7..adf1a58e6 100644
--- a/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs
+++ b/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs
@@ -17,9 +17,7 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.IL;
diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index b33fb0862..5b138a671 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -273,9 +273,7 @@
-
-
@@ -561,16 +559,16 @@
-
-
- CSharp\Ast\PatternMatching\Pattern Matching.html
-
-
Documentation\XML Documentation.html
+
+
+ CSharp\Syntax\PatternMatching\Pattern Matching.html
+
+
diff --git a/ICSharpCode.Decompiler/IL/BlockBuilder.cs b/ICSharpCode.Decompiler/IL/BlockBuilder.cs
index ffd0036cc..bfa9d81af 100644
--- a/ICSharpCode.Decompiler/IL/BlockBuilder.cs
+++ b/ICSharpCode.Decompiler/IL/BlockBuilder.cs
@@ -21,8 +21,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs
index c1b763c8f..59e76a5a7 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs
@@ -16,8 +16,6 @@
// 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;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.FlowAnalysis;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs b/ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs
index 3f92dd864..031a66015 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs
@@ -15,7 +15,6 @@
// 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.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs b/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs
index f9f7684c0..9efaee404 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs
@@ -16,7 +16,6 @@
// 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.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/IntroduceExitPoints.cs b/ICSharpCode.Decompiler/IL/ControlFlow/IntroduceExitPoints.cs
index e01975d97..4a8cbb79a 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/IntroduceExitPoints.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/IntroduceExitPoints.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using ICSharpCode.Decompiler.IL.Transforms;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
index 07aa55061..b2ecd7e3f 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
@@ -16,7 +16,6 @@
// 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.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs
index 68e7fe403..c8c709cf9 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
index eda0a541d..e5b5ded4a 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
@@ -20,8 +20,6 @@ using ICSharpCode.Decompiler.IL.Transforms;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Diagnostics;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/IInlineContext.cs b/ICSharpCode.Decompiler/IL/IInlineContext.cs
index 917811180..7ae383bcf 100644
--- a/ICSharpCode.Decompiler/IL/IInlineContext.cs
+++ b/ICSharpCode.Decompiler/IL/IInlineContext.cs
@@ -15,7 +15,6 @@
// 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;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/ILOpCodes.cs b/ICSharpCode.Decompiler/IL/ILOpCodes.cs
index f6a5bfb34..7a9f59aaa 100644
--- a/ICSharpCode.Decompiler/IL/ILOpCodes.cs
+++ b/ICSharpCode.Decompiler/IL/ILOpCodes.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
namespace ICSharpCode.Decompiler.IL
{
enum ILOpCode : ushort
diff --git a/ICSharpCode.Decompiler/IL/ILReader.cs b/ICSharpCode.Decompiler/IL/ILReader.cs
index 7d2caf5e0..7b632a8cc 100644
--- a/ICSharpCode.Decompiler/IL/ILReader.cs
+++ b/ICSharpCode.Decompiler/IL/ILReader.cs
@@ -19,8 +19,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Collections.Immutable;
using System.Diagnostics;
using Mono.Cecil;
diff --git a/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs b/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs
index d46a69c31..89f998823 100644
--- a/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs
+++ b/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs
@@ -17,12 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using Mono.Cecil;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/ILVariable.cs b/ICSharpCode.Decompiler/IL/ILVariable.cs
index 95fb5351d..621fda052 100644
--- a/ICSharpCode.Decompiler/IL/ILVariable.cs
+++ b/ICSharpCode.Decompiler/IL/ILVariable.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/InstructionFlags.cs b/ICSharpCode.Decompiler/IL/InstructionFlags.cs
index a805d5ff9..6c0894643 100644
--- a/ICSharpCode.Decompiler/IL/InstructionFlags.cs
+++ b/ICSharpCode.Decompiler/IL/InstructionFlags.cs
@@ -17,10 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs b/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs
index 7832dbd77..7efdf4107 100644
--- a/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs
+++ b/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs
@@ -16,11 +16,6 @@
// 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 System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.Disassembler;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Instructions.cs b/ICSharpCode.Decompiler/IL/Instructions.cs
index eda5384da..76c54c025 100644
--- a/ICSharpCode.Decompiler/IL/Instructions.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
index 66c80b74e..ef9fa0543 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
@@ -18,11 +18,10 @@
using System;
using System.Diagnostics;
-using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL
-{
+{
public enum BinaryNumericOperator : byte
{
None,
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Block.cs b/ICSharpCode.Decompiler/IL/Instructions/Block.cs
index cf634d359..d53e568dd 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Block.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Block.cs
@@ -16,13 +16,9 @@
// 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.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.IL.Transforms;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs b/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs
index e1bf24c5c..8673f4791 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs
@@ -18,11 +18,8 @@
using System;
using System.Collections.Generic;
-using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Branch.cs b/ICSharpCode.Decompiler/IL/Instructions/Branch.cs
index 0252f9ede..aea2885a5 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Branch.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Branch.cs
@@ -17,12 +17,7 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs
index e873f9603..016180ea1 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs
@@ -17,11 +17,7 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.Disassembler;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Comp.cs b/ICSharpCode.Decompiler/IL/Instructions/Comp.cs
index 07c391e6f..4adcaab8d 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Comp.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Comp.cs
@@ -18,9 +18,8 @@
using System;
using System.Diagnostics;
-using System.Linq;
+using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.IL
{
public enum ComparisonKind : byte
diff --git a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
index e9a1de69d..77acb628e 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
-using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Conv.cs b/ICSharpCode.Decompiler/IL/Instructions/Conv.cs
index 794768d60..8342c8347 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Conv.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Conv.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Instructions/IfInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/IfInstruction.cs
index ed7e87441..69809efa3 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/IfInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/IfInstruction.cs
@@ -16,8 +16,6 @@
// 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.Diagnostics;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/InstructionCollection.cs b/ICSharpCode.Decompiler/IL/Instructions/InstructionCollection.cs
index 84fa56e71..747541260 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/InstructionCollection.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/InstructionCollection.cs
@@ -18,9 +18,6 @@
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/LdLen.cs b/ICSharpCode.Decompiler/IL/Instructions/LdLen.cs
index d78c1911d..6075fd941 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/LdLen.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/LdLen.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Leave.cs b/ICSharpCode.Decompiler/IL/Instructions/Leave.cs
index 5b05cae34..e8856ca31 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Leave.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Leave.cs
@@ -16,13 +16,7 @@
// 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.Collections.Immutable;
using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/MemoryInstructions.cs b/ICSharpCode.Decompiler/IL/Instructions/MemoryInstructions.cs
index d68d4bf63..07204374b 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/MemoryInstructions.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/MemoryInstructions.cs
@@ -16,13 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using ICSharpCode.Decompiler.Disassembler;
-using Mono.Cecil;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs b/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs
index 271cf20d8..491e6bb16 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/Return.cs b/ICSharpCode.Decompiler/IL/Instructions/Return.cs
index 053293692..f3aa34457 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/Return.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/Return.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
namespace ICSharpCode.Decompiler.IL
diff --git a/ICSharpCode.Decompiler/IL/Instructions/SimpleInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/SimpleInstruction.cs
index 2079340f8..457be97ef 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/SimpleInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/SimpleInstruction.cs
@@ -16,12 +16,6 @@
// 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 System.Text;
-using System.Threading.Tasks;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs
index b9aa0c03b..c855a71a3 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs
@@ -16,8 +16,6 @@
// 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.Immutable;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs
index 1b8eecbf4..bfbaa2806 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
diff --git a/ICSharpCode.Decompiler/IL/Instructions/UnaryInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/UnaryInstruction.cs
index 8735f6d58..914919c27 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/UnaryInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/UnaryInstruction.cs
@@ -16,10 +16,6 @@
// 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.Diagnostics;
-using System.Linq;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Instructions/VariableScope.cs b/ICSharpCode.Decompiler/IL/Instructions/VariableScope.cs
index 39c40765c..7cbf60ee4 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/VariableScope.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/VariableScope.cs
@@ -19,7 +19,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Patterns/ListMatch.cs b/ICSharpCode.Decompiler/IL/Patterns/ListMatch.cs
index f5230cce7..a22999434 100644
--- a/ICSharpCode.Decompiler/IL/Patterns/ListMatch.cs
+++ b/ICSharpCode.Decompiler/IL/Patterns/ListMatch.cs
@@ -16,7 +16,6 @@
// 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;
namespace ICSharpCode.Decompiler.IL.Patterns
diff --git a/ICSharpCode.Decompiler/IL/Patterns/Match.cs b/ICSharpCode.Decompiler/IL/Patterns/Match.cs
index 8b01293f8..1c6a55ce4 100644
--- a/ICSharpCode.Decompiler/IL/Patterns/Match.cs
+++ b/ICSharpCode.Decompiler/IL/Patterns/Match.cs
@@ -16,7 +16,6 @@
// 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;
namespace ICSharpCode.Decompiler.IL.Patterns
diff --git a/ICSharpCode.Decompiler/IL/PrimitiveType.cs b/ICSharpCode.Decompiler/IL/PrimitiveType.cs
index 092b7e169..46d2a319c 100644
--- a/ICSharpCode.Decompiler/IL/PrimitiveType.cs
+++ b/ICSharpCode.Decompiler/IL/PrimitiveType.cs
@@ -17,11 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using Mono.Cecil;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/SemanticHelper.cs b/ICSharpCode.Decompiler/IL/SemanticHelper.cs
index da94b41c6..38328d1f7 100644
--- a/ICSharpCode.Decompiler/IL/SemanticHelper.cs
+++ b/ICSharpCode.Decompiler/IL/SemanticHelper.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Linq;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/SlotInfo.cs b/ICSharpCode.Decompiler/IL/SlotInfo.cs
index 27fe156bd..e72d8e897 100644
--- a/ICSharpCode.Decompiler/IL/SlotInfo.cs
+++ b/ICSharpCode.Decompiler/IL/SlotInfo.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/StackType.cs b/ICSharpCode.Decompiler/IL/StackType.cs
index 89e068679..b2a4381a1 100644
--- a/ICSharpCode.Decompiler/IL/StackType.cs
+++ b/ICSharpCode.Decompiler/IL/StackType.cs
@@ -16,11 +16,6 @@
// 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 System.Text;
-using System.Threading.Tasks;
namespace ICSharpCode.Decompiler.IL
{
diff --git a/ICSharpCode.Decompiler/IL/Transforms/BlockTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/BlockTransform.cs
index de2497639..28eb829d2 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/BlockTransform.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/BlockTransform.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.FlowAnalysis;
using ICSharpCode.Decompiler.IL.ControlFlow;
diff --git a/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs b/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs
index f5e57a530..b9cb27850 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs
@@ -16,11 +16,7 @@
// 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.Decompiler.CSharp;
-using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL.Transforms
diff --git a/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs b/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
index 031555db2..53c58bc04 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
@@ -16,8 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs b/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs
index fcda190c0..e3ef51bde 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.CSharp;
-using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL.Transforms
diff --git a/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs b/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs
index 8171079bd..84fa7adab 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs
index 8166b547f..ab9709a71 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
using System.Diagnostics;
using System.Threading;
using ICSharpCode.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
index 373e7cdbf..f0a24fa4f 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
@@ -17,11 +17,8 @@
// DEALINGS IN THE SOFTWARE.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-using Mono.Cecil;
-using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.IL.Transforms
diff --git a/ICSharpCode.Decompiler/IL/Transforms/LoopingTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/LoopingTransform.cs
index 9613800b6..f216cb49b 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/LoopingTransform.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/LoopingTransform.cs
@@ -16,10 +16,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using System.Linq;
using System.Collections.Generic;
-using System.Collections.Immutable;
namespace ICSharpCode.Decompiler.IL.Transforms
{
diff --git a/ICSharpCode.Decompiler/IL/Transforms/RemoveDeadVariableInit.cs b/ICSharpCode.Decompiler/IL/Transforms/RemoveDeadVariableInit.cs
index 7252ef93f..71532deb5 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/RemoveDeadVariableInit.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/RemoveDeadVariableInit.cs
@@ -16,9 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using System.Diagnostics;
-using System.Linq;
using ICSharpCode.Decompiler.FlowAnalysis;
namespace ICSharpCode.Decompiler.IL.Transforms
diff --git a/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs b/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs
index cb6a424d6..514883add 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs
@@ -16,9 +16,7 @@
// 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.Diagnostics;
using System.Linq;
using ICSharpCode.Decompiler.FlowAnalysis;
using ICSharpCode.Decompiler.Util;
diff --git a/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs b/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs
index d39eea79d..eef39e433 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs
@@ -20,8 +20,6 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.IL.Transforms
diff --git a/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
index c8e8b4545..81a335a5c 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
@@ -16,8 +16,6 @@
// 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.Decompiler.TypeSystem;
diff --git a/ICSharpCode.Decompiler/Output/ITextOutput.cs b/ICSharpCode.Decompiler/Output/ITextOutput.cs
index 5fe83124b..9f8c0bcf9 100644
--- a/ICSharpCode.Decompiler/Output/ITextOutput.cs
+++ b/ICSharpCode.Decompiler/Output/ITextOutput.cs
@@ -16,9 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
-using System.IO;
-using Mono.Cecil;
namespace ICSharpCode.Decompiler
{
diff --git a/ICSharpCode.Decompiler/Output/PlainTextOutput.cs b/ICSharpCode.Decompiler/Output/PlainTextOutput.cs
index c2d44c8db..d598b4bd6 100644
--- a/ICSharpCode.Decompiler/Output/PlainTextOutput.cs
+++ b/ICSharpCode.Decompiler/Output/PlainTextOutput.cs
@@ -19,7 +19,6 @@
using System;
using System.IO;
using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler
{
diff --git a/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs b/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs
index 277d2a656..495001a9d 100644
--- a/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs
+++ b/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.Semantics
{
diff --git a/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs b/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs
index 0536bc4a8..568d915cf 100644
--- a/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs
+++ b/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs
@@ -10,7 +10,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
{
class RemoveCompilerAttribute : DepthFirstAstVisitor, IAstTransform
{
- public override object VisitAttribute(NRefactory.CSharp.Attribute attribute, object data)
+ public override object VisitAttribute(CSharp.Syntax.Attribute attribute, object data)
{
var section = (AttributeSection)attribute.Parent;
SimpleType type = attribute.Type as SimpleType;
diff --git a/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs b/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs
index cc2728443..858ebcc5e 100644
--- a/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs b/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs
index d0be4d384..3a454a163 100644
--- a/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs b/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs
index af3622fc5..7978c43e8 100644
--- a/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs
@@ -67,11 +67,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
/// Gets/Sets the cancellation token used by the assembly loader.
///
public CancellationToken CancellationToken { get; set; }
-
- ///
- /// Gets/Sets the documentation provider that is used to retrieve the XML documentation for all members.
- ///
- public IDocumentationProvider DocumentationProvider { get; set; }
[CLSCompliant(false)]
protected InterningProvider interningProvider = new SimpleInterningProvider();
diff --git a/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs b/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs
index 2e07e6d20..f8e2d1662 100644
--- a/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs
@@ -25,7 +25,6 @@ using System.Runtime.InteropServices;
using System.Threading;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Documentation;
using Mono.Cecil;
@@ -103,7 +102,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
#endregion
ModuleDefinition currentModule;
- CecilUnresolvedAssembly currentAssembly;
+ DefaultUnresolvedAssembly currentAssembly;
///
/// Initializes a new instance of the class.
@@ -180,7 +179,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
assemblyAttributes = interningProvider.InternList(assemblyAttributes);
moduleAttributes = interningProvider.InternList(moduleAttributes);
- this.currentAssembly = new CecilUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name, this.DocumentationProvider);
+ this.currentAssembly = new DefaultUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name);
currentAssembly.Location = moduleDefinition.FullyQualifiedName;
ExtensionMethods.AddRange(currentAssembly.AssemblyAttributes, assemblyAttributes);
ExtensionMethods.AddRange(currentAssembly.ModuleAttributes, assemblyAttributes);
@@ -273,28 +272,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
}
#endregion
- #region IUnresolvedAssembly implementation
- [Serializable]
- sealed class CecilUnresolvedAssembly : DefaultUnresolvedAssembly, IDocumentationProvider
- {
- readonly IDocumentationProvider documentationProvider;
-
- public CecilUnresolvedAssembly(string fullAssemblyName, IDocumentationProvider documentationProvider)
- : base(fullAssemblyName)
- {
- this.documentationProvider = documentationProvider;
- }
-
- DocumentationComment IDocumentationProvider.GetDocumentation(IEntity entity)
- {
- if (documentationProvider != null)
- return documentationProvider.GetDocumentation(entity);
- else
- return null;
- }
- }
- #endregion
-
#region Load Assembly From Disk
public override IUnresolvedAssembly LoadAssemblyFile(string fileName)
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/IEntity.cs b/ICSharpCode.Decompiler/TypeSystem/IEntity.cs
index 9b0bd1f52..d842a8a30 100644
--- a/ICSharpCode.Decompiler/TypeSystem/IEntity.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/IEntity.cs
@@ -140,11 +140,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
///
IList Attributes { get; }
- ///
- /// Gets the documentation for this entity.
- ///
- DocumentationComment Documentation { get; }
-
///
/// Gets whether this entity is static.
/// Returns true if either the 'static' or the 'const' modifier is set.
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs
index c8049d4c8..ee2efaa20 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs
index 25dc466ba..6b06d3a21 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs
@@ -71,25 +71,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
}
public IList Attributes { get; protected set; }
-
- public virtual DocumentationComment Documentation {
- get {
- IDocumentationProvider provider = FindDocumentation(parentContext);
- if (provider != null)
- return provider.GetDocumentation(this);
- else
- return null;
- }
- }
-
- internal static IDocumentationProvider FindDocumentation(ITypeResolveContext context)
- {
- IAssembly asm = context.CurrentAssembly;
- if (asm != null)
- return asm.UnresolvedAssembly as IDocumentationProvider;
- else
- return null;
- }
public abstract ISymbolReference ToReference();
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs
index 3e4862846..2f26ab8d8 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs
@@ -19,7 +19,6 @@
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Documentation;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
@@ -93,18 +92,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
}
}
- public override DocumentationComment Documentation {
- get {
- IUnresolvedDocumentationProvider docProvider = unresolved.UnresolvedFile as IUnresolvedDocumentationProvider;
- if (docProvider != null) {
- var doc = docProvider.GetDocumentation(unresolved, this);
- if (doc != null)
- return doc;
- }
- return base.Documentation;
- }
- }
-
public bool IsExplicitInterfaceImplementation {
get { return unresolved.IsExplicitInterfaceImplementation; }
}
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs
index 9a7e52538..2e95791cd 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs
index e092f2fc4..9e63c5799 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs
index dcdae321d..f6a6b66d6 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs
index 1c56415ee..08ad1b9b6 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs
index e2cee004a..49f277bd3 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs
@@ -19,7 +19,6 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs
index ac1b72dc1..c4e2ad20c 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs
@@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE.
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs
index da99081de..35dcc82e8 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs
@@ -18,7 +18,6 @@
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs
index 958bba3e6..2c572e51b 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs
index a78631e49..60db2dbdb 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs
@@ -19,7 +19,6 @@
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
index 30ba51672..beb706d54 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Documentation;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
@@ -622,24 +621,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
get { return parentContext.CurrentAssembly; }
}
- public virtual DocumentationComment Documentation {
- get {
- foreach (var part in parts) {
- var unresolvedProvider = part.UnresolvedFile as IUnresolvedDocumentationProvider;
- if (unresolvedProvider != null) {
- var doc = unresolvedProvider.GetDocumentation(part, this);
- if (doc != null)
- return doc;
- }
- }
- IDocumentationProvider provider = AbstractResolvedEntity.FindDocumentation(parentContext);
- if (provider != null)
- return provider.GetDocumentation(this);
- else
- return null;
- }
- }
-
public ICompilation Compilation {
get { return parentContext.Compilation; }
}
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs
index d3297f8e4..476611619 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs
@@ -18,7 +18,6 @@
using System.Collections.Generic;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs
index f9e12b7d5..b17ce3795 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs
@@ -20,7 +20,6 @@ using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
index e716282a4..a9ac6a727 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs
@@ -22,7 +22,6 @@ using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs
index 5b9b46e53..474d45dc2 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs
@@ -19,7 +19,6 @@
using System.Collections.Generic;
using System.Threading;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs
index 8774d2f3a..36a2f6530 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs
@@ -30,7 +30,6 @@ using System.Diagnostics;
using System.Threading;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs
index 326d5fa77..caa491d23 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Runtime.CompilerServices;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs
index e8046d9a1..6ebb7d959 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs
@@ -23,7 +23,6 @@ using System.Linq;
using System.Text;
using System.Threading;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Documentation;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
@@ -230,10 +229,6 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
get { return baseMember.IsExplicitInterfaceImplementation; }
}
- public DocumentationComment Documentation {
- get { return baseMember.Documentation; }
- }
-
public Accessibility Accessibility {
get { return baseMember.Accessibility; }
}
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs
index 3d04f458a..bec4e1f0f 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs
@@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs
index 74ff9473a..d0c34b602 100644
--- a/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs
@@ -19,7 +19,6 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem.Implementation
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs b/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs
index 53a53cef1..b7796d129 100644
--- a/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs
@@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-using System;
namespace ICSharpCode.Decompiler.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs
index c748f861d..106f837da 100644
--- a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs
@@ -23,7 +23,6 @@ using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
-using ICSharpCode.NRefactory;
namespace ICSharpCode.Decompiler.TypeSystem
{
diff --git a/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs b/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs
index 25183a160..66ee9252c 100644
--- a/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs
@@ -270,10 +270,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
get { return baseMethod.Attributes; }
}
- public ICSharpCode.NRefactory.Documentation.DocumentationComment Documentation {
- get { return baseMethod.Documentation; }
- }
-
public bool IsStatic {
get { return baseMethod.IsStatic; }
}
diff --git a/ILSpy.AddIn/CodeElementXmlDocKeyProvider.cs b/ILSpy.AddIn/CodeElementXmlDocKeyProvider.cs
index 6a3b7281e..daffa9865 100644
--- a/ILSpy.AddIn/CodeElementXmlDocKeyProvider.cs
+++ b/ILSpy.AddIn/CodeElementXmlDocKeyProvider.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.ILSpy.AddIn
diff --git a/doc/Pattern Matching.html b/doc/Pattern Matching.html
new file mode 100644
index 000000000..88ea83e22
--- /dev/null
+++ b/doc/Pattern Matching.html
@@ -0,0 +1,115 @@
+
+NRefactory Pattern Matching
+
+ The pattern matching API for the C# AST is similar to how regular
+ expressions work in .NET, except that it's working with AstNodes
+ instead of characters.
+ First you declare a pattern, for example: "X a = new X(...);".
+ var pattern = new VariableDeclarationStatement {
+ Type = newAnyNode("type"),
+ Variables = {
+ new VariableInitializer {
+ Name = Pattern.AnyString,
+ Initializer = new ObjectCreateExpression {
+ Type = newBackreference("type"),
+ Arguments = {newRepeat(newAnyNode())}
+ Initializer = newOptionalNode(newAnyNode())
+ }
+ }
+ }};
+
+ This is a pattern AST - it is a C# AST using the normal C#
+ AST classes, but also contains special pattern nodes
+ (AnyNode, Repeat, OptionalNode, Backreference, NamedNode, Choice,
+ ...).
+ If you call
+ Match m = pattern.Match(someNode);
+ then m.Success will be true if someNode is a
+ VariableDeclarationStatement that declares a single variable, which
+ is initialized to a new object of the variable type.
+ Basically, Match performs a comparison of the pattern AST with
+ someNode. If the pattern AST does not contain any pattern nodes, the
+ match will be successful if the ASTs are syntactically identical
+ (whitespace/comments are not compared).
+ AnyNode will match any non-null node, and optionally store the
+ node it was matched against in a named capture group.
+ Backreference will match any node that is syntactically identical
+ to the node that was previously stored in the named capture group.
+ Repeat can be used only in AstNodeCollections and will try to
+ match its child pattern against any number of nodes - this is
+ equivalent to * (Kleene star) in regular expressions.
+ OptionalNode will match null nodes, or will try to match its child
+ pattern against the node. OptionalNode can also be used in
+ AstNodeCollections, where it is equivalent to a Repeat with
+ MinCount=0 and MaxCount=1.
+
+ The resulting match object can also be used to retrieve the nodes
+ stored in the capture groups:
+ if(m.Success){
+ m.Get<AstType>("type").Single().ReplaceWith(newSimpleType("var"));
+ }
+
+ This feature was originally written for the decompiler in ILSpy, but
+ it is also very useful for refactorings. You can also implement
+ custom pattern nodes (derive from the Pattern base class) with
+ custom match logic - for example if you want to check the semantics
+ of a node.
+
\ No newline at end of file