From e19d4def221a54eae8d0cbef396ba5d3f822e35a Mon Sep 17 00:00:00 2001 From: eeichinger Date: Thu, 15 Oct 2009 11:41:43 +0000 Subject: [PATCH] commmitted antlr f. net-2.0 generated grammars --- .../Spring.Core/Expressions/Parser/ExpressionLexer.cs | 8 ++++---- .../Spring.Core/Expressions/Parser/ExpressionParser.cs | 2 +- .../Expressions/Parser/ExpressionParserTokenTypes.cs | 2 +- .../Expressions/Parser/ExpressionParserTokenTypes.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs index c488b998..77d61566 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs @@ -1,4 +1,4 @@ -// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionLexer.cs"$ namespace Spring.Expressions.Parser { @@ -126,18 +126,18 @@ namespace Spring.Expressions.Parser caseSensitiveLiterals = true; setCaseSensitive(true); literals = new Hashtable(100, (float) 0.4, null, Comparer.Default); + literals.Add("false", 6); literals.Add("true", 7); literals.Add("and", 8); - literals.Add("matches", 15); literals.Add("in", 11); literals.Add("xor", 10); literals.Add("null", 16); - literals.Add("between", 13); + literals.Add("matches", 15); literals.Add("or", 9); + literals.Add("between", 13); literals.Add("is", 12); literals.Add("like", 14); literals.Add("new", 49); - literals.Add("false", 6); } override public IToken nextToken() //throws TokenStreamException diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs index 29d44bd3..68dc0f1f 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs @@ -1,4 +1,4 @@ -// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionParser.cs"$ namespace Spring.Expressions.Parser { diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs index 7d3fb74d..db21e18b 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs @@ -1,4 +1,4 @@ -// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionLexer.cs"$ namespace Spring.Expressions.Parser { diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt index bd2a5021..55f23d35 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt @@ -1,4 +1,4 @@ -// $ANTLR 2.7.6 (2005-12-22): Expression.g -> ExpressionParserTokenTypes.txt$ +// $ANTLR 2.7.6 (2005-12-22): Expressions/Expression.g -> ExpressionParserTokenTypes.txt$ ExpressionParser // output token vocab name EXPR=4 OPERAND=5