From 1ce8349dd9f31d7bdeeb16d4f14a6b4f740c2cf3 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Sat, 26 Nov 2016 11:12:53 +0100 Subject: [PATCH] Adjust namespaces --- .../CSharp/Analysis/ControlFlow.cs | 10 +- .../DeclarationSpace/LocalDeclarationSpace.cs | 4 +- .../LocalDeclarationSpaceVisitor.cs | 1 + .../Analysis/DefiniteAssignmentAnalysis.cs | 11 +- ICSharpCode.Decompiler/CSharp/Annotations.cs | 5 +- .../CSharp/CSharpDecompiler.cs | 9 +- .../CSharp/ExpressionBuilder.cs | 24 +- .../CSharp/NRefactoryExtensions.cs | 2 +- .../CSharp/OutputVisitor/CSharpAmbience.cs | 7 +- .../OutputVisitor/CSharpFormattingOptions.cs | 6 +- .../OutputVisitor/CSharpOutputVisitor.cs | 14 +- .../OutputVisitor/FormattingOptionsFactory.cs | 3 +- .../CSharp/OutputVisitor/ITokenWriter.cs | 4 +- .../InsertMissingTokensDecorator.cs | 5 +- .../OutputVisitor/InsertParenthesesVisitor.cs | 4 +- .../InsertRequiredSpacesDecorator.cs | 12 +- .../OutputVisitor/InsertSpecialsDecorator.cs | 5 +- .../TextWriterOutputFormatter.cs | 4 +- .../Resolver/AliasNamespaceResolveResult.cs | 8 +- .../CSharp/Resolver/AliasTypeResolveResult.cs | 7 +- .../CSharp/Resolver/AwaitResolveResult.cs | 8 +- .../CSharp/Resolver/CSharpConversions.cs | 9 +- .../Resolver/CSharpInvocationResolveResult.cs | 6 +- .../CSharp/Resolver/CSharpOperators.cs | 11 +- .../CSharp/Resolver/CSharpResolver.cs | 17 +- .../CSharp/Resolver/CastResolveResult.cs | 7 +- .../CompositeResolveVisitorNavigator.cs | 8 +- .../Resolver/DetectSkippableNodesNavigator.cs | 9 +- .../DynamicInvocationResolveResult.cs | 10 +- .../Resolver/DynamicMemberResolveResult.cs | 8 +- .../CSharp/Resolver/FindReferencedEntities.cs | 8 +- .../Resolver/IResolveVisitorNavigator.cs | 9 +- .../CSharp/Resolver/LambdaResolveResult.cs | 7 +- ICSharpCode.Decompiler/CSharp/Resolver/Log.cs | 3 +- .../CSharp/Resolver/MemberLookup.cs | 7 +- .../Resolver/MethodGroupResolveResult.cs | 13 +- .../CSharp/Resolver/NameLookupMode.cs | 4 +- .../NodeListResolveVisitorNavigator.cs | 8 +- .../CSharp/Resolver/OverloadResolution.cs | 12 +- .../Resolver/OverloadResolutionErrors.cs | 2 +- .../CSharp/Resolver/ReducedExtensionMethod.cs | 6 +- .../Resolver/RenameCallbackArguments.cs | 3 +- .../CSharp/Resolver/TypeInference.cs | 11 +- .../CSharp/StatementBuilder.cs | 7 +- .../CSharp/{Ast => Syntax}/AstNode.cs | 41 +-- .../{Ast => Syntax}/AstNodeCollection.cs | 2 +- .../CSharp/{Ast => Syntax}/AstType.cs | 22 +- .../{Ast => Syntax}/CSharpModifierToken.cs | 8 +- .../CSharp/{Ast => Syntax}/CSharpTokenNode.cs | 10 +- .../CSharp/{Ast => Syntax}/CSharpUtil.cs | 4 +- .../CSharp/{Ast => Syntax}/ComposedType.cs | 13 +- .../{Ast => Syntax}/DepthFirstAstVisitor.cs | 11 +- .../{Ast => Syntax}/DocumentationReference.cs | 6 +- .../CSharp/{Ast => Syntax}/ErrorNode.cs | 8 +- .../Expressions/AnonymousMethodExpression.cs | 1 + .../AnonymousTypeCreateExpression.cs | 1 + .../Expressions/ArrayCreateExpression.cs | 1 + .../Expressions/ArrayInitializerExpression.cs | 1 + .../Expressions/AsExpression.cs | 1 + .../Expressions/AssignmentExpression.cs | 1 + .../Expressions/BaseReferenceExpression.cs | 2 + .../Expressions/BinaryOperatorExpression.cs | 1 + .../Expressions/CastExpression.cs | 1 + .../Expressions/CheckedExpression.cs | 2 + .../Expressions/ConditionalExpression.cs | 1 + .../Expressions/DefaultValueExpression.cs | 2 + .../Expressions/DirectionExpression.cs | 2 + .../Expressions/ErrorExpression.cs | 1 + .../{Ast => Syntax}/Expressions/Expression.cs | 1 + .../Expressions/IdentifierExpression.cs | 5 +- .../Expressions/IndexerExpression.cs | 1 + .../Expressions/InvocationExpression.cs | 1 + .../Expressions/IsExpression.cs | 1 + .../Expressions/LambdaExpression.cs | 1 + .../Expressions/MemberReferenceExpression.cs | 1 + .../Expressions/NamedArgumentExpression.cs | 3 +- .../Expressions/NamedExpression.cs | 3 +- .../Expressions/NullReferenceExpression.cs | 2 + .../Expressions/ObjectCreateExpression.cs | 1 + .../Expressions/ParenthesizedExpression.cs | 2 + .../Expressions/PointerReferenceExpression.cs | 1 + .../Expressions/PrimitiveExpression.cs | 1 + .../Expressions/QueryExpression.cs | 8 +- .../Expressions/SizeOfExpression.cs | 2 + .../Expressions/StackAllocExpression.cs | 2 + .../Expressions/ThisReferenceExpression.cs | 2 + .../Expressions/TypeOfExpression.cs | 2 + .../Expressions/TypeReferenceExpression.cs | 1 + .../Expressions/UnaryOperatorExpression.cs | 1 + .../Expressions/UncheckedExpression.cs | 2 + .../Expressions/UndocumentedExpression.cs | 1 + .../{Ast => Syntax}/GeneralScope/Attribute.cs | 2 + .../GeneralScope/AttributeSection.cs | 3 +- .../{Ast => Syntax}/GeneralScope/Comment.cs | 2 + .../GeneralScope/Constraint.cs | 1 + .../GeneralScope/DelegateDeclaration.cs | 3 +- .../GeneralScope/ExternAliasDeclaration.cs | 2 + .../GeneralScope/NamespaceDeclaration.cs | 1 + .../GeneralScope/NewLineNode.cs | 3 + .../GeneralScope/PreProcessorDirective.cs | 1 + .../{Ast => Syntax}/GeneralScope/TextNode.cs | 2 + .../GeneralScope/TypeDeclaration.cs | 3 +- .../GeneralScope/TypeParameterDeclaration.cs | 3 +- .../GeneralScope/UsingAliasDeclaration.cs | 2 + .../GeneralScope/UsingDeclaration.cs | 1 + .../GeneralScope/WhitespaceNode.cs | 2 + .../CSharp/{Ast => Syntax}/IAnnotatable.cs | 2 +- .../CSharp/{Ast => Syntax}/IAstVisitor.cs | 11 +- .../CSharp/{Ast => Syntax}/Identifier.cs | 6 +- .../IdentifierExpressionBackreference.cs | 8 +- .../CSharp/{Ast => Syntax}/MemberType.cs | 13 +- .../CSharp/{Ast => Syntax}/Modifiers.cs | 2 +- .../CSharp/{Ast => Syntax}/NodeType.cs | 4 +- .../{Ast => Syntax}/ObservableAstVisitor.cs | 6 +- .../PatternMatching/AnyNode.cs | 0 .../PatternMatching/AnyNodeOrNull.cs | 0 .../PatternMatching/Backreference.cs | 0 .../PatternMatching/BacktrackingInfo.cs | 0 .../{Ast => Syntax}/PatternMatching/Choice.cs | 0 .../{Ast => Syntax}/PatternMatching/INode.cs | 1 + .../{Ast => Syntax}/PatternMatching/Match.cs | 0 .../PatternMatching/NamedNode.cs | 0 .../PatternMatching/OptionalNode.cs | 1 + .../PatternMatching/Pattern.cs | 1 + .../{Ast => Syntax}/PatternMatching/Repeat.cs | 1 + .../CSharp/{Ast => Syntax}/PrimitiveType.cs | 15 +- .../CSharp/{Ast => Syntax}/Role.cs | 2 +- .../CSharp/{Ast => Syntax}/Roles.cs | 23 +- .../CSharp/{Ast => Syntax}/SimpleType.cs | 20 +- .../Statements/BlockStatement.cs | 1 + .../Statements/BreakStatement.cs | 2 + .../Statements/CheckedStatement.cs | 2 + .../Statements/ContinueStatement.cs | 2 + .../Statements/DoWhileStatement.cs | 2 + .../Statements/EmptyStatement.cs | 2 + .../Statements/ExpressionStatement.cs | 2 + .../Statements/FixedStatement.cs | 1 + .../Statements/ForStatement.cs | 1 + .../Statements/ForeachStatement.cs | 2 + .../Statements/GotoStatement.cs | 2 + .../Statements/IfElseStatement.cs | 2 + .../Statements/LabelStatement.cs | 2 + .../Statements/LockStatement.cs | 2 + .../Statements/ReturnStatement.cs | 2 + .../{Ast => Syntax}/Statements/Statement.cs | 1 + .../Statements/SwitchStatement.cs | 1 + .../Statements/ThrowStatement.cs | 2 + .../Statements/TryCatchStatement.cs | 1 + .../Statements/UncheckedStatement.cs | 2 + .../Statements/UnsafeStatement.cs | 2 + .../Statements/UsingStatement.cs | 2 + .../VariableDeclarationStatement.cs | 1 + .../Statements/WhileStatement.cs | 2 + .../Statements/YieldBreakStatement.cs | 2 + .../Statements/YieldReturnStatement.cs | 2 + .../{Ast => Syntax}/SyntaxExtensions.cs | 4 +- .../CSharp/{Ast => Syntax}/SyntaxTree.cs | 15 +- .../CSharp/{Ast => Syntax}/TextLocation.cs | 7 +- .../CSharp/{Ast => Syntax}/TokenRole.cs | 3 +- .../{Ast => Syntax}/TypeMembers/Accessor.cs | 3 +- .../TypeMembers/ConstructorDeclaration.cs | 3 +- .../TypeMembers/DestructorDeclaration.cs | 3 +- .../TypeMembers/EntityDeclaration.cs | 4 +- .../TypeMembers/EnumMemberDeclaration.cs | 3 +- .../TypeMembers/EventDeclaration.cs | 4 +- .../TypeMembers/FieldDeclaration.cs | 3 +- .../TypeMembers/FixedFieldDeclaration.cs | 3 +- .../TypeMembers/FixedVariableInitializer.cs | 1 + .../TypeMembers/IndexerDeclaration.cs | 3 +- .../TypeMembers/MethodDeclaration.cs | 3 +- .../TypeMembers/OperatorDeclaration.cs | 3 +- .../TypeMembers/ParameterDeclaration.cs | 1 + .../TypeMembers/PropertyDeclaration.cs | 4 +- .../TypeMembers/VariableInitializer.cs | 2 + .../{Ast => Syntax}/TypeSystemAstBuilder.cs | 17 +- .../CSharp/Transforms/AddCheckedBlocks.cs | 1 + .../Transforms/ContextTrackingVisitor.cs | 3 +- .../ConvertConstructorCallIntoInitializer.cs | 4 +- .../CSharp/Transforms/CustomPatterns.cs | 1 + .../Transforms/DecimalConstantTransform.cs | 3 +- .../CSharp/Transforms/DeclareVariables.cs | 7 +- .../Transforms/EscapeInvalidIdentifiers.cs | 3 +- .../CSharp/Transforms/FixNameCollisions.cs | 4 +- .../CSharp/Transforms/IAstTransform.cs | 2 +- .../Transforms/IntroduceUnsafeModifier.cs | 3 +- .../Transforms/IntroduceUsingDeclarations.cs | 10 +- .../Transforms/PatternStatementTransform.cs | 7 +- .../ReplaceMethodCallsWithOperators.cs | 3 +- .../CSharp/Transforms/TransformContext.cs | 5 +- .../CSharp/TranslatedExpression.cs | 5 +- .../CSharp/TranslationContext.cs | 2 +- .../TypeSystem/AliasNamespaceReference.cs | 8 +- .../TypeSystem/AttributeTypeReference.cs | 11 +- .../CSharp/TypeSystem/CSharpAttribute.cs | 14 +- .../TypeSystem/CSharpTypeResolveContext.cs | 4 +- .../CSharp/TypeSystem/ConstantValues.cs | 14 +- .../MemberTypeOrNamespaceReference.cs | 14 +- ...odTypeParameterWithInheritedConstraints.cs | 9 +- .../CSharp/TypeSystem/ResolvedUsingScope.cs | 14 +- .../SimpleTypeOrNamespaceReference.cs | 15 +- .../TypeSystem/TypeOrNamespaceReference.cs | 8 +- .../CSharp/TypeSystem/UsingScope.cs | 12 +- .../CSharp/WholeProjectDecompiler.cs | 5 +- ICSharpCode.Decompiler/CecilExtensions.cs | 6 +- ICSharpCode.Decompiler/DecompilerSettings.cs | 1 + .../Documentation/DocumentationComment.cs | 2 +- .../GetPotentiallyNestedClassTypeReference.cs | 4 +- .../Documentation/IDocumentationProvider.cs | 2 +- .../Documentation/IdStringMemberReference.cs | 2 +- .../Documentation/IdStringProvider.cs | 4 +- .../Documentation/XmlDocumentationProvider.cs | 2 +- ICSharpCode.Decompiler/Editor/IDocument.cs | 1 + ICSharpCode.Decompiler/Editor/ITextAnchor.cs | 1 + .../Editor/ReadOnlyDocument.cs | 1 + .../Editor/StringBuilderDocument.cs | 3 +- .../Editor/TextSourceVersionProvider.cs | 1 + .../FlowAnalysis/ControlFlowNode.cs | 1 - .../FlowAnalysis/DefiniteAssignmentVisitor.cs | 1 + .../FlowAnalysis/Dominance.cs | 1 + .../ReachingDefinitionsVisitor.cs | 1 + .../ICSharpCode.Decompiler.csproj | 262 +++++++++--------- ICSharpCode.Decompiler/IL/BlockBuilder.cs | 3 +- .../IL/ControlFlow/ConditionDetection.cs | 1 + .../IL/ControlFlow/DetectPinnedRegions.cs | 2 +- .../IL/ControlFlow/LoopDetection.cs | 2 +- .../IL/ControlFlow/SwitchAnalysis.cs | 2 + .../IL/ControlFlow/SwitchDetection.cs | 1 + ICSharpCode.Decompiler/IL/ILReader.cs | 37 +-- ICSharpCode.Decompiler/IL/ILTypeExtensions.cs | 1 + ICSharpCode.Decompiler/IL/ILVariable.cs | 2 +- .../IL/InstructionOutputExtensions.cs | 2 +- ICSharpCode.Decompiler/IL/Instructions.cs | 2 +- .../Instructions/BinaryNumericInstruction.cs | 3 +- .../IL/Instructions/Block.cs | 2 - .../IL/Instructions/BlockContainer.cs | 1 + .../IL/Instructions/CallInstruction.cs | 2 +- .../IL/Instructions/Comp.cs | 1 + .../CompoundAssignmentInstruction.cs | 3 +- .../IL/Instructions/Conv.cs | 1 + .../IL/Instructions/ILFunction.cs | 3 +- .../IL/Instructions/ILInstruction.cs | 8 +- .../IL/Instructions/PatternMatching.cs | 2 +- .../IL/Instructions/SwitchInstruction.cs | 1 + ICSharpCode.Decompiler/IL/SemanticHelper.cs | 1 + .../CachedDelegateInitialization.cs | 2 +- .../IL/Transforms/CopyPropagation.cs | 4 +- .../IL/Transforms/DelegateConstruction.cs | 2 +- .../IL/Transforms/ExpressionTransforms.cs | 2 +- .../IL/Transforms/IILTransform.cs | 1 + .../IL/Transforms/ILInlining.cs | 2 +- .../IL/Transforms/SplitVariables.cs | 1 + .../IL/Transforms/Stepper.cs | 1 + .../Transforms/TransformArrayInitializers.cs | 5 +- .../IL/Transforms/TransformAssignment.cs | 3 +- ICSharpCode.Decompiler/NRExtensions.cs | 2 +- .../Output/PlainTextOutput.cs | 1 + .../Semantics/AmbiguousResolveResult.cs | 5 +- .../Semantics/ArrayAccessResolveResult.cs | 5 +- .../Semantics/ArrayCreateResolveResult.cs | 5 +- .../Semantics/ByReferenceResolveResult.cs | 5 +- .../Semantics/ConstantResolveResult.cs | 5 +- .../Semantics/Conversion.cs | 4 +- .../Semantics/ConversionResolveResult.cs | 4 +- .../Semantics/ErrorResolveResult.cs | 6 +- .../Semantics/ForEachResolveResult.cs | 4 +- .../InitializedObjectResolveResult.cs | 5 +- .../Semantics/InvocationResolveResult.cs | 8 +- .../Semantics/LocalResolveResult.cs | 4 +- .../Semantics/MemberResolveResult.cs | 6 +- .../Semantics/NamedArgumentResolveResult.cs | 4 +- .../Semantics/NamespaceResolveResult.cs | 5 +- .../Semantics/OperatorResolveResult.cs | 4 +- .../Semantics/ResolveResult.cs | 4 +- .../Semantics/SizeOfResolveResult.cs | 4 +- .../Semantics/ThisResolveResult.cs | 5 +- .../Semantics/TypeIsResolveResult.cs | 4 +- .../Semantics/TypeOfResolveResult.cs | 4 +- .../Semantics/TypeResolveResult.cs | 5 +- .../Semantics/UnknownMemberResolveResult.cs | 4 +- .../Tests/DecompilerTestBase.cs | 3 +- .../Tests/Helpers/RemoveCompilerAttribute.cs | 2 +- .../Tests/Helpers/Tester.cs | 2 + .../Tests/Helpers/TypeSystemHelper.cs | 3 +- .../Tests/RoundtripAssembly.cs | 1 - .../TestCases/Correctness/Conversions.cs | 2 +- .../Tests/Util/IntervalTests.cs | 1 + .../Tests/Util/LongSetTests.cs | 1 + .../TypeSystem/Accessibility.cs | 4 +- .../TypeSystem/AnonymousType.cs | 7 +- .../TypeSystem/ArrayType.cs | 6 +- .../TypeSystem/AssemblyLoader.cs | 6 +- .../TypeSystem/AssemblyQualifiedTypeName.cs | 2 +- .../TypeSystem/ByReferenceType.cs | 4 +- .../TypeSystem/CecilLoader.cs | 21 +- .../TypeSystem/ComHelper.cs | 5 +- .../TypeSystem/DecompilerTypeSystem.cs | 11 +- .../TypeSystem/DefaultSolutionSnapshot.cs | 5 +- .../TypeSystem/DomRegion.cs | 3 +- .../TypeSystem/EntityType.cs | 2 +- ICSharpCode.Decompiler/TypeSystem/Error.cs | 11 +- .../TypeSystem/FullTypeName.cs | 2 +- .../TypeSystem/IAmbience.cs | 2 +- .../TypeSystem/IAssembly.cs | 3 +- .../TypeSystem/IAttribute.cs | 6 +- .../TypeSystem/ICodeContext.cs | 3 +- .../TypeSystem/ICompilation.cs | 4 +- .../TypeSystem/IConstantValue.cs | 6 +- .../TypeSystem/IDecompilerTypeSystem.cs | 5 +- ICSharpCode.Decompiler/TypeSystem/IEntity.cs | 3 +- ICSharpCode.Decompiler/TypeSystem/IEvent.cs | 6 +- ICSharpCode.Decompiler/TypeSystem/IField.cs | 5 +- .../TypeSystem/IFreezable.cs | 4 +- .../TypeSystem/IInterningProvider.cs | 3 +- ICSharpCode.Decompiler/TypeSystem/IMember.cs | 3 +- ICSharpCode.Decompiler/TypeSystem/IMethod.cs | 4 +- .../TypeSystem/INamedElement.cs | 5 +- .../TypeSystem/INamespace.cs | 3 +- .../TypeSystem/IParameter.cs | 4 +- .../TypeSystem/IParameterizedMember.cs | 4 +- .../TypeSystem/IProjectContent.cs | 3 +- .../TypeSystem/IProperty.cs | 4 +- .../TypeSystem/ISolutionSnapshot.cs | 4 +- .../TypeSystem/ISupportsInterning.cs | 4 +- ICSharpCode.Decompiler/TypeSystem/ISymbol.cs | 4 +- ICSharpCode.Decompiler/TypeSystem/IType.cs | 2 +- .../TypeSystem/ITypeDefinition.cs | 4 +- .../TypeSystem/ITypeParameter.cs | 5 +- .../TypeSystem/ITypeReference.cs | 4 +- .../TypeSystem/IUnresolvedFile.cs | 3 +- .../TypeSystem/IVariable.cs | 4 +- .../Implementation/AbstractFreezable.cs | 4 +- .../Implementation/AbstractResolvedEntity.cs | 2 +- .../Implementation/AbstractResolvedMember.cs | 6 +- .../AbstractResolvedTypeParameter.cs | 6 +- .../TypeSystem/Implementation/AbstractType.cs | 5 +- .../AbstractUnresolvedEntity.cs | 4 +- .../AbstractUnresolvedMember.cs | 5 +- .../AccessorOwnerMemberReference.cs | 2 +- .../Implementation/BaseTypeCollector.cs | 3 +- .../TypeSystem/Implementation/BlobReader.cs | 4 +- .../DefaultAssemblyReference.cs | 2 +- .../Implementation/DefaultAttribute.cs | 6 +- .../Implementation/DefaultMemberReference.cs | 5 +- .../Implementation/DefaultParameter.cs | 2 +- .../Implementation/DefaultResolvedEvent.cs | 7 +- .../Implementation/DefaultResolvedField.cs | 9 +- .../Implementation/DefaultResolvedMethod.cs | 6 +- .../Implementation/DefaultResolvedProperty.cs | 6 +- .../DefaultResolvedTypeDefinition.cs | 9 +- .../DefaultResolvedTypeParameter.cs | 8 +- .../DefaultUnresolvedAssembly.cs | 8 +- .../DefaultUnresolvedAttribute.cs | 9 +- .../Implementation/DefaultUnresolvedEvent.cs | 2 +- .../Implementation/DefaultUnresolvedField.cs | 2 +- .../Implementation/DefaultUnresolvedMethod.cs | 2 +- .../DefaultUnresolvedParameter.cs | 7 +- .../DefaultUnresolvedProperty.cs | 2 +- .../DefaultUnresolvedTypeDefinition.cs | 3 +- .../DefaultUnresolvedTypeParameter.cs | 5 +- .../Implementation/DefaultVariable.cs | 2 +- .../Implementation/DummyTypeParameter.cs | 5 +- ...tInterfaceImplementationMemberReference.cs | 2 +- .../FullNameAndTypeParameterCount.cs | 3 +- .../Implementation/GetClassTypeReference.cs | 4 +- .../Implementation/GetMembersHelper.cs | 4 +- .../Implementation/KnownTypeCache.cs | 5 +- .../Implementation/MergedNamespace.cs | 4 +- .../Implementation/MinimalCorlib.cs | 2 +- .../Implementation/NestedTypeReference.cs | 2 +- .../Implementation/ResolvedAttributeBlob.cs | 7 +- .../Implementation/SimpleCompilation.cs | 4 +- .../Implementation/SimpleConstantValue.cs | 4 +- .../Implementation/SimpleInterningProvider.cs | 8 +- .../Implementation/SpecializedEvent.cs | 4 +- .../Implementation/SpecializedField.cs | 4 +- .../Implementation/SpecializedMember.cs | 5 +- .../Implementation/SpecializedMethod.cs | 7 +- .../Implementation/SpecializedProperty.cs | 4 +- .../SpecializingMemberReference.cs | 2 +- .../Implementation/TypeParameterReference.cs | 4 +- .../Implementation/TypeWithElementType.cs | 2 +- .../TypeSystem/Implementation/UnknownType.cs | 2 +- .../Implementation/UnresolvedAttributeBlob.cs | 2 +- .../UnresolvedSecurityDeclarationBlob.cs | 4 +- .../Implementation/VoidTypeDefinition.cs | 4 +- .../TypeSystem/InheritanceHelper.cs | 3 +- .../TypeSystem/IntersectionType.cs | 5 +- .../TypeSystem/KnownTypeReference.cs | 2 +- .../TypeSystem/NullableType.cs | 2 +- .../TypeSystem/ParameterListComparer.cs | 5 +- .../TypeSystem/ParameterizedType.cs | 5 +- .../TypeSystem/PointerType.cs | 5 +- .../TypeSystem/ProjectReference.cs | 2 +- .../TypeSystem/ReferenceResolvingException.cs | 5 +- .../TypeSystem/ReflectionHelper.cs | 5 +- .../ReflectionNameParseException.cs | 2 +- .../TypeSystem/SimpleTypeResolveContext.cs | 2 +- .../TypeSystem/SpecialType.cs | 5 +- .../SpecializingDecompilerTypeSystem.cs | 4 +- ICSharpCode.Decompiler/TypeSystem/TaskType.cs | 2 +- .../TypeSystem/TopLevelTypeName.cs | 2 +- ICSharpCode.Decompiler/TypeSystem/TypeKind.cs | 2 +- .../TypeSystem/TypeParameterSubstitution.cs | 3 +- .../TypeSystem/TypeSystemExtensions.cs | 10 +- .../TypeSystem/TypeUtils.cs | 7 +- .../TypeSystem/TypeVisitor.cs | 4 +- .../TypeSystem/TypesHierarchyHelpers.cs | 11 +- .../TypeSystem/VarArgInstanceMethod.cs | 5 +- .../Util/7BitEncodedInts.cs | 2 +- ICSharpCode.Decompiler/Util/BitSet.cs | 2 +- ICSharpCode.Decompiler/Util/BitVector16.cs | 2 +- ICSharpCode.Decompiler/Util/BusyManager.cs | 2 +- .../Util/CSharpPrimitiveCast.cs | 2 +- ICSharpCode.Decompiler/Util/CacheManager.cs | 4 +- .../Util/CallbackOnDispose.cs | 3 +- .../Util/CollectionExtensions.cs | 5 +- ICSharpCode.Decompiler/Util/EmptyList.cs | 3 +- .../Util/ExtensionMethods.cs | 2 +- ICSharpCode.Decompiler/Util/ImmutableStack.cs | 3 +- ICSharpCode.Decompiler/Util/Interval.cs | 2 +- ICSharpCode.Decompiler/Util/LazyInit.cs | 3 +- ICSharpCode.Decompiler/Util/LongSet.cs | 2 +- .../Util/MultiDictionary.cs | 3 +- ICSharpCode.Decompiler/Util/Platform.cs | 2 +- ICSharpCode.Decompiler/Util/ProjectedList.cs | 2 +- .../Util/ReferenceComparer.cs | 3 +- ICSharpCode.Decompiler/Util/TreeTraversal.cs | 2 +- ICSharpCode.Decompiler/Util/UnionFind.cs | 4 +- .../ConnectMethodDecompiler.cs | 2 +- ILSpy/Languages/CSharpLanguage.cs | 2 + ILSpy/Languages/ILAstLanguage.cs | 1 + ILSpy/Languages/TextTokenWriter.cs | 2 + ILSpy/SearchStrategies.cs | 2 - ILSpy/TextView/AvalonEditTextOutput.cs | 5 +- .../AnalyzedAttributeAppliedToTreeNode.cs | 2 +- .../AnalyzedEventOverridesTreeNode.cs | 2 +- ...yzedInterfaceEventImplementedByTreeNode.cs | 2 +- ...zedInterfaceMethodImplementedByTreeNode.cs | 2 +- ...dInterfacePropertyImplementedByTreeNode.cs | 2 +- .../AnalyzedMethodOverridesTreeNode.cs | 2 +- .../AnalyzedPropertyOverridesTreeNode.cs | 2 +- .../AnalyzedTypeInstantiationsTreeNode.cs | 2 +- .../AnalyzedVirtualMethodUsedByTreeNode.cs | 2 +- .../Analyzer/ScopedWhereUsedAnalyzer.cs | 2 +- ILSpy/TreeNodes/DerivedTypesTreeNode.cs | 2 +- ILSpy/XmlDoc/AddXmlDocTransform.cs | 1 + ILSpy/XmlDoc/XmlDocKeyProvider.cs | 6 +- TestPlugin/CustomLanguage.cs | 1 - 448 files changed, 1126 insertions(+), 1040 deletions(-) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/AstNode.cs (94%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/AstNodeCollection.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/AstType.cs (91%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/CSharpModifierToken.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/CSharpTokenNode.cs (91%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/CSharpUtil.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/ComposedType.cs (94%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/DepthFirstAstVisitor.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/DocumentationReference.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/ErrorNode.cs (91%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/AnonymousMethodExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/AnonymousTypeCreateExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ArrayCreateExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ArrayInitializerExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/AsExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/AssignmentExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/BaseReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/BinaryOperatorExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/CastExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/CheckedExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ConditionalExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/DefaultValueExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/DirectionExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ErrorExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/Expression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/IdentifierExpression.cs (92%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/IndexerExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/InvocationExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/IsExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/LambdaExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/MemberReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/NamedArgumentExpression.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/NamedExpression.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/NullReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ObjectCreateExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ParenthesizedExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/PointerReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/PrimitiveExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/QueryExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/SizeOfExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/StackAllocExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/ThisReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/TypeOfExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/TypeReferenceExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/UnaryOperatorExpression.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/UncheckedExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Expressions/UndocumentedExpression.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/Attribute.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/AttributeSection.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/Comment.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/Constraint.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/DelegateDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/ExternAliasDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/NamespaceDeclaration.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/NewLineNode.cs (95%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/PreProcessorDirective.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/TextNode.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/TypeDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/TypeParameterDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/UsingAliasDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/UsingDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/GeneralScope/WhitespaceNode.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/IAnnotatable.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/IAstVisitor.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Identifier.cs (94%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/IdentifierExpressionBackreference.cs (86%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/MemberType.cs (93%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Modifiers.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/NodeType.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/ObservableAstVisitor.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/AnyNode.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/AnyNodeOrNull.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/Backreference.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/BacktrackingInfo.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/Choice.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/INode.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/Match.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/NamedNode.cs (100%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/OptionalNode.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/Pattern.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PatternMatching/Repeat.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/PrimitiveType.cs (91%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Role.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Roles.cs (89%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/SimpleType.cs (89%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/BlockStatement.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/BreakStatement.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/CheckedStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ContinueStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/DoWhileStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/EmptyStatement.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ExpressionStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/FixedStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ForStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ForeachStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/GotoStatement.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/IfElseStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/LabelStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/LockStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ReturnStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/Statement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/SwitchStatement.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/ThrowStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/TryCatchStatement.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/UncheckedStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/UnsafeStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/UsingStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/VariableDeclarationStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/WhileStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/YieldBreakStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/Statements/YieldReturnStatement.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/SyntaxExtensions.cs (95%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/SyntaxTree.cs (92%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TextLocation.cs (95%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TokenRole.cs (95%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/Accessor.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/ConstructorDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/DestructorDeclaration.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/EntityDeclaration.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/EnumMemberDeclaration.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/EventDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/FieldDeclaration.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/FixedFieldDeclaration.cs (96%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/FixedVariableInitializer.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/IndexerDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/MethodDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/OperatorDeclaration.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/ParameterDeclaration.cs (98%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/PropertyDeclaration.cs (97%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeMembers/VariableInitializer.cs (99%) rename ICSharpCode.Decompiler/CSharp/{Ast => Syntax}/TypeSystemAstBuilder.cs (98%) diff --git a/ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs b/ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs index 79cde5c06..f082493b6 100644 --- a/ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs +++ b/ICSharpCode.Decompiler/CSharp/Analysis/ControlFlow.cs @@ -21,12 +21,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.Semantics; namespace ICSharpCode.NRefactory.CSharp.Analysis { diff --git a/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs b/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs index a412cba3a..cbfef83d9 100644 --- a/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs +++ b/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpace.cs @@ -23,10 +23,12 @@ // 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 ICSharpCode.NRefactory.Utils; + using System.Collections.Generic; using System.Linq; using System; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.NRefactory.CSharp.Analysis { diff --git a/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs b/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs index 08389a413..9e573b959 100644 --- a/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs +++ b/ICSharpCode.Decompiler/CSharp/Analysis/DeclarationSpace/LocalDeclarationSpaceVisitor.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp.Analysis { diff --git a/ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs b/ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs index eef55dd3f..b4cb74626 100644 --- a/ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs +++ b/ICSharpCode.Decompiler/CSharp/Analysis/DefiniteAssignmentAnalysis.cs @@ -21,13 +21,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; - -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem.Implementation; namespace ICSharpCode.NRefactory.CSharp.Analysis { diff --git a/ICSharpCode.Decompiler/CSharp/Annotations.cs b/ICSharpCode.Decompiler/CSharp/Annotations.cs index c49ca45ee..9f2b9213d 100644 --- a/ICSharpCode.Decompiler/CSharp/Annotations.cs +++ b/ICSharpCode.Decompiler/CSharp/Annotations.cs @@ -19,10 +19,11 @@ using System; using System.Collections; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs b/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs index a7b2ca295..e5b2cb67d 100644 --- a/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs +++ b/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs @@ -21,17 +21,16 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; 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.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; using Mono.Cecil; using ICSharpCode.Decompiler.CSharp.Transforms; using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL.ControlFlow; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.CSharp.Refactoring; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs index ee1120276..f738972db 100644 --- a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs +++ b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs @@ -20,19 +20,19 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; - +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.CSharp.Transforms; +using ICSharpCode.Decompiler.CSharp.TypeSystem; 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.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 PrimitiveType = ICSharpCode.Decompiler.CSharp.Syntax.PrimitiveType; namespace ICSharpCode.Decompiler.CSharp { @@ -92,13 +92,13 @@ namespace ICSharpCode.Decompiler.CSharp var pe = expr as PrimitiveExpression; if (pe != null) { 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) - expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("byte")); + expr = expr.CastTo(new PrimitiveType("byte")); 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) - expr = expr.CastTo(new NRefactory.CSharp.PrimitiveType("ushort")); + expr = expr.CastTo(new PrimitiveType("ushort")); } var exprRR = expr.Annotation(); if (exprRR == null) { diff --git a/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs b/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs index c081d6ac6..b3b26f8ad 100644 --- a/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs +++ b/ICSharpCode.Decompiler/CSharp/NRefactoryExtensions.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs index 8476f9515..c3def2f73 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs @@ -18,10 +18,11 @@ using System; using System.IO; -using ICSharpCode.NRefactory.CSharp.Refactoring; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { /// /// C# ambience. Used to convert type system symbols to text (usually for displaying the symbol to the user; e.g. in editor tooltips) diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpFormattingOptions.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpFormattingOptions.cs index 0a97a1c0b..f5bd39d48 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpFormattingOptions.cs +++ b/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 // THE SOFTWARE. -using System; -using System.Reflection; -using System.Linq; - -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { public enum BraceStyle { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs index 683a632e9..c04bd663d 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs +++ b/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 // 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.Globalization; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; +using ICSharpCode.NRefactory.PatternMatching; +using Attribute = ICSharpCode.NRefactory.CSharp.Attribute; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { /// /// Outputs the AST. @@ -2276,7 +2276,7 @@ namespace ICSharpCode.NRefactory.CSharp #endregion #region Pattern Nodes - public virtual void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) + public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern) { StartNode(placeholder); VisitNodeInPattern(pattern); diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs index ff32c1f8c..8fbeb4bbd 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/FormattingOptionsFactory.cs @@ -23,9 +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; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { /// /// The formatting options factory creates pre defined formatting option styles. diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs index 31b73f987..8d6b166af 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/ITokenWriter.cs @@ -18,8 +18,10 @@ using System; 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 { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs index 3f9200145..21500156d 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { class InsertMissingTokensDecorator : DecoratingTokenWriter { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs index 475ca40b1..5dff3ad23 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertParenthesesVisitor.cs @@ -17,8 +17,10 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { /// /// Inserts the parentheses into the AST that are needed to ensure the AST can be printed correctly. diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs index e9aca4bf5..70fbff709 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertRequiredSpacesDecorator.cs @@ -17,18 +17,10 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -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.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { class InsertRequiredSpacesDecorator : DecoratingTokenWriter { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs index 0fafdeef0..de58c2dea 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertSpecialsDecorator.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { class InsertSpecialsDecorator : DecoratingTokenWriter { diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs index 277b1c3e9..f21863206 100644 --- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs +++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/TextWriterOutputFormatter.cs @@ -20,8 +20,10 @@ using System; using System.Globalization; using System.IO; using System.Text; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.OutputVisitor { /// /// Writes C# code into a TextWriter. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs index 2d6dec1ae..37b681193 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/AliasNamespaceResolveResult.cs @@ -23,12 +23,10 @@ // 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.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 { /// /// Represents a namespace resolve result that's resolved using an alias. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/AliasTypeResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/AliasTypeResolveResult.cs index f7f639b48..85e5a3367 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/AliasTypeResolveResult.cs +++ b/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 // THE SOFTWARE. -using System; -using ICSharpCode.NRefactory.Semantics; -using System.Collections.Generic; -using ICSharpCode.NRefactory.CSharp.TypeSystem; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents a type resolve result that's resolved using an alias. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs index 8eefcfd07..64264ec75 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/AwaitResolveResult.cs @@ -18,12 +18,10 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents the result of an await expression. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs index 666e420e7..50aa089cb 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpConversions.cs @@ -21,12 +21,11 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Threading; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Contains logic that determines whether an implicit conversion exists between two types. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs index 3117fee76..ac524ee3d 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpInvocationResolveResult.cs @@ -19,10 +19,10 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents the result of a method, constructor or indexer invocation. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs index 64df3a118..9e552ffd9 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpOperators.cs @@ -20,11 +20,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { sealed class CSharpOperators { @@ -168,7 +169,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver get { return EmptyList.Instance; } } - Documentation.DocumentationComment IEntity.Documentation { + NRefactory.Documentation.DocumentationComment IEntity.Documentation { get { return null; } } diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs index 4072f276b..7bed28a15 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/CSharpResolver.cs @@ -20,13 +20,16 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +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.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Contains the main resolver logic. @@ -1386,7 +1389,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver internal object CSharpPrimitiveCast(TypeCode targetType, object input) { - return Utils.CSharpPrimitiveCast.Cast(targetType, input, this.CheckForOverflow); + return Util.CSharpPrimitiveCast.Cast(targetType, input, this.CheckForOverflow); } #endregion diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CastResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CastResolveResult.cs index 7d27e4e0e..ef8f68d4d 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CastResolveResult.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents an explicitly applied conversion (CastExpression or AsExpression) diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs index a9cc22e26..b3827d8a5 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/CompositeResolveVisitorNavigator.cs @@ -17,10 +17,12 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +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 { diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs index a8c04f1f9..4e53b98c9 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/DetectSkippableNodesNavigator.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// When an is searching for specific nodes diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs index e21c5b30d..f8d06d204 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicInvocationResolveResult.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { public enum DynamicInvocationType { /// diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicMemberResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/DynamicMemberResolveResult.cs index 746931b6a..72e6e3213 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/DynamicMemberResolveResult.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents the result of an access to a member of a dynamic object. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs b/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs index df82588c4..0d646decf 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/FindReferencedEntities.cs @@ -17,10 +17,12 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Find all entities that are referenced in the scanned AST. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs index 75c9603fc..53b9a8c30 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/IResolveVisitorNavigator.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Allows controlling which nodes are resolved by the resolve visitor. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/LambdaResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/LambdaResolveResult.cs index 850fc6514..73f431953 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/LambdaResolveResult.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Represents an anonymous method or lambda expression. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/Log.cs b/ICSharpCode.Decompiler/CSharp/Resolver/Log.cs index f5ea9395b..e8884a0e0 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/Log.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Resolver logging helper. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs b/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs index 0bb00cd26..aef828726 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs @@ -20,11 +20,10 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; - -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Implementation of member lookup (C# 4.0 spec, §7.4). diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs b/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs index d1b51248a..7457b4e6f 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/MethodGroupResolveResult.cs @@ -18,16 +18,15 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; -using System.Text; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// A method list that belongs to a declaring type. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/NameLookupMode.cs b/ICSharpCode.Decompiler/CSharp/Resolver/NameLookupMode.cs index 3196dc583..b67f612f2 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/NameLookupMode.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; - -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Resolver { public enum NameLookupMode { diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs b/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs index 11bde999b..df90f0ee9 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/NodeListResolveVisitorNavigator.cs @@ -18,10 +18,12 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// implementation that resolves a list of nodes. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs index c9e3e2690..6956413e0 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolution.cs @@ -20,13 +20,13 @@ using System; using System.Collections.Generic; using System.Diagnostics; 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; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// C# overload resolution (C# 4.0 spec: §7.5). diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs index 9e4904bcf..4ef9a7b98 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/OverloadResolutionErrors.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { [Flags] public enum OverloadResolutionErrors diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs b/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs index 64acd15b8..2a5dbabce 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/ReducedExtensionMethod.cs @@ -23,13 +23,13 @@ // 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.NRefactory.TypeSystem; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// An invocated extension method hides the extension parameter in its parameter list. diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs b/ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs index dbeadb205..082291dd0 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/RenameCallbackArguments.cs @@ -17,8 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { /// /// Arguments for the callback of . diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs b/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs index acbdbbf32..7add45d5d 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/TypeInference.cs @@ -20,12 +20,13 @@ using System; using System.Collections.Generic; 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; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - -namespace ICSharpCode.NRefactory.CSharp.Resolver +namespace ICSharpCode.Decompiler.CSharp.Resolver { public enum TypeInferenceAlgorithm { diff --git a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs index 03159902f..5575ed155 100644 --- a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs +++ b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs @@ -17,14 +17,15 @@ // DEALINGS IN THE SOFTWARE. using System.Diagnostics; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; using ICSharpCode.Decompiler.IL; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.TypeSystem; using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/AstNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs similarity index 94% rename from ICSharpCode.Decompiler/CSharp/Ast/AstNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs index 213270da6..abd0a52f3 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/AstNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstNode.cs @@ -25,17 +25,18 @@ // THE SOFTWARE. using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Threading; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +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 internal static readonly Role RootRole = new Role ("Root"); @@ -72,7 +73,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; } @@ -80,16 +81,16 @@ namespace ICSharpCode.NRefactory.CSharp #endregion #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; } - 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; } @@ -113,12 +114,12 @@ namespace ICSharpCode.NRefactory.CSharp 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); } - 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); } @@ -206,11 +207,11 @@ namespace ICSharpCode.NRefactory.CSharp /// 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. /// - public ICSharpCode.NRefactory.TypeSystem.DomRegion GetRegion() + public DomRegion GetRegion() { var syntaxTree = (this.Ancestors.LastOrDefault() ?? this) as SyntaxTree; 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 { @@ -649,29 +650,29 @@ namespace ICSharpCode.NRefactory.CSharp #region Pattern Matching 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; // try matching if other is null, or if other is an AstNode 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; return (pos == null || o != null) && DoMatch (o, match); } - PatternMatching.INode PatternMatching.INode.NextSibling { + NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.NextSibling { get { return nextSibling; } } - PatternMatching.INode PatternMatching.INode.FirstChild { + NRefactory.PatternMatching.INode NRefactory.PatternMatching.INode.FirstChild { get { return firstChild; } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/AstNodeCollection.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/AstNodeCollection.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs index 32d08b2e4..bba990689 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/AstNodeCollection.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstNodeCollection.cs @@ -23,7 +23,7 @@ using System.Diagnostics; using System.Linq; using ICSharpCode.NRefactory.PatternMatching; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Represents the children of an AstNode that have a specific role. diff --git a/ICSharpCode.Decompiler/CSharp/Ast/AstType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs similarity index 91% rename from ICSharpCode.Decompiler/CSharp/Ast/AstType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs index 80ca72ac9..68c641268 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/AstType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/AstType.cs @@ -18,10 +18,12 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; +using ICSharpCode.NRefactory.PatternMatching; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// A type reference in the C# AST. @@ -54,7 +56,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; } @@ -67,16 +69,16 @@ namespace ICSharpCode.NRefactory.CSharp #endregion #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; } - 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; } @@ -105,12 +107,12 @@ namespace ICSharpCode.NRefactory.CSharp 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); } - 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); } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/CSharpModifierToken.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/CSharpModifierToken.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs index 1a46006f2..fc13db37d 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/CSharpModifierToken.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs @@ -23,11 +23,13 @@ // 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.OutputVisitor; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class CSharpModifierToken : CSharpTokenNode { @@ -52,7 +54,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; return o != null && this.modifier == o.modifier; diff --git a/ICSharpCode.Decompiler/CSharp/Ast/CSharpTokenNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs similarity index 91% rename from ICSharpCode.Decompiler/CSharp/Ast/CSharpTokenNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs index 713f664b3..c3706d0d8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/CSharpTokenNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpTokenNode.cs @@ -23,9 +23,11 @@ // 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.NRefactory.CSharp +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.NRefactory.CSharp; + +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// 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); } - 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; } @@ -121,7 +123,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; return o != null && !o.IsNull && !(o is CSharpModifierToken); diff --git a/ICSharpCode.Decompiler/CSharp/Ast/CSharpUtil.cs b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/CSharpUtil.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs index a2a07ad6e..ced86a5da 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/CSharpUtil.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/CSharpUtil.cs @@ -23,11 +23,11 @@ // 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.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public static class CSharpUtil { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/ComposedType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs similarity index 94% rename from ICSharpCode.Decompiler/CSharp/Ast/ComposedType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs index 2bbfc5a8a..d44cf6fd8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/ComposedType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/ComposedType.cs @@ -23,13 +23,16 @@ // 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 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 { @@ -114,7 +117,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; return o != null @@ -244,7 +247,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; return o != null && this.Dimensions == o.Dimensions; diff --git a/ICSharpCode.Decompiler/CSharp/Ast/DepthFirstAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/DepthFirstAstVisitor.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/DepthFirstAstVisitor.cs index d8c678e2b..f44747046 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/DepthFirstAstVisitor.cs +++ b/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 // THE SOFTWARE. -using System; +using ICSharpCode.NRefactory.CSharp; +using Attribute = ICSharpCode.NRefactory.CSharp.Attribute; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// AST visitor with a default implementation that visits all node depth-first. @@ -627,7 +628,7 @@ namespace ICSharpCode.NRefactory.CSharp VisitChildren(errorNode); } - public virtual void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) + public virtual void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern) { VisitChildren (placeholder); } @@ -1234,7 +1235,7 @@ namespace ICSharpCode.NRefactory.CSharp 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); } @@ -1841,7 +1842,7 @@ namespace ICSharpCode.NRefactory.CSharp 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); } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/DocumentationReference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/DocumentationReference.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/DocumentationReference.cs index 633f921b2..5b89bc2c6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/DocumentationReference.cs +++ b/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 // DEALINGS IN THE SOFTWARE. -using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Represents a 'cref' reference in XML documentation. diff --git a/ICSharpCode.Decompiler/CSharp/Ast/ErrorNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs similarity index 91% rename from ICSharpCode.Decompiler/CSharp/Ast/ErrorNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs index 36d9ef6e0..a7bf6a6ac 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/ErrorNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/ErrorNode.cs @@ -23,9 +23,11 @@ // 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.NRefactory.CSharp +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.NRefactory.CSharp; + +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// 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); } - 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; return o != null; diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousMethodExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousMethodExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs index e8de95431..ea6215bde 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousMethodExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousMethodExpression.cs @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousTypeCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousTypeCreateExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs index 944bf61f5..e0fb338eb 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AnonymousTypeCreateExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AnonymousTypeCreateExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayCreateExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs index 3720a3fc8..d36dd3f81 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayCreateExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayCreateExpression.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayInitializerExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayInitializerExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs index fa3246f92..55bbb7505 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ArrayInitializerExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ArrayInitializerExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AsExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/AsExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs index 5a7b5ac5d..7e4dacbd4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AsExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AsExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AssignmentExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/AssignmentExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs index 95d0cdf28..0f408701c 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/AssignmentExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/AssignmentExpression.cs @@ -27,6 +27,7 @@ using System; using System.Linq.Expressions; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/BaseReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/BaseReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BaseReferenceExpression.cs index 399c36c22..a8a9e8ee5 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/BaseReferenceExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/BinaryOperatorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/BinaryOperatorExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs index e4408e184..b4214d3d3 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/BinaryOperatorExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/BinaryOperatorExpression.cs @@ -27,6 +27,7 @@ using System; using System.Linq.Expressions; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/CastExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/CastExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs index e771d18fe..63c1a2c6e 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/CastExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CastExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/CheckedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/CheckedExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/CheckedExpression.cs index 66bdcb54d..faf0510ef 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/CheckedExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ConditionalExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ConditionalExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ConditionalExpression.cs index 4367a0cce..65772d3ff 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ConditionalExpression.cs +++ b/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 // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/DefaultValueExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/DefaultValueExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DefaultValueExpression.cs index 0aab343f3..1ba6fbc8b 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/DefaultValueExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/DirectionExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/DirectionExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/DirectionExpression.cs index a17c117bb..e20b56fe6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/DirectionExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { public enum FieldDirection diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ErrorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ErrorExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ErrorExpression.cs index 6054792e4..adaa492d2 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ErrorExpression.cs +++ b/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 // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/Expression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/Expression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs index 22962a606..0218a081b 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/Expression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/Expression.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IdentifierExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs similarity index 92% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/IdentifierExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IdentifierExpression.cs index 0ec466c3f..6c8af5611 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IdentifierExpression.cs +++ b/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 // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { @@ -40,7 +41,7 @@ namespace ICSharpCode.NRefactory.CSharp 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 { @@ -52,7 +53,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } set { - SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value)); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IndexerExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/IndexerExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs index cbc80c2cf..b8999bfc2 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IndexerExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IndexerExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/InvocationExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/InvocationExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs index ad768d541..7b3f856a9 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/InvocationExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InvocationExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IsExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/IsExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/IsExpression.cs index 791ab25d7..e77b690a3 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/IsExpression.cs +++ b/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 // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/LambdaExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/LambdaExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs index e85902d84..3106ae284 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/LambdaExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/LambdaExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/MemberReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/MemberReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs index 334c6a260..0215f83e5 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/MemberReferenceExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/MemberReferenceExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedArgumentExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedArgumentExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs index 6b485f015..bd79a825c 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedArgumentExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedArgumentExpression.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { @@ -41,7 +42,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } set { - SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole(Roles.Identifier, Identifier.Create (value)); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs index 92bc993b1..e56669993 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NamedExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NamedExpression.cs @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { @@ -51,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } set { - SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole(Roles.Identifier, Identifier.Create (value)); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NullReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/NullReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/NullReferenceExpression.cs index fbfeb6f91..e19ab7b04 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/NullReferenceExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ObjectCreateExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ObjectCreateExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs index a9665f8c7..5cb476277 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ObjectCreateExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ObjectCreateExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ParenthesizedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ParenthesizedExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ParenthesizedExpression.cs index 7dddcb3fb..9ba439089 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ParenthesizedExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/PointerReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/PointerReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs index 35c4a7203..a13dca5aa 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/PointerReferenceExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PointerReferenceExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/PrimitiveExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/PrimitiveExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs index adfe7c3ba..11bf1adeb 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/PrimitiveExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/PrimitiveExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/QueryExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/QueryExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs index b52f50a47..81d59cfce 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/QueryExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/QueryExpression.cs @@ -19,6 +19,8 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { public class QueryExpression : Expression @@ -194,7 +196,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } 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; } 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; } set { - SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole(Roles.Identifier, Decompiler.CSharp.Syntax.Identifier.Create (value)); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/SizeOfExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/SizeOfExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/SizeOfExpression.cs index 8a794960c..0868ff2be 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/SizeOfExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/StackAllocExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/StackAllocExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/StackAllocExpression.cs index ad9f58c1b..a53942e65 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/StackAllocExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ThisReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/ThisReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/ThisReferenceExpression.cs index 481ef6658..ab8aaac67 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/ThisReferenceExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeOfExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeOfExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs index fd2e93ab8..dea22554b 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeOfExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeOfExpression.cs @@ -25,6 +25,8 @@ // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeReferenceExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeReferenceExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs index 84b2d60dc..e86831b3f 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/TypeReferenceExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/TypeReferenceExpression.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UnaryOperatorExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/UnaryOperatorExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs index 878d6132f..8c39ae912 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UnaryOperatorExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UnaryOperatorExpression.cs @@ -26,6 +26,7 @@ using System; using System.Linq.Expressions; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UncheckedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/UncheckedExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UncheckedExpression.cs index 5b8686a26..5c91d3f81 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UncheckedExpression.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UndocumentedExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Expressions/UndocumentedExpression.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs index 0efc0d70f..6a12672a6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Expressions/UndocumentedExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/UndocumentedExpression.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Attribute.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Attribute.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs index cc99936e5..f2b262c69 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Attribute.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Attribute.cs @@ -25,6 +25,8 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/AttributeSection.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/AttributeSection.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs index 67b04412b..bac41958f 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/AttributeSection.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/AttributeSection.cs @@ -27,6 +27,7 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { @@ -96,7 +97,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } set { - SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole (Roles.Identifier, Identifier.Create (value)); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Comment.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Comment.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Comment.cs index 9d53f6e66..39824eaa2 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Comment.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { public enum CommentType diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Constraint.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Constraint.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs index c49930427..dca7fe645 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/Constraint.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/Constraint.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/DelegateDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/DelegateDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/DelegateDeclaration.cs index 68489bc7f..b71211c84 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/DelegateDeclaration.cs +++ b/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 // THE SOFTWARE. -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/ExternAliasDeclaration.cs index 9404d417f..4e0d80b83 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs +++ b/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 // THE SOFTWARE. +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NamespaceDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NamespaceDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs index dbcf0192d..624f19bf0 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NamespaceDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NamespaceDeclaration.cs @@ -27,6 +27,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NewLineNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs similarity index 95% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NewLineNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs index 12b004420..d6a32f979 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/NewLineNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/NewLineNode.cs @@ -1,4 +1,7 @@ using System; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/PreProcessorDirective.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/PreProcessorDirective.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs index 631f35e98..4a3ccdcd1 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/PreProcessorDirective.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/PreProcessorDirective.cs @@ -26,6 +26,7 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TextNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TextNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs index 4c7f9b942..aa01eef15 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TextNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TextNode.cs @@ -25,6 +25,8 @@ // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs index f2dedfa16..97dcc693b 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeDeclaration.cs @@ -26,7 +26,8 @@ using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs index c992b629a..ef8f7ce22 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/TypeParameterDeclaration.cs @@ -17,7 +17,8 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs index 9924132d3..e00aac0dd 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingAliasDeclaration.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs index 9e0c35a89..f00b6c1a8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/UsingDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/UsingDeclaration.cs @@ -28,6 +28,7 @@ using System; using System.Linq; using System.Text; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/WhitespaceNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/WhitespaceNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs index a03588aa1..2554c9209 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/GeneralScope/WhitespaceNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/GeneralScope/WhitespaceNode.cs @@ -25,6 +25,8 @@ // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; + namespace ICSharpCode.NRefactory.CSharp { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/IAnnotatable.cs b/ICSharpCode.Decompiler/CSharp/Syntax/IAnnotatable.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/IAnnotatable.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/IAnnotatable.cs index 9030de417..0eea3a140 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/IAnnotatable.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/IAnnotatable.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -namespace ICSharpCode.NRefactory +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Provides an interface to handle annotations in an object. diff --git a/ICSharpCode.Decompiler/CSharp/Ast/IAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/IAstVisitor.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs index 4aadddbdc..91fa6b57e 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/IAstVisitor.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/IAstVisitor.cs @@ -16,9 +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 ICSharpCode.NRefactory.CSharp; +using Attribute = ICSharpCode.NRefactory.CSharp.Attribute; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// AST visitor. @@ -149,7 +150,7 @@ namespace ICSharpCode.NRefactory.CSharp void VisitNullNode(AstNode nullNode); void VisitErrorNode(AstNode errorNode); - void VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern); + void VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern); } /// @@ -281,7 +282,7 @@ namespace ICSharpCode.NRefactory.CSharp S VisitNullNode(AstNode nullNode); S VisitErrorNode(AstNode errorNode); - S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern); + S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern); } /// @@ -413,6 +414,6 @@ namespace ICSharpCode.NRefactory.CSharp S VisitNullNode(AstNode nullNode, T data); S VisitErrorNode(AstNode errorNode, T data); - S VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern, T data); + S VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern, T data); } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Identifier.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs similarity index 94% rename from ICSharpCode.Decompiler/CSharp/Ast/Identifier.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs index cf403afbd..392a43be6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Identifier.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Identifier.cs @@ -26,7 +26,7 @@ using System; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class Identifier : AstNode { @@ -54,7 +54,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; } @@ -164,7 +164,7 @@ namespace ICSharpCode.NRefactory.CSharp return visitor.VisitIdentifier (this, data); } - protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) + protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match) { Identifier o = other as Identifier; return o != null && !o.IsNull && MatchString(this.Name, o.Name); diff --git a/ICSharpCode.Decompiler/CSharp/Ast/IdentifierExpressionBackreference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs similarity index 86% rename from ICSharpCode.Decompiler/CSharp/Ast/IdentifierExpressionBackreference.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs index 7bfacd990..7854fb51c 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/IdentifierExpressionBackreference.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs @@ -20,7 +20,7 @@ using System; using System.Linq; using ICSharpCode.NRefactory.PatternMatching; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Matches identifier expressions that have the same identifier as the referenced variable/type definition/method definition. @@ -42,13 +42,13 @@ namespace ICSharpCode.NRefactory.CSharp public override bool DoMatch(INode other, Match match) { - CSharp.IdentifierExpression ident = other as CSharp.IdentifierExpression; + NRefactory.CSharp.IdentifierExpression ident = other as NRefactory.CSharp.IdentifierExpression; if (ident == null || ident.TypeArguments.Any()) return false; - CSharp.AstNode referenced = (CSharp.AstNode)match.Get(referencedGroupName).Last(); + AstNode referenced = (AstNode)match.Get(referencedGroupName).Last(); if (referenced == null) return false; - return ident.Identifier == referenced.GetChildByRole(CSharp.Roles.Identifier).Name; + return ident.Identifier == referenced.GetChildByRole(Roles.Identifier).Name; } } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/MemberType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs similarity index 93% rename from ICSharpCode.Decompiler/CSharp/Ast/MemberType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs index 2045d00ed..c20e78012 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/MemberType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/MemberType.cs @@ -24,14 +24,13 @@ // 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 ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class MemberType : AstType { @@ -112,7 +111,7 @@ namespace ICSharpCode.NRefactory.CSharp return visitor.VisitMemberType (this, data); } - protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) + protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match) { MemberType o = other as MemberType; return o != null && this.IsDoubleColon == o.IsDoubleColon diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Modifiers.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Modifiers.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/Modifiers.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Modifiers.cs index eb320495c..0247d7ff8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Modifiers.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Modifiers.cs @@ -28,7 +28,7 @@ using System; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { [Flags] public enum Modifiers diff --git a/ICSharpCode.Decompiler/CSharp/Ast/NodeType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/NodeType.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/NodeType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/NodeType.cs index cf96a60c8..3237aea26 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/NodeType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/NodeType.cs @@ -24,9 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using System; - -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public enum NodeType { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/ObservableAstVisitor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/ObservableAstVisitor.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs index 898d51864..6ce2a07bb 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/ObservableAstVisitor.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/ObservableAstVisitor.cs @@ -25,8 +25,10 @@ // THE SOFTWARE. using System; +using ICSharpCode.NRefactory.CSharp; +using Attribute = ICSharpCode.NRefactory.CSharp.Attribute; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class ObservableAstVisitor : IAstVisitor { @@ -850,7 +852,7 @@ namespace ICSharpCode.NRefactory.CSharp Visit(EnterNamedExpression, LeaveNamedExpression, namedExpression); } - void IAstVisitor.VisitPatternPlaceholder(AstNode placeholder, PatternMatching.Pattern pattern) + void IAstVisitor.VisitPatternPlaceholder(AstNode placeholder, NRefactory.PatternMatching.Pattern pattern) { } } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/AnyNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/AnyNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNode.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/AnyNodeOrNull.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/AnyNodeOrNull.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/AnyNodeOrNull.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Backreference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Backreference.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Backreference.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/BacktrackingInfo.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/BacktrackingInfo.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/BacktrackingInfo.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Choice.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Choice.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Choice.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/INode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/INode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs index bacf5e461..a8b114a97 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/INode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/INode.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.PatternMatching { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Match.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Match.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Match.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/NamedNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs similarity index 100% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/NamedNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/NamedNode.cs diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/OptionalNode.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/OptionalNode.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs index 2d72677a1..a86b2fc61 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/OptionalNode.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/OptionalNode.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.PatternMatching { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Pattern.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Pattern.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs index c27c9d445..612f866e6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Pattern.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Pattern.cs @@ -20,6 +20,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.PatternMatching { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Repeat.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Repeat.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs index c2b40c5c5..30f59bca8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/PatternMatching/Repeat.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/Repeat.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.PatternMatching { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/PrimitiveType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs similarity index 91% rename from ICSharpCode.Decompiler/CSharp/Ast/PrimitiveType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs index e3761bc82..2beeb1bd3 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/PrimitiveType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/PrimitiveType.cs @@ -23,14 +23,15 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. + using System; -using System.Collections.Generic; -using System.Linq; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +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.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class PrimitiveType : AstType { @@ -99,7 +100,7 @@ namespace ICSharpCode.NRefactory.CSharp return visitor.VisitPrimitiveType (this, data); } - protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) + protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match) { PrimitiveType o = other as PrimitiveType; return o != null && MatchString(this.Keyword, o.Keyword); diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Role.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Role.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Role.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Role.cs index 2a84b464e..5d03a7d46 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Role.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Role.cs @@ -19,7 +19,7 @@ using System; using System.Threading; -namespace ICSharpCode.NRefactory +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Represents the role a node plays within its parent. diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Roles.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs similarity index 89% rename from ICSharpCode.Decompiler/CSharp/Ast/Roles.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs index a7408c91d..aa35babf4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Roles.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Roles.cs @@ -24,28 +24,29 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using System; +using ICSharpCode.NRefactory.CSharp; +using Attribute = ICSharpCode.NRefactory.CSharp.Attribute; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public static class Roles { public static readonly Role Root = AstNode.RootRole; // some pre defined constants for common roles - public static readonly Role Identifier = new Role ("Identifier", CSharp.Identifier.Null); - public static readonly Role Body = new Role ("Body", CSharp.BlockStatement.Null); + 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 Parameter = new Role ("Parameter"); - public static readonly Role Argument = new Role ("Argument", CSharp.Expression.Null); - public static readonly Role Type = new Role ("Type", CSharp.AstType.Null); - public static readonly Role Expression = new Role ("Expression", CSharp.Expression.Null); - public static readonly Role TargetExpression = new Role ("Target", CSharp.Expression.Null); - public readonly static Role Condition = new Role ("Condition", CSharp.Expression.Null); + public static readonly Role Argument = new Role ("Argument", NRefactory.CSharp.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 TypeParameter = new Role ("TypeParameter"); - public static readonly Role TypeArgument = new Role ("TypeArgument", CSharp.AstType.Null); + 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", CSharp.Statement.Null); + public static readonly Role EmbeddedStatement = new Role ("EmbeddedStatement", NRefactory.CSharp.Statement.Null); public readonly static Role TypeMemberRole = new Role ("TypeMember"); diff --git a/ICSharpCode.Decompiler/CSharp/Ast/SimpleType.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs similarity index 89% rename from ICSharpCode.Decompiler/CSharp/Ast/SimpleType.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs index 529a62fbe..bf9fddcd6 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/SimpleType.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/SimpleType.cs @@ -24,15 +24,13 @@ // 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 ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class SimpleType : AstType { @@ -62,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp 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; } @@ -90,7 +88,7 @@ namespace ICSharpCode.NRefactory.CSharp public SimpleType(string identifier, TextLocation location) { - SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (identifier, location)); + SetChildByRole (Roles.Identifier, Syntax.Identifier.Create (identifier, location)); } public SimpleType (string identifier, IEnumerable typeArguments) @@ -110,7 +108,7 @@ namespace ICSharpCode.NRefactory.CSharp return GetChildByRole (Roles.Identifier).Name; } set { - SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (value)); + SetChildByRole (Roles.Identifier, Syntax.Identifier.Create (value)); } } @@ -142,7 +140,7 @@ namespace ICSharpCode.NRefactory.CSharp return visitor.VisitSimpleType (this, data); } - protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) + protected internal override bool DoMatch(AstNode other, NRefactory.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/Ast/Statements/BlockStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/BlockStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs index 24b9cd106..b7b094457 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/BlockStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BlockStatement.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/BreakStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/BreakStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs index 4bb4e39ef..32e5b83c7 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/BreakStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/BreakStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/CheckedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/CheckedStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs index 803067aff..25270fc3f 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/CheckedStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/CheckedStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ContinueStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ContinueStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs index aac1690b2..5117658f8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ContinueStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ContinueStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/DoWhileStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/DoWhileStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs index 280ca7cea..ac0064428 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/DoWhileStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/DoWhileStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/EmptyStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/EmptyStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs index deaa3a9c4..394d42ef4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/EmptyStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/EmptyStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ExpressionStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ExpressionStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs index 1fdc4ddc4..0df9c53d7 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ExpressionStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ExpressionStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/FixedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/FixedStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs index d44366504..16e7a8157 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/FixedStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/FixedStatement.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ForStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ForStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs index d369536d0..d0a2b780c 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ForStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForStatement.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ForeachStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ForeachStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs index b3a9c5f78..bf12df024 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ForeachStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ForeachStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/GotoStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/GotoStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs index 7aff7a82f..f7aacb6fb 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/GotoStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/GotoStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/IfElseStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/IfElseStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs index 70ece3fd5..096af1803 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/IfElseStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/IfElseStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/LabelStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/LabelStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs index 43d22cea7..a5957a81f 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/LabelStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LabelStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/LockStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/LockStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs index e59f99308..720c1a12b 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/LockStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/LockStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ReturnStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ReturnStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs index 0970bce43..f2366bc7d 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ReturnStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ReturnStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/Statement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/Statement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs index 24d3ede92..79028d388 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/Statement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/Statement.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/SwitchStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/SwitchStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs index fa8e80cd5..356f9aff7 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/SwitchStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/SwitchStatement.cs @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ThrowStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/ThrowStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs index 98e27d1e7..f959d96d8 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/ThrowStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/ThrowStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/TryCatchStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/TryCatchStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs index b93a168a4..6d0bd3f73 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/TryCatchStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UncheckedStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/UncheckedStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs index 765cd9ab3..6b2050d54 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UncheckedStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UncheckedStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UnsafeStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/UnsafeStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs index fa6421ae6..4b69f65af 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UnsafeStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UnsafeStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UsingStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/UsingStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs index c87304675..9b35e55ed 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/UsingStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/UsingStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/VariableDeclarationStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/VariableDeclarationStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs index 32c141d96..ec28dd401 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/VariableDeclarationStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/VariableDeclarationStatement.cs @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/WhileStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/WhileStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs index e38daa144..d229383c4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/WhileStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/WhileStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldBreakStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldBreakStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs index ea5cac4a6..282148b63 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldBreakStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldBreakStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldReturnStatement.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldReturnStatement.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs index 6539bf0c0..999dcdaf9 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/Statements/YieldReturnStatement.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/Statements/YieldReturnStatement.cs @@ -24,6 +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 { /// diff --git a/ICSharpCode.Decompiler/CSharp/Ast/SyntaxExtensions.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs similarity index 95% rename from ICSharpCode.Decompiler/CSharp/Ast/SyntaxExtensions.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs index bac28bb76..9f2a0278d 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/SyntaxExtensions.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxExtensions.cs @@ -18,9 +18,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using System; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Extension methods for the syntax tree. diff --git a/ICSharpCode.Decompiler/CSharp/Ast/SyntaxTree.cs b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs similarity index 92% rename from ICSharpCode.Decompiler/CSharp/Ast/SyntaxTree.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs index fccf906fc..e521d5e20 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/SyntaxTree.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/SyntaxTree.cs @@ -24,16 +24,13 @@ // 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.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem; -using System.Threading; -using System.IO; -using ICSharpCode.NRefactory.Editor; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { public class SyntaxTree : AstNode { @@ -125,7 +122,7 @@ namespace ICSharpCode.NRefactory.CSharp } - protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) + protected internal override bool DoMatch(AstNode other, NRefactory.PatternMatching.Match match) { SyntaxTree o = other as SyntaxTree; return o != null && this.Members.DoMatch(o.Members, match); diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TextLocation.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs similarity index 95% rename from ICSharpCode.Decompiler/CSharp/Ast/TextLocation.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs index ead697ce8..ef4f5ff65 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TextLocation.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TextLocation.cs @@ -19,16 +19,17 @@ using System; using System.ComponentModel; using System.Globalization; +using ICSharpCode.NRefactory.Editor; -namespace ICSharpCode.NRefactory +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// A line/column position. /// Text editor lines/columns are counted started from one. /// /// - /// The document provides the methods and - /// to convert between offsets and TextLocations. + /// The document provides the methods and + /// to convert between offsets and TextLocations. /// [Serializable] [TypeConverter(typeof(TextLocationConverter))] diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TokenRole.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TokenRole.cs similarity index 95% rename from ICSharpCode.Decompiler/CSharp/Ast/TokenRole.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TokenRole.cs index 8c9c7392a..7ac213103 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TokenRole.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TokenRole.cs @@ -1,7 +1,6 @@ -using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.CSharp +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// A specific role only used for C# tokens diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/Accessor.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/Accessor.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs index 8bd18c477..8917d1600 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/Accessor.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/Accessor.cs @@ -25,7 +25,8 @@ // THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ConstructorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ConstructorDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs index 23a973a5c..0b40dcaa4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ConstructorDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ConstructorDeclaration.cs @@ -24,7 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/DestructorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/DestructorDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs index 0609e5dc6..61c77d187 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/DestructorDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/DestructorDeclaration.cs @@ -24,7 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EntityDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EntityDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs index c02ff21b6..4bde2f067 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EntityDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EntityDeclaration.cs @@ -19,6 +19,8 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { @@ -33,7 +35,7 @@ namespace ICSharpCode.NRefactory.CSharp get { return NodeType.Member; } } - public abstract NRefactory.TypeSystem.SymbolKind SymbolKind { get; } + public abstract SymbolKind SymbolKind { get; } public AstNodeCollection Attributes { get { return base.GetChildrenByRole (AttributeRole); } diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs index b7c924ab9..e802d6594 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EnumMemberDeclaration.cs @@ -25,7 +25,8 @@ // THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EventDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EventDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs index d543f9ea7..d9dbaa239 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/EventDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/EventDeclaration.cs @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.ComponentModel; - -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FieldDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FieldDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs index de220ecd7..2add610bc 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FieldDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FieldDeclaration.cs @@ -26,7 +26,8 @@ using System; using System.ComponentModel; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedFieldDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs similarity index 96% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedFieldDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs index fea2a2af2..dfb4ef652 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedFieldDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedFieldDeclaration.cs @@ -24,7 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedVariableInitializer.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedVariableInitializer.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs index 2c320a826..095ecb5a7 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/FixedVariableInitializer.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/FixedVariableInitializer.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/IndexerDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/IndexerDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs index 56156dd19..8ee17a57a 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/IndexerDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/IndexerDeclaration.cs @@ -26,7 +26,8 @@ using System; using System.ComponentModel; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/MethodDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/MethodDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs index 90aaa3047..4141cd137 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/MethodDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/MethodDeclaration.cs @@ -24,7 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/OperatorDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/OperatorDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs index 5162b3174..b20d8cd67 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/OperatorDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/OperatorDeclaration.cs @@ -26,7 +26,8 @@ using System; using System.ComponentModel; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ParameterDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ParameterDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs index cc69ff1fd..69e52279e 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/ParameterDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs @@ -27,6 +27,7 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/PropertyDeclaration.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs similarity index 97% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/PropertyDeclaration.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs index 1f137e0c9..c2a82ccea 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/PropertyDeclaration.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/PropertyDeclaration.cs @@ -23,7 +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 ICSharpCode.NRefactory.TypeSystem; + +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/VariableInitializer.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs similarity index 99% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/VariableInitializer.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs index dbf4bbe3d..4caf747a4 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeMembers/VariableInitializer.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/VariableInitializer.cs @@ -24,6 +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 { public class VariableInitializer : AstNode diff --git a/ICSharpCode.Decompiler/CSharp/Ast/TypeSystemAstBuilder.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs similarity index 98% rename from ICSharpCode.Decompiler/CSharp/Ast/TypeSystemAstBuilder.cs rename to ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs index 476ab8dcb..a50c2bd53 100644 --- a/ICSharpCode.Decompiler/CSharp/Ast/TypeSystemAstBuilder.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs @@ -20,14 +20,17 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +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.NRefactory.CSharp.Refactoring +namespace ICSharpCode.Decompiler.CSharp.Syntax { /// /// Converts from type system to the C# AST. diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs b/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs index 7d03fd979..7ba94ddb5 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/AddCheckedBlocks.cs @@ -18,6 +18,7 @@ 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 21814a06f..ef6927dff 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/ContextTrackingVisitor.cs @@ -18,8 +18,9 @@ using System; using System.Diagnostics; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.TypeSystem; 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 e6c77e436..efa174ffa 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs @@ -20,10 +20,10 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; 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 401f554de..887cc6b5f 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/CustomPatterns.cs @@ -19,6 +19,7 @@ using System; using System.Linq; using System.Reflection; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; using Mono.Cecil; diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs index b67d42ed3..93398cccb 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/DecimalConstantTransform.cs @@ -17,9 +17,10 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs b/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs index a124b1164..fe43041f7 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/DeclareVariables.cs @@ -21,12 +21,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.Utils; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs b/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs index 5f487577e..ce2af1cfa 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/EscapeInvalidIdentifiers.cs @@ -18,8 +18,9 @@ using System; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.Semantics; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs b/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs index 845a79bb1..505bc0f40 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/FixNameCollisions.cs @@ -19,8 +19,10 @@ 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; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs index 4e106ed88..f743bba27 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/IAstTransform.cs @@ -18,8 +18,8 @@ using System; using System.Threading; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs index 01514aa0b..83f1cd851 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUnsafeModifier.cs @@ -17,8 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs index 27b486d06..8bea7c0ba 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/IntroduceUsingDeclarations.cs @@ -19,12 +19,12 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; 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 Mono.Cecil; namespace ICSharpCode.Decompiler.CSharp.Transforms diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs b/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs index dc0644989..b79d743cc 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/PatternStatementTransform.cs @@ -20,13 +20,12 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; - +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.CSharp.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp.Analysis; -using ICSharpCode.NRefactory.CSharp.TypeSystem; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; 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 fe75fc727..16082f96e 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs @@ -20,8 +20,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.TypeSystem; using Mono.Cecil; using Ast = ICSharpCode.NRefactory.CSharp; using ICSharpCode.NRefactory.CSharp; diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs index 212ef2457..b8b085cfb 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs @@ -18,9 +18,8 @@ using System; using System.Threading; -using ICSharpCode.NRefactory.CSharp.Refactoring; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.CSharp.Transforms { diff --git a/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs b/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs index d3c385a0a..36ca422f4 100644 --- a/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs +++ b/ICSharpCode.Decompiler/CSharp/TranslatedExpression.cs @@ -20,11 +20,12 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.CSharp.Transforms; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/TranslationContext.cs b/ICSharpCode.Decompiler/CSharp/TranslationContext.cs index 87a8ee3f9..7b492201b 100644 --- a/ICSharpCode.Decompiler/CSharp/TranslationContext.cs +++ b/ICSharpCode.Decompiler/CSharp/TranslationContext.cs @@ -17,7 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.CSharp { diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/AliasNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/AliasNamespaceReference.cs index 3b3e9e5ef..f6c834320 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/AliasNamespaceReference.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/AliasNamespaceReference.cs @@ -17,11 +17,11 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Looks up an alias (identifier in front of :: operator). diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/AttributeTypeReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/AttributeTypeReference.cs index 36f4ee0f0..c854c4aac 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/AttributeTypeReference.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/AttributeTypeReference.cs @@ -17,16 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Diagnostics; -using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Type reference used within an attribute. diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs index 5af7d8e3b..5fafb46a7 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpAttribute.cs @@ -18,16 +18,14 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { [Serializable] public sealed class CSharpAttribute : IUnresolvedAttribute diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpTypeResolveContext.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpTypeResolveContext.cs index 40933dbfd..fd4fe6dfa 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpTypeResolveContext.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/CSharpTypeResolveContext.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { public sealed class CSharpTypeResolveContext : ITypeResolveContext { diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs index 24760b0db..a08a3591b 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/ConstantValues.cs @@ -18,14 +18,14 @@ using System; using System.Collections.Generic; -using System.Linq; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem.ConstantValues +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. diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs index 4315e8d29..b09db3d14 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/MemberTypeOrNamespaceReference.cs @@ -18,14 +18,14 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Reference to a qualified type or namespace name. diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs index fc9e6cd86..786de505e 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/MethodTypeParameterWithInheritedConstraints.cs @@ -19,11 +19,12 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { [Serializable] public sealed class MethodTypeParameterWithInheritedConstraints : DefaultUnresolvedTypeParameter diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs index 210325117..fac4346e9 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/ResolvedUsingScope.cs @@ -21,13 +21,15 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Resolver; +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.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Resolved version of using scope. diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs index 33cb1639c..96232e1e6 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/SimpleTypeOrNamespaceReference.cs @@ -18,15 +18,14 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Represents a simple C# name. (a single non-qualified identifier with an optional list of type arguments) diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/TypeOrNamespaceReference.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/TypeOrNamespaceReference.cs index c4d0d5143..3574fa7e8 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/TypeOrNamespaceReference.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/TypeOrNamespaceReference.cs @@ -17,11 +17,11 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Resolver; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Represents a reference which could point to a type or namespace. diff --git a/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs b/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs index 6050a1c69..1a1ab1820 100644 --- a/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs +++ b/ICSharpCode.Decompiler/CSharp/TypeSystem/UsingScope.cs @@ -18,14 +18,12 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory.CSharp; -namespace ICSharpCode.NRefactory.CSharp.TypeSystem +namespace ICSharpCode.Decompiler.CSharp.TypeSystem { /// /// Represents a scope that contains "using" statements. diff --git a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs index e58aa7857..9288fb9c6 100644 --- a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs +++ b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs @@ -24,9 +24,12 @@ using System.Linq; using System.Resources; using System.Threading.Tasks; using System.Xml; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.CSharp.Transforms; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.Utils; using Mono.Cecil; namespace ICSharpCode.Decompiler.CSharp diff --git a/ICSharpCode.Decompiler/CecilExtensions.cs b/ICSharpCode.Decompiler/CecilExtensions.cs index c94e96a66..14accb955 100644 --- a/ICSharpCode.Decompiler/CecilExtensions.cs +++ b/ICSharpCode.Decompiler/CecilExtensions.cs @@ -19,8 +19,10 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; using Mono.Cecil.Cil; +using ArrayType = Mono.Cecil.ArrayType; namespace ICSharpCode.Decompiler { @@ -362,9 +364,9 @@ namespace ICSharpCode.Decompiler } } - public static ICSharpCode.NRefactory.TypeSystem.FullTypeName GetFullTypeName(this TypeDefinition typeDef) + public static FullTypeName GetFullTypeName(this TypeDefinition typeDef) { - return new ICSharpCode.NRefactory.TypeSystem.FullTypeName(typeDef.FullName); + return new FullTypeName(typeDef.FullName); } public static bool IsDelegate(this TypeDefinition type) diff --git a/ICSharpCode.Decompiler/DecompilerSettings.cs b/ICSharpCode.Decompiler/DecompilerSettings.cs index 74bdc9433..090465b3a 100644 --- a/ICSharpCode.Decompiler/DecompilerSettings.cs +++ b/ICSharpCode.Decompiler/DecompilerSettings.cs @@ -18,6 +18,7 @@ using System; using System.ComponentModel; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; using ICSharpCode.NRefactory.CSharp; namespace ICSharpCode.Decompiler diff --git a/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs b/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs index a93758bd7..b1013b6c2 100644 --- a/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs +++ b/ICSharpCode.Decompiler/Documentation/DocumentationComment.cs @@ -17,8 +17,8 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.Editor; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Documentation/GetPotentiallyNestedClassTypeReference.cs b/ICSharpCode.Decompiler/Documentation/GetPotentiallyNestedClassTypeReference.cs index 1e5807d77..86bafce76 100644 --- a/ICSharpCode.Decompiler/Documentation/GetPotentiallyNestedClassTypeReference.cs +++ b/ICSharpCode.Decompiler/Documentation/GetPotentiallyNestedClassTypeReference.cs @@ -18,8 +18,8 @@ using System; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs b/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs index d02dea360..be944095c 100644 --- a/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs +++ b/ICSharpCode.Decompiler/Documentation/IDocumentationProvider.cs @@ -18,7 +18,7 @@ using System; using System.IO; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Documentation/IdStringMemberReference.cs b/ICSharpCode.Decompiler/Documentation/IdStringMemberReference.cs index db7706e02..fb722dcbc 100644 --- a/ICSharpCode.Decompiler/Documentation/IdStringMemberReference.cs +++ b/ICSharpCode.Decompiler/Documentation/IdStringMemberReference.cs @@ -17,7 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs b/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs index 3b2315628..44d57920d 100644 --- a/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs +++ b/ICSharpCode.Decompiler/Documentation/IdStringProvider.cs @@ -20,8 +20,8 @@ using System; using System.Linq; using System.Collections.Generic; using System.Text; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs b/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs index ae9a0a1fa..a79a052ba 100644 --- a/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs +++ b/ICSharpCode.Decompiler/Documentation/XmlDocumentationProvider.cs @@ -23,8 +23,8 @@ using System.IO; using System.Runtime.Serialization; using System.Text; using System.Xml; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.Editor; -using ICSharpCode.NRefactory.TypeSystem; namespace ICSharpCode.NRefactory.Documentation { diff --git a/ICSharpCode.Decompiler/Editor/IDocument.cs b/ICSharpCode.Decompiler/Editor/IDocument.cs index b18732c05..6efeca525 100644 --- a/ICSharpCode.Decompiler/Editor/IDocument.cs +++ b/ICSharpCode.Decompiler/Editor/IDocument.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.Editor { diff --git a/ICSharpCode.Decompiler/Editor/ITextAnchor.cs b/ICSharpCode.Decompiler/Editor/ITextAnchor.cs index cf61db1cc..c617efb25 100644 --- a/ICSharpCode.Decompiler/Editor/ITextAnchor.cs +++ b/ICSharpCode.Decompiler/Editor/ITextAnchor.cs @@ -17,6 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.Editor { diff --git a/ICSharpCode.Decompiler/Editor/ReadOnlyDocument.cs b/ICSharpCode.Decompiler/Editor/ReadOnlyDocument.cs index 6770d4a8b..b71e4c8eb 100644 --- a/ICSharpCode.Decompiler/Editor/ReadOnlyDocument.cs +++ b/ICSharpCode.Decompiler/Editor/ReadOnlyDocument.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.NRefactory.Editor { diff --git a/ICSharpCode.Decompiler/Editor/StringBuilderDocument.cs b/ICSharpCode.Decompiler/Editor/StringBuilderDocument.cs index 5f234687b..403471de4 100644 --- a/ICSharpCode.Decompiler/Editor/StringBuilderDocument.cs +++ b/ICSharpCode.Decompiler/Editor/StringBuilderDocument.cs @@ -20,7 +20,8 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.NRefactory.Editor { diff --git a/ICSharpCode.Decompiler/Editor/TextSourceVersionProvider.cs b/ICSharpCode.Decompiler/Editor/TextSourceVersionProvider.cs index b3415c940..b235ad2f7 100644 --- a/ICSharpCode.Decompiler/Editor/TextSourceVersionProvider.cs +++ b/ICSharpCode.Decompiler/Editor/TextSourceVersionProvider.cs @@ -20,6 +20,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.NRefactory.Editor { diff --git a/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs b/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs index b33a90db5..a95b88922 100644 --- a/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs +++ b/ICSharpCode.Decompiler/FlowAnalysis/ControlFlowNode.cs @@ -20,7 +20,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.Utils; namespace ICSharpCode.Decompiler.FlowAnalysis { diff --git a/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs b/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs index d0fa90c81..3d897a970 100644 --- a/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs +++ b/ICSharpCode.Decompiler/FlowAnalysis/DefiniteAssignmentVisitor.cs @@ -19,6 +19,7 @@ using System; using System.Diagnostics; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.FlowAnalysis { diff --git a/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs b/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs index ecbb28709..8037d8611 100644 --- a/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs +++ b/ICSharpCode.Decompiler/FlowAnalysis/Dominance.cs @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.FlowAnalysis { diff --git a/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs b/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs index 45241d736..409c269b7 100644 --- a/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs +++ b/ICSharpCode.Decompiler/FlowAnalysis/ReachingDefinitionsVisitor.cs @@ -23,6 +23,7 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.FlowAnalysis { diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index ae66c2a83..b33fb0862 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -73,138 +73,138 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + ArrayInitializerExpression.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -296,7 +296,7 @@ - + diff --git a/ICSharpCode.Decompiler/IL/BlockBuilder.cs b/ICSharpCode.Decompiler/IL/BlockBuilder.cs index 741f07cda..ffd0036cc 100644 --- a/ICSharpCode.Decompiler/IL/BlockBuilder.cs +++ b/ICSharpCode.Decompiler/IL/BlockBuilder.cs @@ -23,7 +23,8 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs index 100857c29..c1b763c8f 100644 --- a/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs +++ b/ICSharpCode.Decompiler/IL/ControlFlow/ConditionDetection.cs @@ -22,6 +22,7 @@ using System.Diagnostics; using System.Linq; using ICSharpCode.Decompiler.FlowAnalysis; using ICSharpCode.Decompiler.IL.Transforms; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.ControlFlow { diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs b/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs index 6485990ed..f9f7684c0 100644 --- a/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs +++ b/ICSharpCode.Decompiler/IL/ControlFlow/DetectPinnedRegions.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL.ControlFlow { diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs index dd804de4b..07aa55061 100644 --- a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs +++ b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs @@ -22,7 +22,7 @@ using System.Diagnostics; using System.Linq; using ICSharpCode.Decompiler.FlowAnalysis; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.ControlFlow { diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs index e9d83a8c6..68e7fe403 100644 --- a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs +++ b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchAnalysis.cs @@ -4,6 +4,8 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.ControlFlow { diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs index dd899dab7..eda0a541d 100644 --- a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs +++ b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs @@ -23,6 +23,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Diagnostics; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.ControlFlow { diff --git a/ICSharpCode.Decompiler/IL/ILReader.cs b/ICSharpCode.Decompiler/IL/ILReader.cs index b4b7bd105..7d2caf5e0 100644 --- a/ICSharpCode.Decompiler/IL/ILReader.cs +++ b/ICSharpCode.Decompiler/IL/ILReader.cs @@ -23,11 +23,14 @@ using System.Text; using System.Threading.Tasks; using System.Collections.Immutable; using System.Diagnostics; -using ICSharpCode.NRefactory.TypeSystem; using Mono.Cecil; using Cil = Mono.Cecil.Cil; using System.Collections; using System.Threading; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; +using ArrayType = ICSharpCode.Decompiler.TypeSystem.ArrayType; +using ByReferenceType = ICSharpCode.Decompiler.TypeSystem.ByReferenceType; namespace ICSharpCode.Decompiler.IL { @@ -48,14 +51,14 @@ namespace ICSharpCode.Decompiler.IL StackType methodReturnStackType; Cil.Instruction currentInstruction; int nextInstructionIndex; - ImmutableStack currentStack; + System.Collections.Immutable.ImmutableStack currentStack; ILVariable[] parameterVariables; ILVariable[] localVariables; BitArray isBranchTarget; List instructionBuilder; // Dictionary that stores stacks for each IL instruction - Dictionary> stackByOffset; + Dictionary> stackByOffset; Dictionary variableByExceptionHandler; UnionFind unionFind; IEnumerable stackVariables; @@ -67,7 +70,7 @@ namespace ICSharpCode.Decompiler.IL this.body = body; this.currentInstruction = null; this.nextInstructionIndex = 0; - this.currentStack = ImmutableStack.Empty; + this.currentStack = System.Collections.Immutable.ImmutableStack.Empty; this.unionFind = new UnionFind(); this.methodReturnStackType = typeSystem.Resolve(body.Method.ReturnType).GetStackType(); InitParameterVariables(); @@ -79,7 +82,7 @@ namespace ICSharpCode.Decompiler.IL } this.instructionBuilder = new List(); this.isBranchTarget = new BitArray(body.CodeSize); - this.stackByOffset = new Dictionary>(); + this.stackByOffset = new Dictionary>(); this.variableByExceptionHandler = new Dictionary(); } @@ -138,7 +141,7 @@ namespace ICSharpCode.Decompiler.IL if (def != null && def.TypeParameterCount > 0) { parameterType = new ParameterizedType(def, def.TypeArguments); if (def.IsReferenceType == false) { - parameterType = new NRefactory.TypeSystem.ByReferenceType(parameterType); + parameterType = new ByReferenceType(parameterType); } } else { parameterType = typeSystem.Resolve(p.ParameterType); @@ -173,7 +176,7 @@ namespace ICSharpCode.Decompiler.IL Debug.Fail(string.Format("IL_{0:x4}: {1}", currentInstruction.Offset, message)); } - void MergeStacks(ImmutableStack a, ImmutableStack b) + void MergeStacks(System.Collections.Immutable.ImmutableStack a, System.Collections.Immutable.ImmutableStack b) { var enum1 = a.GetEnumerator(); var enum2 = b.GetEnumerator(); @@ -192,9 +195,9 @@ namespace ICSharpCode.Decompiler.IL } } - void StoreStackForOffset(int offset, ImmutableStack stack) + void StoreStackForOffset(int offset, System.Collections.Immutable.ImmutableStack stack) { - ImmutableStack existing; + System.Collections.Immutable.ImmutableStack existing; if (stackByOffset.TryGetValue(offset, out existing)) { MergeStacks(existing, stack); } else { @@ -206,7 +209,7 @@ namespace ICSharpCode.Decompiler.IL { // Fill isBranchTarget and branchStackDict based on exception handlers foreach (var eh in body.ExceptionHandlers) { - ImmutableStack ehStack = null; + System.Collections.Immutable.ImmutableStack ehStack = null; if (eh.HandlerType == Cil.ExceptionHandlerType.Catch || eh.HandlerType == Cil.ExceptionHandlerType.Filter) { var v = new ILVariable(VariableKind.Exception, typeSystem.Resolve(eh.CatchType), eh.HandlerStart.Offset) { Name = "E_" + eh.HandlerStart.Offset @@ -214,7 +217,7 @@ namespace ICSharpCode.Decompiler.IL variableByExceptionHandler.Add(eh, v); ehStack = ImmutableStack.Create(v); } else { - ehStack = ImmutableStack.Empty; + ehStack = System.Collections.Immutable.ImmutableStack.Empty; } if (eh.FilterStart != null) { isBranchTarget[eh.FilterStart.Offset] = true; @@ -240,7 +243,7 @@ namespace ICSharpCode.Decompiler.IL instructionBuilder.Add(decodedInstruction); if (decodedInstruction.HasDirectFlag(InstructionFlags.EndPointUnreachable)) { if (!stackByOffset.TryGetValue(end, out currentStack)) { - currentStack = ImmutableStack.Empty; + currentStack = System.Collections.Immutable.ImmutableStack.Empty; } } Debug.Assert(currentInstruction.Next == null || currentInstruction.Next.Offset == end); @@ -296,10 +299,10 @@ namespace ICSharpCode.Decompiler.IL var blockBuilder = new BlockBuilder(body, typeSystem, variableByExceptionHandler); var container = blockBuilder.CreateBlocks(instructionBuilder, isBranchTarget); var function = new ILFunction(body.Method, container); - function.Variables.AddRange(parameterVariables); - function.Variables.AddRange(localVariables); - function.Variables.AddRange(stackVariables); - function.Variables.AddRange(variableByExceptionHandler.Values); + CollectionExtensions.AddRange(function.Variables, parameterVariables); + CollectionExtensions.AddRange(function.Variables, localVariables); + CollectionExtensions.AddRange(function.Variables, stackVariables); + CollectionExtensions.AddRange(function.Variables, variableByExceptionHandler.Values); function.AddRef(); // mark the root node foreach (var c in function.Descendants.OfType()) { c.SortBlocks(); @@ -1050,7 +1053,7 @@ namespace ICSharpCode.Decompiler.IL } switch (method.DeclaringType.Kind) { case TypeKind.Array: - var elementType = ((ICSharpCode.NRefactory.TypeSystem.ArrayType)method.DeclaringType).ElementType; + var elementType = ((ArrayType)method.DeclaringType).ElementType; if (opCode == OpCode.NewObj) return Push(new NewArr(elementType, arguments)); if (method.Name == "Set") { diff --git a/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs b/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs index 6ea50297e..d46a69c31 100644 --- a/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs +++ b/ICSharpCode.Decompiler/IL/ILTypeExtensions.cs @@ -23,6 +23,7 @@ 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 7ca9d8a09..95fb5351d 100644 --- a/ICSharpCode.Decompiler/IL/ILVariable.cs +++ b/ICSharpCode.Decompiler/IL/ILVariable.cs @@ -16,9 +16,9 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -using ICSharpCode.NRefactory.TypeSystem; using System; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs b/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs index 311be0419..7832dbd77 100644 --- a/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs +++ b/ICSharpCode.Decompiler/IL/InstructionOutputExtensions.cs @@ -21,8 +21,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Disassembler; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions.cs b/ICSharpCode.Decompiler/IL/Instructions.cs index 41a0f7a14..eda5384da 100644 --- a/ICSharpCode.Decompiler/IL/Instructions.cs +++ b/ICSharpCode.Decompiler/IL/Instructions.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs index 48a980c6b..66c80b74e 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs @@ -19,8 +19,7 @@ using System; using System.Diagnostics; using System.Linq; - -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/Block.cs b/ICSharpCode.Decompiler/IL/Instructions/Block.cs index a39d359fe..cf634d359 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/Block.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/Block.cs @@ -24,8 +24,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs b/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs index 552b6ea06..e1bf24c5c 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs @@ -23,6 +23,7 @@ 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/CallInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs index 91fb2b6b7..e873f9603 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/CallInstruction.cs @@ -22,8 +22,8 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; -using ICSharpCode.NRefactory.TypeSystem; using ICSharpCode.Decompiler.Disassembler; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/Comp.cs b/ICSharpCode.Decompiler/IL/Instructions/Comp.cs index 112f2bbb2..07c391e6f 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/Comp.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/Comp.cs @@ -19,6 +19,7 @@ using System; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs index 541c56892..e9a1de69d 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs @@ -19,8 +19,7 @@ using System; using System.Diagnostics; using System.Linq; - -using ICSharpCode.NRefactory.TypeSystem; +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 f98b78c41..794768d60 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/Conv.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/Conv.cs @@ -18,6 +18,7 @@ using System; using System.Diagnostics; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/ILFunction.cs b/ICSharpCode.Decompiler/IL/Instructions/ILFunction.cs index 9f0cedcf9..aa47dbca1 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/ILFunction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/ILFunction.cs @@ -20,10 +20,11 @@ using System; using System.Collections.Generic; using System.Threading; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.TypeSystem; using Mono.Cecil; using ICSharpCode.Decompiler.Disassembler; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs index e113824bf..f46f85c00 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs @@ -20,6 +20,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; using ICSharpCode.Decompiler.IL.Patterns; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL { @@ -665,16 +667,16 @@ namespace ICSharpCode.Decompiler.IL public interface IInstructionWithTypeOperand { - ICSharpCode.NRefactory.TypeSystem.IType Type { get; } + IType Type { get; } } public interface IInstructionWithFieldOperand { - ICSharpCode.NRefactory.TypeSystem.IField Field { get; } + IField Field { get; } } public interface IInstructionWithMethodOperand { - ICSharpCode.NRefactory.TypeSystem.IMethod Method { get; } + IMethod Method { get; } } } diff --git a/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs b/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs index 38c653555..271cf20d8 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/PatternMatching.cs @@ -17,7 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs index a8ebb79ee..b9aa0c03b 100644 --- a/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs +++ b/ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs @@ -20,6 +20,7 @@ using System; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/SemanticHelper.cs b/ICSharpCode.Decompiler/IL/SemanticHelper.cs index 8985d5f7b..da94b41c6 100644 --- a/ICSharpCode.Decompiler/IL/SemanticHelper.cs +++ b/ICSharpCode.Decompiler/IL/SemanticHelper.cs @@ -18,6 +18,7 @@ using System; using System.Linq; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL { diff --git a/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs b/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs index e332470ba..f5e57a530 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/CachedDelegateInitialization.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.IL; -using ICSharpCode.NRefactory.TypeSystem; +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 8fdb2ba22..031555db2 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs @@ -18,6 +18,8 @@ using System; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.Transforms { @@ -49,7 +51,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms }; block.Instructions.Insert(i++, new StLoc(uninlinedArgs[j], arg)); } - v.Scope.Variables.AddRange(uninlinedArgs); + CollectionExtensions.AddRange(v.Scope.Variables, uninlinedArgs); // perform copy propagation: foreach (var expr in v.Scope.Descendants) { if (expr.MatchLdLoc(v)) { diff --git a/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs b/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs index b31b6afd7..fcda190c0 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.IL; -using ICSharpCode.NRefactory.TypeSystem; +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 3d4c7bacf..8171079bd 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs @@ -19,7 +19,7 @@ using System; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL.Transforms { diff --git a/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs index 4d31e009f..8166b547f 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs @@ -19,6 +19,7 @@ using System; using System.Diagnostics; using System.Threading; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL.Transforms { diff --git a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs index 19e844579..373e7cdbf 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs @@ -20,9 +20,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; using Mono.Cecil; using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL.Transforms { diff --git a/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs b/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs index 186e97deb..cb6a424d6 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/SplitVariables.cs @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using ICSharpCode.Decompiler.FlowAnalysis; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.IL.Transforms { diff --git a/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs b/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs index 223aa0312..d39eea79d 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/Stepper.cs @@ -22,6 +22,7 @@ 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/TransformArrayInitializers.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformArrayInitializers.cs index a5b85c343..f0f18e2c2 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/TransformArrayInitializers.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/TransformArrayInitializers.cs @@ -19,8 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +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 f9d984b2d..c8e8b4545 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs @@ -19,8 +19,7 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler.IL.Transforms { diff --git a/ICSharpCode.Decompiler/NRExtensions.cs b/ICSharpCode.Decompiler/NRExtensions.cs index 21dabcf4b..4e72c08ab 100644 --- a/ICSharpCode.Decompiler/NRExtensions.cs +++ b/ICSharpCode.Decompiler/NRExtensions.cs @@ -17,7 +17,7 @@ // DEALINGS IN THE SOFTWARE. using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; namespace ICSharpCode.Decompiler { diff --git a/ICSharpCode.Decompiler/Output/PlainTextOutput.cs b/ICSharpCode.Decompiler/Output/PlainTextOutput.cs index 9d79891d8..c2d44c8db 100644 --- a/ICSharpCode.Decompiler/Output/PlainTextOutput.cs +++ b/ICSharpCode.Decompiler/Output/PlainTextOutput.cs @@ -18,6 +18,7 @@ using System; using System.IO; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory; namespace ICSharpCode.Decompiler diff --git a/ICSharpCode.Decompiler/Semantics/AmbiguousResolveResult.cs b/ICSharpCode.Decompiler/Semantics/AmbiguousResolveResult.cs index dec7ade3a..a339741e8 100644 --- a/ICSharpCode.Decompiler/Semantics/AmbiguousResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/AmbiguousResolveResult.cs @@ -16,10 +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.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents an ambiguous type resolve result. diff --git a/ICSharpCode.Decompiler/Semantics/ArrayAccessResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ArrayAccessResolveResult.cs index e8acea445..f5b8be0a1 100644 --- a/ICSharpCode.Decompiler/Semantics/ArrayAccessResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ArrayAccessResolveResult.cs @@ -19,10 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Resolve result representing an array access. diff --git a/ICSharpCode.Decompiler/Semantics/ArrayCreateResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ArrayCreateResolveResult.cs index eb9dbd417..4f62989c0 100644 --- a/ICSharpCode.Decompiler/Semantics/ArrayCreateResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ArrayCreateResolveResult.cs @@ -19,10 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Resolve result representing an array creation. diff --git a/ICSharpCode.Decompiler/Semantics/ByReferenceResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ByReferenceResolveResult.cs index 50995312f..b5f927827 100644 --- a/ICSharpCode.Decompiler/Semantics/ByReferenceResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ByReferenceResolveResult.cs @@ -16,13 +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.Globalization; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the resolve result of an 'ref x' or 'out x' expression. diff --git a/ICSharpCode.Decompiler/Semantics/ConstantResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ConstantResolveResult.cs index abce12597..7efacf6db 100644 --- a/ICSharpCode.Decompiler/Semantics/ConstantResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ConstantResolveResult.cs @@ -16,11 +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.Globalization; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// ResolveResult representing a compile-time constant. diff --git a/ICSharpCode.Decompiler/Semantics/Conversion.cs b/ICSharpCode.Decompiler/Semantics/Conversion.cs index 3dbfca1be..7fb62fbb5 100644 --- a/ICSharpCode.Decompiler/Semantics/Conversion.cs +++ b/ICSharpCode.Decompiler/Semantics/Conversion.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Holds information about a conversion between two types. diff --git a/ICSharpCode.Decompiler/Semantics/ConversionResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ConversionResolveResult.cs index 8ae2f5437..615c0e72e 100644 --- a/ICSharpCode.Decompiler/Semantics/ConversionResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ConversionResolveResult.cs @@ -18,9 +18,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents an implicit or explicit type conversion. diff --git a/ICSharpCode.Decompiler/Semantics/ErrorResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ErrorResolveResult.cs index 569e7244c..de993c555 100644 --- a/ICSharpCode.Decompiler/Semantics/ErrorResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ErrorResolveResult.cs @@ -16,10 +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 ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents a resolve error. diff --git a/ICSharpCode.Decompiler/Semantics/ForEachResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ForEachResolveResult.cs index 5ed44bf60..3013a7282 100644 --- a/ICSharpCode.Decompiler/Semantics/ForEachResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ForEachResolveResult.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Resolve result representing a 'foreach' loop. diff --git a/ICSharpCode.Decompiler/Semantics/InitializedObjectResolveResult.cs b/ICSharpCode.Decompiler/Semantics/InitializedObjectResolveResult.cs index 1eed13396..8d5028645 100644 --- a/ICSharpCode.Decompiler/Semantics/InitializedObjectResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/InitializedObjectResolveResult.cs @@ -16,10 +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.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Refers to the object that is currently being initialized. diff --git a/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs b/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs index b5d2a4d94..277d2a656 100644 --- a/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/InvocationResolveResult.cs @@ -16,13 +16,13 @@ // 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; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.TypeSystem; - -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the result of a method, constructor or indexer invocation. diff --git a/ICSharpCode.Decompiler/Semantics/LocalResolveResult.cs b/ICSharpCode.Decompiler/Semantics/LocalResolveResult.cs index fddf6a04b..96958f541 100644 --- a/ICSharpCode.Decompiler/Semantics/LocalResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/LocalResolveResult.cs @@ -18,9 +18,9 @@ using System; using System.Globalization; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents a local variable or parameter. diff --git a/ICSharpCode.Decompiler/Semantics/MemberResolveResult.cs b/ICSharpCode.Decompiler/Semantics/MemberResolveResult.cs index 553b721e3..25ba586a6 100644 --- a/ICSharpCode.Decompiler/Semantics/MemberResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/MemberResolveResult.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.Globalization; using System.Linq; +using ICSharpCode.Decompiler.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem; - -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the result of a member invocation. diff --git a/ICSharpCode.Decompiler/Semantics/NamedArgumentResolveResult.cs b/ICSharpCode.Decompiler/Semantics/NamedArgumentResolveResult.cs index 522ef7cc2..34acc839c 100644 --- a/ICSharpCode.Decompiler/Semantics/NamedArgumentResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/NamedArgumentResolveResult.cs @@ -18,9 +18,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents a named argument. diff --git a/ICSharpCode.Decompiler/Semantics/NamespaceResolveResult.cs b/ICSharpCode.Decompiler/Semantics/NamespaceResolveResult.cs index 62fcbf4b1..3e19a6554 100644 --- a/ICSharpCode.Decompiler/Semantics/NamespaceResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/NamespaceResolveResult.cs @@ -16,11 +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.Globalization; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents that an expression resolved to a namespace. diff --git a/ICSharpCode.Decompiler/Semantics/OperatorResolveResult.cs b/ICSharpCode.Decompiler/Semantics/OperatorResolveResult.cs index 9f77b39b6..eb7a0d6f8 100644 --- a/ICSharpCode.Decompiler/Semantics/OperatorResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/OperatorResolveResult.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents a unary/binary/ternary operator invocation. diff --git a/ICSharpCode.Decompiler/Semantics/ResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ResolveResult.cs index 3fce91236..f45b5e40f 100644 --- a/ICSharpCode.Decompiler/Semantics/ResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ResolveResult.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the result of resolving an expression. diff --git a/ICSharpCode.Decompiler/Semantics/SizeOfResolveResult.cs b/ICSharpCode.Decompiler/Semantics/SizeOfResolveResult.cs index 41ad3be7d..ca4abbed5 100644 --- a/ICSharpCode.Decompiler/Semantics/SizeOfResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/SizeOfResolveResult.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the 'sizeof'. diff --git a/ICSharpCode.Decompiler/Semantics/ThisResolveResult.cs b/ICSharpCode.Decompiler/Semantics/ThisResolveResult.cs index 302ee4ed2..c6de1a744 100644 --- a/ICSharpCode.Decompiler/Semantics/ThisResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/ThisResolveResult.cs @@ -16,10 +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.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the 'this' reference. diff --git a/ICSharpCode.Decompiler/Semantics/TypeIsResolveResult.cs b/ICSharpCode.Decompiler/Semantics/TypeIsResolveResult.cs index 1704eafff..bc2718b74 100644 --- a/ICSharpCode.Decompiler/Semantics/TypeIsResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/TypeIsResolveResult.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Resolve result for a C# 'is' expression. diff --git a/ICSharpCode.Decompiler/Semantics/TypeOfResolveResult.cs b/ICSharpCode.Decompiler/Semantics/TypeOfResolveResult.cs index b88b24719..f1d3be7ad 100644 --- a/ICSharpCode.Decompiler/Semantics/TypeOfResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/TypeOfResolveResult.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents the 'typeof'. diff --git a/ICSharpCode.Decompiler/Semantics/TypeResolveResult.cs b/ICSharpCode.Decompiler/Semantics/TypeResolveResult.cs index 268865504..a8049aa0d 100644 --- a/ICSharpCode.Decompiler/Semantics/TypeResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/TypeResolveResult.cs @@ -16,10 +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.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// The resolved expression refers to a type name. diff --git a/ICSharpCode.Decompiler/Semantics/UnknownMemberResolveResult.cs b/ICSharpCode.Decompiler/Semantics/UnknownMemberResolveResult.cs index 1051bb961..23327ddc7 100644 --- a/ICSharpCode.Decompiler/Semantics/UnknownMemberResolveResult.cs +++ b/ICSharpCode.Decompiler/Semantics/UnknownMemberResolveResult.cs @@ -21,9 +21,9 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Globalization; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.NRefactory.Semantics +namespace ICSharpCode.Decompiler.Semantics { /// /// Represents an unknown member. diff --git a/ICSharpCode.Decompiler/Tests/DecompilerTestBase.cs b/ICSharpCode.Decompiler/Tests/DecompilerTestBase.cs index 08d44073b..e42f3090f 100644 --- a/ICSharpCode.Decompiler/Tests/DecompilerTestBase.cs +++ b/ICSharpCode.Decompiler/Tests/DecompilerTestBase.cs @@ -22,13 +22,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; - -using ICSharpCode.Decompiler.Ast; using ICSharpCode.Decompiler.Tests.Helpers; using Microsoft.CSharp; using Mono.Cecil; using NUnit.Framework; using ICSharpCode.Decompiler.CSharp; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; using ICSharpCode.NRefactory.CSharp; namespace ICSharpCode.Decompiler.Tests diff --git a/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs b/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs index f1afbc24a..0536bc4a8 100644 --- a/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs +++ b/ICSharpCode.Decompiler/Tests/Helpers/RemoveCompilerAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; - +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; using ICSharpCode.Decompiler.CSharp.Transforms; diff --git a/ICSharpCode.Decompiler/Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler/Tests/Helpers/Tester.cs index eb83eb983..cd184c4ff 100644 --- a/ICSharpCode.Decompiler/Tests/Helpers/Tester.cs +++ b/ICSharpCode.Decompiler/Tests/Helpers/Tester.cs @@ -26,7 +26,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using ICSharpCode.Decompiler.CSharp; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; using ICSharpCode.Decompiler.CSharp.Transforms; +using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.NRefactory.CSharp; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; diff --git a/ICSharpCode.Decompiler/Tests/Helpers/TypeSystemHelper.cs b/ICSharpCode.Decompiler/Tests/Helpers/TypeSystemHelper.cs index 5c32f9d44..d9098a411 100644 --- a/ICSharpCode.Decompiler/Tests/Helpers/TypeSystemHelper.cs +++ b/ICSharpCode.Decompiler/Tests/Helpers/TypeSystemHelper.cs @@ -21,8 +21,7 @@ using System.Collections.Concurrent; using System.Linq; using System.Reflection; using ICSharpCode.Decompiler.IL; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.Decompiler.Tests.Helpers diff --git a/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs b/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs index 95ebeb36e..55945dd90 100644 --- a/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs +++ b/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs @@ -23,7 +23,6 @@ using System.Linq; using System.Text.RegularExpressions; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.Tests.Helpers; -using ICSharpCode.NRefactory.Utils; using Microsoft.Win32; using Mono.Cecil; using NUnit.Framework; diff --git a/ICSharpCode.Decompiler/Tests/TestCases/Correctness/Conversions.cs b/ICSharpCode.Decompiler/Tests/TestCases/Correctness/Conversions.cs index 901d21f4b..0771ae32a 100644 --- a/ICSharpCode.Decompiler/Tests/TestCases/Correctness/Conversions.cs +++ b/ICSharpCode.Decompiler/Tests/TestCases/Correctness/Conversions.cs @@ -19,7 +19,7 @@ // #include "../../../Util/CSharpPrimitiveCast.cs" using System; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.Tests.TestCases { diff --git a/ICSharpCode.Decompiler/Tests/Util/IntervalTests.cs b/ICSharpCode.Decompiler/Tests/Util/IntervalTests.cs index 174b8cdf1..46336a006 100644 --- a/ICSharpCode.Decompiler/Tests/Util/IntervalTests.cs +++ b/ICSharpCode.Decompiler/Tests/Util/IntervalTests.cs @@ -21,6 +21,7 @@ using System.Diagnostics; using ICSharpCode.Decompiler.IL; using NUnit.Framework; using ICSharpCode.Decompiler.Tests.Helpers; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.Decompiler.Tests.Util { diff --git a/ICSharpCode.Decompiler/Tests/Util/LongSetTests.cs b/ICSharpCode.Decompiler/Tests/Util/LongSetTests.cs index 417e5b888..9409e561b 100644 --- a/ICSharpCode.Decompiler/Tests/Util/LongSetTests.cs +++ b/ICSharpCode.Decompiler/Tests/Util/LongSetTests.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Immutable; using System.Linq; +using ICSharpCode.Decompiler.Util; using NUnit.Framework; namespace ICSharpCode.Decompiler.Tests.Util diff --git a/ICSharpCode.Decompiler/TypeSystem/Accessibility.cs b/ICSharpCode.Decompiler/TypeSystem/Accessibility.cs index 9e633f7c7..fae4c9673 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Accessibility.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Accessibility.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Enum that describes the accessibility of an entity. diff --git a/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs b/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs index 1c97be5eb..cc2728443 100644 --- a/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/AnonymousType.cs @@ -19,10 +19,11 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Anonymous type. diff --git a/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs b/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs index 7d02785ee..d0be4d384 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ArrayType.cs @@ -18,9 +18,11 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an array type. diff --git a/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs b/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs index db230f461..af3622fc5 100644 --- a/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs +++ b/ICSharpCode.Decompiler/TypeSystem/AssemblyLoader.cs @@ -23,14 +23,14 @@ // 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.Reflection; using System.Threading; +using ICSharpCode.Decompiler.TypeSystem.Implementation; using ICSharpCode.NRefactory.Documentation; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public enum AssemblyLoaderBackend { Auto, diff --git a/ICSharpCode.Decompiler/TypeSystem/AssemblyQualifiedTypeName.cs b/ICSharpCode.Decompiler/TypeSystem/AssemblyQualifiedTypeName.cs index 8b07c5197..9447788ee 100644 --- a/ICSharpCode.Decompiler/TypeSystem/AssemblyQualifiedTypeName.cs +++ b/ICSharpCode.Decompiler/TypeSystem/AssemblyQualifiedTypeName.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public struct AssemblyQualifiedTypeName : IEquatable { diff --git a/ICSharpCode.Decompiler/TypeSystem/ByReferenceType.cs b/ICSharpCode.Decompiler/TypeSystem/ByReferenceType.cs index a7799de4e..7f87043fd 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ByReferenceType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ByReferenceType.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public sealed class ByReferenceType : TypeWithElementType { diff --git a/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs b/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs index 025ccbbb2..2e07e6d20 100644 --- a/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs +++ b/ICSharpCode.Decompiler/TypeSystem/CecilLoader.cs @@ -23,16 +23,15 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Documentation; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; using Mono.Cecil; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { - using BlobReader = ICSharpCode.NRefactory.TypeSystem.Implementation.BlobReader; + using BlobReader = BlobReader; /// /// Allows loading an IProjectContent from an already compiled assembly. @@ -107,14 +106,14 @@ namespace ICSharpCode.NRefactory.TypeSystem CecilUnresolvedAssembly currentAssembly; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public CecilLoader() { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// If true references to the cecil objects are hold. In this case the cecil loader can do a type system -> cecil mapping. @@ -183,8 +182,8 @@ namespace ICSharpCode.NRefactory.TypeSystem this.currentAssembly = new CecilUnresolvedAssembly(assemblyDefinition != null ? assemblyDefinition.Name.FullName : moduleDefinition.Name, this.DocumentationProvider); currentAssembly.Location = moduleDefinition.FullyQualifiedName; - currentAssembly.AssemblyAttributes.AddRange(assemblyAttributes); - currentAssembly.ModuleAttributes.AddRange(assemblyAttributes); + ExtensionMethods.AddRange(currentAssembly.AssemblyAttributes, assemblyAttributes); + ExtensionMethods.AddRange(currentAssembly.ModuleAttributes, assemblyAttributes); // Register type forwarders: foreach (ExportedType type in moduleDefinition.ExportedTypes) { @@ -859,7 +858,7 @@ namespace ICSharpCode.NRefactory.TypeSystem return; // https://github.com/icsharpcode/SharpDevelop/issues/284 } var blobSecDecl = new UnresolvedSecurityDeclarationBlob((int)secDecl.Action, blob); - targetCollection.AddRange(blobSecDecl.UnresolvedAttributes); + ExtensionMethods.AddRange(targetCollection, blobSecDecl.UnresolvedAttributes); } #endregion #endregion diff --git a/ICSharpCode.Decompiler/TypeSystem/ComHelper.cs b/ICSharpCode.Decompiler/TypeSystem/ComHelper.cs index 3b7358059..2be326cfe 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ComHelper.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ComHelper.cs @@ -16,11 +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.Linq; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Helper methods for COM. diff --git a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs index 0c75396c7..71fe17c8c 100644 --- a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs +++ b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs @@ -1,16 +1,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; using Mono.Cecil; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Manages the NRefactory type system for the decompiler. diff --git a/ICSharpCode.Decompiler/TypeSystem/DefaultSolutionSnapshot.cs b/ICSharpCode.Decompiler/TypeSystem/DefaultSolutionSnapshot.cs index c3b4bc534..9aaa9d998 100644 --- a/ICSharpCode.Decompiler/TypeSystem/DefaultSolutionSnapshot.cs +++ b/ICSharpCode.Decompiler/TypeSystem/DefaultSolutionSnapshot.cs @@ -19,10 +19,9 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; +using ICSharpCode.Decompiler.Util; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Default implementation of ISolutionSnapshot. diff --git a/ICSharpCode.Decompiler/TypeSystem/DomRegion.cs b/ICSharpCode.Decompiler/TypeSystem/DomRegion.cs index 11b0f794e..2659895cb 100644 --- a/ICSharpCode.Decompiler/TypeSystem/DomRegion.cs +++ b/ICSharpCode.Decompiler/TypeSystem/DomRegion.cs @@ -18,8 +18,9 @@ using System; using System.Globalization; +using ICSharpCode.Decompiler.CSharp.Syntax; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { [Serializable] public struct DomRegion : IEquatable diff --git a/ICSharpCode.Decompiler/TypeSystem/EntityType.cs b/ICSharpCode.Decompiler/TypeSystem/EntityType.cs index b0124200a..3cb27a121 100644 --- a/ICSharpCode.Decompiler/TypeSystem/EntityType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/EntityType.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { [Obsolete("Use SymbolKind instead")] public enum EntityType : byte diff --git a/ICSharpCode.Decompiler/TypeSystem/Error.cs b/ICSharpCode.Decompiler/TypeSystem/Error.cs index ade3d45c8..e21b77175 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Error.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Error.cs @@ -25,8 +25,9 @@ // THE SOFTWARE. using System; +using ICSharpCode.Decompiler.CSharp.Syntax; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Enum that describes the type of an error. @@ -64,7 +65,7 @@ namespace ICSharpCode.NRefactory.TypeSystem public DomRegion Region { get { return region; } } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// The error type. @@ -83,7 +84,7 @@ namespace ICSharpCode.NRefactory.TypeSystem } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// The error type. @@ -102,7 +103,7 @@ namespace ICSharpCode.NRefactory.TypeSystem } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// The error type. @@ -121,7 +122,7 @@ namespace ICSharpCode.NRefactory.TypeSystem } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// The error type. diff --git a/ICSharpCode.Decompiler/TypeSystem/FullTypeName.cs b/ICSharpCode.Decompiler/TypeSystem/FullTypeName.cs index b1bc888c4..d3db271eb 100644 --- a/ICSharpCode.Decompiler/TypeSystem/FullTypeName.cs +++ b/ICSharpCode.Decompiler/TypeSystem/FullTypeName.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Holds the full name of a type definition. diff --git a/ICSharpCode.Decompiler/TypeSystem/IAmbience.cs b/ICSharpCode.Decompiler/TypeSystem/IAmbience.cs index 18beccfa6..18907d08a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IAmbience.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IAmbience.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { [Flags] public enum ConversionFlags diff --git a/ICSharpCode.Decompiler/TypeSystem/IAssembly.cs b/ICSharpCode.Decompiler/TypeSystem/IAssembly.cs index 9dcb69f9c..0730f5a0b 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IAssembly.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IAssembly.cs @@ -16,10 +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; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an unresolved assembly. diff --git a/ICSharpCode.Decompiler/TypeSystem/IAttribute.cs b/ICSharpCode.Decompiler/TypeSystem/IAttribute.cs index 0689aebbe..bd2a258e6 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IAttribute.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IAttribute.cs @@ -16,12 +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 ICSharpCode.Decompiler.Semantics; -using ICSharpCode.NRefactory.Semantics; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an unresolved attribute. diff --git a/ICSharpCode.Decompiler/TypeSystem/ICodeContext.cs b/ICSharpCode.Decompiler/TypeSystem/ICodeContext.cs index 407673375..a3daa5a07 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ICodeContext.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ICodeContext.cs @@ -16,10 +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; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface ICodeContext : ITypeResolveContext { diff --git a/ICSharpCode.Decompiler/TypeSystem/ICompilation.cs b/ICSharpCode.Decompiler/TypeSystem/ICompilation.cs index 308bf24b1..2a8c3b3c7 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ICompilation.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ICompilation.cs @@ -18,9 +18,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface ICompilation { diff --git a/ICSharpCode.Decompiler/TypeSystem/IConstantValue.cs b/ICSharpCode.Decompiler/TypeSystem/IConstantValue.cs index 30df08f3e..73673365f 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IConstantValue.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IConstantValue.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.Diagnostics.Contracts; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an unresolved constant value. diff --git a/ICSharpCode.Decompiler/TypeSystem/IDecompilerTypeSystem.cs b/ICSharpCode.Decompiler/TypeSystem/IDecompilerTypeSystem.cs index 75f27f262..3c0061a16 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IDecompilerTypeSystem.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IDecompilerTypeSystem.cs @@ -15,11 +15,10 @@ // 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.NRefactory.TypeSystem; + using Mono.Cecil; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Allows resolving cecil types into the NRefactory type system. diff --git a/ICSharpCode.Decompiler/TypeSystem/IEntity.cs b/ICSharpCode.Decompiler/TypeSystem/IEntity.cs index 85d69ca4b..9b0bd1f52 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IEntity.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IEntity.cs @@ -18,10 +18,9 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using ICSharpCode.NRefactory.Documentation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an unresolved entity. diff --git a/ICSharpCode.Decompiler/TypeSystem/IEvent.cs b/ICSharpCode.Decompiler/TypeSystem/IEvent.cs index f8d9c675c..a4f3b45e6 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IEvent.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IEvent.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.Diagnostics.Contracts; -using ICSharpCode.NRefactory.TypeSystem; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface IUnresolvedEvent : IUnresolvedMember { diff --git a/ICSharpCode.Decompiler/TypeSystem/IField.cs b/ICSharpCode.Decompiler/TypeSystem/IField.cs index 98fa0efe3..0987d9c79 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IField.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IField.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.Diagnostics.Contracts; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a field or constant. diff --git a/ICSharpCode.Decompiler/TypeSystem/IFreezable.cs b/ICSharpCode.Decompiler/TypeSystem/IFreezable.cs index 3a0c66591..50bd42c68 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IFreezable.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IFreezable.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface IFreezable { diff --git a/ICSharpCode.Decompiler/TypeSystem/IInterningProvider.cs b/ICSharpCode.Decompiler/TypeSystem/IInterningProvider.cs index 6f80d4a98..68b740ebb 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IInterningProvider.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IInterningProvider.cs @@ -16,10 +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; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Provider used for interning. diff --git a/ICSharpCode.Decompiler/TypeSystem/IMember.cs b/ICSharpCode.Decompiler/TypeSystem/IMember.cs index 405dc5184..d8e2d4b53 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IMember.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IMember.cs @@ -18,9 +18,8 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Method/field/property/event. diff --git a/ICSharpCode.Decompiler/TypeSystem/IMethod.cs b/ICSharpCode.Decompiler/TypeSystem/IMethod.cs index d73616d35..61c077123 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IMethod.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IMethod.cs @@ -18,10 +18,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; -using ICSharpCode.NRefactory.TypeSystem; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface IUnresolvedMethod : IUnresolvedParameterizedMember { diff --git a/ICSharpCode.Decompiler/TypeSystem/INamedElement.cs b/ICSharpCode.Decompiler/TypeSystem/INamedElement.cs index 4a4aff26c..42c86b5b0 100644 --- a/ICSharpCode.Decompiler/TypeSystem/INamedElement.cs +++ b/ICSharpCode.Decompiler/TypeSystem/INamedElement.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.Diagnostics.Contracts; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface INamedElement { diff --git a/ICSharpCode.Decompiler/TypeSystem/INamespace.cs b/ICSharpCode.Decompiler/TypeSystem/INamespace.cs index 213f2f87b..224a7acde 100644 --- a/ICSharpCode.Decompiler/TypeSystem/INamespace.cs +++ b/ICSharpCode.Decompiler/TypeSystem/INamespace.cs @@ -16,10 +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; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a resolved namespace. diff --git a/ICSharpCode.Decompiler/TypeSystem/IParameter.cs b/ICSharpCode.Decompiler/TypeSystem/IParameter.cs index 74f23c691..617d7d5f7 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IParameter.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.Diagnostics.Contracts; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public interface IUnresolvedParameter { diff --git a/ICSharpCode.Decompiler/TypeSystem/IParameterizedMember.cs b/ICSharpCode.Decompiler/TypeSystem/IParameterizedMember.cs index e76f10608..8d2830873 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IParameterizedMember.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IParameterizedMember.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.Diagnostics.Contracts; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a method or property. diff --git a/ICSharpCode.Decompiler/TypeSystem/IProjectContent.cs b/ICSharpCode.Decompiler/TypeSystem/IProjectContent.cs index ff6a39c35..bf51a4f2b 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IProjectContent.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IProjectContent.cs @@ -18,9 +18,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an assembly consisting of source code (parsed files). diff --git a/ICSharpCode.Decompiler/TypeSystem/IProperty.cs b/ICSharpCode.Decompiler/TypeSystem/IProperty.cs index df9d613e6..85e10c666 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IProperty.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IProperty.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a property or indexer. diff --git a/ICSharpCode.Decompiler/TypeSystem/ISolutionSnapshot.cs b/ICSharpCode.Decompiler/TypeSystem/ISolutionSnapshot.cs index de302731d..99c964682 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ISolutionSnapshot.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ISolutionSnapshot.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a snapshot of the whole solution (multiple compilations). diff --git a/ICSharpCode.Decompiler/TypeSystem/ISupportsInterning.cs b/ICSharpCode.Decompiler/TypeSystem/ISupportsInterning.cs index 5188bffe5..4ab83d78d 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ISupportsInterning.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ISupportsInterning.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Interface for TypeSystem objects that support interning. diff --git a/ICSharpCode.Decompiler/TypeSystem/ISymbol.cs b/ICSharpCode.Decompiler/TypeSystem/ISymbol.cs index 495c932fd..12a765b85 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ISymbol.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ISymbol.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public enum SymbolKind : byte { diff --git a/ICSharpCode.Decompiler/TypeSystem/IType.cs b/ICSharpCode.Decompiler/TypeSystem/IType.cs index 2a85f2b9a..0b70c3a4c 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IType.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// This interface represents a resolved type in the type system. diff --git a/ICSharpCode.Decompiler/TypeSystem/ITypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/ITypeDefinition.cs index 9a3b0b63a..88b87ff19 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ITypeDefinition.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ITypeDefinition.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.Diagnostics.Contracts; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an unresolved class, enum, interface, struct, delegate or VB module. diff --git a/ICSharpCode.Decompiler/TypeSystem/ITypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/ITypeParameter.cs index e74af0557..07ec61892 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ITypeParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ITypeParameter.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.Diagnostics.Contracts; -using ICSharpCode.NRefactory.TypeSystem; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Type parameter of a generic class/method. diff --git a/ICSharpCode.Decompiler/TypeSystem/ITypeReference.cs b/ICSharpCode.Decompiler/TypeSystem/ITypeReference.cs index a5186820a..7d442051b 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ITypeReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ITypeReference.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a reference to a type. diff --git a/ICSharpCode.Decompiler/TypeSystem/IUnresolvedFile.cs b/ICSharpCode.Decompiler/TypeSystem/IUnresolvedFile.cs index 7c7918c06..9895e9e25 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IUnresolvedFile.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IUnresolvedFile.cs @@ -18,8 +18,9 @@ using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.CSharp.Syntax; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { [Obsolete("IParsedFile was renamed to IUnresolvedFile", true)] public interface IParsedFile {} diff --git a/ICSharpCode.Decompiler/TypeSystem/IVariable.cs b/ICSharpCode.Decompiler/TypeSystem/IVariable.cs index 253fe99a5..a46e3b5f8 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IVariable.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IVariable.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents a variable (name/type pair). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs index 1a3dbd3a3..c8049d4c8 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractFreezable.cs @@ -20,8 +20,10 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public static class FreezableHelper { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs index 1a3fe19bd..25dc466ba 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedEntity.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using ICSharpCode.NRefactory.Documentation; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Implementation of that resolves an unresolved entity. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs index e64f2aa5a..3e4862846 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedMember.cs @@ -16,13 +16,13 @@ // 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.Util; +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Documentation; -using ICSharpCode.NRefactory.Utils; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Implementation of that resolves an unresolved member. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs index 857db81c0..9a7e52538 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractResolvedTypeParameter.cs @@ -19,10 +19,10 @@ using System; using System.Collections.Generic; using System.Globalization; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public abstract class AbstractTypeParameter : ITypeParameter, ICompilationProvider { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs index c86ff87fd..e092f2fc4 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractType.cs @@ -18,10 +18,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Contracts; using System.Linq; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation for IType interface. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedEntity.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedEntity.cs index c92291312..4b4186be8 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedEntity.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedEntity.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Text; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Base class for implementations. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs index d4d47c251..dcdae321d 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AbstractUnresolvedMember.cs @@ -19,9 +19,10 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Base class for implementations. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/AccessorOwnerMemberReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/AccessorOwnerMemberReference.cs index 5db066b6e..bd126a3cc 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/AccessorOwnerMemberReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/AccessorOwnerMemberReference.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Given a reference to an accessor, returns the accessor's owner. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/BaseTypeCollector.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/BaseTypeCollector.cs index 04df5df6f..322dfa16a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/BaseTypeCollector.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/BaseTypeCollector.cs @@ -16,10 +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; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Helper class for the GetAllBaseTypes() implementation. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/BlobReader.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/BlobReader.cs index 3e6a420cd..ec1961417 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/BlobReader.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/BlobReader.cs @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { sealed class BlobReader { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAssemblyReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAssemblyReference.cs index 9f5f7e1ec..917bbec31 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAssemblyReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAssemblyReference.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// References an existing assembly by name. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs index 53ddec9ad..1c56415ee 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultAttribute.cs @@ -19,9 +19,11 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// IAttribute implementation for already-resolved attributes. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs index 017302101..e2cee004a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultMemberReference.cs @@ -18,9 +18,10 @@ using System; using System.Collections.Generic; -using System.Linq; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// References an entity by its type and name. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultParameter.cs index 9d9565558..c923e2759 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultParameter.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs index 2335b788a..ac1b72dc1 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedEvent.cs @@ -16,11 +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 ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public class DefaultResolvedEvent : AbstractResolvedMember, IEvent { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs index 16981d2b7..da99081de 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedField.cs @@ -16,12 +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 ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public class DefaultResolvedField : AbstractResolvedMember, IField { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs index 0dc9bcc54..958bba3e6 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedMethod.cs @@ -20,10 +20,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.Semantics; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of that resolves an unresolved method. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs index 69b477f8e..a78631e49 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedProperty.cs @@ -16,12 +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 ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public class DefaultResolvedProperty : AbstractResolvedMember, IProperty { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs index 80b332d85..30ba51672 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs @@ -19,10 +19,11 @@ using System; using System.Collections.Generic; using System.Linq; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Documentation; -using ICSharpCode.NRefactory.Utils; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . @@ -801,7 +802,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation public virtual IEnumerable GetMethods(Predicate filter = null, GetMemberOptions options = GetMemberOptions.None) { if ((options & GetMemberOptions.IgnoreInheritedMembers) == GetMemberOptions.IgnoreInheritedMembers) { - return GetFilteredMethods(Utils.ExtensionMethods.And(m => !m.IsConstructor, filter)); + return GetFilteredMethods(ExtensionMethods.And(m => !m.IsConstructor, filter)); } else { return GetMembersHelper.GetMethods(this, filter, options); } @@ -825,7 +826,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation return EmptyList.Instance; } if ((options & GetMemberOptions.IgnoreInheritedMembers) == GetMemberOptions.IgnoreInheritedMembers) { - return GetFilteredMethods(Utils.ExtensionMethods.And(m => m.IsConstructor && !m.IsStatic, filter)); + return GetFilteredMethods(ExtensionMethods.And(m => m.IsConstructor && !m.IsStatic, filter)); } else { return GetMembersHelper.GetConstructors(this, filter, options); } diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs index ea0968ce1..d3297f8e4 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultResolvedTypeParameter.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 System.Threading; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public class DefaultTypeParameter : AbstractTypeParameter { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAssembly.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAssembly.cs index de9834ccb..711511589 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAssembly.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAssembly.cs @@ -21,13 +21,11 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Runtime.Serialization; using System.Threading; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation for . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs index ac30211de..f9e12b7d5 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedAttribute.cs @@ -18,10 +18,11 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . @@ -47,7 +48,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation if (attributeType == null) throw new ArgumentNullException("attributeType"); this.attributeType = attributeType; - this.ConstructorParameterTypes.AddRange(constructorParameterTypes); + ExtensionMethods.AddRange(this.ConstructorParameterTypes, constructorParameterTypes); } protected override void FreezeInternal() diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedEvent.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedEvent.cs index f9abd1a6a..b16e3c707 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedEvent.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedEvent.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedField.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedField.cs index 6b578e6f5..e70829110 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedField.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedField.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedMethod.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedMethod.cs index 3e8c61c64..48fd837e9 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedMethod.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedMethod.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of interface. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs index d57197fa8..e716282a4 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedParameter.cs @@ -20,10 +20,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation for IUnresolvedParameter. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedProperty.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedProperty.cs index d8113f36e..ee39954a2 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedProperty.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedProperty.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeDefinition.cs index cc35adf94..aae9c4127 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeDefinition.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeDefinition.cs @@ -18,10 +18,9 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents an unresolved type definition. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeParameter.cs index 492d3e222..047f80f50 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultUnresolvedTypeParameter.cs @@ -19,10 +19,9 @@ using System; using System.Collections.Generic; using System.Globalization; +using ICSharpCode.Decompiler.Util; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultVariable.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultVariable.cs index 0ce0be0e0..0f1350519 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultVariable.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultVariable.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Default implementation of . diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs index 6530da822..5b9b46e53 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/DummyTypeParameter.cs @@ -16,11 +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.Threading; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public sealed class DummyTypeParameter : AbstractType, ITypeParameter { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/ExplicitInterfaceImplementationMemberReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/ExplicitInterfaceImplementationMemberReference.cs index abe280028..d33173730 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/ExplicitInterfaceImplementationMemberReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/ExplicitInterfaceImplementationMemberReference.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// References a member that is an explicit interface implementation. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/FullNameAndTypeParameterCount.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/FullNameAndTypeParameterCount.cs index 302e896b9..408a5c7f7 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/FullNameAndTypeParameterCount.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/FullNameAndTypeParameterCount.cs @@ -17,9 +17,8 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { [Obsolete("This struct was renamed to 'TopLevelTypeName'.", true)] public struct FullNameAndTypeParameterCount diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/GetClassTypeReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/GetClassTypeReference.cs index e465f1aee..59b3351eb 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/GetClassTypeReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/GetClassTypeReference.cs @@ -17,10 +17,8 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Linq; -using System.Threading; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Type Reference used when the fully qualified type name is known. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/GetMembersHelper.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/GetMembersHelper.cs index 881c56e7c..ea9ab9482 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/GetMembersHelper.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/GetMembersHelper.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Provides helper methods for implementing GetMembers() on IType-implementations. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/KnownTypeCache.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/KnownTypeCache.cs index 9e984618a..f610de230 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/KnownTypeCache.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/KnownTypeCache.cs @@ -16,10 +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.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Cache for KnownTypeReferences. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/MergedNamespace.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/MergedNamespace.cs index 0891df1f0..07bb87ff5 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/MergedNamespace.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/MergedNamespace.cs @@ -20,9 +20,9 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// A merged namespace. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/MinimalCorlib.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/MinimalCorlib.cs index a28302b91..52688763f 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/MinimalCorlib.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/MinimalCorlib.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Resolve context represents the minimal mscorlib required for evaluating constants. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/NestedTypeReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/NestedTypeReference.cs index a9fe40148..1d930c62a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/NestedTypeReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/NestedTypeReference.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Type reference used to reference nested types. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs index 8c7472509..8774d2f3a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/ResolvedAttributeBlob.cs @@ -28,10 +28,11 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Threading; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { sealed class CecilResolvedAttribute : IAttribute { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleCompilation.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleCompilation.cs index a4da92dbf..944ca2c5c 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleCompilation.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleCompilation.cs @@ -18,9 +18,9 @@ using System; using System.Collections.Generic; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Simple compilation implementation. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleConstantValue.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleConstantValue.cs index 191caf6f0..b314b9e67 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleConstantValue.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleConstantValue.cs @@ -17,9 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// A simple constant value that is independent of the resolve context. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs index bb8c8bc9a..326d5fa77 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SimpleInterningProvider.cs @@ -16,16 +16,14 @@ // 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 System.Collections.ObjectModel; -using System.Linq; using System.Runtime.CompilerServices; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -using ICSharpCode.NRefactory.Utils; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Simple interning provider. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedEvent.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedEvent.cs index a1ec2675a..5e68861dc 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedEvent.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedEvent.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; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents a specialized IEvent (event after type substitution). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedField.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedField.cs index 66f8a0ad0..762f95117 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedField.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedField.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; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents a specialized IField (field after type substitution). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs index 45bdcc944..e8046d9a1 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMember.cs @@ -22,10 +22,11 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Threading; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Documentation; -using ICSharpCode.NRefactory.Utils; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents a SpecializedMember (a member on which type substitution has been performed). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs index c2fdb2d51..3d04f458a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedMethod.cs @@ -18,13 +18,12 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; -using System.Threading; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents a specialized IMethod (e.g. after type substitution). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedProperty.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedProperty.cs index 575144991..7e1c18270 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedProperty.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedProperty.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; - -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Represents a specialized IProperty (property after type substitution). diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializingMemberReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializingMemberReference.cs index 701a7f642..46c846632 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializingMemberReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializingMemberReference.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { [Serializable] public sealed class SpecializingMemberReference : IMemberReference diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeParameterReference.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeParameterReference.cs index e6ef94003..712d536bc 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeParameterReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeParameterReference.cs @@ -18,9 +18,9 @@ using System; using System.Globalization; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { [Serializable] public sealed class TypeParameterReference : ITypeReference, ISymbolReference diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeWithElementType.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeWithElementType.cs index afc22a08c..900289220 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeWithElementType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/TypeWithElementType.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { public abstract class TypeWithElementType : AbstractType { diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnknownType.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnknownType.cs index e1855eb99..ae881a7b7 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnknownType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnknownType.cs @@ -19,7 +19,7 @@ using System; using System.Diagnostics; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// An unknown type where (part) of the name is known. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedAttributeBlob.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedAttributeBlob.cs index a66e97934..f4b1aedcd 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedAttributeBlob.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedAttributeBlob.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// IUnresolvedAttribute implementation that loads the arguments from a binary blob. diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs index 0b4bc2cb8..41e89e90b 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using ICSharpCode.NRefactory.Semantics; +using ICSharpCode.Decompiler.Semantics; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { [Serializable] public sealed class UnresolvedSecurityDeclarationBlob diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs index eba354cbc..74ff9473a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs +++ b/ICSharpCode.Decompiler/TypeSystem/Implementation/VoidTypeDefinition.cs @@ -18,8 +18,10 @@ using System; using System.Collections.Generic; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem.Implementation +namespace ICSharpCode.Decompiler.TypeSystem.Implementation { /// /// Special type definition for 'void'. diff --git a/ICSharpCode.Decompiler/TypeSystem/InheritanceHelper.cs b/ICSharpCode.Decompiler/TypeSystem/InheritanceHelper.cs index b4f272a6c..46e72c058 100644 --- a/ICSharpCode.Decompiler/TypeSystem/InheritanceHelper.cs +++ b/ICSharpCode.Decompiler/TypeSystem/InheritanceHelper.cs @@ -19,9 +19,8 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Provides helper methods for inheritance. diff --git a/ICSharpCode.Decompiler/TypeSystem/IntersectionType.cs b/ICSharpCode.Decompiler/TypeSystem/IntersectionType.cs index f273208e0..ead0093aa 100644 --- a/ICSharpCode.Decompiler/TypeSystem/IntersectionType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/IntersectionType.cs @@ -22,10 +22,9 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; using System.Text; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents the intersection of several types. diff --git a/ICSharpCode.Decompiler/TypeSystem/KnownTypeReference.cs b/ICSharpCode.Decompiler/TypeSystem/KnownTypeReference.cs index 98f3a1841..6765b8a41 100644 --- a/ICSharpCode.Decompiler/TypeSystem/KnownTypeReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/KnownTypeReference.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents some well-known types. diff --git a/ICSharpCode.Decompiler/TypeSystem/NullableType.cs b/ICSharpCode.Decompiler/TypeSystem/NullableType.cs index 622e66435..c28488018 100644 --- a/ICSharpCode.Decompiler/TypeSystem/NullableType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/NullableType.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Static helper methods for working with nullable types. diff --git a/ICSharpCode.Decompiler/TypeSystem/ParameterListComparer.cs b/ICSharpCode.Decompiler/TypeSystem/ParameterListComparer.cs index 82447a516..982ef534a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ParameterListComparer.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ParameterListComparer.cs @@ -18,10 +18,9 @@ using System; using System.Collections.Generic; -using System.Threading; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Compares parameter lists by comparing the types of all parameters. diff --git a/ICSharpCode.Decompiler/TypeSystem/ParameterizedType.cs b/ICSharpCode.Decompiler/TypeSystem/ParameterizedType.cs index 10e7a984c..e9e505b2f 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ParameterizedType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ParameterizedType.cs @@ -22,10 +22,9 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; using System.Text; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// ParameterizedType represents an instance of a generic type. diff --git a/ICSharpCode.Decompiler/TypeSystem/PointerType.cs b/ICSharpCode.Decompiler/TypeSystem/PointerType.cs index 9ad523bc1..108ed32a7 100644 --- a/ICSharpCode.Decompiler/TypeSystem/PointerType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/PointerType.cs @@ -17,10 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { public sealed class PointerType : TypeWithElementType { diff --git a/ICSharpCode.Decompiler/TypeSystem/ProjectReference.cs b/ICSharpCode.Decompiler/TypeSystem/ProjectReference.cs index cd79aa309..a74670df1 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ProjectReference.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ProjectReference.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// References another project content in the same solution. diff --git a/ICSharpCode.Decompiler/TypeSystem/ReferenceResolvingException.cs b/ICSharpCode.Decompiler/TypeSystem/ReferenceResolvingException.cs index 22af690a9..4b013740b 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ReferenceResolvingException.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ReferenceResolvingException.cs @@ -17,11 +17,8 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an error while resolving a reference to a type or a member. diff --git a/ICSharpCode.Decompiler/TypeSystem/ReflectionHelper.cs b/ICSharpCode.Decompiler/TypeSystem/ReflectionHelper.cs index 3352650a2..34dd735e0 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ReflectionHelper.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ReflectionHelper.cs @@ -18,10 +18,9 @@ using System; using System.Collections.Generic; -using System.Text; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Static helper methods for reflection names. diff --git a/ICSharpCode.Decompiler/TypeSystem/ReflectionNameParseException.cs b/ICSharpCode.Decompiler/TypeSystem/ReflectionNameParseException.cs index a54af9624..6dd3e77f2 100644 --- a/ICSharpCode.Decompiler/TypeSystem/ReflectionNameParseException.cs +++ b/ICSharpCode.Decompiler/TypeSystem/ReflectionNameParseException.cs @@ -19,7 +19,7 @@ using System; using System.Runtime.Serialization; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Represents an error while parsing a reflection name. diff --git a/ICSharpCode.Decompiler/TypeSystem/SimpleTypeResolveContext.cs b/ICSharpCode.Decompiler/TypeSystem/SimpleTypeResolveContext.cs index 8cda2952d..c3721cc1e 100644 --- a/ICSharpCode.Decompiler/TypeSystem/SimpleTypeResolveContext.cs +++ b/ICSharpCode.Decompiler/TypeSystem/SimpleTypeResolveContext.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Default ITypeResolveContext implementation. diff --git a/ICSharpCode.Decompiler/TypeSystem/SpecialType.cs b/ICSharpCode.Decompiler/TypeSystem/SpecialType.cs index 1c67a7ec6..aa29065c9 100644 --- a/ICSharpCode.Decompiler/TypeSystem/SpecialType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/SpecialType.cs @@ -17,10 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Collections.Generic; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Contains static implementations of special types. diff --git a/ICSharpCode.Decompiler/TypeSystem/SpecializingDecompilerTypeSystem.cs b/ICSharpCode.Decompiler/TypeSystem/SpecializingDecompilerTypeSystem.cs index 1cfba32c0..bb50f7153 100644 --- a/ICSharpCode.Decompiler/TypeSystem/SpecializingDecompilerTypeSystem.cs +++ b/ICSharpCode.Decompiler/TypeSystem/SpecializingDecompilerTypeSystem.cs @@ -15,10 +15,10 @@ // 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.NRefactory.TypeSystem; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Decompiler type system for generic types or methods: diff --git a/ICSharpCode.Decompiler/TypeSystem/TaskType.cs b/ICSharpCode.Decompiler/TypeSystem/TaskType.cs index 58e958bb6..5aca29c9d 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TaskType.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TaskType.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Helper class for dealing with System.Threading.Tasks.Task. diff --git a/ICSharpCode.Decompiler/TypeSystem/TopLevelTypeName.cs b/ICSharpCode.Decompiler/TypeSystem/TopLevelTypeName.cs index fb13eea6c..a8c778d00 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TopLevelTypeName.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TopLevelTypeName.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Holds the name of a top-level type. diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs b/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs index dd5d9b066..53a53cef1 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeKind.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// . diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeParameterSubstitution.cs b/ICSharpCode.Decompiler/TypeSystem/TypeParameterSubstitution.cs index 28b4abb37..e86996ced 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeParameterSubstitution.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeParameterSubstitution.cs @@ -16,11 +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.Text; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Substitutes class and method type parameters. diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs index fd818302e..c748f861d 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs @@ -19,11 +19,13 @@ using System; using System.Collections.Generic; using System.Linq; -using ICSharpCode.NRefactory.Semantics; -using ICSharpCode.NRefactory.TypeSystem.Implementation; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.CSharp.Syntax; +using ICSharpCode.Decompiler.Semantics; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.Decompiler.Util; +using ICSharpCode.NRefactory; -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Contains extension methods for the type system. diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeUtils.cs b/ICSharpCode.Decompiler/TypeSystem/TypeUtils.cs index 32a0fd846..6719a636a 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeUtils.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeUtils.cs @@ -15,12 +15,11 @@ // 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.IL; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { public static class TypeUtils { diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeVisitor.cs b/ICSharpCode.Decompiler/TypeSystem/TypeVisitor.cs index 7c6cc1631..eae8aceed 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeVisitor.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeVisitor.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; - -namespace ICSharpCode.NRefactory.TypeSystem +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Base class for the visitor pattern on . diff --git a/ICSharpCode.Decompiler/TypeSystem/TypesHierarchyHelpers.cs b/ICSharpCode.Decompiler/TypeSystem/TypesHierarchyHelpers.cs index 2f020044c..71e97d482 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypesHierarchyHelpers.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypesHierarchyHelpers.cs @@ -20,10 +20,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; using Mono.Cecil; -namespace ICSharpCode.Decompiler.Ast +namespace ICSharpCode.Decompiler.TypeSystem { public static class TypesHierarchyHelpers { @@ -444,18 +443,18 @@ namespace ICSharpCode.Decompiler.Ast private TypeReference ReplaceElementType(TypeSpecification ts, TypeReference newElementType) { - var arrayType = ts as ArrayType; + var arrayType = ts as Mono.Cecil.ArrayType; if (arrayType != null) { if (newElementType == arrayType.ElementType) return arrayType; - var newArrayType = new ArrayType(newElementType, arrayType.Rank); + var newArrayType = new Mono.Cecil.ArrayType(newElementType, arrayType.Rank); for (int dimension = 0; dimension < arrayType.Rank; dimension++) newArrayType.Dimensions[dimension] = arrayType.Dimensions[dimension]; return newArrayType; } - var byReferenceType = ts as ByReferenceType; + var byReferenceType = ts as Mono.Cecil.ByReferenceType; if (byReferenceType != null) { - return new ByReferenceType(newElementType); + return new Mono.Cecil.ByReferenceType(newElementType); } // TODO: should we throw an exception instead calling Resolve method? return ts.ResolveOrThrow(); diff --git a/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs b/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs index 61183a2c2..25183a160 100644 --- a/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs +++ b/ICSharpCode.Decompiler/TypeSystem/VarArgInstanceMethod.cs @@ -21,10 +21,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory.TypeSystem.Implementation; +using ICSharpCode.Decompiler.TypeSystem.Implementation; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.TypeSystem { /// /// Used when calling a vararg method. Stores the actual parameter types being passed. diff --git a/ICSharpCode.Decompiler/Util/7BitEncodedInts.cs b/ICSharpCode.Decompiler/Util/7BitEncodedInts.cs index 01f507293..536653ade 100644 --- a/ICSharpCode.Decompiler/Util/7BitEncodedInts.cs +++ b/ICSharpCode.Decompiler/Util/7BitEncodedInts.cs @@ -19,7 +19,7 @@ using System; using System.IO; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// A binary reader that can read the output of BinaryWriterWith7BitEncodedInts. diff --git a/ICSharpCode.Decompiler/Util/BitSet.cs b/ICSharpCode.Decompiler/Util/BitSet.cs index 737f65c30..8a00021e6 100644 --- a/ICSharpCode.Decompiler/Util/BitSet.cs +++ b/ICSharpCode.Decompiler/Util/BitSet.cs @@ -20,7 +20,7 @@ using System; using System.Diagnostics; using System.Text; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.Util { /// /// Improved version of BitArray diff --git a/ICSharpCode.Decompiler/Util/BitVector16.cs b/ICSharpCode.Decompiler/Util/BitVector16.cs index fb4de8e59..08c3ed54a 100644 --- a/ICSharpCode.Decompiler/Util/BitVector16.cs +++ b/ICSharpCode.Decompiler/Util/BitVector16.cs @@ -19,7 +19,7 @@ using System; using System.Globalization; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Holds 16 boolean values. diff --git a/ICSharpCode.Decompiler/Util/BusyManager.cs b/ICSharpCode.Decompiler/Util/BusyManager.cs index 660042b21..1ab8e0a8d 100644 --- a/ICSharpCode.Decompiler/Util/BusyManager.cs +++ b/ICSharpCode.Decompiler/Util/BusyManager.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// This class is used to prevent stack overflows by representing a 'busy' flag diff --git a/ICSharpCode.Decompiler/Util/CSharpPrimitiveCast.cs b/ICSharpCode.Decompiler/Util/CSharpPrimitiveCast.cs index 3a1cbd4ee..c78c51fc1 100644 --- a/ICSharpCode.Decompiler/Util/CSharpPrimitiveCast.cs +++ b/ICSharpCode.Decompiler/Util/CSharpPrimitiveCast.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Static helper method for converting between primitive types. diff --git a/ICSharpCode.Decompiler/Util/CacheManager.cs b/ICSharpCode.Decompiler/Util/CacheManager.cs index f28e8970d..151c7feb6 100644 --- a/ICSharpCode.Decompiler/Util/CacheManager.cs +++ b/ICSharpCode.Decompiler/Util/CacheManager.cs @@ -18,10 +18,8 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Threading; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Allows caching values for a specific compilation. diff --git a/ICSharpCode.Decompiler/Util/CallbackOnDispose.cs b/ICSharpCode.Decompiler/Util/CallbackOnDispose.cs index 5dfa5e093..f98601869 100644 --- a/ICSharpCode.Decompiler/Util/CallbackOnDispose.cs +++ b/ICSharpCode.Decompiler/Util/CallbackOnDispose.cs @@ -17,10 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; -using System.Diagnostics; using System.Threading; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Invokes an action when it is disposed. diff --git a/ICSharpCode.Decompiler/Util/CollectionExtensions.cs b/ICSharpCode.Decompiler/Util/CollectionExtensions.cs index 4329d59b1..d79536b7f 100644 --- a/ICSharpCode.Decompiler/Util/CollectionExtensions.cs +++ b/ICSharpCode.Decompiler/Util/CollectionExtensions.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.Util { static class CollectionExtensions { diff --git a/ICSharpCode.Decompiler/Util/EmptyList.cs b/ICSharpCode.Decompiler/Util/EmptyList.cs index 90f0f8627..1a6efff08 100644 --- a/ICSharpCode.Decompiler/Util/EmptyList.cs +++ b/ICSharpCode.Decompiler/Util/EmptyList.cs @@ -19,9 +19,8 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Collections.ObjectModel; -namespace ICSharpCode.NRefactory +namespace ICSharpCode.Decompiler.Util { [Serializable] public sealed class EmptyList : IList, IEnumerator diff --git a/ICSharpCode.Decompiler/Util/ExtensionMethods.cs b/ICSharpCode.Decompiler/Util/ExtensionMethods.cs index e5829b2c2..5da0357bb 100644 --- a/ICSharpCode.Decompiler/Util/ExtensionMethods.cs +++ b/ICSharpCode.Decompiler/Util/ExtensionMethods.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Contains extension methods for use within NRefactory. diff --git a/ICSharpCode.Decompiler/Util/ImmutableStack.cs b/ICSharpCode.Decompiler/Util/ImmutableStack.cs index 9738ddc33..2ef2b9a91 100644 --- a/ICSharpCode.Decompiler/Util/ImmutableStack.cs +++ b/ICSharpCode.Decompiler/Util/ImmutableStack.cs @@ -18,10 +18,9 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Text; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// An immutable stack. diff --git a/ICSharpCode.Decompiler/Util/Interval.cs b/ICSharpCode.Decompiler/Util/Interval.cs index 1aaed6922..7c8abddae 100644 --- a/ICSharpCode.Decompiler/Util/Interval.cs +++ b/ICSharpCode.Decompiler/Util/Interval.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.Util { /// /// Represents a half-closed interval. diff --git a/ICSharpCode.Decompiler/Util/LazyInit.cs b/ICSharpCode.Decompiler/Util/LazyInit.cs index 3483e53f4..99cf4a2fc 100644 --- a/ICSharpCode.Decompiler/Util/LazyInit.cs +++ b/ICSharpCode.Decompiler/Util/LazyInit.cs @@ -16,10 +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.Threading; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { public static class LazyInit { diff --git a/ICSharpCode.Decompiler/Util/LongSet.cs b/ICSharpCode.Decompiler/Util/LongSet.cs index 94ede546c..c26e3828b 100644 --- a/ICSharpCode.Decompiler/Util/LongSet.cs +++ b/ICSharpCode.Decompiler/Util/LongSet.cs @@ -22,7 +22,7 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -namespace ICSharpCode.Decompiler +namespace ICSharpCode.Decompiler.Util { /// /// An immutable set of longs, that is implemented as a list of intervals. diff --git a/ICSharpCode.Decompiler/Util/MultiDictionary.cs b/ICSharpCode.Decompiler/Util/MultiDictionary.cs index 261537601..5cd8bcc8a 100644 --- a/ICSharpCode.Decompiler/Util/MultiDictionary.cs +++ b/ICSharpCode.Decompiler/Util/MultiDictionary.cs @@ -16,11 +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.Linq; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// A dictionary that allows multiple pairs with the same key. diff --git a/ICSharpCode.Decompiler/Util/Platform.cs b/ICSharpCode.Decompiler/Util/Platform.cs index 383d8f11a..d1567cc16 100644 --- a/ICSharpCode.Decompiler/Util/Platform.cs +++ b/ICSharpCode.Decompiler/Util/Platform.cs @@ -18,7 +18,7 @@ using System; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Platform-specific code. diff --git a/ICSharpCode.Decompiler/Util/ProjectedList.cs b/ICSharpCode.Decompiler/Util/ProjectedList.cs index 8b0ae69b8..348af3532 100644 --- a/ICSharpCode.Decompiler/Util/ProjectedList.cs +++ b/ICSharpCode.Decompiler/Util/ProjectedList.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { public sealed class ProjectedList : IList where TOutput : class { diff --git a/ICSharpCode.Decompiler/Util/ReferenceComparer.cs b/ICSharpCode.Decompiler/Util/ReferenceComparer.cs index d87709c69..aa3ed8a07 100644 --- a/ICSharpCode.Decompiler/Util/ReferenceComparer.cs +++ b/ICSharpCode.Decompiler/Util/ReferenceComparer.cs @@ -16,11 +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.Runtime.CompilerServices; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { public sealed class ReferenceComparer : IEqualityComparer { diff --git a/ICSharpCode.Decompiler/Util/TreeTraversal.cs b/ICSharpCode.Decompiler/Util/TreeTraversal.cs index 23f0bcb9f..b33c8b3fa 100644 --- a/ICSharpCode.Decompiler/Util/TreeTraversal.cs +++ b/ICSharpCode.Decompiler/Util/TreeTraversal.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.NRefactory.Utils +namespace ICSharpCode.Decompiler.Util { /// /// Static helper methods for traversing trees. diff --git a/ICSharpCode.Decompiler/Util/UnionFind.cs b/ICSharpCode.Decompiler/Util/UnionFind.cs index 939836e1b..936bd78bc 100644 --- a/ICSharpCode.Decompiler/Util/UnionFind.cs +++ b/ICSharpCode.Decompiler/Util/UnionFind.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.Decompiler +namespace ICSharpCode.Decompiler.Util { /// /// Union-Find data structure. diff --git a/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs b/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs index 18d0ed115..f4ddec62c 100644 --- a/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs +++ b/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs @@ -9,7 +9,7 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL.Transforms; -using ICSharpCode.NRefactory.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ILSpy.BamlDecompiler diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs index 93e473687..5b2061f43 100644 --- a/ILSpy/Languages/CSharpLanguage.cs +++ b/ILSpy/Languages/CSharpLanguage.cs @@ -34,6 +34,8 @@ using ICSharpCode.ILSpy.XmlDoc; using ICSharpCode.NRefactory.CSharp; using Mono.Cecil; using ICSharpCode.Decompiler.CSharp; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.Decompiler.CSharp.Syntax; namespace ICSharpCode.ILSpy { diff --git a/ILSpy/Languages/ILAstLanguage.cs b/ILSpy/Languages/ILAstLanguage.cs index 8dbc816b8..db2fc8a7e 100644 --- a/ILSpy/Languages/ILAstLanguage.cs +++ b/ILSpy/Languages/ILAstLanguage.cs @@ -26,6 +26,7 @@ using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.Disassembler; using ICSharpCode.Decompiler.IL; using ICSharpCode.Decompiler.IL.Transforms; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy diff --git a/ILSpy/Languages/TextTokenWriter.cs b/ILSpy/Languages/TextTokenWriter.cs index 833ebb5b1..eb407793c 100644 --- a/ILSpy/Languages/TextTokenWriter.cs +++ b/ILSpy/Languages/TextTokenWriter.cs @@ -21,6 +21,8 @@ using System.Collections.Generic; using System.Linq; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp; +using ICSharpCode.Decompiler.CSharp.OutputVisitor; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.IL; using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.CSharp; diff --git a/ILSpy/SearchStrategies.cs b/ILSpy/SearchStrategies.cs index cfae22b0a..9ccf987cc 100644 --- a/ILSpy/SearchStrategies.cs +++ b/ILSpy/SearchStrategies.cs @@ -5,8 +5,6 @@ using System.Text.RegularExpressions; using System.Windows.Media; using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.Utils; - using Mono.Cecil; using Mono.Cecil.Cil; diff --git a/ILSpy/TextView/AvalonEditTextOutput.cs b/ILSpy/TextView/AvalonEditTextOutput.cs index f8487a539..6206dbbf4 100644 --- a/ILSpy/TextView/AvalonEditTextOutput.cs +++ b/ILSpy/TextView/AvalonEditTextOutput.cs @@ -27,6 +27,7 @@ using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.AvalonEdit.Rendering; using ICSharpCode.Decompiler; +using TextLocation = ICSharpCode.Decompiler.CSharp.Syntax.TextLocation; namespace ICSharpCode.ILSpy.TextView { @@ -119,9 +120,9 @@ namespace ICSharpCode.ILSpy.TextView get { return b.Length; } } - public ICSharpCode.NRefactory.TextLocation Location { + public TextLocation Location { get { - return new ICSharpCode.NRefactory.TextLocation(lineNumber, b.Length - lastLineStart + 1 + (needsIndent ? indent : 0)); + return new TextLocation(lineNumber, b.Length - lastLineStart + 1 + (needsIndent ? indent : 0)); } } diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedAttributeAppliedToTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedAttributeAppliedToTreeNode.cs index 50ca65ace..6ca5766ad 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedAttributeAppliedToTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedAttributeAppliedToTreeNode.cs @@ -22,8 +22,8 @@ using System.Linq; using System.Threading; using Mono.Cecil; using Mono.Cecil.Cil; -using ICSharpCode.NRefactory.Utils; using System.Collections.Concurrent; +using ICSharpCode.Decompiler.Util; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer { diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs index 1ce65f153..e3be33a6f 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceEventImplementedByTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceEventImplementedByTreeNode.cs index 1959ee6ef..c0021b5b4 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceEventImplementedByTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceEventImplementedByTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs index f7b3f0417..7c82b7a76 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs index f063713f5..8a7311e74 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs index c70629834..787671387 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using ICSharpCode.Decompiler; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs index e02b6e410..69db2bcc6 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs index f0375dc63..43b20c722 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.Decompiler.Ast; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; using Mono.Cecil.Cil; diff --git a/ILSpy/TreeNodes/Analyzer/AnalyzedVirtualMethodUsedByTreeNode.cs b/ILSpy/TreeNodes/Analyzer/AnalyzedVirtualMethodUsedByTreeNode.cs index c769dc6a2..266f1460a 100644 --- a/ILSpy/TreeNodes/Analyzer/AnalyzedVirtualMethodUsedByTreeNode.cs +++ b/ILSpy/TreeNodes/Analyzer/AnalyzedVirtualMethodUsedByTreeNode.cs @@ -21,9 +21,9 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; using Mono.Cecil.Cil; -using ICSharpCode.Decompiler.Ast; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer { diff --git a/ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs b/ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs index 66494e5db..e5359ea63 100644 --- a/ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs +++ b/ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes.Analyzer diff --git a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs index 87279e2b0..a6f66fae2 100644 --- a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs +++ b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using ICSharpCode.Decompiler; -using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Decompiler.Util; using Mono.Cecil; namespace ICSharpCode.ILSpy.TreeNodes diff --git a/ILSpy/XmlDoc/AddXmlDocTransform.cs b/ILSpy/XmlDoc/AddXmlDocTransform.cs index 2ffaf3e0c..bafe9be32 100644 --- a/ILSpy/XmlDoc/AddXmlDocTransform.cs +++ b/ILSpy/XmlDoc/AddXmlDocTransform.cs @@ -18,6 +18,7 @@ using System; using System.IO; +using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.NRefactory.CSharp; using Mono.Cecil; diff --git a/ILSpy/XmlDoc/XmlDocKeyProvider.cs b/ILSpy/XmlDoc/XmlDocKeyProvider.cs index a02b5b823..77b6b173b 100644 --- a/ILSpy/XmlDoc/XmlDocKeyProvider.cs +++ b/ILSpy/XmlDoc/XmlDocKeyProvider.cs @@ -21,7 +21,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; +using ICSharpCode.Decompiler.TypeSystem; using Mono.Cecil; +using ArrayType = Mono.Cecil.ArrayType; +using ByReferenceType = Mono.Cecil.ByReferenceType; +using PointerType = Mono.Cecil.PointerType; namespace ICSharpCode.ILSpy.XmlDoc { @@ -146,7 +150,7 @@ namespace ICSharpCode.ILSpy.XmlDoc b.Append('.'); } int localTypeParameterCount = 0; - b.Append(NRefactory.TypeSystem.ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out localTypeParameterCount)); + b.Append(ReflectionHelper.SplitTypeParameterCountFromReflectionName(type.Name, out localTypeParameterCount)); if (localTypeParameterCount > 0) { int totalTypeParameterCount = outerTypeParameterCount + localTypeParameterCount; diff --git a/TestPlugin/CustomLanguage.cs b/TestPlugin/CustomLanguage.cs index 327b405d5..8fce32bb8 100644 --- a/TestPlugin/CustomLanguage.cs +++ b/TestPlugin/CustomLanguage.cs @@ -6,7 +6,6 @@ using System.ComponentModel.Composition; using System.Linq; using System.Windows.Controls; using ICSharpCode.Decompiler; -using ICSharpCode.Decompiler.Ast; using ICSharpCode.ILSpy; using ICSharpCode.NRefactory.CSharp; using Mono.Cecil;