From bc6029a8a7f351f087d4751674f1d568be7eb0aa Mon Sep 17 00:00:00 2001 From: eeichinger Date: Wed, 6 Aug 2008 00:17:42 +0000 Subject: [PATCH] updated latest antlr generated expression lexer & parser files --- .../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 b3308506..f80e88df 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): "Expressions/Expression.g" -> "ExpressionLexer.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ namespace Spring.Expressions { @@ -123,18 +123,18 @@ namespace Spring.Expressions 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", 14); literals.Add("in", 10); literals.Add("null", 15); - literals.Add("matches", 14); - literals.Add("or", 9); literals.Add("between", 12); + literals.Add("or", 9); literals.Add("is", 11); literals.Add("like", 13); literals.Add("new", 46); literals.Add("date", 52); + 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 bb19ddfa..d7779e60 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): "Expressions/Expression.g" -> "ExpressionParser.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$ namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs index bf82456b..1f47e89a 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): "Expressions/Expression.g" -> "ExpressionLexer.cs"$ +// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt index c92e21f2..5e36c13e 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): Expressions/Expression.g -> ExpressionParserTokenTypes.txt$ +// $ANTLR 2.7.6 (2005-12-22): Expression.g -> ExpressionParserTokenTypes.txt$ ExpressionParser // output token vocab name EXPR=4 OPERAND=5