Browse Source

Adjust namespaces

pull/728/merge
Christoph Wille 9 years ago
parent
commit
1ce8349dd9
  1. 10
      ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs
  2. 4
      ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs
  3. 1
      ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs
  4. 11
      ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs
  5. 5
      ICSharpCode.Decompiler/CSharp/Annotations.cs
  6. 9
      ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
  7. 24
      ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
  8. 2
      ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs
  9. 7
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
  10. 6
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpFormattingOptions.cs
  11. 14
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
  12. 3
      ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs
  13. 4
      ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs
  14. 5
      ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs
  15. 4
      ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs
  16. 12
      ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs
  17. 5
      ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs
  18. 4
      ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
  19. 8
      ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs
  20. 7
      ICSharpCode.Decompiler/CSharp/Resolver/AliasTypeResolveResult.cs
  21. 8
      ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs
  22. 9
      ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs
  23. 6
      ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs
  24. 11
      ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs
  25. 17
      ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs
  26. 7
      ICSharpCode.Decompiler/CSharp/Resolver/CastResolveResult.cs
  27. 8
      ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs
  28. 9
      ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs
  29. 10
      ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs
  30. 8
      ICSharpCode.Decompiler/CSharp/Resolver/DynamicMemberResolveResult.cs
  31. 8
      ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs
  32. 9
      ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs
  33. 7
      ICSharpCode.Decompiler/CSharp/Resolver/LambdaResolveResult.cs
  34. 3
      ICSharpCode.Decompiler/CSharp/Resolver/Log.cs
  35. 7
      ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs
  36. 13
      ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs
  37. 4
      ICSharpCode.Decompiler/CSharp/Resolver/NameLookupMode.cs
  38. 8
      ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
  39. 12
      ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs
  40. 2
      ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs
  41. 6
      ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs
  42. 3
      ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs
  43. 11
      ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs
  44. 7
      ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
  45. 41
      ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs
  46. 2
      ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs
  47. 22
      ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs
  48. 8
      ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs
  49. 10
      ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs
  50. 4
      ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs
  51. 13
      ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs
  52. 11
      ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs
  53. 6
      ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs
  54. 8
      ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs
  55. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs
  56. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs
  57. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs
  58. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs
  59. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs
  60. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs
  61. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs
  62. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs
  63. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs
  64. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs
  65. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs
  66. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs
  67. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs
  68. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs
  69. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs
  70. 5
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs
  71. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs
  72. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs
  73. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs
  74. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs
  75. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs
  76. 3
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs
  77. 3
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs
  78. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs
  79. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs
  80. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs
  81. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs
  82. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs
  83. 8
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs
  84. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs
  85. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs
  86. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs
  87. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs
  88. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs
  89. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs
  90. 2
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs
  91. 1
      ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs
  92. 2
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs
  93. 3
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs
  94. 2
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs
  95. 1
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs
  96. 3
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs
  97. 2
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs
  98. 1
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs
  99. 3
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs
  100. 1
      ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs
  101. Some files were not shown because too many files have changed in this diff Show More

10
ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs

