diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-12-02 17:41:25 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-12-02 17:41:25 +0400 |
commit | 32132381cdc908bccb91df8fa121f1c0bcfb5c6d (patch) | |
tree | 5102e481c0bbbcca5130c2e5f72fc1480fecd5ea /main/contrib | |
parent | baf99a5dfc643219b12faf28fe4c0d560f5d768a (diff) |
[NRefactory] Fixed makefles.
Diffstat (limited to 'main/contrib')
-rwxr-xr-x[-rw-r--r--] | main/contrib/ICSharpCode.NRefactory.CSharp/Makefile.am | 30 | ||||
-rwxr-xr-x[-rw-r--r--] | main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/Log.cs | 22 | ||||
-rw-r--r-- | main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj | 36 | ||||
-rwxr-xr-x[-rw-r--r--] | main/contrib/ICSharpCode.NRefactory/Makefile.am | 72 |
4 files changed, 93 insertions, 67 deletions
diff --git a/main/contrib/ICSharpCode.NRefactory.CSharp/Makefile.am b/main/contrib/ICSharpCode.NRefactory.CSharp/Makefile.am index f5a27368ee..f1c028f8ec 100644..100755 --- a/main/contrib/ICSharpCode.NRefactory.CSharp/Makefile.am +++ b/main/contrib/ICSharpCode.NRefactory.CSharp/Makefile.am @@ -132,6 +132,7 @@ FILES = \ Completion/CSharpParameterCompletionEngine.cs \ Completion/ICompletionDataFactory.cs \ Completion/IParameterCompletionDataFactory.cs \ + CSharpProjectContent.cs \ Formatter/AstFormattingVisitor.cs \ Formatter/CSharpFormattingOptions.cs \ Formatter/Indent.cs \ @@ -201,8 +202,6 @@ FILES = \ Parser/mcs/typemanager.cs \ Parser/mcs/typespec.cs \ Parser/mcs/visit.cs \ - Parser/ParsedFile.cs \ - Parser/TypeSystemConvertVisitor.cs \ Properties/AssemblyInfo.cs \ Refactoring/Action.cs \ Refactoring/ContextAction/AddAnotherAccessor.cs \ @@ -238,37 +237,44 @@ FILES = \ Refactoring/Script.cs \ Refactoring/TextReplaceAction.cs \ Refactoring/TypeSystemAstBuilder.cs \ - Resolver/AliasNamespaceReference.cs \ Resolver/CompositeResolveVisitorNavigator.cs \ - Resolver/ConstantValues.cs \ Resolver/ConversionResolveResult.cs \ Resolver/Conversions.cs \ - Resolver/CSharpAttribute.cs \ + Resolver/CSharpAstResolver.cs \ Resolver/CSharpInvocationResolveResult.cs \ + Resolver/CSharpOperators.cs \ Resolver/CSharpResolver.cs \ Resolver/DetectSkippableNodesNavigator.cs \ - Resolver/ErrorResolveResult.cs \ Resolver/FindReferencedEntities.cs \ Resolver/FindReferences.cs \ Resolver/FindReferenceSearchScope.cs \ Resolver/IResolveVisitorNavigator.cs \ - Resolver/ITypeOrNamespaceReference.cs \ Resolver/LambdaResolveResult.cs \ Resolver/Log.cs \ - Resolver/MapTypeIntoNewContext.cs \ Resolver/MemberLookup.cs \ - Resolver/MemberTypeOrNamespaceReference.cs \ Resolver/MethodGroupResolveResult.cs \ Resolver/NodeListResolveVisitorNavigator.cs \ - Resolver/OperatorResolveResult.cs \ Resolver/OverloadResolution.cs \ Resolver/OverloadResolutionErrors.cs \ Resolver/ResolveAtLocation.cs \ Resolver/ResolveVisitor.cs \ Resolver/SimpleNameLookupMode.cs \ - Resolver/SimpleTypeOrNamespaceReference.cs \ Resolver/TypeInference.cs \ - Resolver/UsingScope.cs + TypeSystem/AliasNamespaceReference.cs \ + TypeSystem/AttributeTypeReference.cs \ + TypeSystem/ConstantValues.cs \ + TypeSystem/CSharpAssembly.cs \ + TypeSystem/CSharpAttribute.cs \ + TypeSystem/CSharpParsedFile.cs \ + TypeSystem/CSharpTypeResolveContext.cs \ + TypeSystem/CSharpUnresolvedTypeDefinition.cs \ + TypeSystem/MemberTypeOrNamespaceReference.cs \ + TypeSystem/MethodTypeParameterWithInheritedConstraints.cs \ + TypeSystem/ResolvedUsingScope.cs \ + TypeSystem/SimpleTypeOrNamespaceReference.cs \ + TypeSystem/TypeOrNamespaceReference.cs \ + TypeSystem/TypeSystemConvertVisitor.cs \ + TypeSystem/UsingScope.cs all: $(ASSEMBLY) $(ASSEMBLY).mdb diff --git a/main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/Log.cs b/main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/Log.cs index c3d43c2f4d..3e4adfa9fb 100644..100755 --- a/main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/Log.cs +++ b/main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/Log.cs @@ -37,22 +37,22 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver { const bool logEnabled = false; - [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] +// [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] internal static void WriteLine(string text) { - Debug.WriteLine(text); +// Debug.WriteLine(text); } - [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] +// [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] internal static void WriteLine(string format, params object[] args) { - Debug.WriteLine(format, args); +// Debug.WriteLine(format, args); } - [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] +// [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] internal static void WriteCollection<T>(string text, IEnumerable<T> lines) { - #if DEBUG +/* #if DEBUG T[] arr = lines.ToArray(); if (arr.Length == 0) { Debug.WriteLine(text + "<empty collection>"); @@ -62,19 +62,19 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver Debug.WriteLine(new string(' ', text.Length) + (arr[i] != null ? arr[i].ToString() : "<null>")); } } - #endif + #endif*/ } - [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] +// [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] public static void Indent() { - Debug.Indent(); +// Debug.Indent(); } - [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] +// [Conditional(logEnabled ? "DEBUG" : "LOG_DISABLED")] public static void Unindent() { - Debug.Unindent(); +// Debug.Unindent(); } } } diff --git a/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj index 786e12d166..c5fc42d3d6 100644 --- a/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj +++ b/main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj @@ -196,15 +196,8 @@ <Compile Include="Completion\IParameterDataProvider.cs" /> <Compile Include="Semantics\OperatorResolveResult.cs" /> <Compile Include="TypeSystem\InheritanceHelper.cs" /> - <Compile Include="Semantics\ErrorResolveResult.cs" /> <Compile Include="Semantics\ThisResolveResult.cs" /> - <Compile Include="TypeSystem\Implementation\AbstractResolvedEntity.cs" /> - <Compile Include="TypeSystem\Implementation\AbstractResolvedMember.cs" /> - <Compile Include="TypeSystem\Implementation\AbstractResolvedTypeParameter.cs" /> - <Compile Include="TypeSystem\Implementation\AbstractUnresolvedEntity.cs" /> - <Compile Include="TypeSystem\Implementation\AbstractUnresolvedMember.cs" /> - <Compile Include="TypeSystem\Implementation\DefaultAssemblyReference.cs" /> - <Compile Include="TypeSystem\Implementation\DefaultMemberReference.cs" /> + <Compile Include="Semantics\ErrorResolveResult.cs" /> <Compile Include="TypeSystem\Implementation\DefaultResolvedAccessor.cs" /> <Compile Include="TypeSystem\Implementation\DefaultResolvedEvent.cs" /> <Compile Include="TypeSystem\Implementation\DefaultResolvedField.cs" /> @@ -225,22 +218,29 @@ <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeParameter.cs" /> <Compile Include="TypeSystem\Implementation\DummyTypeParameter.cs" /> <Compile Include="TypeSystem\Implementation\FullNameAndTypeParameterCount.cs" /> - <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" /> - <Compile Include="TypeSystem\Implementation\MergedNamespace.cs" /> - <Compile Include="TypeSystem\Implementation\MinimalCorlib.cs" /> - <Compile Include="TypeSystem\ISolutionSnapshot.cs" /> <Compile Include="TypeSystem\SpecialType.cs" /> - <Compile Include="Utils\ImmutableStack.cs" /> - <Compile Include="Utils\LazyInit.cs" /> - <Compile Include="Utils\ProjectedList.cs" /> + <Compile Include="TypeSystem\ISolutionSnapshot.cs" /> + <Compile Include="TypeSystem\INamespace.cs" /> + <Compile Include="TypeSystem\ICompilation.cs" /> + <Compile Include="TypeSystem\IAssembly.cs" /> <Compile Include="TypeSystem\Implementation\UnknownType.cs" /> <Compile Include="TypeSystem\AnonymousType.cs" /> - <Compile Include="TypeSystem\IAssembly.cs" /> - <Compile Include="TypeSystem\ICompilation.cs" /> <Compile Include="TypeSystem\Implementation\TypeParameterReference.cs" /> + <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" /> + <Compile Include="TypeSystem\Implementation\MergedNamespace.cs" /> + <Compile Include="TypeSystem\Implementation\MinimalCorlib.cs" /> <Compile Include="TypeSystem\Implementation\SimpleTypeResolveContext.cs" /> <Compile Include="TypeSystem\Implementation\SimpleCompilation.cs" /> - <Compile Include="TypeSystem\INamespace.cs" /> + <Compile Include="TypeSystem\Implementation\DefaultAssemblyReference.cs" /> + <Compile Include="TypeSystem\Implementation\DefaultMemberReference.cs" /> + <Compile Include="TypeSystem\Implementation\AbstractUnresolvedEntity.cs" /> + <Compile Include="TypeSystem\Implementation\AbstractUnresolvedMember.cs" /> + <Compile Include="TypeSystem\Implementation\AbstractResolvedEntity.cs" /> + <Compile Include="TypeSystem\Implementation\AbstractResolvedMember.cs" /> + <Compile Include="TypeSystem\Implementation\AbstractResolvedTypeParameter.cs" /> + <Compile Include="Utils\ImmutableStack.cs" /> + <Compile Include="Utils\LazyInit.cs" /> + <Compile Include="Utils\ProjectedList.cs" /> <Compile Include="IAnnotatable.cs" /> </ItemGroup> <ItemGroup> diff --git a/main/contrib/ICSharpCode.NRefactory/Makefile.am b/main/contrib/ICSharpCode.NRefactory/Makefile.am index 633a4ae99a..dc3e21c0bf 100644..100755 --- a/main/contrib/ICSharpCode.NRefactory/Makefile.am +++ b/main/contrib/ICSharpCode.NRefactory/Makefile.am @@ -28,6 +28,7 @@ FILES = \ Editor/ReadOnlyDocument.cs \ Editor/StringTextSource.cs \ Editor/TextChangeEventArgs.cs \ + IAnnotatable.cs \ PatternMatching/AnyNode.cs \ PatternMatching/Backreference.cs \ PatternMatching/BacktrackingInfo.cs \ @@ -44,18 +45,20 @@ FILES = \ Semantics/ArrayCreateResolveResult.cs \ Semantics/ByReferenceResolveResult.cs \ Semantics/ConstantResolveResult.cs \ + Semantics/ErrorResolveResult.cs \ Semantics/InvocationResolveResult.cs \ Semantics/LocalResolveResult.cs \ Semantics/MemberResolveResult.cs \ Semantics/NamespaceResolveResult.cs \ Semantics/OperatorResolveResult.cs \ Semantics/ResolveResult.cs \ + Semantics/ThisResolveResult.cs \ Semantics/TypeOfResolveResult.cs \ Semantics/TypeResolveResult.cs \ Semantics/UnknownMemberResolveResult.cs \ - Semantics/UnknownTypeResolveResult.cs \ TextLocation.cs \ TypeSystem/Accessibility.cs \ + TypeSystem/AnonymousType.cs \ TypeSystem/ArrayType.cs \ TypeSystem/ByReferenceType.cs \ TypeSystem/CecilLoader.cs \ @@ -65,56 +68,71 @@ FILES = \ TypeSystem/ExtensionMethods.cs \ TypeSystem/IAccessor.cs \ TypeSystem/IAmbience.cs \ - TypeSystem/IAnnotatable.cs \ + TypeSystem/IAssembly.cs \ TypeSystem/IAttribute.cs \ + TypeSystem/ICompilation.cs \ TypeSystem/IConstantValue.cs \ TypeSystem/IDocumentationProvider.cs \ TypeSystem/IEntity.cs \ TypeSystem/IEvent.cs \ - TypeSystem/IExplicitInterfaceImplementation.cs \ TypeSystem/IField.cs \ TypeSystem/IFreezable.cs \ TypeSystem/IInterningProvider.cs \ TypeSystem/IMember.cs \ TypeSystem/IMethod.cs \ TypeSystem/Implementation/AbstractFreezable.cs \ - TypeSystem/Implementation/AbstractMember.cs \ + TypeSystem/Implementation/AbstractResolvedEntity.cs \ + TypeSystem/Implementation/AbstractResolvedMember.cs \ + TypeSystem/Implementation/AbstractResolvedTypeParameter.cs \ TypeSystem/Implementation/AbstractType.cs \ - TypeSystem/Implementation/AbstractTypeParameter.cs \ + TypeSystem/Implementation/AbstractUnresolvedEntity.cs \ + TypeSystem/Implementation/AbstractUnresolvedMember.cs \ TypeSystem/Implementation/BaseTypeCollector.cs \ - TypeSystem/Implementation/CompositeTypeResolveContext.cs \ - TypeSystem/Implementation/CompoundTypeDefinition.cs \ - TypeSystem/Implementation/DefaultAccessor.cs \ - TypeSystem/Implementation/DefaultAttribute.cs \ - TypeSystem/Implementation/DefaultEvent.cs \ - TypeSystem/Implementation/DefaultExplicitInterfaceImplementation.cs \ - TypeSystem/Implementation/DefaultField.cs \ - TypeSystem/Implementation/DefaultMethod.cs \ + TypeSystem/Implementation/DefaultAssemblyReference.cs \ + TypeSystem/Implementation/DefaultMemberReference.cs \ TypeSystem/Implementation/DefaultParameter.cs \ - TypeSystem/Implementation/DefaultProperty.cs \ - TypeSystem/Implementation/DefaultTypeDefinition.cs \ - TypeSystem/Implementation/DefaultTypeParameter.cs \ - TypeSystem/Implementation/DefaultTypeParameterConstraints.cs \ + TypeSystem/Implementation/DefaultResolvedAccessor.cs \ + TypeSystem/Implementation/DefaultResolvedEvent.cs \ + TypeSystem/Implementation/DefaultResolvedField.cs \ + TypeSystem/Implementation/DefaultResolvedMethod.cs \ + TypeSystem/Implementation/DefaultResolvedProperty.cs \ + TypeSystem/Implementation/DefaultResolvedTypeDefinition.cs \ + TypeSystem/Implementation/DefaultResolvedTypeParameter.cs \ + TypeSystem/Implementation/DefaultSolutionSnapshot.cs \ + TypeSystem/Implementation/DefaultUnresolvedAccessor.cs \ + TypeSystem/Implementation/DefaultUnresolvedAssembly.cs \ + TypeSystem/Implementation/DefaultUnresolvedAttribute.cs \ + TypeSystem/Implementation/DefaultUnresolvedEvent.cs \ + TypeSystem/Implementation/DefaultUnresolvedField.cs \ + TypeSystem/Implementation/DefaultUnresolvedMethod.cs \ + TypeSystem/Implementation/DefaultUnresolvedParameter.cs \ + TypeSystem/Implementation/DefaultUnresolvedProperty.cs \ + TypeSystem/Implementation/DefaultUnresolvedTypeDefinition.cs \ + TypeSystem/Implementation/DefaultUnresolvedTypeParameter.cs \ + TypeSystem/Implementation/DummyTypeParameter.cs \ + TypeSystem/Implementation/FullNameAndTypeParameterCount.cs \ TypeSystem/Implementation/GetClassTypeReference.cs \ TypeSystem/Implementation/GetMembersHelper.cs \ - TypeSystem/Implementation/MinimalResolveContext.cs \ + TypeSystem/Implementation/KnownTypeCache.cs \ + TypeSystem/Implementation/MergedNamespace.cs \ + TypeSystem/Implementation/MinimalCorlib.cs \ TypeSystem/Implementation/NestedTypeReference.cs \ - TypeSystem/Implementation/ProxyTypeResolveContext.cs \ + TypeSystem/Implementation/SimpleCompilation.cs \ TypeSystem/Implementation/SimpleConstantValue.cs \ TypeSystem/Implementation/SimpleInterningProvider.cs \ - TypeSystem/Implementation/SimpleProjectContent.cs \ + TypeSystem/Implementation/SimpleTypeResolveContext.cs \ TypeSystem/Implementation/SpecializedEvent.cs \ TypeSystem/Implementation/SpecializedField.cs \ TypeSystem/Implementation/SpecializedMember.cs \ TypeSystem/Implementation/SpecializedMethod.cs \ TypeSystem/Implementation/SpecializedProperty.cs \ - TypeSystem/Implementation/SubstitutionTypeReference.cs \ + TypeSystem/Implementation/TypeParameterReference.cs \ TypeSystem/Implementation/TypeParameterSubstitution.cs \ - TypeSystem/Implementation/TypeParameterWithInheritedConstraints.cs \ - TypeSystem/Implementation/TypeStorage.cs \ TypeSystem/Implementation/TypeWithElementType.cs \ + TypeSystem/Implementation/UnknownType.cs \ TypeSystem/Implementation/VoidTypeDefinition.cs \ TypeSystem/INamedElement.cs \ + TypeSystem/INamespace.cs \ TypeSystem/InheritanceHelper.cs \ TypeSystem/IntersectionType.cs \ TypeSystem/IParameter.cs \ @@ -122,13 +140,12 @@ FILES = \ TypeSystem/IParsedFile.cs \ TypeSystem/IProjectContent.cs \ TypeSystem/IProperty.cs \ + TypeSystem/ISolutionSnapshot.cs \ TypeSystem/ISupportsInterning.cs \ - TypeSystem/ISynchronizedTypeResolveContext.cs \ TypeSystem/IType.cs \ TypeSystem/ITypeDefinition.cs \ TypeSystem/ITypeParameter.cs \ TypeSystem/ITypeReference.cs \ - TypeSystem/ITypeResolveContext.cs \ TypeSystem/IVariable.cs \ TypeSystem/KnownTypeReference.cs \ TypeSystem/NullableType.cs \ @@ -137,7 +154,7 @@ FILES = \ TypeSystem/PointerType.cs \ TypeSystem/ReflectionHelper.cs \ TypeSystem/ReflectionNameParseException.cs \ - TypeSystem/SharedTypes.cs \ + TypeSystem/SpecialType.cs \ TypeSystem/TypeKind.cs \ TypeSystem/TypeVisitor.cs \ Utils/7BitEncodedInts.cs \ @@ -149,7 +166,10 @@ FILES = \ Utils/ExtensionMethods.cs \ Utils/FastSerializer.cs \ Utils/GraphVizGraph.cs \ + Utils/ImmutableStack.cs \ + Utils/LazyInit.cs \ Utils/Platform.cs \ + Utils/ProjectedList.cs \ Utils/ReferenceComparer.cs \ Utils/TreeTraversal.cs |