From 8cee8f532c56a4569ed6110b04ca1f754df06ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Thu, 29 Nov 2012 11:09:26 +0100 Subject: [PATCH] Fixed some compiler warnings. --- .../Completion/CSharpCompletionEngine.cs | 2 +- ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs | 2 +- ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs | 6 +++--- .../CodeActions/ExtractMethod/VariableUsageAnalyzation.cs | 4 ++-- .../CodeActions/ImplementAbstractMembersAction.cs | 2 +- .../Refactoring/CodeActions/MoveToOuterScopeAction.cs | 2 +- .../CodeIssues/ConditionalToNullCoalescingIssue.cs | 4 ++-- .../CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs | 2 +- .../CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs | 2 +- .../InconsistentNamingIssue/NamingConventionService.cs | 2 +- .../Refactoring/CodeIssues/NotImplementedExceptionIssue.cs | 4 ++-- .../ParameterCanBeDemotedIssue/HasMemberCriterion.cs | 4 ++-- .../ParameterCanBeDemotedIssue.cs | 2 +- .../Refactoring/CodeIssues/RedundantInternalIssue.cs | 4 ++-- .../Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs | 4 ++-- .../Refactoring/CodeIssues/RedundantPrivateIssue.cs | 4 ++-- .../Refactoring/CodeIssues/UseVarKeywordIssue.cs | 4 ++-- ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 81e7212029..d481e76561 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -1787,7 +1787,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion return ""; } - static CSharpAmbience amb = new CSharpAmbience(); +// static CSharpAmbience amb = new CSharpAmbience(); class Category : CompletionCategory { diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs index 475d973cf6..11de45c233 100644 --- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs +++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs @@ -1572,7 +1572,7 @@ namespace Mono.CSharp #endif number_pos = 0; var loc = Location; - bool hasLeadingDot = c == '.'; +// bool hasLeadingDot = c == '.'; if (c >= '0' && c <= '9'){ if (c == '0'){ diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs index 5094472e72..6714f7c17b 100644 --- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs +++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs @@ -2076,8 +2076,8 @@ namespace Mono.CSharp { static int id; public int ID = id++; - static int clone_id_counter; - int clone_id; +// static int clone_id_counter; +// int clone_id; #endif // int assignable_slots; @@ -2396,7 +2396,7 @@ namespace Mono.CSharp { { Block target = (Block) t; #if DEBUG - target.clone_id = clone_id_counter++; +// target.clone_id = clone_id_counter++; #endif clonectx.AddBlockMap (this, target); diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs index b759245440..631d700edb 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/VariableUsageAnalyzation.cs @@ -40,7 +40,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod public class VariableUsageAnalyzation : DepthFirstAstVisitor { - readonly RefactoringContext context; +// readonly RefactoringContext context; readonly List usedVariables; Dictionary states = new Dictionary (); @@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod public VariableUsageAnalyzation (RefactoringContext context, List usedVariables) { - this.context = context; +// this.context = context; this.usedVariables = usedVariables; } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs index 97a4b9b00e..b8f13d36b3 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementAbstractMembersAction.cs @@ -67,7 +67,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public static List CollectMembersToImplement(ITypeDefinition implementingType, IType abstractType) { - var def = abstractType.GetDefinition(); +// var def = abstractType.GetDefinition(); var toImplement = new List(); bool alreadyImplemented; diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs index f04be04710..a184131d35 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/MoveToOuterScopeAction.cs @@ -103,7 +103,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring if (localResolveResult == null) continue; bool referenceFound = false; - var variable = localResolveResult.Variable; +// var variable = localResolveResult.Variable; var syntaxTree = context.RootNode as SyntaxTree; referenceFinder.FindLocalReferences(localResolveResult.Variable, context.UnresolvedFile, syntaxTree, context.Compilation, (node, nodeResolveResult) => { diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs index d3499a7d9a..8e0c0695c2 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs @@ -62,11 +62,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly ConditionalToNullCoalescingIssue inspector; +// readonly ConditionalToNullCoalescingIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, ConditionalToNullCoalescingIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } public override void VisitConditionalExpression(ConditionalExpression conditionalExpression) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs index 4fbe64f46e..91dd6bad91 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssue.cs @@ -59,7 +59,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring var type = ctx.Resolve (isExpression.Expression).Type; var providedType = ctx.ResolveType (isExpression.Type); - var foundConversion = conversions.ImplicitConversion(type, providedType); +// var foundConversion = conversions.ImplicitConversion(type, providedType); if (!IsValidReferenceOrBoxingConversion(type, providedType)) return; diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs index 543b2bdb61..e84f9944f2 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExpressionIsNeverOfProvidedTypeIssue.cs @@ -57,7 +57,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring { base.VisitIsExpression (isExpression); - var conversions = CSharpConversions.Get(ctx.Compilation); +// var conversions = CSharpConversions.Get(ctx.Compilation); var exprType = ctx.Resolve (isExpression.Expression).Type; var providedType = ctx.ResolveType (isExpression.Type); diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs index 4b1e1e8207..a1c2e9b6e3 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/NamingConventionService.cs @@ -49,7 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring } if (!rule.IsValid(name)) { IList suggestedNames; - var msg = rule.GetErrorMessage(ctx, name, out suggestedNames); + rule.GetErrorMessage(ctx, name, out suggestedNames); if (suggestedNames.Any ()) return suggestedNames [0]; } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs index d10f1fe2a1..4632cf10c7 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs @@ -44,11 +44,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly NotImplementedExceptionIssue inspector; +// readonly NotImplementedExceptionIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, NotImplementedExceptionIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } public override void VisitThrowStatement(ThrowStatement throwStatement) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs index e917be8cdc..399b762174 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/HasMemberCriterion.cs @@ -32,12 +32,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring { public class HasMemberCriterion : ITypeCriterion { - IMember neededMember; +// IMember neededMember; IList acceptableMembers; public HasMemberCriterion(IMember neededMember) { - this.neededMember = neededMember; +// this.neededMember = neededMember; if (neededMember.ImplementedInterfaceMembers.Any()) { acceptableMembers = neededMember.ImplementedInterfaceMembers.ToList(); diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs index 9fa163dd8a..0a3b73edd2 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ParameterCanBeDemotedIssue/ParameterCanBeDemotedIssue.cs @@ -205,7 +205,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public void Resolved(AstNode node, ResolveResult result) { - bool errors = result.IsError; +// bool errors = result.IsError; FoundErrors |= result.IsError; } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs index f30493b9c8..f8a2a1c55c 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs @@ -48,11 +48,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly RedundantInternalIssue inspector; +// readonly RedundantInternalIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, RedundantInternalIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs index 84d69449be..c8a23b2623 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs @@ -50,11 +50,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly RedundantNamespaceUsageIssue inspector; +// readonly RedundantNamespaceUsageIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, RedundantNamespaceUsageIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } public override void VisitMemberReferenceExpression(MemberReferenceExpression memberReferenceExpression) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs index 3438e13614..71787ee344 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs @@ -48,11 +48,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly RedundantPrivateIssue inspector; +// readonly RedundantPrivateIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, RedundantPrivateIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } void CheckNode(EntityDeclaration node) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs index 74c2a0f722..f7329ac5fa 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs @@ -50,11 +50,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring class GatherVisitor : GatherVisitorBase { - readonly UseVarKeywordIssue inspector; +// readonly UseVarKeywordIssue inspector; public GatherVisitor (BaseRefactoringContext ctx, UseVarKeywordIssue inspector) : base (ctx) { - this.inspector = inspector; +// this.inspector = inspector; } public override void VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement) diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs index 1fce31a562..418b1347a5 100644 --- a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs +++ b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs @@ -570,7 +570,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver if (unresolvedFile != null) { resolver = resolver.WithCurrentUsingScope(unresolvedFile.GetUsingScope(namespaceDeclaration.StartLocation).Resolve(resolver.Compilation)); } else { - string fileName = namespaceDeclaration.GetRegion().FileName ?? string.Empty; +// string fileName = namespaceDeclaration.GetRegion().FileName ?? string.Empty; // Fetch parent using scope // Create root using scope if necessary if (resolver.CurrentUsingScope == null)