@ -21,12 +21,10 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.NRefactory.CSharp.Resolver; using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.NRefactory.CSharp.TypeSystem; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Utils;
namespace ICSharpCode.NRefactory.CSharp.Analysis namespace ICSharpCode.NRefactory.CSharp.Analysis
{ {

4
ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs

@ -23,10 +23,12 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.NRefactory.Utils;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.NRefactory.CSharp.Analysis namespace ICSharpCode.NRefactory.CSharp.Analysis
{ {

1
ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp.Analysis namespace ICSharpCode.NRefactory.CSharp.Analysis
{ {

11
ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs

@ -21,13 +21,10 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp.Resolver; using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.NRefactory.CSharp.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Utils;
namespace ICSharpCode.NRefactory.CSharp.Analysis namespace ICSharpCode.NRefactory.CSharp.Analysis
{ {

5
ICSharpCode.Decompiler/CSharp/Annotations.cs

@ -19,10 +19,11 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.CSharp namespace ICSharpCode.Decompiler.CSharp
{ {

9
ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@ -21,17 +21,16 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.Decompiler.Ast; using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Resolver;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using Mono.Cecil; using Mono.Cecil;
using ICSharpCode.Decompiler.CSharp.Transforms; using ICSharpCode.Decompiler.CSharp.Transforms;
using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.IL.ControlFlow; using ICSharpCode.Decompiler.IL.ControlFlow;
using ICSharpCode.Decompiler.IL.Transforms; using ICSharpCode.Decompiler.IL.Transforms;
using ICSharpCode.NRefactory.CSharp.Refactoring; using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.CSharp namespace ICSharpCode.Decompiler.CSharp
{ {

24
ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs

@ -20,19 +20,19 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.Transforms; using ICSharpCode.Decompiler.CSharp.Transforms;
using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory; using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Refactoring;
using ICSharpCode.NRefactory.CSharp.Resolver;
using ICSharpCode.NRefactory.CSharp.TypeSystem;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ExpressionType = System.Linq.Expressions.ExpressionType; using ExpressionType = System.Linq.Expressions.ExpressionType;
using PrimitiveType = ICSharpCode.Decompiler.CSharp.Syntax.PrimitiveType;
namespace ICSharpCode.Decompiler.CSharp namespace ICSharpCode.Decompiler.CSharp
{ {
@ -92,13 +92,13 @@ namespace ICSharpCode.Decompiler.CSharp
var pe = expr as PrimitiveExpression; var pe = expr as PrimitiveExpression;
if (pe != null) { if (pe != null) {
if (pe.Value is sbyte) if (pe.Value is sbyte)
expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("sbyte")); expr = expr.CastTo(new PrimitiveType("sbyte"));
else if (pe.Value is byte) else if (pe.Value is byte)
expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("byte")); expr = expr.CastTo(new PrimitiveType("byte"));
else if (pe.Value is short) else if (pe.Value is short)
expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("short")); expr = expr.CastTo(new PrimitiveType("short"));
else if (pe.Value is ushort) else if (pe.Value is ushort)
expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("ushort")); expr = expr.CastTo(new PrimitiveType("ushort"));
} }
var exprRR = expr.Annotation<ResolveResult>(); var exprRR = expr.Annotation<ResolveResult>();
if (exprRR == null) { if (exprRR == null) {

2
ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs

@ -17,9 +17,9 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.PatternMatching; using ICSharpCode.NRefactory.PatternMatching;
using ICSharpCode.NRefactory.TypeSystem;
namespace ICSharpCode.Decompiler.CSharp namespace ICSharpCode.Decompiler.CSharp
{ {

7
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs

@ -18,10 +18,11 @@
using System; using System;
using System.IO; using System.IO;
using ICSharpCode.NRefactory.CSharp.Refactoring; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
/// <summary> /// <summary>
/// C# ambience. Used to convert type system symbols to text (usually for displaying the symbol to the user; e.g. in editor tooltips) /// C# ambience. Used to convert type system symbols to text (usually for displaying the symbol to the user; e.g. in editor tooltips)

6
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpFormattingOptions.cs

@ -24,11 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
using System.Reflection;
using System.Linq;
namespace ICSharpCode.NRefactory.CSharp
{ {
public enum BraceStyle public enum BraceStyle
{ {

14
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs

@ -15,19 +15,19 @@
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR // 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 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using ICSharpCode.Decompiler.CSharp.Syntax;
using System.Threading.Tasks; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.PatternMatching;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.PatternMatching;
using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
/// <summary> /// <summary>
/// Outputs the AST. /// Outputs the AST.
@ -2276,7 +2276,7 @@ namespace ICSharpCode.NRefactory.CSharp
#endregion #endregion
#region Pattern Nodes #region Pattern Nodes
public virtual void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
{ {
StartNode(placeholder); StartNode(placeholder);
VisitNodeInPattern(pattern); VisitNodeInPattern(pattern);

3
ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs

@ -23,9 +23,8 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
/// <summary> /// <summary>
/// The formatting options factory creates pre defined formatting option styles. /// The formatting options factory creates pre defined formatting option styles.

4
ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs

@ -18,8 +18,10 @@
using System; using System;
using System.IO; using System.IO;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
public abstract class TokenWriter public abstract class TokenWriter
{ {

5
ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs

@ -16,11 +16,12 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
class InsertMissingTokensDecorator : DecoratingTokenWriter class InsertMissingTokensDecorator : DecoratingTokenWriter
{ {

4
ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs

@ -17,8 +17,10 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
/// <summary> /// <summary>
/// Inserts the parentheses into the AST that are needed to ensure the AST can be printed correctly. /// Inserts the parentheses into the AST that are needed to ensure the AST can be printed correctly.

12
ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs

@ -17,18 +17,10 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using ICSharpCode.Decompiler.CSharp.Syntax;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ICSharpCode.NRefactory.PatternMatching;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
class InsertRequiredSpacesDecorator : DecoratingTokenWriter class InsertRequiredSpacesDecorator : DecoratingTokenWriter
{ {

5
ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs

@ -16,13 +16,12 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
class InsertSpecialsDecorator : DecoratingTokenWriter class InsertSpecialsDecorator : DecoratingTokenWriter
{ {

4
ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs

@ -20,8 +20,10 @@ using System;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{ {
/// <summary> /// <summary>
/// Writes C# code into a TextWriter. /// Writes C# code into a TextWriter.

8
ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs

@ -23,12 +23,10 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System;
using ICSharpCode.NRefactory.Semantics;
using System.Collections.Generic;
using ICSharpCode.NRefactory.CSharp.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver using ICSharpCode.Decompiler.Semantics;
namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents a namespace resolve result that's resolved using an alias. /// Represents a namespace resolve result that's resolved using an alias.

7
ICSharpCode.Decompiler/CSharp/Resolver/AliasTypeResolveResult.cs

@ -24,12 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics;
using System.Collections.Generic;
using ICSharpCode.NRefactory.CSharp.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents a type resolve result that's resolved using an alias. /// Represents a type resolve result that's resolved using an alias.

8
ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs

@ -18,12 +18,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using ICSharpCode.Decompiler.Semantics;
using System.Linq.Expressions; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents the result of an await expression. /// Represents the result of an await expression.

9
ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs

@ -21,12 +21,11 @@ using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory.Utils;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Contains logic that determines whether an implicit conversion exists between two types. /// Contains logic that determines whether an implicit conversion exists between two types.

6
ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs

@ -19,10 +19,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents the result of a method, constructor or indexer invocation. /// Represents the result of a method, constructor or indexer invocation.

11
ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs

@ -20,11 +20,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation; using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Utils; using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
sealed class CSharpOperators sealed class CSharpOperators
{ {
@ -168,7 +169,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
get { return EmptyList<IAttribute>.Instance; } get { return EmptyList<IAttribute>.Instance; }
} }
Documentation.DocumentationComment IEntity.Documentation { NRefactory.Documentation.DocumentationComment IEntity.Documentation {
get { return null; } get { return null; }
} }

17
ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs

@ -20,13 +20,16 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.NRefactory.CSharp.TypeSystem; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.TypeSystem.Implementation; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.Utils; using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Contains the main resolver logic. /// Contains the main resolver logic.
@ -1386,7 +1389,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
internal object CSharpPrimitiveCast(TypeCode targetType, object input) internal object CSharpPrimitiveCast(TypeCode targetType, object input)
{ {
return Utils.CSharpPrimitiveCast.Cast(targetType, input, this.CheckForOverflow); return Util.CSharpPrimitiveCast.Cast(targetType, input, this.CheckForOverflow);
} }
#endregion #endregion

7
ICSharpCode.Decompiler/CSharp/Resolver/CastResolveResult.cs

@ -16,11 +16,10 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents an explicitly applied conversion (CastExpression or AsExpression) /// Represents an explicitly applied conversion (CastExpression or AsExpression)

8
ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs

@ -17,10 +17,12 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
public sealed class CompositeResolveVisitorNavigator : IResolveVisitorNavigator public sealed class CompositeResolveVisitorNavigator : IResolveVisitorNavigator
{ {

9
ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs

@ -16,12 +16,13 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// When an <see cref="IResolveVisitorNavigator"/> is searching for specific nodes /// When an <see cref="IResolveVisitorNavigator"/> is searching for specific nodes

10
ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs

@ -16,14 +16,14 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
public enum DynamicInvocationType { public enum DynamicInvocationType {
/// <summary> /// <summary>

8
ICSharpCode.Decompiler/CSharp/Resolver/DynamicMemberResolveResult.cs

@ -16,14 +16,12 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents the result of an access to a member of a dynamic object. /// Represents the result of an access to a member of a dynamic object.

8
ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs

@ -17,10 +17,12 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Find all entities that are referenced in the scanned AST. /// Find all entities that are referenced in the scanned AST.

9
ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs

@ -16,11 +16,12 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Allows controlling which nodes are resolved by the resolve visitor. /// Allows controlling which nodes are resolved by the resolve visitor.

7
ICSharpCode.Decompiler/CSharp/Resolver/LambdaResolveResult.cs

@ -16,12 +16,11 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Represents an anonymous method or lambda expression. /// Represents an anonymous method or lambda expression.

3
ICSharpCode.Decompiler/CSharp/Resolver/Log.cs

@ -16,12 +16,11 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Resolver logging helper. /// Resolver logging helper.

7
ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs

@ -20,11 +20,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.Semantics; namespace ICSharpCode.Decompiler.CSharp.Resolver
using ICSharpCode.NRefactory.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Implementation of member lookup (C# 4.0 spec, §7.4). /// Implementation of member lookup (C# 4.0 spec, §7.4).

13
ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs

@ -18,16 +18,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.NRefactory.CSharp.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory.TypeSystem.Implementation; using ICSharpCode.NRefactory;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// A method list that belongs to a declaring type. /// A method list that belongs to a declaring type.

4
ICSharpCode.Decompiler/CSharp/Resolver/NameLookupMode.cs

@ -16,9 +16,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; namespace ICSharpCode.Decompiler.CSharp.Resolver
namespace ICSharpCode.NRefactory.CSharp
{ {
public enum NameLookupMode public enum NameLookupMode
{ {

8
ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs

@ -18,10 +18,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.NRefactory.Semantics; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// <see cref="IResolveVisitorNavigator"/> implementation that resolves a list of nodes. /// <see cref="IResolveVisitorNavigator"/> implementation that resolves a list of nodes.

12
ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs

@ -20,13 +20,13 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Semantics; namespace ICSharpCode.Decompiler.CSharp.Resolver
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
namespace ICSharpCode.NRefactory.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// C# overload resolution (C# 4.0 spec: §7.5). /// C# overload resolution (C# 4.0 spec: §7.5).

2
ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs

@ -18,7 +18,7 @@
using System; using System;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
[Flags] [Flags]
public enum OverloadResolutionErrors public enum OverloadResolutionErrors

6
ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs

@ -23,13 +23,13 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using ICSharpCode.NRefactory.TypeSystem;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.NRefactory.TypeSystem.Implementation; using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// An invocated extension method hides the extension parameter in its parameter list. /// An invocated extension method hides the extension parameter in its parameter list.

3
ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs

@ -17,8 +17,9 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp.Resolver namespace ICSharpCode.Decompiler.CSharp.Resolver
{ {
/// <summary> /// <summary>
/// Arguments for the callback of <see cref="FindReferences.RenameReferencesInFile"/>. /// Arguments for the callback of <see cref="FindReferences.RenameReferencesInFile"/>.

11
ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs

@ -20,12 +20,13 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Semantics; namespace ICSharpCode.Decompiler.CSharp.Resolver
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
namespace ICSharpCode.NRefactory.CSharp.Resolver
{ {
public enum TypeInferenceAlgorithm public enum TypeInferenceAlgorithm
{ {

7
ICSharpCode.Decompiler/CSharp/StatementBuilder.cs

@ -17,14 +17,15 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System.Diagnostics; using System.Diagnostics;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.Utils;
using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.TypeSystem;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.Semantics;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.CSharp namespace ICSharpCode.Decompiler.CSharp
{ {

41
ICSharpCode.Decompiler/CSharp/Ast/AstNode.cs → ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs

@ -25,17 +25,18 @@
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
public abstract class AstNode : AbstractAnnotatable, ICSharpCode.NRefactory.TypeSystem.IFreezable, PatternMatching.INode, ICloneable public abstract class AstNode : AbstractAnnotatable, IFreezable, INode, ICloneable
{ {
// the Root role must be available when creating the null nodes, so we can't put it in the Roles class // the Root role must be available when creating the null nodes, so we can't put it in the Roles class
internal static readonly Role<AstNode> RootRole = new Role<AstNode> ("Root"); internal static readonly Role<AstNode> RootRole = new Role<AstNode> ("Root");
@ -72,7 +73,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitNullNode(this, data); return visitor.VisitNullNode(this, data);
} }
protected internal override bool DoMatch (AstNode other, PatternMatching.Match match) protected internal override bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match)
{ {
return other == null || other.IsNull; return other == null || other.IsNull;
} }
@ -80,16 +81,16 @@ namespace ICSharpCode.NRefactory.CSharp
#endregion #endregion
#region PatternPlaceholder #region PatternPlaceholder
public static implicit operator AstNode (PatternMatching.Pattern pattern) public static implicit operator AstNode (NRefactory.PatternMatching.Pattern pattern)
{ {
return pattern != null ? new PatternPlaceholder (pattern) : null; return pattern != null ? new PatternPlaceholder (pattern) : null;
} }
sealed class PatternPlaceholder : AstNode, PatternMatching.INode sealed class PatternPlaceholder : AstNode, INode
{ {
readonly PatternMatching.Pattern child; readonly NRefactory.PatternMatching.Pattern child;
public PatternPlaceholder (PatternMatching.Pattern child) public PatternPlaceholder (NRefactory.PatternMatching.Pattern child)
{ {
this.child = child; this.child = child;
} }
@ -113,12 +114,12 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitPatternPlaceholder (this, child, data); return visitor.VisitPatternPlaceholder (this, child, data);
} }
protected internal override bool DoMatch (AstNode other, PatternMatching.Match match) protected internal override bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match)
{ {
return child.DoMatch (other, match); return child.DoMatch (other, match);
} }
bool PatternMatching.INode.DoMatchCollection (Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo) bool NRefactory.PatternMatching.INode.DoMatchCollection (Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
{ {
return child.DoMatchCollection (role, pos, match, backtrackingInfo); return child.DoMatchCollection (role, pos, match, backtrackingInfo);
} }
@ -206,11 +207,11 @@ namespace ICSharpCode.NRefactory.CSharp
/// The file name of the region is set based on the parent SyntaxTree's file name. /// The file name of the region is set based on the parent SyntaxTree's file name.
/// If this node is not connected to a whole compilation, the file name will be null. /// If this node is not connected to a whole compilation, the file name will be null.
/// </summary> /// </summary>
public ICSharpCode.NRefactory.TypeSystem.DomRegion GetRegion() public DomRegion GetRegion()
{ {
var syntaxTree = (this.Ancestors.LastOrDefault() ?? this) as SyntaxTree; var syntaxTree = (this.Ancestors.LastOrDefault() ?? this) as SyntaxTree;
string fileName = (syntaxTree != null ? syntaxTree.FileName : null); string fileName = (syntaxTree != null ? syntaxTree.FileName : null);
return new ICSharpCode.NRefactory.TypeSystem.DomRegion(fileName, this.StartLocation, this.EndLocation); return new DomRegion(fileName, this.StartLocation, this.EndLocation);
} }
public AstNode Parent { public AstNode Parent {
@ -649,29 +650,29 @@ namespace ICSharpCode.NRefactory.CSharp
#region Pattern Matching #region Pattern Matching
protected static bool MatchString (string pattern, string text) protected static bool MatchString (string pattern, string text)
{ {
return PatternMatching.Pattern.MatchString(pattern, text); return NRefactory.PatternMatching.Pattern.MatchString(pattern, text);
} }
protected internal abstract bool DoMatch (AstNode other, PatternMatching.Match match); protected internal abstract bool DoMatch (AstNode other, NRefactory.PatternMatching.Match match);
bool PatternMatching.INode.DoMatch (PatternMatching.INode other, PatternMatching.Match match) bool NRefactory.PatternMatching.INode.DoMatch (NRefactory.PatternMatching.INode other, NRefactory.PatternMatching.Match match)
{ {
AstNode o = other as AstNode; AstNode o = other as AstNode;
// try matching if other is null, or if other is an AstNode // try matching if other is null, or if other is an AstNode
return (other == null || o != null) && DoMatch (o, match); return (other == null || o != null) && DoMatch (o, match);
} }
bool PatternMatching.INode.DoMatchCollection (Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo) bool NRefactory.PatternMatching.INode.DoMatchCollection (Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
{ {
AstNode o = pos as AstNode; AstNode o = pos as AstNode;
return (pos == null || o != null) && DoMatch (o, match); return (pos == null || o != null) && DoMatch (o, match);
} }
PatternMatching.INode PatternMatching.INode.NextSibling { NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.NextSibling {
get { return nextSibling; } get { return nextSibling; }
} }
PatternMatching.INode PatternMatching.INode.FirstChild { NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.FirstChild {
get { return firstChild; } get { return firstChild; }
} }

2
ICSharpCode.Decompiler/CSharp/Ast/AstNodeCollection.cs → ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs

@ -23,7 +23,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.NRefactory.PatternMatching; using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// Represents the children of an AstNode that have a specific role. /// Represents the children of an AstNode that have a specific role.

22
ICSharpCode.Decompiler/CSharp/Ast/AstType.cs → ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs

@ -18,10 +18,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.NRefactory.CSharp.Resolver; using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// A type reference in the C# AST. /// A type reference in the C# AST.
@ -54,7 +56,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitNullNode(this, data); return visitor.VisitNullNode(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
return other == null || other.IsNull; return other == null || other.IsNull;
} }
@ -67,16 +69,16 @@ namespace ICSharpCode.NRefactory.CSharp
#endregion #endregion
#region PatternPlaceholder #region PatternPlaceholder
public static implicit operator AstType(PatternMatching.Pattern pattern) public static implicit operator AstType(NRefactory.PatternMatching.Pattern pattern)
{ {
return pattern != null ? new PatternPlaceholder(pattern) : null; return pattern != null ? new PatternPlaceholder(pattern) : null;
} }
sealed class PatternPlaceholder : AstType, PatternMatching.INode sealed class PatternPlaceholder : AstType, INode
{ {
readonly PatternMatching.Pattern child; readonly NRefactory.PatternMatching.Pattern child;
public PatternPlaceholder(PatternMatching.Pattern child) public PatternPlaceholder(NRefactory.PatternMatching.Pattern child)
{ {
this.child = child; this.child = child;
} }
@ -105,12 +107,12 @@ namespace ICSharpCode.NRefactory.CSharp
throw new NotSupportedException(); throw new NotSupportedException();
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
return child.DoMatch(other, match); return child.DoMatch(other, match);
} }
bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo) bool NRefactory.PatternMatching.INode.DoMatchCollection(Role role, NRefactory.PatternMatching.INode pos, NRefactory.PatternMatching.Match match, NRefactory.PatternMatching.BacktrackingInfo backtrackingInfo)
{ {
return child.DoMatchCollection(role, pos, match, backtrackingInfo); return child.DoMatchCollection(role, pos, match, backtrackingInfo);
} }

8
ICSharpCode.Decompiler/CSharp/Ast/CSharpModifierToken.cs → ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs

@ -23,11 +23,13 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
public class CSharpModifierToken : CSharpTokenNode public class CSharpModifierToken : CSharpTokenNode
{ {
@ -52,7 +54,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetModifierName (Modifier); return GetModifierName (Modifier);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
CSharpModifierToken o = other as CSharpModifierToken; CSharpModifierToken o = other as CSharpModifierToken;
return o != null && this.modifier == o.modifier; return o != null && this.modifier == o.modifier;

10
ICSharpCode.Decompiler/CSharp/Ast/CSharpTokenNode.cs → ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs

@ -23,9 +23,11 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System;
namespace ICSharpCode.NRefactory.CSharp using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// Represents a token in C#. Note that the type of the token is defined through the TokenRole. /// Represents a token in C#. Note that the type of the token is defined through the TokenRole.
@ -63,7 +65,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitNullNode(this, data); return visitor.VisitNullNode(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
return other == null || other.IsNull; return other == null || other.IsNull;
} }
@ -121,7 +123,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitCSharpTokenNode (this, data); return visitor.VisitCSharpTokenNode (this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
CSharpTokenNode o = other as CSharpTokenNode; CSharpTokenNode o = other as CSharpTokenNode;
return o != null && !o.IsNull && !(o is CSharpModifierToken); return o != null && !o.IsNull && !(o is CSharpModifierToken);

4
ICSharpCode.Decompiler/CSharp/Ast/CSharpUtil.cs → ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs

@ -23,11 +23,11 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System;
using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.PatternMatching; using ICSharpCode.NRefactory.PatternMatching;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
public static class CSharpUtil public static class CSharpUtil
{ {

13
ICSharpCode.Decompiler/CSharp/Ast/ComposedType.cs → ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs

@ -23,13 +23,16 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Resolver;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
public class ComposedType : AstType public class ComposedType : AstType
{ {
@ -114,7 +117,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitComposedType (this, data); return visitor.VisitComposedType (this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
ComposedType o = other as ComposedType; ComposedType o = other as ComposedType;
return o != null return o != null
@ -244,7 +247,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitArraySpecifier(this, data); return visitor.VisitArraySpecifier(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
ArraySpecifier o = other as ArraySpecifier; ArraySpecifier o = other as ArraySpecifier;
return o != null && this.Dimensions == o.Dimensions; return o != null && this.Dimensions == o.Dimensions;

11
ICSharpCode.Decompiler/CSharp/Ast/DepthFirstAstVisitor.cs → ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs

@ -24,9 +24,10 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using ICSharpCode.NRefactory.CSharp;
using Attribute = ICSharpCode.NRefactory.CSharp.Attribute;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// AST visitor with a default implementation that visits all node depth-first. /// AST visitor with a default implementation that visits all node depth-first.
@ -627,7 +628,7 @@ namespace ICSharpCode.NRefactory.CSharp
VisitChildren(errorNode); VisitChildren(errorNode);
} }
public virtual void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
{ {
VisitChildren (placeholder); VisitChildren (placeholder);
} }
@ -1234,7 +1235,7 @@ namespace ICSharpCode.NRefactory.CSharp
return VisitChildren(errorNode); return VisitChildren(errorNode);
} }
public virtual T VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) public virtual T VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern)
{ {
return VisitChildren (placeholder); return VisitChildren (placeholder);
} }
@ -1841,7 +1842,7 @@ namespace ICSharpCode.NRefactory.CSharp
return VisitChildren(errorNode, data); return VisitChildren(errorNode, data);
} }
public virtual S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern, T data) public virtual S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern, T data)
{ {
return VisitChildren (placeholder, data); return VisitChildren (placeholder, data);
} }

6
ICSharpCode.Decompiler/CSharp/Ast/DocumentationReference.cs → ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs

@ -16,10 +16,10 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// Represents a 'cref' reference in XML documentation. /// Represents a 'cref' reference in XML documentation.

8
ICSharpCode.Decompiler/CSharp/Ast/ErrorNode.cs → ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs

@ -23,9 +23,11 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // 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 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System;
namespace ICSharpCode.NRefactory.CSharp using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.NRefactory.CSharp;
namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
/// <summary> /// <summary>
/// Represents a parsing error in the ast. At the moment it only represents missing closing bracket. /// Represents a parsing error in the ast. At the moment it only represents missing closing bracket.
@ -73,7 +75,7 @@ namespace ICSharpCode.NRefactory.CSharp
return visitor.VisitErrorNode(this, data); return visitor.VisitErrorNode(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match)
{ {
var o = other as ErrorNode; var o = other as ErrorNode;
return o != null; return o != null;

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousMethodExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs

@ -26,6 +26,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousTypeCreateExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayCreateExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs

@ -18,6 +18,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayInitializerExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/AsExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/AssignmentExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs

@ -27,6 +27,7 @@
using System; using System;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/BaseReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/BinaryOperatorExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs

@ -27,6 +27,7 @@
using System; using System;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/CastExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/CheckedExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ConditionalExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs

@ -24,6 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/DefaultValueExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/DirectionExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
public enum FieldDirection public enum FieldDirection

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ErrorExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs

@ -24,6 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/Expression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs

@ -18,6 +18,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

5
ICSharpCode.Decompiler/CSharp/Ast/Expressions/IdentifierExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs

@ -24,6 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
@ -40,7 +41,7 @@ namespace ICSharpCode.NRefactory.CSharp
public IdentifierExpression(string identifier, TextLocation location) public IdentifierExpression(string identifier, TextLocation location)
{ {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (identifier, location)); SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (identifier, location));
} }
// public Identifier IdentifierToken { // public Identifier IdentifierToken {
@ -52,7 +53,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value));
} }
} }

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/IndexerExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/InvocationExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/IsExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs

@ -24,6 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/LambdaExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/MemberReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

3
ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedArgumentExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs

@ -17,6 +17,7 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
@ -41,7 +42,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Identifier.Create (value));
} }
} }

3
ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs

@ -26,6 +26,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
@ -51,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Identifier.Create (value));
} }
} }

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/NullReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ObjectCreateExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ParenthesizedExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/PointerReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/PrimitiveExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

8
ICSharpCode.Decompiler/CSharp/Ast/Expressions/QueryExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs

@ -19,6 +19,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
public class QueryExpression : Expression public class QueryExpression : Expression
@ -194,7 +196,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value));
} }
} }
@ -243,7 +245,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value));
} }
} }
@ -296,7 +298,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole(Roles.Identifier).Name; return GetChildByRole(Roles.Identifier).Name;
} }
set { set {
SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value));
} }
} }

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/SizeOfExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/StackAllocExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/ThisReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeOfExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs

@ -25,6 +25,8 @@
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeReferenceExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs

@ -17,6 +17,7 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/UnaryOperatorExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs

@ -26,6 +26,7 @@
using System; using System;
using System.Linq.Expressions; using System.Linq.Expressions;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/Expressions/UncheckedExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/Expressions/UndocumentedExpression.cs → ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Attribute.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs

@ -25,6 +25,8 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

3
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/AttributeSection.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
@ -96,7 +97,7 @@ namespace ICSharpCode.NRefactory.CSharp
return GetChildByRole (Roles.Identifier).Name; return GetChildByRole (Roles.Identifier).Name;
} }
set { set {
SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (value)); SetChildByRole (Roles.Identifier, Identifier.Create (value));
} }
} }

2
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Comment.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
public enum CommentType public enum CommentType

1
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Constraint.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs

@ -25,6 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

3
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/DelegateDeclaration.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs

@ -24,7 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

2
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs

@ -24,6 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {
/// <summary> /// <summary>

1
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NamespaceDeclaration.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs

@ -27,6 +27,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System; using System;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

3
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NewLineNode.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs

@ -1,4 +1,7 @@
using System; using System;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

1
ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/PreProcessorDirective.cs → ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs

@ -26,6 +26,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax;
namespace ICSharpCode.NRefactory.CSharp namespace ICSharpCode.NRefactory.CSharp
{ {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save