From 042aecda375350f733c0ff8f6b6e35feacb8960a Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Sun, 28 Nov 2010 19:19:22 +0100 Subject: [PATCH] Cleanup from FxCop --- .../BaseClasses/Printing/StandardPrinter.cs | 6 +- .../Exporter/Converters/BaseConverter.cs | 2 +- .../Converters/GroupedRowConverter.cs | 2 +- .../Converters/GroupedTableConverter.cs | 2 +- .../ReportingLanguageCompiler.cs | 124 +----------------- 5 files changed, 9 insertions(+), 127 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index 78038c8b7b..484c4efd86 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -259,9 +259,9 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing foreach (BaseExportColumn element in row) { ExportText textItem = element as ExportText; if (textItem != null) { - if (textItem.Text.StartsWith("=")) { -// Console.WriteLine(textItem.Text); - } +// if (textItem.Text.StartsWith("=",StringComparison.InvariantCulture)) { +//// Console.WriteLine(textItem.Text); +// } textItem.Text = evaluator.Evaluate(textItem.Text); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index b1bd5fa887..6ea374ca63 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -149,7 +149,7 @@ namespace ICSharpCode.Reports.Core.Exporter } protected Point ConvertGroupChilds(ExporterCollection mylist, BaseSection section, - ISimpleContainer simpleContainer,IDataNavigator currentNavigator) + ISimpleContainer simpleContainer) { PrepareContainerForConverting(section,simpleContainer); Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index b6c61760b0..7de663af78 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -102,7 +102,7 @@ namespace ICSharpCode.Reports.Core.Exporter section.Items[1].Size = childSize; Console.WriteLine("\tFillRow"); childNavigator.Fill(simpleContainer.Items); - base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer,childNavigator); + base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer); FireRowRendering(simpleContainer,childNavigator); CheckForPageBreak(section,exporterCollection); Console.WriteLine(""); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs index 90f64b923d..e59fab02fa 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs @@ -106,7 +106,7 @@ namespace ICSharpCode.Reports.Core.Exporter childNavigator.Fill(simpleContainer.Items); - base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer,childNavigator); + base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer); simpleContainer.Size = containerSize; CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs index 4d7fa511d7..7ccb8ef310 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs @@ -17,7 +17,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage /// public class ReportingLanguageCompiler:SimpleExpressionLanguageCompiler { - private IPageInfo singlePage; +// private IPageInfo singlePage; private ReportingLanguage reportingLanguage; private Compiler compiler; @@ -97,9 +97,6 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage return CompileExpressionNode(factory, astNode.ChildNodes[2]); case "FieldsSectionStmt" : //return CompileExpressionNode (factory,astNode.ChildNodes[2]); - object o0 =astNode.ChildNodes[0].Token.Text; - object o1 =astNode.ChildNodes[1].Token.Text; - object o2 =astNode.ChildNodes[2].Token.Text; IExpression l = CompileExpressionNode(factory, astNode.ChildNodes[2]); return factory.CreateFunction(astNode.ChildNodes[0].Token.Text, l); @@ -187,122 +184,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage } - - // don't call base - protected IExpression old_CompileExpressionNode(IExpressionNodeFactory factory,ParseTreeNode astNode) -// protected override IExpression old_CompileExpressionNode(IExpressionNodeFactory factory,ParseTreeNode astNode) - { - switch (astNode.Term.Name) - { - case "Number": - var num = TypeNormalizer.EnsureType(astNode.Token.Value); - return factory.CreateLiteral(num); - case "String": - var str = TypeNormalizer.EnsureType(astNode.Token.Value); - return factory.CreateLiteral(str); - case "Boolean": - var bln = TypeNormalizer.EnsureType(astNode.Token.Value); - return factory.CreateLiteral(bln); - case "Identifier": - var variable = astNode.Token.Value; - if (variable != null) - return factory.CreateVariable(variable.ToString()); - break; - case "Symbol" : - var str_1 = TypeNormalizer.EnsureType(astNode.Token.Value); - return factory.CreateLiteral(str_1); - case "UserSectionStmt": - return factory.CreateFunction(astNode.ChildNodes[2].Token.Text,null); - case "GlobalSectionStmt" : - return factory.CreateLiteral(this.SinglePage.EvaluatePropertyPath(astNode.ChildNodes[2].Token.Text)); - case "ParameterSectionStmt" : - return CompileExpressionNode(factory, astNode.ChildNodes[2]); - - case "ParExpr" : - return CompileExpressionNode(factory, astNode.ChildNodes[0]); - - case "BinExpr": - if (astNode.ChildNodes.Count == 3 && - astNode.ChildNodes[1].Term is SymbolTerminal) - { - IExpression left = CompileExpressionNode(factory, astNode.ChildNodes[0]); - IExpression right = CompileExpressionNode(factory, astNode.ChildNodes[2]); - return factory.CreateBinaryOperator(astNode.ChildNodes[1].Term.Name, left, right); - } - if (astNode.ChildNodes.Count == 2 && - astNode.ChildNodes[0].Term is SymbolTerminal) - { - IExpression arg = CompileExpressionNode(factory, astNode.ChildNodes[1]); - return factory.CreateUnaryOperator(astNode.ChildNodes[0].Term.Name, arg); - } - if (astNode.ChildNodes.Count == 2 && - astNode.ChildNodes[1].Term is SymbolTerminal) - { - IExpression arg = CompileExpressionNode(factory, astNode.ChildNodes[0]); - return factory.CreateUnaryOperator(astNode.ChildNodes[1].Term.Name, arg); - } - break; - - case "QualifiedName": - var parts = new List(); - - if (astNode.ChildNodes.Count == 2) - return new QualifiedName(new[] {astNode.ChildNodes[1].Token.ValueString}); - /* - //Condition ought to be impossible - if (astNode.ChildNodes.Count != 3 ) - throw new Exception("Malformed QualifiedName - should have 3 child nodes"); - */ - if (astNode.ChildNodes.Count == 1) { - return CompileExpressionNode(factory, astNode.ChildNodes[0]); - } - SimpleExpressionLanguageCompiler.ExtractQualifiedName(astNode, parts); - - return new QualifiedName(parts.ToArray()); - - case "FunctionExpression": - string functionName = (astNode.ChildNodes[0].ChildNodes[0].Token.ValueString); - - var args = new IExpression[astNode.ChildNodes[0].ChildNodes[0].ChildNodes.Count]; - for (int i = 0; i < astNode.ChildNodes[0].ChildNodes[0].ChildNodes.Count;i++) - { - args[i] = CompileExpressionNode(factory, astNode.ChildNodes[1].ChildNodes[i]); - } - - return factory.CreateFunction(functionName, args); - - - case "IfThen": - IExpression condition = CompileExpressionNode(factory,astNode.ChildNodes[1].ChildNodes[0]); - IExpression trueExpr = CompileExpressionNode(factory, astNode.ChildNodes[3]); - IExpression falseExpr = null; - if (astNode.ChildNodes.Count == 6) - falseExpr = CompileExpressionNode(factory, astNode.ChildNodes[5]); - var func = new IfThen(); - if (falseExpr != null) - func.AcceptArguments(condition, trueExpr, falseExpr); - else - func.AcceptArguments(condition, trueExpr); - return func; - - /* - case "ArrayExpression": - IExpression context = CompileExpressionNode(factory, astNode.ChildNodes[0]); - IExpression index = CompileExpressionNode(factory, astNode.ChildNodes[1]); - var indexer = new ItemAtIndex(); - indexer.AcceptArguments(context, index); - return indexer; - - */ - } - return null; - } - - - public IPageInfo SinglePage { - get { return singlePage; } - set { singlePage = value; } - } - + public IPageInfo SinglePage {get;set;} + } }