From 0000c6f260ff3550bb0bf58af7dbc4f705638366 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 16 Sep 2008 17:13:31 +0000 Subject: [PATCH] bean references removed, no more @(context:beanname) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@102 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../expression/spel/ast/Reference.java | 88 - .../spel/generated/SpringExpressions.g | 13 - .../spel/generated/SpringExpressions.tokens | 157 +- .../generated/SpringExpressionsLexer.java | 557 ++-- .../generated/SpringExpressionsParser.java | 2518 ++++++++--------- .../spel/generated/SpringExpressions__.g | 124 +- .../spel/internal/SpelTreeAdaptor.java | 3 - .../expression/spel/EvaluationTests.java | 46 +- .../expression/spel/ParsingTests.java | 24 +- 9 files changed, 1616 insertions(+), 1914 deletions(-) delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Reference.java diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Reference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Reference.java deleted file mode 100644 index a3cdb679874..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Reference.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.ExpressionState; -import org.springframework.expression.spel.generated.SpringExpressionsLexer; - -/** - * Represent a object reference of the form '@(:)' - * - */ -public class Reference extends SpelNode { - - private boolean contextAndObjectDetermined = false; - private SpelNode contextNode = null; - private SpelNode objectNode = null; - - public Reference(Token payload) { - super(payload); - } - - @Override - public Object getValue(ExpressionState state) throws EvaluationException { - - ensureContextAndNameDetermined(); - Object contextName = (contextNode == null ? null : contextNode.getValue(state)); - Object objectName = (objectNode == null ? null : objectNode.getValue(state)); - - Object referencedValue = state.lookupReference(contextName, objectName); - - return referencedValue; - } - - /** - * Work out which represents the context and which the object. This would be trivial except for parser recovery - * situations where the expression was incomplete. We need to do our best here to recover so that we can offer - * suitable code completion suggestions. - */ - private void ensureContextAndNameDetermined() { - if (contextAndObjectDetermined) - return; - contextAndObjectDetermined = true; - int colon = -1; - for (int i = 0; i < getChildCount(); i++) { - if (getChild(i).getToken().getType() == SpringExpressionsLexer.COLON) { - colon = i; - } - } - if (colon != -1) { - contextNode = getChild(colon - 1); - objectNode = getChild(colon + 1); - } else { - objectNode = getChild(0); - } - if (objectNode.getToken().getType() != SpringExpressionsLexer.QUALIFIED_IDENTIFIER) { - objectNode = null; - } - } - - @Override - public String toStringAST() { - ensureContextAndNameDetermined(); - StringBuilder sb = new StringBuilder(); - sb.append("@("); - if (contextNode != null) { - sb.append(contextNode.toStringAST()).append(":"); - } - sb.append(objectNode.toStringAST()); - sb.append(")"); - return sb.toString(); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g index aff8bf6f143..fb6f92a78d2 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g @@ -13,7 +13,6 @@ tokens { INTEGER_LITERAL; EXPRESSION; QUALIFIED_IDENTIFIER; - REFERENCE; PROPERTY_OR_FIELD; INDEXER; CONSTRUCTOR; @@ -97,7 +96,6 @@ startNode parenExpr | methodOrProperty | functionOrVar - | reference | indexer | literal | type @@ -152,17 +150,6 @@ methodArgs : LPAREN! (argument (COMMA! argument)* (COMMA!)?)? RPAREN!; // access id as a child of the new node. property: id=ID -> ^(PROPERTY_OR_FIELD[$id]); -// start - in this block there are changes to help parser recovery and code completion - -// fiddled with to support better code completion -// we preserve the colon and rparen to give positional info and the qualifiedId is optional to cope with -// code completing in @() (which is really an invalid expression) -reference - : AT pos=LPAREN (cn=contextName COLON)? (q=qualifiedId)? RPAREN - -> ^(REFERENCE[$pos] ($cn COLON)? $q? RPAREN); -// what I really want here is: was there a colon? position of the right paren - -// end - in this block there are changes to help parser recovery and code completion //indexer: LBRACKET r1=range (COMMA r2=range)* RBRACKET -> ^(INDEXER $r1 ($r2)*); indexer: LBRACKET r1=argument (COMMA r2=argument)* RBRACKET -> ^(INDEXER $r1 ($r2)*); diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.tokens b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.tokens index 246e965b3f0..5d51ef149ef 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.tokens +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.tokens @@ -1,83 +1,82 @@ -GREATER_THAN_OR_EQUAL=71 -SELECT_FIRST=52 -COMMA=45 -HOLDER=12 -GREATER_THAN=70 -TYPE=54 +GREATER_THAN_OR_EQUAL=69 +SELECT_FIRST=50 +COMMA=44 +HOLDER=11 +GREATER_THAN=68 +TYPE=52 EXPRESSIONLIST=4 -MINUS=36 -MAP_ENTRY=21 -SELECT_LAST=53 -NUMBER=25 -LESS_THAN=68 -BANG=41 -FALSE=62 -METHOD=22 -PROPERTY_OR_FIELD=9 -LBRACKET=47 -INDEXER=10 -MOD=39 -CONSTRUCTOR_ARRAY=13 -FUNCTIONREF=15 -NULL_LITERAL=58 -NAMED_ARGUMENT=14 -OR=33 -PIPE=77 -DOT=42 -RCURLY=50 +MINUS=35 +MAP_ENTRY=20 +SELECT_LAST=51 +NUMBER=24 +LESS_THAN=66 +BANG=40 +FALSE=60 +METHOD=21 +PROPERTY_OR_FIELD=8 +LBRACKET=45 +INDEXER=9 +MOD=38 +CONSTRUCTOR_ARRAY=12 +FUNCTIONREF=14 +NULL_LITERAL=56 +NAMED_ARGUMENT=13 +OR=32 +PIPE=75 +DOT=41 +RCURLY=48 EXPRESSION=6 -AND=34 -LCURLY=55 -REAL_TYPE_SUFFIX=84 -STRING_LITERAL=56 -SELECT=51 +AND=33 +LCURLY=53 +REAL_TYPE_SUFFIX=83 +STRING_LITERAL=54 +SELECT=49 QUALIFIED_IDENTIFIER=7 -RBRACKET=48 -SUBTRACT=24 -ASSIGN=27 -BETWEEN=74 -RPAREN=32 -SIGN=85 -LPAREN=31 -HEX_DIGIT=65 -PLUS=35 -LIST_INITIALIZER=19 -APOS=78 +RBRACKET=46 +SUBTRACT=23 +ASSIGN=26 +BETWEEN=72 +RPAREN=31 +SIGN=84 +LPAREN=30 +HEX_DIGIT=63 +PLUS=34 +LIST_INITIALIZER=18 +APOS=76 INTEGER_LITERAL=5 -AT=46 -ID=44 -NOT_EQUAL=67 -RANGE=17 -POWER=40 -TYPEREF=16 -DECIMAL_DIGIT=63 -WS=80 -IS=73 -DOLLAR=81 -LESS_THAN_OR_EQUAL=69 -SEMIRPAREN=26 -DQ_STRING_LITERAL=57 -HEXADECIMAL_INTEGER_LITERAL=59 -MAP_INITIALIZER=20 -IN=72 -SEMI=76 -CONSTRUCTOR=11 -INTEGER_TYPE_SUFFIX=64 -EQUAL=66 -MATCHES=75 -DOT_ESCAPED=79 -UPTO=82 -QMARK=29 -REFERENCE=8 -PROJECT=49 -DEFAULT=28 -COLON=30 -DIV=38 -STAR=37 -REAL_LITERAL=60 -VARIABLEREF=18 -EXPONENT_PART=83 -TRUE=61 -ADD=23 -POUND=43 -'new'=86 +AT=80 +ID=43 +NOT_EQUAL=65 +RANGE=16 +POWER=39 +TYPEREF=15 +DECIMAL_DIGIT=61 +WS=78 +IS=71 +DOLLAR=79 +LESS_THAN_OR_EQUAL=67 +SEMIRPAREN=25 +DQ_STRING_LITERAL=55 +HEXADECIMAL_INTEGER_LITERAL=57 +MAP_INITIALIZER=19 +IN=70 +SEMI=74 +CONSTRUCTOR=10 +INTEGER_TYPE_SUFFIX=62 +EQUAL=64 +MATCHES=73 +DOT_ESCAPED=77 +UPTO=81 +QMARK=28 +PROJECT=47 +DEFAULT=27 +COLON=29 +DIV=37 +STAR=36 +REAL_LITERAL=58 +VARIABLEREF=17 +EXPONENT_PART=82 +TRUE=59 +ADD=22 +POUND=42 +'new'=85 diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsLexer.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsLexer.java index b1a40bff861..5a0a2e57f7b 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsLexer.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 09:57:24 +// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 10:12:48 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -7,101 +7,100 @@ import java.util.List; import java.util.ArrayList; public class SpringExpressionsLexer extends Lexer { - public static final int GREATER_THAN_OR_EQUAL=71; - public static final int SELECT_FIRST=52; - public static final int COMMA=45; - public static final int HOLDER=12; + public static final int GREATER_THAN_OR_EQUAL=69; + public static final int SELECT_FIRST=50; + public static final int COMMA=44; + public static final int HOLDER=11; public static final int EXPRESSIONLIST=4; - public static final int TYPE=54; - public static final int GREATER_THAN=70; - public static final int MINUS=36; - public static final int MAP_ENTRY=21; - public static final int SELECT_LAST=53; - public static final int NUMBER=25; - public static final int BANG=41; - public static final int LESS_THAN=68; - public static final int METHOD=22; - public static final int FALSE=62; - public static final int PROPERTY_OR_FIELD=9; - public static final int LBRACKET=47; - public static final int INDEXER=10; - public static final int MOD=39; - public static final int CONSTRUCTOR_ARRAY=13; - public static final int FUNCTIONREF=15; - public static final int NULL_LITERAL=58; - public static final int NAMED_ARGUMENT=14; - public static final int OR=33; - public static final int PIPE=77; - public static final int DOT=42; - public static final int RCURLY=50; + public static final int TYPE=52; + public static final int GREATER_THAN=68; + public static final int MINUS=35; + public static final int MAP_ENTRY=20; + public static final int SELECT_LAST=51; + public static final int NUMBER=24; + public static final int BANG=40; + public static final int LESS_THAN=66; + public static final int METHOD=21; + public static final int FALSE=60; + public static final int PROPERTY_OR_FIELD=8; + public static final int LBRACKET=45; + public static final int T85=85; + public static final int INDEXER=9; + public static final int MOD=38; + public static final int CONSTRUCTOR_ARRAY=12; + public static final int FUNCTIONREF=14; + public static final int NULL_LITERAL=56; + public static final int NAMED_ARGUMENT=13; + public static final int OR=32; + public static final int PIPE=75; + public static final int DOT=41; + public static final int RCURLY=48; public static final int EXPRESSION=6; - public static final int AND=34; - public static final int T86=86; - public static final int LCURLY=55; - public static final int REAL_TYPE_SUFFIX=84; - public static final int STRING_LITERAL=56; - public static final int SELECT=51; + public static final int AND=33; + public static final int LCURLY=53; + public static final int REAL_TYPE_SUFFIX=83; + public static final int STRING_LITERAL=54; + public static final int SELECT=49; public static final int QUALIFIED_IDENTIFIER=7; - public static final int RBRACKET=48; - public static final int SUBTRACT=24; - public static final int ASSIGN=27; - public static final int BETWEEN=74; - public static final int RPAREN=32; - public static final int LPAREN=31; - public static final int SIGN=85; - public static final int HEX_DIGIT=65; - public static final int PLUS=35; - public static final int LIST_INITIALIZER=19; - public static final int APOS=78; + public static final int RBRACKET=46; + public static final int SUBTRACT=23; + public static final int ASSIGN=26; + public static final int BETWEEN=72; + public static final int RPAREN=31; + public static final int LPAREN=30; + public static final int SIGN=84; + public static final int HEX_DIGIT=63; + public static final int PLUS=34; + public static final int LIST_INITIALIZER=18; + public static final int APOS=76; public static final int INTEGER_LITERAL=5; - public static final int AT=46; - public static final int ID=44; - public static final int NOT_EQUAL=67; - public static final int RANGE=17; - public static final int POWER=40; - public static final int TYPEREF=16; - public static final int DECIMAL_DIGIT=63; - public static final int WS=80; - public static final int IS=73; - public static final int DOLLAR=81; - public static final int SEMIRPAREN=26; - public static final int LESS_THAN_OR_EQUAL=69; - public static final int DQ_STRING_LITERAL=57; - public static final int MAP_INITIALIZER=20; - public static final int HEXADECIMAL_INTEGER_LITERAL=59; - public static final int IN=72; - public static final int CONSTRUCTOR=11; - public static final int SEMI=76; - public static final int INTEGER_TYPE_SUFFIX=64; - public static final int EQUAL=66; - public static final int MATCHES=75; - public static final int DOT_ESCAPED=79; - public static final int QMARK=29; - public static final int UPTO=82; + public static final int AT=80; + public static final int ID=43; + public static final int NOT_EQUAL=65; + public static final int RANGE=16; + public static final int POWER=39; + public static final int TYPEREF=15; + public static final int DECIMAL_DIGIT=61; + public static final int WS=78; + public static final int IS=71; + public static final int DOLLAR=79; + public static final int SEMIRPAREN=25; + public static final int LESS_THAN_OR_EQUAL=67; + public static final int DQ_STRING_LITERAL=55; + public static final int MAP_INITIALIZER=19; + public static final int HEXADECIMAL_INTEGER_LITERAL=57; + public static final int IN=70; + public static final int CONSTRUCTOR=10; + public static final int SEMI=74; + public static final int INTEGER_TYPE_SUFFIX=62; + public static final int EQUAL=64; + public static final int MATCHES=73; + public static final int DOT_ESCAPED=77; + public static final int QMARK=28; + public static final int UPTO=81; public static final int EOF=-1; - public static final int REFERENCE=8; - public static final int Tokens=87; - public static final int COLON=30; - public static final int DEFAULT=28; - public static final int PROJECT=49; - public static final int DIV=38; - public static final int STAR=37; - public static final int VARIABLEREF=18; - public static final int REAL_LITERAL=60; - public static final int ADD=23; - public static final int TRUE=61; - public static final int EXPONENT_PART=83; - public static final int POUND=43; + public static final int Tokens=86; + public static final int COLON=29; + public static final int DEFAULT=27; + public static final int PROJECT=47; + public static final int DIV=37; + public static final int STAR=36; + public static final int VARIABLEREF=17; + public static final int REAL_LITERAL=58; + public static final int ADD=22; + public static final int TRUE=59; + public static final int EXPONENT_PART=82; + public static final int POUND=42; public SpringExpressionsLexer() {;} public SpringExpressionsLexer(CharStream input) { super(input); } public String getGrammarFileName() { return "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g"; } - // $ANTLR start T86 - public final void mT86() throws RecognitionException { + // $ANTLR start T85 + public final void mT85() throws RecognitionException { try { - int _type = T86; + int _type = T85; // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:8:5: ( 'new' ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:8:7: 'new' { @@ -115,14 +114,14 @@ public class SpringExpressionsLexer extends Lexer { finally { } } - // $ANTLR end T86 + // $ANTLR end T85 // $ANTLR start SEMIRPAREN public final void mSEMIRPAREN() throws RecognitionException { try { int _type = SEMIRPAREN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:12: ( ';)' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:14: ';)' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:12: ( ';)' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:14: ';)' { match(";)"); @@ -140,10 +139,10 @@ public class SpringExpressionsLexer extends Lexer { public final void mINTEGER_LITERAL() throws RecognitionException { try { int _type = INTEGER_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:2: ( ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:4: ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:2: ( ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:4: ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:4: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:4: ( DECIMAL_DIGIT )+ int cnt1=0; loop1: do { @@ -157,7 +156,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt1) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:5: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:5: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -173,7 +172,7 @@ public class SpringExpressionsLexer extends Lexer { cnt1++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:21: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:21: ( INTEGER_TYPE_SUFFIX )? int alt2=2; int LA2_0 = input.LA(1); @@ -182,7 +181,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt2) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:22: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:22: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -205,10 +204,10 @@ public class SpringExpressionsLexer extends Lexer { public final void mHEXADECIMAL_INTEGER_LITERAL() throws RecognitionException { try { int _type = HEXADECIMAL_INTEGER_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:29: ( ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:31: ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:29: ( ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:31: ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:31: ( '0x' | '0X' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:31: ( '0x' | '0X' ) int alt3=2; int LA3_0 = input.LA(1); @@ -223,20 +222,20 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("240:31: ( '0x' | '0X' )", 3, 1, input); + new NoViableAltException("227:31: ( '0x' | '0X' )", 3, 1, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("240:31: ( '0x' | '0X' )", 3, 0, input); + new NoViableAltException("227:31: ( '0x' | '0X' )", 3, 0, input); throw nvae; } switch (alt3) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:32: '0x' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:32: '0x' { match("0x"); @@ -244,7 +243,7 @@ public class SpringExpressionsLexer extends Lexer { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:39: '0X' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:39: '0X' { match("0X"); @@ -254,7 +253,7 @@ public class SpringExpressionsLexer extends Lexer { } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:45: ( HEX_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:45: ( HEX_DIGIT )+ int cnt4=0; loop4: do { @@ -268,7 +267,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt4) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:46: HEX_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:46: HEX_DIGIT { mHEX_DIGIT(); @@ -284,7 +283,7 @@ public class SpringExpressionsLexer extends Lexer { cnt4++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:58: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:58: ( INTEGER_TYPE_SUFFIX )? int alt5=2; int LA5_0 = input.LA(1); @@ -293,7 +292,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt5) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:59: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:59: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -316,8 +315,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mASSIGN() throws RecognitionException { try { int _type = ASSIGN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:7: ( '=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:9: '=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:7: ( '=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:9: '=' { match('='); @@ -334,8 +333,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mEQUAL() throws RecognitionException { try { int _type = EQUAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:6: ( '==' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:8: '==' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:6: ( '==' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:8: '==' { match("=="); @@ -353,8 +352,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mNOT_EQUAL() throws RecognitionException { try { int _type = NOT_EQUAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:10: ( '!=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:12: '!=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:10: ( '!=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:12: '!=' { match("!="); @@ -372,8 +371,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mLESS_THAN() throws RecognitionException { try { int _type = LESS_THAN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:10: ( '<' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:12: '<' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:10: ( '<' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:12: '<' { match('<'); @@ -390,8 +389,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mLESS_THAN_OR_EQUAL() throws RecognitionException { try { int _type = LESS_THAN_OR_EQUAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:19: ( '<=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:21: '<=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:19: ( '<=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:21: '<=' { match("<="); @@ -409,8 +408,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mGREATER_THAN() throws RecognitionException { try { int _type = GREATER_THAN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:13: ( '>' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:15: '>' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:13: ( '>' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:15: '>' { match('>'); @@ -427,8 +426,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mGREATER_THAN_OR_EQUAL() throws RecognitionException { try { int _type = GREATER_THAN_OR_EQUAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:22: ( '>=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:24: '>=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:22: ( '>=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:24: '>=' { match(">="); @@ -446,8 +445,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mIN() throws RecognitionException { try { int _type = IN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:3: ( 'in' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:9: 'in' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:3: ( 'in' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:9: 'in' { match("in"); @@ -465,8 +464,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mIS() throws RecognitionException { try { int _type = IS; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:3: ( 'is' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:9: 'is' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:3: ( 'is' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:9: 'is' { match("is"); @@ -484,8 +483,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mBETWEEN() throws RecognitionException { try { int _type = BETWEEN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:8: ( 'between' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:9: 'between' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:8: ( 'between' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:9: 'between' { match("between"); @@ -503,8 +502,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mMATCHES() throws RecognitionException { try { int _type = MATCHES; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:8: ( 'matches' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:9: 'matches' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:8: ( 'matches' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:9: 'matches' { match("matches"); @@ -522,8 +521,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mNULL_LITERAL() throws RecognitionException { try { int _type = NULL_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:13: ( 'null' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:15: 'null' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:13: ( 'null' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:15: 'null' { match("null"); @@ -541,8 +540,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mSEMI() throws RecognitionException { try { int _type = SEMI; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:5: ( ';' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:7: ';' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:5: ( ';' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:7: ';' { match(';'); @@ -559,8 +558,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mDOT() throws RecognitionException { try { int _type = DOT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:4: ( '.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:9: '.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:4: ( '.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:9: '.' { match('.'); @@ -577,8 +576,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mCOMMA() throws RecognitionException { try { int _type = COMMA; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:6: ( ',' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:8: ',' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:6: ( ',' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:8: ',' { match(','); @@ -595,8 +594,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mLPAREN() throws RecognitionException { try { int _type = LPAREN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:7: ( '(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:9: '(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:7: ( '(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:9: '(' { match('('); @@ -613,8 +612,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mRPAREN() throws RecognitionException { try { int _type = RPAREN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:7: ( ')' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:9: ')' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:7: ( ')' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:9: ')' { match(')'); @@ -631,8 +630,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mLCURLY() throws RecognitionException { try { int _type = LCURLY; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:7: ( '{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:9: '{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:7: ( '{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:9: '{' { match('{'); @@ -649,8 +648,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mRCURLY() throws RecognitionException { try { int _type = RCURLY; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:7: ( '}' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:9: '}' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:7: ( '}' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:9: '}' { match('}'); @@ -667,8 +666,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mLBRACKET() throws RecognitionException { try { int _type = LBRACKET; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:9: ( '[' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:11: '[' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:9: ( '[' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:11: '[' { match('['); @@ -685,8 +684,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mRBRACKET() throws RecognitionException { try { int _type = RBRACKET; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:276:9: ( ']' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:276:11: ']' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:9: ( ']' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:11: ']' { match(']'); @@ -703,8 +702,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPIPE() throws RecognitionException { try { int _type = PIPE; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:5: ( '|' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:7: '|' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:5: ( '|' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:7: '|' { match('|'); @@ -721,8 +720,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mAND() throws RecognitionException { try { int _type = AND; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:4: ( 'and' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:9: 'and' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:4: ( 'and' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:9: 'and' { match("and"); @@ -740,8 +739,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mOR() throws RecognitionException { try { int _type = OR; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:3: ( 'or' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:9: 'or' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:3: ( 'or' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:9: 'or' { match("or"); @@ -759,8 +758,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mFALSE() throws RecognitionException { try { int _type = FALSE; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:6: ( 'false' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:9: 'false' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:6: ( 'false' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:9: 'false' { match("false"); @@ -778,8 +777,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mTRUE() throws RecognitionException { try { int _type = TRUE; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:5: ( 'true' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:9: 'true' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:5: ( 'true' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:9: 'true' { match("true"); @@ -797,8 +796,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPLUS() throws RecognitionException { try { int _type = PLUS; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:5: ( '+' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:7: '+' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:5: ( '+' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:7: '+' { match('+'); @@ -815,8 +814,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mMINUS() throws RecognitionException { try { int _type = MINUS; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:6: ( '-' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:8: '-' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:6: ( '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:8: '-' { match('-'); @@ -833,8 +832,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mDIV() throws RecognitionException { try { int _type = DIV; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:286:4: ( '/' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:286:6: '/' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:4: ( '/' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:6: '/' { match('/'); @@ -851,8 +850,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mSTAR() throws RecognitionException { try { int _type = STAR; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:5: ( '*' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:7: '*' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:5: ( '*' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:7: '*' { match('*'); @@ -869,8 +868,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mMOD() throws RecognitionException { try { int _type = MOD; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:4: ( '%' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:6: '%' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:4: ( '%' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:6: '%' { match('%'); @@ -887,8 +886,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPOWER() throws RecognitionException { try { int _type = POWER; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:6: ( '^' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:8: '^' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:276:6: ( '^' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:276:8: '^' { match('^'); @@ -905,8 +904,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mBANG() throws RecognitionException { try { int _type = BANG; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:5: ( '!' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:7: '!' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:5: ( '!' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:7: '!' { match('!'); @@ -923,8 +922,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPOUND() throws RecognitionException { try { int _type = POUND; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:6: ( '#' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:8: '#' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:6: ( '#' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:8: '#' { match('#'); @@ -941,8 +940,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mQMARK() throws RecognitionException { try { int _type = QMARK; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:6: ( '?' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:8: '?' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:6: ( '?' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:8: '?' { match('?'); @@ -959,8 +958,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mDEFAULT() throws RecognitionException { try { int _type = DEFAULT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:8: ( '??' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:10: '??' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:8: ( '??' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:10: '??' { match("??"); @@ -978,8 +977,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPROJECT() throws RecognitionException { try { int _type = PROJECT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:8: ( '!{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:10: '!{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:8: ( '!{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:10: '!{' { match("!{"); @@ -997,8 +996,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mSELECT() throws RecognitionException { try { int _type = SELECT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:7: ( '?{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:9: '?{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:7: ( '?{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:9: '?{' { match("?{"); @@ -1016,8 +1015,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mSELECT_FIRST() throws RecognitionException { try { int _type = SELECT_FIRST; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:13: ( '^{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:15: '^{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:13: ( '^{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:15: '^{' { match("^{"); @@ -1035,8 +1034,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mSELECT_LAST() throws RecognitionException { try { int _type = SELECT_LAST; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:12: ( '${' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:14: '${' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:12: ( '${' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:14: '${' { match("${"); @@ -1054,8 +1053,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mTYPE() throws RecognitionException { try { int _type = TYPE; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:5: ( 'T(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:7: 'T(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:5: ( 'T(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:7: 'T(' { match("T("); @@ -1073,11 +1072,11 @@ public class SpringExpressionsLexer extends Lexer { public final void mSTRING_LITERAL() throws RecognitionException { try { int _type = STRING_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:17: '\\'' ( APOS | ~ '\\'' )* '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:17: '\\'' ( APOS | ~ '\\'' )* '\\'' { match('\''); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:23: ( APOS | ~ '\\'' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:23: ( APOS | ~ '\\'' )* loop6: do { int alt6=3; @@ -1099,14 +1098,14 @@ public class SpringExpressionsLexer extends Lexer { switch (alt6) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:24: APOS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:24: APOS { mAPOS(); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:29: ~ '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:29: ~ '\\'' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1142,11 +1141,11 @@ public class SpringExpressionsLexer extends Lexer { public final void mDQ_STRING_LITERAL() throws RecognitionException { try { int _type = DQ_STRING_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:18: ( '\"' (~ '\"' )* '\"' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:20: '\"' (~ '\"' )* '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:18: ( '\"' (~ '\"' )* '\"' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:20: '\"' (~ '\"' )* '\"' { match('\"'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:25: (~ '\"' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:25: (~ '\"' )* loop7: do { int alt7=2; @@ -1159,7 +1158,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt7) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:26: ~ '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:26: ~ '\"' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1195,8 +1194,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mID() throws RecognitionException { try { int _type = ID; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:3: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:5: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:3: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:5: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* { if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -1208,7 +1207,7 @@ public class SpringExpressionsLexer extends Lexer { recover(mse); throw mse; } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* loop8: do { int alt8=6; @@ -1302,35 +1301,35 @@ public class SpringExpressionsLexer extends Lexer { switch (alt8) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:30: 'a' .. 'z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:30: 'a' .. 'z' { matchRange('a','z'); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:39: 'A' .. 'Z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:39: 'A' .. 'Z' { matchRange('A','Z'); } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:48: '_' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:48: '_' { match('_'); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:52: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:52: '0' .. '9' { matchRange('0','9'); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:61: DOT_ESCAPED + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:61: DOT_ESCAPED { mDOT_ESCAPED(); @@ -1356,8 +1355,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mDOT_ESCAPED() throws RecognitionException { try { int _type = DOT_ESCAPED; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:12: ( '\\\\.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:14: '\\\\.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:12: ( '\\\\.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:14: '\\\\.' { match("\\."); @@ -1375,10 +1374,10 @@ public class SpringExpressionsLexer extends Lexer { public final void mWS() throws RecognitionException { try { int _type = WS; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ int cnt9=0; loop9: do { @@ -1432,8 +1431,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mDOLLAR() throws RecognitionException { try { int _type = DOLLAR; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:7: ( '$' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:9: '$' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:7: ( '$' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:9: '$' { match('$'); @@ -1450,8 +1449,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mAT() throws RecognitionException { try { int _type = AT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:3: ( '@' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:5: '@' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:3: ( '@' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:5: '@' { match('@'); @@ -1468,8 +1467,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mUPTO() throws RecognitionException { try { int _type = UPTO; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:5: ( '..' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:7: '..' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:5: ( '..' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:7: '..' { match(".."); @@ -1487,8 +1486,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mCOLON() throws RecognitionException { try { int _type = COLON; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:6: ( ':' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:8: ':' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:6: ( ':' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:8: ':' { match(':'); @@ -1505,18 +1504,18 @@ public class SpringExpressionsLexer extends Lexer { public final void mREAL_LITERAL() throws RecognitionException { try { int _type = REAL_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:14: ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:14: ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) ) int alt20=4; alt20 = dfa20.predict(input); switch (alt20) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:4: '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:4: '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? { match('.'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:8: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:8: ( DECIMAL_DIGIT )+ int cnt10=0; loop10: do { @@ -1530,7 +1529,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt10) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:9: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:9: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1546,7 +1545,7 @@ public class SpringExpressionsLexer extends Lexer { cnt10++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:25: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:25: ( EXPONENT_PART )? int alt11=2; int LA11_0 = input.LA(1); @@ -1555,7 +1554,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt11) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:26: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:26: EXPONENT_PART { mEXPONENT_PART(); @@ -1564,7 +1563,7 @@ public class SpringExpressionsLexer extends Lexer { } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:42: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:42: ( REAL_TYPE_SUFFIX )? int alt12=2; int LA12_0 = input.LA(1); @@ -1573,7 +1572,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt12) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:43: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:43: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1589,12 +1588,12 @@ public class SpringExpressionsLexer extends Lexer { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:3: ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:3: ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:3: ( DECIMAL_DIGIT )+ int cnt13=0; loop13: do { @@ -1608,7 +1607,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt13) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1625,7 +1624,7 @@ public class SpringExpressionsLexer extends Lexer { } while (true); match('.'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:24: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:24: ( DECIMAL_DIGIT )+ int cnt14=0; loop14: do { @@ -1639,7 +1638,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt14) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:25: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:25: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1655,7 +1654,7 @@ public class SpringExpressionsLexer extends Lexer { cnt14++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:41: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:41: ( EXPONENT_PART )? int alt15=2; int LA15_0 = input.LA(1); @@ -1664,7 +1663,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt15) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:42: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:42: EXPONENT_PART { mEXPONENT_PART(); @@ -1673,7 +1672,7 @@ public class SpringExpressionsLexer extends Lexer { } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:58: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:58: ( REAL_TYPE_SUFFIX )? int alt16=2; int LA16_0 = input.LA(1); @@ -1682,7 +1681,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt16) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:59: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:59: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1698,12 +1697,12 @@ public class SpringExpressionsLexer extends Lexer { } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:3: ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:3: ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:3: ( DECIMAL_DIGIT )+ int cnt17=0; loop17: do { @@ -1717,7 +1716,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt17) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1733,14 +1732,14 @@ public class SpringExpressionsLexer extends Lexer { cnt17++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:20: ( EXPONENT_PART ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:21: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:20: ( EXPONENT_PART ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:21: EXPONENT_PART { mEXPONENT_PART(); } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:36: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:36: ( REAL_TYPE_SUFFIX )? int alt18=2; int LA18_0 = input.LA(1); @@ -1749,7 +1748,7 @@ public class SpringExpressionsLexer extends Lexer { } switch (alt18) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:37: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:37: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1765,12 +1764,12 @@ public class SpringExpressionsLexer extends Lexer { } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:3: ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:3: ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:3: ( DECIMAL_DIGIT )+ int cnt19=0; loop19: do { @@ -1784,7 +1783,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt19) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1800,8 +1799,8 @@ public class SpringExpressionsLexer extends Lexer { cnt19++; } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:20: ( REAL_TYPE_SUFFIX ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:21: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:20: ( REAL_TYPE_SUFFIX ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:21: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1825,8 +1824,8 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start APOS public final void mAPOS() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:317:15: ( '\\'' '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:317:17: '\\'' '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:15: ( '\\'' '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:17: '\\'' '\\'' { match('\''); match('\''); @@ -1842,8 +1841,8 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start DECIMAL_DIGIT public final void mDECIMAL_DIGIT() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:24: ( '0' .. '9' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:26: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:24: ( '0' .. '9' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:26: '0' .. '9' { matchRange('0','9'); @@ -1858,8 +1857,8 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start INTEGER_TYPE_SUFFIX public final void mINTEGER_TYPE_SUFFIX() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:30: ( ( 'L' | 'l' ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:32: ( 'L' | 'l' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:30: ( ( 'L' | 'l' ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:32: ( 'L' | 'l' ) { if ( input.LA(1)=='L'||input.LA(1)=='l' ) { input.consume(); @@ -1883,7 +1882,7 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start HEX_DIGIT public final void mHEX_DIGIT() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:320:20: ( '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:20: ( '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { @@ -1908,7 +1907,7 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start EXPONENT_PART public final void mEXPONENT_PART() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ ) int alt25=2; int LA25_0 = input.LA(1); @@ -1920,16 +1919,16 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("322:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input); + new NoViableAltException("309:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input); throw nvae; } switch (alt25) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+ { match('e'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:31: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:31: ( SIGN )* loop21: do { int alt21=2; @@ -1942,7 +1941,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt21) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:32: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:32: SIGN { mSIGN(); @@ -1954,7 +1953,7 @@ public class SpringExpressionsLexer extends Lexer { } } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:40: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:40: ( DECIMAL_DIGIT )+ int cnt22=0; loop22: do { @@ -1968,7 +1967,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt22) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:41: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:41: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1988,10 +1987,10 @@ public class SpringExpressionsLexer extends Lexer { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+ { match('E'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:64: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:64: ( SIGN )* loop23: do { int alt23=2; @@ -2004,7 +2003,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt23) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:65: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:65: SIGN { mSIGN(); @@ -2016,7 +2015,7 @@ public class SpringExpressionsLexer extends Lexer { } } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:73: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:73: ( DECIMAL_DIGIT )+ int cnt24=0; loop24: do { @@ -2030,7 +2029,7 @@ public class SpringExpressionsLexer extends Lexer { switch (alt24) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:74: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:74: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -2060,7 +2059,7 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start SIGN public final void mSIGN() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:323:15: ( '+' | '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:310:15: ( '+' | '-' ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: { if ( input.LA(1)=='+'||input.LA(1)=='-' ) { @@ -2085,7 +2084,7 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR start REAL_TYPE_SUFFIX public final void mREAL_TYPE_SUFFIX() throws RecognitionException { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:324:27: ( 'F' | 'f' | 'D' | 'd' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:27: ( 'F' | 'f' | 'D' | 'd' ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: { if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) { @@ -2108,14 +2107,14 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR end REAL_TYPE_SUFFIX public void mTokens() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:8: ( T86 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:8: ( T85 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL ) int alt26=55; alt26 = dfa26.predict(input); switch (alt26) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:10: T86 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:10: T85 { - mT86(); + mT85(); } break; @@ -2556,7 +2555,7 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA20_transition; } public String getDescription() { - return "311:1: REAL_LITERAL : ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) );"; + return "298:1: REAL_LITERAL : ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) );"; } } static final String DFA26_eotS = @@ -2734,7 +2733,7 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA26_transition; } public String getDescription() { - return "1:1: Tokens : ( T86 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL );"; + return "1:1: Tokens : ( T85 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL );"; } } diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsParser.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsParser.java index 696e8206acd..b2d3c8fc781 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsParser.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressionsParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 09:57:23 +// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 10:12:48 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -12,95 +12,94 @@ import org.antlr.runtime.tree.*; public class SpringExpressionsParser extends Parser { public static final String[] tokenNames = new String[] { - "", "", "", "", "EXPRESSIONLIST", "INTEGER_LITERAL", "EXPRESSION", "QUALIFIED_IDENTIFIER", "REFERENCE", "PROPERTY_OR_FIELD", "INDEXER", "CONSTRUCTOR", "HOLDER", "CONSTRUCTOR_ARRAY", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "RANGE", "VARIABLEREF", "LIST_INITIALIZER", "MAP_INITIALIZER", "MAP_ENTRY", "METHOD", "ADD", "SUBTRACT", "NUMBER", "SEMIRPAREN", "ASSIGN", "DEFAULT", "QMARK", "COLON", "LPAREN", "RPAREN", "OR", "AND", "PLUS", "MINUS", "STAR", "DIV", "MOD", "POWER", "BANG", "DOT", "POUND", "ID", "COMMA", "AT", "LBRACKET", "RBRACKET", "PROJECT", "RCURLY", "SELECT", "SELECT_FIRST", "SELECT_LAST", "TYPE", "LCURLY", "STRING_LITERAL", "DQ_STRING_LITERAL", "NULL_LITERAL", "HEXADECIMAL_INTEGER_LITERAL", "REAL_LITERAL", "TRUE", "FALSE", "DECIMAL_DIGIT", "INTEGER_TYPE_SUFFIX", "HEX_DIGIT", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_OR_EQUAL", "GREATER_THAN", "GREATER_THAN_OR_EQUAL", "IN", "IS", "BETWEEN", "MATCHES", "SEMI", "PIPE", "APOS", "DOT_ESCAPED", "WS", "DOLLAR", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" + "", "", "", "", "EXPRESSIONLIST", "INTEGER_LITERAL", "EXPRESSION", "QUALIFIED_IDENTIFIER", "PROPERTY_OR_FIELD", "INDEXER", "CONSTRUCTOR", "HOLDER", "CONSTRUCTOR_ARRAY", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "RANGE", "VARIABLEREF", "LIST_INITIALIZER", "MAP_INITIALIZER", "MAP_ENTRY", "METHOD", "ADD", "SUBTRACT", "NUMBER", "SEMIRPAREN", "ASSIGN", "DEFAULT", "QMARK", "COLON", "LPAREN", "RPAREN", "OR", "AND", "PLUS", "MINUS", "STAR", "DIV", "MOD", "POWER", "BANG", "DOT", "POUND", "ID", "COMMA", "LBRACKET", "RBRACKET", "PROJECT", "RCURLY", "SELECT", "SELECT_FIRST", "SELECT_LAST", "TYPE", "LCURLY", "STRING_LITERAL", "DQ_STRING_LITERAL", "NULL_LITERAL", "HEXADECIMAL_INTEGER_LITERAL", "REAL_LITERAL", "TRUE", "FALSE", "DECIMAL_DIGIT", "INTEGER_TYPE_SUFFIX", "HEX_DIGIT", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_OR_EQUAL", "GREATER_THAN", "GREATER_THAN_OR_EQUAL", "IN", "IS", "BETWEEN", "MATCHES", "SEMI", "PIPE", "APOS", "DOT_ESCAPED", "WS", "DOLLAR", "AT", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" }; - public static final int GREATER_THAN_OR_EQUAL=71; - public static final int SELECT_FIRST=52; - public static final int COMMA=45; - public static final int HOLDER=12; - public static final int GREATER_THAN=70; - public static final int TYPE=54; + public static final int GREATER_THAN_OR_EQUAL=69; + public static final int SELECT_FIRST=50; + public static final int COMMA=44; + public static final int HOLDER=11; + public static final int GREATER_THAN=68; + public static final int TYPE=52; public static final int EXPRESSIONLIST=4; - public static final int MINUS=36; - public static final int MAP_ENTRY=21; - public static final int SELECT_LAST=53; - public static final int NUMBER=25; - public static final int LESS_THAN=68; - public static final int BANG=41; - public static final int FALSE=62; - public static final int METHOD=22; - public static final int PROPERTY_OR_FIELD=9; - public static final int LBRACKET=47; - public static final int INDEXER=10; - public static final int MOD=39; - public static final int CONSTRUCTOR_ARRAY=13; - public static final int FUNCTIONREF=15; - public static final int NULL_LITERAL=58; - public static final int NAMED_ARGUMENT=14; - public static final int OR=33; - public static final int PIPE=77; - public static final int DOT=42; - public static final int RCURLY=50; + public static final int MINUS=35; + public static final int MAP_ENTRY=20; + public static final int SELECT_LAST=51; + public static final int NUMBER=24; + public static final int LESS_THAN=66; + public static final int BANG=40; + public static final int FALSE=60; + public static final int METHOD=21; + public static final int PROPERTY_OR_FIELD=8; + public static final int LBRACKET=45; + public static final int INDEXER=9; + public static final int MOD=38; + public static final int CONSTRUCTOR_ARRAY=12; + public static final int FUNCTIONREF=14; + public static final int NULL_LITERAL=56; + public static final int NAMED_ARGUMENT=13; + public static final int OR=32; + public static final int PIPE=75; + public static final int DOT=41; + public static final int RCURLY=48; public static final int EXPRESSION=6; - public static final int AND=34; - public static final int LCURLY=55; - public static final int REAL_TYPE_SUFFIX=84; - public static final int STRING_LITERAL=56; - public static final int SELECT=51; + public static final int AND=33; + public static final int LCURLY=53; + public static final int REAL_TYPE_SUFFIX=83; + public static final int STRING_LITERAL=54; + public static final int SELECT=49; public static final int QUALIFIED_IDENTIFIER=7; - public static final int RBRACKET=48; - public static final int SUBTRACT=24; - public static final int ASSIGN=27; - public static final int BETWEEN=74; - public static final int RPAREN=32; - public static final int SIGN=85; - public static final int LPAREN=31; - public static final int HEX_DIGIT=65; - public static final int PLUS=35; - public static final int LIST_INITIALIZER=19; - public static final int APOS=78; + public static final int RBRACKET=46; + public static final int SUBTRACT=23; + public static final int ASSIGN=26; + public static final int BETWEEN=72; + public static final int RPAREN=31; + public static final int SIGN=84; + public static final int LPAREN=30; + public static final int HEX_DIGIT=63; + public static final int PLUS=34; + public static final int LIST_INITIALIZER=18; + public static final int APOS=76; public static final int INTEGER_LITERAL=5; - public static final int AT=46; - public static final int ID=44; - public static final int NOT_EQUAL=67; - public static final int RANGE=17; - public static final int POWER=40; - public static final int TYPEREF=16; - public static final int DECIMAL_DIGIT=63; - public static final int WS=80; - public static final int IS=73; - public static final int DOLLAR=81; - public static final int LESS_THAN_OR_EQUAL=69; - public static final int SEMIRPAREN=26; - public static final int DQ_STRING_LITERAL=57; - public static final int HEXADECIMAL_INTEGER_LITERAL=59; - public static final int MAP_INITIALIZER=20; - public static final int IN=72; - public static final int SEMI=76; - public static final int CONSTRUCTOR=11; - public static final int INTEGER_TYPE_SUFFIX=64; - public static final int EQUAL=66; - public static final int MATCHES=75; - public static final int DOT_ESCAPED=79; - public static final int UPTO=82; + public static final int AT=80; + public static final int ID=43; + public static final int NOT_EQUAL=65; + public static final int RANGE=16; + public static final int POWER=39; + public static final int TYPEREF=15; + public static final int DECIMAL_DIGIT=61; + public static final int WS=78; + public static final int IS=71; + public static final int DOLLAR=79; + public static final int LESS_THAN_OR_EQUAL=67; + public static final int SEMIRPAREN=25; + public static final int DQ_STRING_LITERAL=55; + public static final int HEXADECIMAL_INTEGER_LITERAL=57; + public static final int MAP_INITIALIZER=19; + public static final int IN=70; + public static final int SEMI=74; + public static final int CONSTRUCTOR=10; + public static final int INTEGER_TYPE_SUFFIX=62; + public static final int EQUAL=64; + public static final int MATCHES=73; + public static final int DOT_ESCAPED=77; + public static final int UPTO=81; public static final int EOF=-1; - public static final int QMARK=29; - public static final int REFERENCE=8; - public static final int PROJECT=49; - public static final int DEFAULT=28; - public static final int COLON=30; - public static final int DIV=38; - public static final int STAR=37; - public static final int REAL_LITERAL=60; - public static final int VARIABLEREF=18; - public static final int EXPONENT_PART=83; - public static final int TRUE=61; - public static final int ADD=23; - public static final int POUND=43; + public static final int QMARK=28; + public static final int PROJECT=47; + public static final int DEFAULT=27; + public static final int COLON=29; + public static final int DIV=37; + public static final int STAR=36; + public static final int REAL_LITERAL=58; + public static final int VARIABLEREF=17; + public static final int EXPONENT_PART=82; + public static final int TRUE=59; + public static final int ADD=22; + public static final int POUND=42; public SpringExpressionsParser(TokenStream input) { super(input); - ruleMemo = new HashMap[46+1]; + ruleMemo = new HashMap[45+1]; } protected TreeAdaptor adaptor = new CommonTreeAdaptor(); @@ -126,7 +125,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start expr - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:1: expr : expression EOF ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:1: expr : expression EOF ; public final expr_return expr() throws RecognitionException { expr_return retval = new expr_return(); retval.start = input.LT(1); @@ -140,18 +139,18 @@ public class SpringExpressionsParser extends Parser { Object EOF2_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:5: ( expression EOF ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:7: expression EOF + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:5: ( expression EOF ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:7: expression EOF { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_expr165); + pushFollow(FOLLOW_expression_in_expr161); expression1=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression1.getTree()); EOF2=(Token)input.LT(1); - match(input,EOF,FOLLOW_EOF_in_expr167); if (failed) return retval; + match(input,EOF,FOLLOW_EOF_in_expr163); if (failed) return retval; } @@ -179,7 +178,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start expression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:1: expression : logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:60:1: expression : logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? ; public final expression_return expression() throws RecognitionException { expression_return retval = new expression_return(); retval.start = input.LT(1); @@ -207,17 +206,17 @@ public class SpringExpressionsParser extends Parser { Object COLON10_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:12: ( logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:60:12: ( logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalOrExpression_in_expression196); + pushFollow(FOLLOW_logicalOrExpression_in_expression192); logicalOrExpression3=logicalOrExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, logicalOrExpression3.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? int alt1=4; switch ( input.LA(1) ) { case ASSIGN: @@ -239,18 +238,18 @@ public class SpringExpressionsParser extends Parser { switch (alt1) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:7: ( ASSIGN logicalOrExpression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:7: ( ASSIGN logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:8: ASSIGN logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:8: ASSIGN logicalOrExpression { ASSIGN4=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_expression205); if (failed) return retval; + match(input,ASSIGN,FOLLOW_ASSIGN_in_expression201); if (failed) return retval; if ( backtracking==0 ) { ASSIGN4_tree = (Object)adaptor.create(ASSIGN4); root_0 = (Object)adaptor.becomeRoot(ASSIGN4_tree, root_0); } - pushFollow(FOLLOW_logicalOrExpression_in_expression208); + pushFollow(FOLLOW_logicalOrExpression_in_expression204); logicalOrExpression5=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -262,18 +261,18 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:6: ( DEFAULT logicalOrExpression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:6: ( DEFAULT logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:7: DEFAULT logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:7: DEFAULT logicalOrExpression { DEFAULT6=(Token)input.LT(1); - match(input,DEFAULT,FOLLOW_DEFAULT_in_expression218); if (failed) return retval; + match(input,DEFAULT,FOLLOW_DEFAULT_in_expression214); if (failed) return retval; if ( backtracking==0 ) { DEFAULT6_tree = (Object)adaptor.create(DEFAULT6); root_0 = (Object)adaptor.becomeRoot(DEFAULT6_tree, root_0); } - pushFollow(FOLLOW_logicalOrExpression_in_expression221); + pushFollow(FOLLOW_logicalOrExpression_in_expression217); logicalOrExpression7=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -285,25 +284,25 @@ public class SpringExpressionsParser extends Parser { } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:6: ( QMARK expression COLON expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:6: ( QMARK expression COLON expression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:6: ( QMARK expression COLON expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:7: QMARK expression COLON expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:6: ( QMARK expression COLON expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:7: QMARK expression COLON expression { QMARK8=(Token)input.LT(1); - match(input,QMARK,FOLLOW_QMARK_in_expression231); if (failed) return retval; + match(input,QMARK,FOLLOW_QMARK_in_expression227); if (failed) return retval; if ( backtracking==0 ) { QMARK8_tree = (Object)adaptor.create(QMARK8); root_0 = (Object)adaptor.becomeRoot(QMARK8_tree, root_0); } - pushFollow(FOLLOW_expression_in_expression234); + pushFollow(FOLLOW_expression_in_expression230); expression9=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression9.getTree()); COLON10=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_expression236); if (failed) return retval; - pushFollow(FOLLOW_expression_in_expression239); + match(input,COLON,FOLLOW_COLON_in_expression232); if (failed) return retval; + pushFollow(FOLLOW_expression_in_expression235); expression11=expression(); _fsp--; if (failed) return retval; @@ -344,7 +343,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start parenExpr - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:1: parenExpr : LPAREN expression RPAREN ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:1: parenExpr : LPAREN expression RPAREN ; public final parenExpr_return parenExpr() throws RecognitionException { parenExpr_return retval = new parenExpr_return(); retval.start = input.LT(1); @@ -360,20 +359,20 @@ public class SpringExpressionsParser extends Parser { Object RPAREN14_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:11: ( LPAREN expression RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:13: LPAREN expression RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:11: ( LPAREN expression RPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:13: LPAREN expression RPAREN { root_0 = (Object)adaptor.nil(); LPAREN12=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr250); if (failed) return retval; - pushFollow(FOLLOW_expression_in_parenExpr253); + match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr246); if (failed) return retval; + pushFollow(FOLLOW_expression_in_parenExpr249); expression13=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression13.getTree()); RPAREN14=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr255); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr251); if (failed) return retval; } @@ -401,7 +400,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start logicalOrExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; public final logicalOrExpression_return logicalOrExpression() throws RecognitionException { logicalOrExpression_return retval = new logicalOrExpression_return(); retval.start = input.LT(1); @@ -417,17 +416,17 @@ public class SpringExpressionsParser extends Parser { Object OR16_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:1: ( logicalAndExpression ( OR logicalAndExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:3: logicalAndExpression ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:1: ( logicalAndExpression ( OR logicalAndExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:3: logicalAndExpression ( OR logicalAndExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression268); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression264); logicalAndExpression15=logicalAndExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, logicalAndExpression15.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:24: ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:24: ( OR logicalAndExpression )* loop2: do { int alt2=2; @@ -440,15 +439,15 @@ public class SpringExpressionsParser extends Parser { switch (alt2) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:25: OR logicalAndExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:25: OR logicalAndExpression { OR16=(Token)input.LT(1); - match(input,OR,FOLLOW_OR_in_logicalOrExpression271); if (failed) return retval; + match(input,OR,FOLLOW_OR_in_logicalOrExpression267); if (failed) return retval; if ( backtracking==0 ) { OR16_tree = (Object)adaptor.create(OR16); root_0 = (Object)adaptor.becomeRoot(OR16_tree, root_0); } - pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression274); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression270); logicalAndExpression17=logicalAndExpression(); _fsp--; if (failed) return retval; @@ -489,7 +488,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start logicalAndExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; public final logicalAndExpression_return logicalAndExpression() throws RecognitionException { logicalAndExpression_return retval = new logicalAndExpression_return(); retval.start = input.LT(1); @@ -505,17 +504,17 @@ public class SpringExpressionsParser extends Parser { Object AND19_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:1: ( relationalExpression ( AND relationalExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:3: relationalExpression ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:1: ( relationalExpression ( AND relationalExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:3: relationalExpression ( AND relationalExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression309); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression305); relationalExpression18=relationalExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, relationalExpression18.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:24: ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:24: ( AND relationalExpression )* loop3: do { int alt3=2; @@ -528,15 +527,15 @@ public class SpringExpressionsParser extends Parser { switch (alt3) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:25: AND relationalExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:25: AND relationalExpression { AND19=(Token)input.LT(1); - match(input,AND,FOLLOW_AND_in_logicalAndExpression312); if (failed) return retval; + match(input,AND,FOLLOW_AND_in_logicalAndExpression308); if (failed) return retval; if ( backtracking==0 ) { AND19_tree = (Object)adaptor.create(AND19); root_0 = (Object)adaptor.becomeRoot(AND19_tree, root_0); } - pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression315); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression311); relationalExpression20=relationalExpression(); _fsp--; if (failed) return retval; @@ -577,7 +576,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start relationalExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; public final relationalExpression_return relationalExpression() throws RecognitionException { relationalExpression_return retval = new relationalExpression_return(); retval.start = input.LT(1); @@ -593,17 +592,17 @@ public class SpringExpressionsParser extends Parser { try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:22: ( sumExpression ( relationalOperator sumExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:24: sumExpression ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:22: ( sumExpression ( relationalOperator sumExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:24: sumExpression ( relationalOperator sumExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_sumExpression_in_relationalExpression326); + pushFollow(FOLLOW_sumExpression_in_relationalExpression322); sumExpression21=sumExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, sumExpression21.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:38: ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:38: ( relationalOperator sumExpression )? int alt4=2; int LA4_0 = input.LA(1); @@ -612,14 +611,14 @@ public class SpringExpressionsParser extends Parser { } switch (alt4) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:39: relationalOperator sumExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:39: relationalOperator sumExpression { - pushFollow(FOLLOW_relationalOperator_in_relationalExpression329); + pushFollow(FOLLOW_relationalOperator_in_relationalExpression325); relationalOperator22=relationalOperator(); _fsp--; if (failed) return retval; if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(relationalOperator22.getTree(), root_0); - pushFollow(FOLLOW_sumExpression_in_relationalExpression332); + pushFollow(FOLLOW_sumExpression_in_relationalExpression328); sumExpression23=sumExpression(); _fsp--; if (failed) return retval; @@ -657,7 +656,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start sumExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ; public final sumExpression_return sumExpression() throws RecognitionException { sumExpression_return retval = new sumExpression_return(); retval.start = input.LT(1); @@ -675,17 +674,17 @@ public class SpringExpressionsParser extends Parser { Object MINUS26_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:4: productExpression ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:4: productExpression ( ( PLUS | MINUS ) productExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_productExpression_in_sumExpression343); + pushFollow(FOLLOW_productExpression_in_sumExpression339); productExpression24=productExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, productExpression24.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:22: ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:22: ( ( PLUS | MINUS ) productExpression )* loop6: do { int alt6=2; @@ -698,9 +697,9 @@ public class SpringExpressionsParser extends Parser { switch (alt6) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: ( PLUS | MINUS ) productExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:24: ( PLUS | MINUS ) productExpression { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: ( PLUS | MINUS ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:24: ( PLUS | MINUS ) int alt5=2; int LA5_0 = input.LA(1); @@ -713,16 +712,16 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("80:24: ( PLUS | MINUS )", 5, 0, input); + new NoViableAltException("79:24: ( PLUS | MINUS )", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:25: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:25: PLUS { PLUS25=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_sumExpression348); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_sumExpression344); if (failed) return retval; if ( backtracking==0 ) { PLUS25_tree = (Object)adaptor.create(PLUS25); root_0 = (Object)adaptor.becomeRoot(PLUS25_tree, root_0); @@ -731,10 +730,10 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:33: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:33: MINUS { MINUS26=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_sumExpression353); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_sumExpression349); if (failed) return retval; if ( backtracking==0 ) { MINUS26_tree = (Object)adaptor.create(MINUS26); root_0 = (Object)adaptor.becomeRoot(MINUS26_tree, root_0); @@ -745,7 +744,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_productExpression_in_sumExpression357); + pushFollow(FOLLOW_productExpression_in_sumExpression353); productExpression27=productExpression(); _fsp--; if (failed) return retval; @@ -786,7 +785,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start productExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:1: productExpression : powerExpr ( ( STAR | DIV | MOD ) powerExpr )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82:1: productExpression : powerExpr ( ( STAR | DIV | MOD ) powerExpr )* ; public final productExpression_return productExpression() throws RecognitionException { productExpression_return retval = new productExpression_return(); retval.start = input.LT(1); @@ -806,17 +805,17 @@ public class SpringExpressionsParser extends Parser { Object MOD31_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:2: ( powerExpr ( ( STAR | DIV | MOD ) powerExpr )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:2: ( powerExpr ( ( STAR | DIV | MOD ) powerExpr )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_powerExpr_in_productExpression369); + pushFollow(FOLLOW_powerExpr_in_productExpression365); powerExpr28=powerExpr(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, powerExpr28.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:14: ( ( STAR | DIV | MOD ) powerExpr )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:14: ( ( STAR | DIV | MOD ) powerExpr )* loop8: do { int alt8=2; @@ -829,9 +828,9 @@ public class SpringExpressionsParser extends Parser { switch (alt8) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:15: ( STAR | DIV | MOD ) powerExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:15: ( STAR | DIV | MOD ) powerExpr { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:15: ( STAR | DIV | MOD ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:15: ( STAR | DIV | MOD ) int alt7=3; switch ( input.LA(1) ) { case STAR: @@ -852,17 +851,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("84:15: ( STAR | DIV | MOD )", 7, 0, input); + new NoViableAltException("83:15: ( STAR | DIV | MOD )", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:16: STAR + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:16: STAR { STAR29=(Token)input.LT(1); - match(input,STAR,FOLLOW_STAR_in_productExpression373); if (failed) return retval; + match(input,STAR,FOLLOW_STAR_in_productExpression369); if (failed) return retval; if ( backtracking==0 ) { STAR29_tree = (Object)adaptor.create(STAR29); root_0 = (Object)adaptor.becomeRoot(STAR29_tree, root_0); @@ -871,10 +870,10 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:24: DIV + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:24: DIV { DIV30=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_productExpression378); if (failed) return retval; + match(input,DIV,FOLLOW_DIV_in_productExpression374); if (failed) return retval; if ( backtracking==0 ) { DIV30_tree = (Object)adaptor.create(DIV30); root_0 = (Object)adaptor.becomeRoot(DIV30_tree, root_0); @@ -883,10 +882,10 @@ public class SpringExpressionsParser extends Parser { } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:30: MOD + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:30: MOD { MOD31=(Token)input.LT(1); - match(input,MOD,FOLLOW_MOD_in_productExpression382); if (failed) return retval; + match(input,MOD,FOLLOW_MOD_in_productExpression378); if (failed) return retval; if ( backtracking==0 ) { MOD31_tree = (Object)adaptor.create(MOD31); root_0 = (Object)adaptor.becomeRoot(MOD31_tree, root_0); @@ -897,7 +896,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_powerExpr_in_productExpression386); + pushFollow(FOLLOW_powerExpr_in_productExpression382); powerExpr32=powerExpr(); _fsp--; if (failed) return retval; @@ -938,7 +937,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start powerExpr - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; public final powerExpr_return powerExpr() throws RecognitionException { powerExpr_return retval = new powerExpr_return(); retval.start = input.LT(1); @@ -954,17 +953,17 @@ public class SpringExpressionsParser extends Parser { Object POWER34_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:12: ( unaryExpression ( POWER unaryExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:14: unaryExpression ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:12: ( unaryExpression ( POWER unaryExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:14: unaryExpression ( POWER unaryExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_unaryExpression_in_powerExpr398); + pushFollow(FOLLOW_unaryExpression_in_powerExpr394); unaryExpression33=unaryExpression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, unaryExpression33.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:30: ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:30: ( POWER unaryExpression )? int alt9=2; int LA9_0 = input.LA(1); @@ -973,15 +972,15 @@ public class SpringExpressionsParser extends Parser { } switch (alt9) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:31: POWER unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:31: POWER unaryExpression { POWER34=(Token)input.LT(1); - match(input,POWER,FOLLOW_POWER_in_powerExpr401); if (failed) return retval; + match(input,POWER,FOLLOW_POWER_in_powerExpr397); if (failed) return retval; if ( backtracking==0 ) { POWER34_tree = (Object)adaptor.create(POWER34); root_0 = (Object)adaptor.becomeRoot(POWER34_tree, root_0); } - pushFollow(FOLLOW_unaryExpression_in_powerExpr404); + pushFollow(FOLLOW_unaryExpression_in_powerExpr400); unaryExpression35=unaryExpression(); _fsp--; if (failed) return retval; @@ -1019,7 +1018,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start unaryExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression ); public final unaryExpression_return unaryExpression() throws RecognitionException { unaryExpression_return retval = new unaryExpression_return(); retval.start = input.LT(1); @@ -1039,30 +1038,30 @@ public class SpringExpressionsParser extends Parser { Object BANG38_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:2: ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:2: ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression ) int alt11=2; int LA11_0 = input.LA(1); if ( ((LA11_0>=PLUS && LA11_0<=MINUS)||LA11_0==BANG) ) { alt11=1; } - else if ( (LA11_0==INTEGER_LITERAL||LA11_0==LPAREN||(LA11_0>=POUND && LA11_0<=ID)||(LA11_0>=AT && LA11_0<=LBRACKET)||LA11_0==PROJECT||(LA11_0>=SELECT && LA11_0<=FALSE)||LA11_0==86) ) { + else if ( (LA11_0==INTEGER_LITERAL||LA11_0==LPAREN||(LA11_0>=POUND && LA11_0<=ID)||LA11_0==LBRACKET||LA11_0==PROJECT||(LA11_0>=SELECT && LA11_0<=FALSE)||LA11_0==85) ) { alt11=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("88:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 11, 0, input); + new NoViableAltException("87:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:4: ( PLUS | MINUS | BANG ) unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:4: ( PLUS | MINUS | BANG ) unaryExpression { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:4: ( PLUS | MINUS | BANG ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:4: ( PLUS | MINUS | BANG ) int alt10=3; switch ( input.LA(1) ) { case PLUS: @@ -1083,17 +1082,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("89:4: ( PLUS | MINUS | BANG )", 10, 0, input); + new NoViableAltException("88:4: ( PLUS | MINUS | BANG )", 10, 0, input); throw nvae; } switch (alt10) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:5: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:5: PLUS { PLUS36=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_unaryExpression418); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_unaryExpression414); if (failed) return retval; if ( backtracking==0 ) { PLUS36_tree = (Object)adaptor.create(PLUS36); root_0 = (Object)adaptor.becomeRoot(PLUS36_tree, root_0); @@ -1102,10 +1101,10 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:13: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:13: MINUS { MINUS37=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_unaryExpression423); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_unaryExpression419); if (failed) return retval; if ( backtracking==0 ) { MINUS37_tree = (Object)adaptor.create(MINUS37); root_0 = (Object)adaptor.becomeRoot(MINUS37_tree, root_0); @@ -1114,10 +1113,10 @@ public class SpringExpressionsParser extends Parser { } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:22: BANG + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:22: BANG { BANG38=(Token)input.LT(1); - match(input,BANG,FOLLOW_BANG_in_unaryExpression428); if (failed) return retval; + match(input,BANG,FOLLOW_BANG_in_unaryExpression424); if (failed) return retval; if ( backtracking==0 ) { BANG38_tree = (Object)adaptor.create(BANG38); root_0 = (Object)adaptor.becomeRoot(BANG38_tree, root_0); @@ -1128,7 +1127,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_unaryExpression_in_unaryExpression432); + pushFollow(FOLLOW_unaryExpression_in_unaryExpression428); unaryExpression39=unaryExpression(); _fsp--; if (failed) return retval; @@ -1137,11 +1136,11 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:90:4: primaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:4: primaryExpression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_primaryExpression_in_unaryExpression438); + pushFollow(FOLLOW_primaryExpression_in_unaryExpression434); primaryExpression40=primaryExpression(); _fsp--; if (failed) return retval; @@ -1175,7 +1174,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start primaryExpression - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:1: primaryExpression : startNode ( node )? -> ^( EXPRESSION startNode ( node )? ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:91:1: primaryExpression : startNode ( node )? -> ^( EXPRESSION startNode ( node )? ) ; public final primaryExpression_return primaryExpression() throws RecognitionException { primaryExpression_return retval = new primaryExpression_return(); retval.start = input.LT(1); @@ -1190,15 +1189,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_node=new RewriteRuleSubtreeStream(adaptor,"rule node"); RewriteRuleSubtreeStream stream_startNode=new RewriteRuleSubtreeStream(adaptor,"rule startNode"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:5: ( startNode ( node )? -> ^( EXPRESSION startNode ( node )? ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:7: startNode ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:5: ( startNode ( node )? -> ^( EXPRESSION startNode ( node )? ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:7: startNode ( node )? { - pushFollow(FOLLOW_startNode_in_primaryExpression452); + pushFollow(FOLLOW_startNode_in_primaryExpression448); startNode41=startNode(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_startNode.add(startNode41.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:17: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:17: ( node )? int alt12=2; int LA12_0 = input.LA(1); @@ -1207,9 +1206,9 @@ public class SpringExpressionsParser extends Parser { } switch (alt12) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:18: node + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:18: node { - pushFollow(FOLLOW_node_in_primaryExpression455); + pushFollow(FOLLOW_node_in_primaryExpression451); node42=node(); _fsp--; if (failed) return retval; @@ -1232,15 +1231,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 93:25: -> ^( EXPRESSION startNode ( node )? ) + // 92:25: -> ^( EXPRESSION startNode ( node )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:28: ^( EXPRESSION startNode ( node )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:28: ^( EXPRESSION startNode ( node )? ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(EXPRESSION, "EXPRESSION"), root_1); adaptor.addChild(root_1, stream_startNode.next()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:51: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:51: ( node )? if ( stream_node.hasNext() ) { adaptor.addChild(root_1, stream_node.next()); @@ -1280,7 +1279,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start startNode - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:95:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ); public final startNode_return startNode() throws RecognitionException { startNode_return retval = new startNode_return(); retval.start = input.LT(1); @@ -1293,33 +1292,31 @@ public class SpringExpressionsParser extends Parser { functionOrVar_return functionOrVar45 = null; - reference_return reference46 = null; + indexer_return indexer46 = null; - indexer_return indexer47 = null; + literal_return literal47 = null; - literal_return literal48 = null; + type_return type48 = null; - type_return type49 = null; + constructor_return constructor49 = null; - constructor_return constructor50 = null; + projection_return projection50 = null; - projection_return projection51 = null; + selection_return selection51 = null; - selection_return selection52 = null; + firstSelection_return firstSelection52 = null; - firstSelection_return firstSelection53 = null; + lastSelection_return lastSelection53 = null; - lastSelection_return lastSelection54 = null; + listInitializer_return listInitializer54 = null; - listInitializer_return listInitializer55 = null; - - mapInitializer_return mapInitializer56 = null; + mapInitializer_return mapInitializer55 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:5: ( parenExpr | methodOrProperty | functionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ) - int alt13=14; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:95:5: ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ) + int alt13=13; switch ( input.LA(1) ) { case LPAREN: { @@ -1339,25 +1336,20 @@ public class SpringExpressionsParser extends Parser { alt13=3; } else if ( (LA13_3==LCURLY) ) { - alt13=14; + alt13=13; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("95:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); + new NoViableAltException("94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); throw nvae; } } break; - case AT: - { - alt13=4; - } - break; case LBRACKET: { - alt13=5; + alt13=4; } break; case INTEGER_LITERAL: @@ -1369,59 +1361,59 @@ public class SpringExpressionsParser extends Parser { case TRUE: case FALSE: { - alt13=6; + alt13=5; } break; case TYPE: { - alt13=7; + alt13=6; } break; - case 86: + case 85: { - alt13=8; + alt13=7; } break; case PROJECT: { - alt13=9; + alt13=8; } break; case SELECT: { - alt13=10; + alt13=9; } break; case SELECT_FIRST: { - alt13=11; + alt13=10; } break; case SELECT_LAST: { - alt13=12; + alt13=11; } break; case LCURLY: { - alt13=13; + alt13=12; } break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("95:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 0, input); + new NoViableAltException("94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 0, input); throw nvae; } switch (alt13) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:5: parenExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:5: parenExpr { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_parenExpr_in_startNode488); + pushFollow(FOLLOW_parenExpr_in_startNode484); parenExpr43=parenExpr(); _fsp--; if (failed) return retval; @@ -1430,11 +1422,11 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:98:7: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:7: methodOrProperty { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_methodOrProperty_in_startNode496); + pushFollow(FOLLOW_methodOrProperty_in_startNode492); methodOrProperty44=methodOrProperty(); _fsp--; if (failed) return retval; @@ -1443,11 +1435,11 @@ public class SpringExpressionsParser extends Parser { } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:7: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:98:7: functionOrVar { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_functionOrVar_in_startNode505); + pushFollow(FOLLOW_functionOrVar_in_startNode501); functionOrVar45=functionOrVar(); _fsp--; if (failed) return retval; @@ -1456,145 +1448,132 @@ public class SpringExpressionsParser extends Parser { } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:7: reference + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:7: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_reference_in_startNode513); - reference46=reference(); + pushFollow(FOLLOW_indexer_in_startNode509); + indexer46=indexer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, reference46.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, indexer46.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:7: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:7: literal { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_startNode521); - indexer47=indexer(); + pushFollow(FOLLOW_literal_in_startNode517); + literal47=literal(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, indexer47.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, literal47.getTree()); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:7: literal + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:7: type { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_literal_in_startNode529); - literal48=literal(); + pushFollow(FOLLOW_type_in_startNode525); + type48=type(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, literal48.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, type48.getTree()); } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:7: type + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:7: constructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_type_in_startNode537); - type49=type(); + pushFollow(FOLLOW_constructor_in_startNode533); + constructor49=constructor(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, type49.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, constructor49.getTree()); } break; case 8 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: constructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:7: projection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_constructor_in_startNode545); - constructor50=constructor(); + pushFollow(FOLLOW_projection_in_startNode541); + projection50=projection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, constructor50.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, projection50.getTree()); } break; case 9 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: selection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_projection_in_startNode553); - projection51=projection(); + pushFollow(FOLLOW_selection_in_startNode550); + selection51=selection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, projection51.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, selection51.getTree()); } break; case 10 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: firstSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_selection_in_startNode562); - selection52=selection(); + pushFollow(FOLLOW_firstSelection_in_startNode559); + firstSelection52=firstSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, selection52.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection52.getTree()); } break; case 11 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: lastSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_firstSelection_in_startNode571); - firstSelection53=firstSelection(); + pushFollow(FOLLOW_lastSelection_in_startNode567); + lastSelection53=lastSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection53.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection53.getTree()); } break; case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: listInitializer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_lastSelection_in_startNode579); - lastSelection54=lastSelection(); + pushFollow(FOLLOW_listInitializer_in_startNode575); + listInitializer54=listInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection54.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, listInitializer54.getTree()); } break; case 13 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109:7: listInitializer - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_listInitializer_in_startNode587); - listInitializer55=listInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, listInitializer55.getTree()); - - } - break; - case 14 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:7: mapInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: mapInitializer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_mapInitializer_in_startNode595); - mapInitializer56=mapInitializer(); + pushFollow(FOLLOW_mapInitializer_in_startNode583); + mapInitializer55=mapInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, mapInitializer56.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, mapInitializer55.getTree()); } break; @@ -1624,28 +1603,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start node - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:113:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; public final node_return node() throws RecognitionException { node_return retval = new node_return(); retval.start = input.LT(1); Object root_0 = null; - Token DOT57=null; - dottedNode_return dottedNode58 = null; + Token DOT56=null; + dottedNode_return dottedNode57 = null; - nonDottedNode_return nonDottedNode59 = null; + nonDottedNode_return nonDottedNode58 = null; - Object DOT57_tree=null; + Object DOT56_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:4: ( ( DOT dottedNode ) | nonDottedNode )+ { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:4: ( ( DOT dottedNode ) | nonDottedNode )+ int cnt14=0; loop14: do { @@ -1662,22 +1641,22 @@ public class SpringExpressionsParser extends Parser { switch (alt14) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:5: ( DOT dottedNode ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:5: ( DOT dottedNode ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:6: DOT dottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:6: DOT dottedNode { - DOT57=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_node615); if (failed) return retval; + DOT56=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_node603); if (failed) return retval; if ( backtracking==0 ) { - DOT57_tree = (Object)adaptor.create(DOT57); - adaptor.addChild(root_0, DOT57_tree); + DOT56_tree = (Object)adaptor.create(DOT56); + adaptor.addChild(root_0, DOT56_tree); } - pushFollow(FOLLOW_dottedNode_in_node617); - dottedNode58=dottedNode(); + pushFollow(FOLLOW_dottedNode_in_node605); + dottedNode57=dottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode58.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode57.getTree()); } @@ -1685,13 +1664,13 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:24: nonDottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:24: nonDottedNode { - pushFollow(FOLLOW_nonDottedNode_in_node622); - nonDottedNode59=nonDottedNode(); + pushFollow(FOLLOW_nonDottedNode_in_node610); + nonDottedNode58=nonDottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode59.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode58.getTree()); } break; @@ -1733,28 +1712,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start nonDottedNode - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:116:1: nonDottedNode : indexer ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:1: nonDottedNode : indexer ; public final nonDottedNode_return nonDottedNode() throws RecognitionException { nonDottedNode_return retval = new nonDottedNode_return(); retval.start = input.LT(1); Object root_0 = null; - indexer_return indexer60 = null; + indexer_return indexer59 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117:2: ( indexer ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117:4: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:2: ( indexer ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:4: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_nonDottedNode634); - indexer60=indexer(); + pushFollow(FOLLOW_indexer_in_nonDottedNode622); + indexer59=indexer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, indexer60.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, indexer59.getTree()); } @@ -1782,37 +1761,37 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start dottedNode - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:1: dottedNode : ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117:1: dottedNode : ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ; public final dottedNode_return dottedNode() throws RecognitionException { dottedNode_return retval = new dottedNode_return(); retval.start = input.LT(1); Object root_0 = null; - methodOrProperty_return methodOrProperty61 = null; + methodOrProperty_return methodOrProperty60 = null; - functionOrVar_return functionOrVar62 = null; + functionOrVar_return functionOrVar61 = null; - projection_return projection63 = null; + projection_return projection62 = null; - selection_return selection64 = null; + selection_return selection63 = null; - firstSelection_return firstSelection65 = null; + firstSelection_return firstSelection64 = null; - lastSelection_return lastSelection66 = null; + lastSelection_return lastSelection65 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:120:2: ( ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:118:2: ( ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) int alt15=6; switch ( input.LA(1) ) { case ID: @@ -1848,75 +1827,75 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("121:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection )", 15, 0, input); + new NoViableAltException("119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection )", 15, 0, input); throw nvae; } switch (alt15) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:4: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:4: methodOrProperty { - pushFollow(FOLLOW_methodOrProperty_in_dottedNode647); - methodOrProperty61=methodOrProperty(); + pushFollow(FOLLOW_methodOrProperty_in_dottedNode635); + methodOrProperty60=methodOrProperty(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty61.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty60.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:4: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:120:4: functionOrVar { - pushFollow(FOLLOW_functionOrVar_in_dottedNode653); - functionOrVar62=functionOrVar(); + pushFollow(FOLLOW_functionOrVar_in_dottedNode641); + functionOrVar61=functionOrVar(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar62.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar61.getTree()); } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:7: projection { - pushFollow(FOLLOW_projection_in_dottedNode661); - projection63=projection(); + pushFollow(FOLLOW_projection_in_dottedNode649); + projection62=projection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, projection63.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, projection62.getTree()); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:7: selection { - pushFollow(FOLLOW_selection_in_dottedNode670); - selection64=selection(); + pushFollow(FOLLOW_selection_in_dottedNode658); + selection63=selection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, selection64.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, selection63.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123:7: firstSelection { - pushFollow(FOLLOW_firstSelection_in_dottedNode679); - firstSelection65=firstSelection(); + pushFollow(FOLLOW_firstSelection_in_dottedNode667); + firstSelection64=firstSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection65.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection64.getTree()); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:126:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:7: lastSelection { - pushFollow(FOLLOW_lastSelection_in_dottedNode688); - lastSelection66=lastSelection(); + pushFollow(FOLLOW_lastSelection_in_dottedNode676); + lastSelection65=lastSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection66.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection65.getTree()); } break; @@ -1953,21 +1932,21 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start functionOrVar - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var ); public final functionOrVar_return functionOrVar() throws RecognitionException { functionOrVar_return retval = new functionOrVar_return(); retval.start = input.LT(1); Object root_0 = null; - function_return function67 = null; + function_return function66 = null; - var_return var68 = null; + var_return var67 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:5: ( ( POUND ID LPAREN )=> function | var ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:5: ( ( POUND ID LPAREN )=> function | var ) int alt16=2; int LA16_0 = input.LA(1); @@ -1986,7 +1965,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); + new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); throw nvae; } @@ -1994,7 +1973,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); + new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); throw nvae; } @@ -2002,34 +1981,34 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 0, input); + new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 0, input); throw nvae; } switch (alt16) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:7: ( POUND ID LPAREN )=> function + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:7: ( POUND ID LPAREN )=> function { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_function_in_functionOrVar722); - function67=function(); + pushFollow(FOLLOW_function_in_functionOrVar710); + function66=function(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, function67.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, function66.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:132:7: var + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:7: var { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_var_in_functionOrVar730); - var68=var(); + pushFollow(FOLLOW_var_in_functionOrVar718); + var67=var(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, var68.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, var67.getTree()); } break; @@ -2059,7 +2038,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start function - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:1: function : POUND id= ID methodArgs -> ^( FUNCTIONREF[$id] methodArgs ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:1: function : POUND id= ID methodArgs -> ^( FUNCTIONREF[$id] methodArgs ) ; public final function_return function() throws RecognitionException { function_return retval = new function_return(); retval.start = input.LT(1); @@ -2067,32 +2046,32 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND69=null; - methodArgs_return methodArgs70 = null; + Token POUND68=null; + methodArgs_return methodArgs69 = null; Object id_tree=null; - Object POUND69_tree=null; + Object POUND68_tree=null; RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:10: ( POUND id= ID methodArgs -> ^( FUNCTIONREF[$id] methodArgs ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:12: POUND id= ID methodArgs + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:10: ( POUND id= ID methodArgs -> ^( FUNCTIONREF[$id] methodArgs ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:12: POUND id= ID methodArgs { - POUND69=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_function747); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND69); + POUND68=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_function735); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND68); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_function751); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_function739); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_function753); - methodArgs70=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_function741); + methodArgs69=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs70.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs69.getTree()); // AST REWRITE // elements: methodArgs @@ -2105,9 +2084,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 135:35: -> ^( FUNCTIONREF[$id] methodArgs ) + // 133:35: -> ^( FUNCTIONREF[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:38: ^( FUNCTIONREF[$id] methodArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:38: ^( FUNCTIONREF[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(FUNCTIONREF, id), root_1); @@ -2147,7 +2126,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start var - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:1: var : POUND id= ID -> ^( VARIABLEREF[$id] ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:1: var : POUND id= ID -> ^( VARIABLEREF[$id] ) ; public final var_return var() throws RecognitionException { var_return retval = new var_return(); retval.start = input.LT(1); @@ -2155,23 +2134,23 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND71=null; + Token POUND70=null; Object id_tree=null; - Object POUND71_tree=null; + Object POUND70_tree=null; RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:5: ( POUND id= ID -> ^( VARIABLEREF[$id] ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:7: POUND id= ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:5: ( POUND id= ID -> ^( VARIABLEREF[$id] ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:7: POUND id= ID { - POUND71=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_var774); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND71); + POUND70=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_var762); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND70); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_var778); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_var766); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2186,9 +2165,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 137:19: -> ^( VARIABLEREF[$id] ) + // 135:19: -> ^( VARIABLEREF[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:22: ^( VARIABLEREF[$id] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:22: ^( VARIABLEREF[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(VARIABLEREF, id), root_1); @@ -2226,7 +2205,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start methodOrProperty - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ); public final methodOrProperty_return methodOrProperty() throws RecognitionException { methodOrProperty_return retval = new methodOrProperty_return(); retval.start = input.LT(1); @@ -2234,23 +2213,23 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - methodArgs_return methodArgs72 = null; + methodArgs_return methodArgs71 = null; - property_return property73 = null; + property_return property72 = null; Object id_tree=null; RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) int alt17=2; int LA17_0 = input.LA(1); if ( (LA17_0==ID) ) { int LA17_1 = input.LA(2); - if ( (LA17_1==EOF||(LA17_1>=ASSIGN && LA17_1<=COLON)||(LA17_1>=RPAREN && LA17_1<=POWER)||LA17_1==DOT||LA17_1==COMMA||(LA17_1>=LBRACKET && LA17_1<=RBRACKET)||LA17_1==RCURLY||(LA17_1>=EQUAL && LA17_1<=MATCHES)) ) { + if ( (LA17_1==EOF||(LA17_1>=ASSIGN && LA17_1<=COLON)||(LA17_1>=RPAREN && LA17_1<=POWER)||LA17_1==DOT||(LA17_1>=COMMA && LA17_1<=RBRACKET)||LA17_1==RCURLY||(LA17_1>=EQUAL && LA17_1<=MATCHES)) ) { alt17=2; } else if ( (LA17_1==LPAREN) && (synpred2())) { @@ -2259,7 +2238,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("140:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); + new NoViableAltException("138:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); throw nvae; } @@ -2267,23 +2246,23 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("140:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); + new NoViableAltException("138:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); throw nvae; } switch (alt17) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:4: ( ID LPAREN )=>id= ID methodArgs + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:4: ( ID LPAREN )=>id= ID methodArgs { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_methodOrProperty806); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_methodOrProperty794); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_methodOrProperty808); - methodArgs72=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_methodOrProperty796); + methodArgs71=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs72.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs71.getTree()); // AST REWRITE // elements: methodArgs @@ -2296,9 +2275,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 141:36: -> ^( METHOD[$id] methodArgs ) + // 139:36: -> ^( METHOD[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:39: ^( METHOD[$id] methodArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:39: ^( METHOD[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(METHOD, id), root_1); @@ -2315,15 +2294,15 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:4: property + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:4: property { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_property_in_methodOrProperty822); - property73=property(); + pushFollow(FOLLOW_property_in_methodOrProperty810); + property72=property(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, property73.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, property72.getTree()); } break; @@ -2353,52 +2332,52 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start methodArgs - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:1: methodArgs : LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:1: methodArgs : LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ; public final methodArgs_return methodArgs() throws RecognitionException { methodArgs_return retval = new methodArgs_return(); retval.start = input.LT(1); Object root_0 = null; - Token LPAREN74=null; - Token COMMA76=null; - Token COMMA78=null; - Token RPAREN79=null; - argument_return argument75 = null; + Token LPAREN73=null; + Token COMMA75=null; + Token COMMA77=null; + Token RPAREN78=null; + argument_return argument74 = null; - argument_return argument77 = null; + argument_return argument76 = null; - Object LPAREN74_tree=null; - Object COMMA76_tree=null; - Object COMMA78_tree=null; - Object RPAREN79_tree=null; + Object LPAREN73_tree=null; + Object COMMA75_tree=null; + Object COMMA77_tree=null; + Object RPAREN78_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:12: ( LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:12: ( LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN { root_0 = (Object)adaptor.nil(); - LPAREN74=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs837); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:23: ( argument ( COMMA argument )* ( COMMA )? )? + LPAREN73=(Token)input.LT(1); + match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs825); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:23: ( argument ( COMMA argument )* ( COMMA )? )? int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==INTEGER_LITERAL||LA20_0==LPAREN||(LA20_0>=PLUS && LA20_0<=MINUS)||LA20_0==BANG||(LA20_0>=POUND && LA20_0<=ID)||(LA20_0>=AT && LA20_0<=LBRACKET)||LA20_0==PROJECT||(LA20_0>=SELECT && LA20_0<=FALSE)||LA20_0==86) ) { + if ( (LA20_0==INTEGER_LITERAL||LA20_0==LPAREN||(LA20_0>=PLUS && LA20_0<=MINUS)||LA20_0==BANG||(LA20_0>=POUND && LA20_0<=ID)||LA20_0==LBRACKET||LA20_0==PROJECT||(LA20_0>=SELECT && LA20_0<=FALSE)||LA20_0==85) ) { alt20=1; } switch (alt20) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:24: argument ( COMMA argument )* ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:24: argument ( COMMA argument )* ( COMMA )? { - pushFollow(FOLLOW_argument_in_methodArgs841); - argument75=argument(); + pushFollow(FOLLOW_argument_in_methodArgs829); + argument74=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument75.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:33: ( COMMA argument )* + if ( backtracking==0 ) adaptor.addChild(root_0, argument74.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:33: ( COMMA argument )* loop18: do { int alt18=2; @@ -2407,7 +2386,7 @@ public class SpringExpressionsParser extends Parser { if ( (LA18_0==COMMA) ) { int LA18_1 = input.LA(2); - if ( (LA18_1==INTEGER_LITERAL||LA18_1==LPAREN||(LA18_1>=PLUS && LA18_1<=MINUS)||LA18_1==BANG||(LA18_1>=POUND && LA18_1<=ID)||(LA18_1>=AT && LA18_1<=LBRACKET)||LA18_1==PROJECT||(LA18_1>=SELECT && LA18_1<=FALSE)||LA18_1==86) ) { + if ( (LA18_1==INTEGER_LITERAL||LA18_1==LPAREN||(LA18_1>=PLUS && LA18_1<=MINUS)||LA18_1==BANG||(LA18_1>=POUND && LA18_1<=ID)||LA18_1==LBRACKET||LA18_1==PROJECT||(LA18_1>=SELECT && LA18_1<=FALSE)||LA18_1==85) ) { alt18=1; } @@ -2417,15 +2396,15 @@ public class SpringExpressionsParser extends Parser { switch (alt18) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:34: COMMA argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:34: COMMA argument { - COMMA76=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs844); if (failed) return retval; - pushFollow(FOLLOW_argument_in_methodArgs847); - argument77=argument(); + COMMA75=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs832); if (failed) return retval; + pushFollow(FOLLOW_argument_in_methodArgs835); + argument76=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument77.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument76.getTree()); } break; @@ -2435,7 +2414,7 @@ public class SpringExpressionsParser extends Parser { } } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:52: ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:52: ( COMMA )? int alt19=2; int LA19_0 = input.LA(1); @@ -2444,10 +2423,10 @@ public class SpringExpressionsParser extends Parser { } switch (alt19) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:53: COMMA + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:53: COMMA { - COMMA78=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs852); if (failed) return retval; + COMMA77=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs840); if (failed) return retval; } break; @@ -2460,8 +2439,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN79=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs859); if (failed) return retval; + RPAREN78=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs847); if (failed) return retval; } @@ -2489,7 +2468,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start property - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:1: property : id= ID -> ^( PROPERTY_OR_FIELD[$id] ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:1: property : id= ID -> ^( PROPERTY_OR_FIELD[$id] ) ; public final property_return property() throws RecognitionException { property_return retval = new property_return(); retval.start = input.LT(1); @@ -2502,11 +2481,11 @@ public class SpringExpressionsParser extends Parser { RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:9: (id= ID -> ^( PROPERTY_OR_FIELD[$id] ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:11: id= ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:9: (id= ID -> ^( PROPERTY_OR_FIELD[$id] ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:11: id= ID { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_property872); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_property860); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2521,9 +2500,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 153:17: -> ^( PROPERTY_OR_FIELD[$id] ) + // 151:17: -> ^( PROPERTY_OR_FIELD[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:20: ^( PROPERTY_OR_FIELD[$id] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:20: ^( PROPERTY_OR_FIELD[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(PROPERTY_OR_FIELD, id), root_1); @@ -2555,231 +2534,67 @@ public class SpringExpressionsParser extends Parser { } // $ANTLR end property - public static class reference_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start reference - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:1: reference : AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) ; - public final reference_return reference() throws RecognitionException { - reference_return retval = new reference_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token pos=null; - Token AT80=null; - Token COLON81=null; - Token RPAREN82=null; - contextName_return cn = null; - - qualifiedId_return q = null; - - - Object pos_tree=null; - Object AT80_tree=null; - Object COLON81_tree=null; - Object RPAREN82_tree=null; - RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN"); - RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON"); - RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN"); - RewriteRuleTokenStream stream_AT=new RewriteRuleTokenStream(adaptor,"token AT"); - RewriteRuleSubtreeStream stream_contextName=new RewriteRuleSubtreeStream(adaptor,"rule contextName"); - RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId"); - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:2: ( AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:5: AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN - { - AT80=(Token)input.LT(1); - match(input,AT,FOLLOW_AT_in_reference894); if (failed) return retval; - if ( backtracking==0 ) stream_AT.add(AT80); - - pos=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_reference898); if (failed) return retval; - if ( backtracking==0 ) stream_LPAREN.add(pos); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:19: (cn= contextName COLON )? - int alt21=2; - int LA21_0 = input.LA(1); - - if ( (LA21_0==ID) ) { - int LA21_1 = input.LA(2); - - if ( (LA21_1==COLON||LA21_1==DIV) ) { - alt21=1; - } - } - switch (alt21) { - case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:20: cn= contextName COLON - { - pushFollow(FOLLOW_contextName_in_reference903); - cn=contextName(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_contextName.add(cn.getTree()); - COLON81=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_reference905); if (failed) return retval; - if ( backtracking==0 ) stream_COLON.add(COLON81); - - - } - break; - - } - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:43: (q= qualifiedId )? - int alt22=2; - int LA22_0 = input.LA(1); - - if ( (LA22_0==ID) ) { - alt22=1; - } - switch (alt22) { - case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:161:44: q= qualifiedId - { - pushFollow(FOLLOW_qualifiedId_in_reference912); - q=qualifiedId(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(q.getTree()); - - } - break; - - } - - RPAREN82=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_reference916); if (failed) return retval; - if ( backtracking==0 ) stream_RPAREN.add(RPAREN82); - - - // AST REWRITE - // elements: RPAREN, cn, COLON, q - // token labels: - // rule labels: cn, retval, q - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_cn=new RewriteRuleSubtreeStream(adaptor,"token cn",cn!=null?cn.tree:null); - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - RewriteRuleSubtreeStream stream_q=new RewriteRuleSubtreeStream(adaptor,"token q",q!=null?q.tree:null); - - root_0 = (Object)adaptor.nil(); - // 162:4: -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:7: ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot(adaptor.create(REFERENCE, pos), root_1); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:25: ( $cn COLON )? - if ( stream_cn.hasNext()||stream_COLON.hasNext() ) { - adaptor.addChild(root_1, stream_cn.next()); - adaptor.addChild(root_1, stream_COLON.next()); - - } - stream_cn.reset(); - stream_COLON.reset(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:38: ( $q)? - if ( stream_q.hasNext() ) { - adaptor.addChild(root_1, stream_q.next()); - - } - stream_q.reset(); - adaptor.addChild(root_1, stream_RPAREN.next()); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end reference - public static class indexer_return extends ParserRuleReturnScope { Object tree; public Object getTree() { return tree; } }; // $ANTLR start indexer - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:1: indexer : LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:1: indexer : LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ; public final indexer_return indexer() throws RecognitionException { indexer_return retval = new indexer_return(); retval.start = input.LT(1); Object root_0 = null; - Token LBRACKET83=null; - Token COMMA84=null; - Token RBRACKET85=null; + Token LBRACKET79=null; + Token COMMA80=null; + Token RBRACKET81=null; argument_return r1 = null; argument_return r2 = null; - Object LBRACKET83_tree=null; - Object COMMA84_tree=null; - Object RBRACKET85_tree=null; + Object LBRACKET79_tree=null; + Object COMMA80_tree=null; + Object RBRACKET81_tree=null; RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleTokenStream stream_LBRACKET=new RewriteRuleTokenStream(adaptor,"token LBRACKET"); RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET"); RewriteRuleSubtreeStream stream_argument=new RewriteRuleSubtreeStream(adaptor,"rule argument"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:8: ( LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:8: ( LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET { - LBRACKET83=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer951); if (failed) return retval; - if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET83); + LBRACKET79=(Token)input.LT(1); + match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer876); if (failed) return retval; + if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET79); - pushFollow(FOLLOW_argument_in_indexer955); + pushFollow(FOLLOW_argument_in_indexer880); r1=argument(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_argument.add(r1.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:31: ( COMMA r2= argument )* - loop23: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:31: ( COMMA r2= argument )* + loop21: do { - int alt23=2; - int LA23_0 = input.LA(1); + int alt21=2; + int LA21_0 = input.LA(1); - if ( (LA23_0==COMMA) ) { - alt23=1; + if ( (LA21_0==COMMA) ) { + alt21=1; } - switch (alt23) { + switch (alt21) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:32: COMMA r2= argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:32: COMMA r2= argument { - COMMA84=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_indexer958); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA84); + COMMA80=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_indexer883); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA80); - pushFollow(FOLLOW_argument_in_indexer962); + pushFollow(FOLLOW_argument_in_indexer887); r2=argument(); _fsp--; if (failed) return retval; @@ -2789,13 +2604,13 @@ public class SpringExpressionsParser extends Parser { break; default : - break loop23; + break loop21; } } while (true); - RBRACKET85=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer966); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET85); + RBRACKET81=(Token)input.LT(1); + match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer891); if (failed) return retval; + if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET81); // AST REWRITE @@ -2811,15 +2626,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_r1=new RewriteRuleSubtreeStream(adaptor,"token r1",r1!=null?r1.tree:null); root_0 = (Object)adaptor.nil(); - // 168:61: -> ^( INDEXER $r1 ( $r2)* ) + // 155:61: -> ^( INDEXER $r1 ( $r2)* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:64: ^( INDEXER $r1 ( $r2)* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:64: ^( INDEXER $r1 ( $r2)* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(INDEXER, "INDEXER"), root_1); adaptor.addChild(root_1, stream_r1.next()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:78: ( $r2)* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:78: ( $r2)* while ( stream_r2.hasNext() ) { adaptor.addChild(root_1, stream_r2.next()); @@ -2859,40 +2674,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start projection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:1: projection : PROJECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:1: projection : PROJECT expression RCURLY ; public final projection_return projection() throws RecognitionException { projection_return retval = new projection_return(); retval.start = input.LT(1); Object root_0 = null; - Token PROJECT86=null; - Token RCURLY88=null; - expression_return expression87 = null; + Token PROJECT82=null; + Token RCURLY84=null; + expression_return expression83 = null; - Object PROJECT86_tree=null; - Object RCURLY88_tree=null; + Object PROJECT82_tree=null; + Object RCURLY84_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:11: ( PROJECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:13: PROJECT expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:11: ( PROJECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:13: PROJECT expression RCURLY { root_0 = (Object)adaptor.nil(); - PROJECT86=(Token)input.LT(1); - match(input,PROJECT,FOLLOW_PROJECT_in_projection993); if (failed) return retval; + PROJECT82=(Token)input.LT(1); + match(input,PROJECT,FOLLOW_PROJECT_in_projection918); if (failed) return retval; if ( backtracking==0 ) { - PROJECT86_tree = (Object)adaptor.create(PROJECT86); - root_0 = (Object)adaptor.becomeRoot(PROJECT86_tree, root_0); + PROJECT82_tree = (Object)adaptor.create(PROJECT82); + root_0 = (Object)adaptor.becomeRoot(PROJECT82_tree, root_0); } - pushFollow(FOLLOW_expression_in_projection996); - expression87=expression(); + pushFollow(FOLLOW_expression_in_projection921); + expression83=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression87.getTree()); - RCURLY88=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_projection998); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression83.getTree()); + RCURLY84=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_projection923); if (failed) return retval; } @@ -2920,40 +2735,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start selection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:1: selection : SELECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:1: selection : SELECT expression RCURLY ; public final selection_return selection() throws RecognitionException { selection_return retval = new selection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT89=null; - Token RCURLY91=null; - expression_return expression90 = null; + Token SELECT85=null; + Token RCURLY87=null; + expression_return expression86 = null; - Object SELECT89_tree=null; - Object RCURLY91_tree=null; + Object SELECT85_tree=null; + Object RCURLY87_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:10: ( SELECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:12: SELECT expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:10: ( SELECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:12: SELECT expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT89=(Token)input.LT(1); - match(input,SELECT,FOLLOW_SELECT_in_selection1006); if (failed) return retval; + SELECT85=(Token)input.LT(1); + match(input,SELECT,FOLLOW_SELECT_in_selection931); if (failed) return retval; if ( backtracking==0 ) { - SELECT89_tree = (Object)adaptor.create(SELECT89); - root_0 = (Object)adaptor.becomeRoot(SELECT89_tree, root_0); + SELECT85_tree = (Object)adaptor.create(SELECT85); + root_0 = (Object)adaptor.becomeRoot(SELECT85_tree, root_0); } - pushFollow(FOLLOW_expression_in_selection1009); - expression90=expression(); + pushFollow(FOLLOW_expression_in_selection934); + expression86=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression90.getTree()); - RCURLY91=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_selection1011); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression86.getTree()); + RCURLY87=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_selection936); if (failed) return retval; } @@ -2981,40 +2796,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start firstSelection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:1: firstSelection : SELECT_FIRST expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:1: firstSelection : SELECT_FIRST expression RCURLY ; public final firstSelection_return firstSelection() throws RecognitionException { firstSelection_return retval = new firstSelection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT_FIRST92=null; - Token RCURLY94=null; - expression_return expression93 = null; + Token SELECT_FIRST88=null; + Token RCURLY90=null; + expression_return expression89 = null; - Object SELECT_FIRST92_tree=null; - Object RCURLY94_tree=null; + Object SELECT_FIRST88_tree=null; + Object RCURLY90_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:15: ( SELECT_FIRST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:17: SELECT_FIRST expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:15: ( SELECT_FIRST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:17: SELECT_FIRST expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT_FIRST92=(Token)input.LT(1); - match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection1019); if (failed) return retval; + SELECT_FIRST88=(Token)input.LT(1); + match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection944); if (failed) return retval; if ( backtracking==0 ) { - SELECT_FIRST92_tree = (Object)adaptor.create(SELECT_FIRST92); - root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST92_tree, root_0); + SELECT_FIRST88_tree = (Object)adaptor.create(SELECT_FIRST88); + root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST88_tree, root_0); } - pushFollow(FOLLOW_expression_in_firstSelection1022); - expression93=expression(); + pushFollow(FOLLOW_expression_in_firstSelection947); + expression89=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression93.getTree()); - RCURLY94=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection1024); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression89.getTree()); + RCURLY90=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection949); if (failed) return retval; } @@ -3042,40 +2857,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start lastSelection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:1: lastSelection : SELECT_LAST expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:1: lastSelection : SELECT_LAST expression RCURLY ; public final lastSelection_return lastSelection() throws RecognitionException { lastSelection_return retval = new lastSelection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT_LAST95=null; - Token RCURLY97=null; - expression_return expression96 = null; + Token SELECT_LAST91=null; + Token RCURLY93=null; + expression_return expression92 = null; - Object SELECT_LAST95_tree=null; - Object RCURLY97_tree=null; + Object SELECT_LAST91_tree=null; + Object RCURLY93_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:14: ( SELECT_LAST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:16: SELECT_LAST expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:14: ( SELECT_LAST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:16: SELECT_LAST expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT_LAST95=(Token)input.LT(1); - match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection1032); if (failed) return retval; + SELECT_LAST91=(Token)input.LT(1); + match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection957); if (failed) return retval; if ( backtracking==0 ) { - SELECT_LAST95_tree = (Object)adaptor.create(SELECT_LAST95); - root_0 = (Object)adaptor.becomeRoot(SELECT_LAST95_tree, root_0); + SELECT_LAST91_tree = (Object)adaptor.create(SELECT_LAST91); + root_0 = (Object)adaptor.becomeRoot(SELECT_LAST91_tree, root_0); } - pushFollow(FOLLOW_expression_in_lastSelection1035); - expression96=expression(); + pushFollow(FOLLOW_expression_in_lastSelection960); + expression92=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression96.getTree()); - RCURLY97=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection1037); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression92.getTree()); + RCURLY93=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection962); if (failed) return retval; } @@ -3103,39 +2918,39 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start type - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:1: type : TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:1: type : TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ; public final type_return type() throws RecognitionException { type_return retval = new type_return(); retval.start = input.LT(1); Object root_0 = null; - Token TYPE98=null; - Token RPAREN100=null; - qualifiedId_return qualifiedId99 = null; + Token TYPE94=null; + Token RPAREN96=null; + qualifiedId_return qualifiedId95 = null; - Object TYPE98_tree=null; - Object RPAREN100_tree=null; + Object TYPE94_tree=null; + Object RPAREN96_tree=null; RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN"); RewriteRuleTokenStream stream_TYPE=new RewriteRuleTokenStream(adaptor,"token TYPE"); RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:5: ( TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:7: TYPE qualifiedId RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:5: ( TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:7: TYPE qualifiedId RPAREN { - TYPE98=(Token)input.LT(1); - match(input,TYPE,FOLLOW_TYPE_in_type1046); if (failed) return retval; - if ( backtracking==0 ) stream_TYPE.add(TYPE98); + TYPE94=(Token)input.LT(1); + match(input,TYPE,FOLLOW_TYPE_in_type971); if (failed) return retval; + if ( backtracking==0 ) stream_TYPE.add(TYPE94); - pushFollow(FOLLOW_qualifiedId_in_type1048); - qualifiedId99=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_type973); + qualifiedId95=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId99.getTree()); - RPAREN100=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_type1050); if (failed) return retval; - if ( backtracking==0 ) stream_RPAREN.add(RPAREN100); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId95.getTree()); + RPAREN96=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_type975); if (failed) return retval; + if ( backtracking==0 ) stream_RPAREN.add(RPAREN96); // AST REWRITE @@ -3149,9 +2964,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 182:31: -> ^( TYPEREF qualifiedId ) + // 169:31: -> ^( TYPEREF qualifiedId ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:34: ^( TYPEREF qualifiedId ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:34: ^( TYPEREF qualifiedId ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(TYPEREF, "TYPEREF"), root_1); @@ -3191,46 +3006,46 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start constructor - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ); public final constructor_return constructor() throws RecognitionException { constructor_return retval = new constructor_return(); retval.start = input.LT(1); Object root_0 = null; - Token string_literal101=null; - qualifiedId_return qualifiedId102 = null; + Token string_literal97=null; + qualifiedId_return qualifiedId98 = null; - ctorArgs_return ctorArgs103 = null; + ctorArgs_return ctorArgs99 = null; - arrayConstructor_return arrayConstructor104 = null; + arrayConstructor_return arrayConstructor100 = null; - Object string_literal101_tree=null; - RewriteRuleTokenStream stream_86=new RewriteRuleTokenStream(adaptor,"token 86"); + Object string_literal97_tree=null; + RewriteRuleTokenStream stream_85=new RewriteRuleTokenStream(adaptor,"token 85"); RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId"); RewriteRuleSubtreeStream stream_ctorArgs=new RewriteRuleSubtreeStream(adaptor,"rule ctorArgs"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) - int alt24=2; - int LA24_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) + int alt22=2; + int LA22_0 = input.LA(1); - if ( (LA24_0==86) ) { - int LA24_1 = input.LA(2); + if ( (LA22_0==85) ) { + int LA22_1 = input.LA(2); - if ( (LA24_1==ID) ) { - int LA24_2 = input.LA(3); + if ( (LA22_1==ID) ) { + int LA22_2 = input.LA(3); if ( (synpred3()) ) { - alt24=1; + alt22=1; } else if ( (true) ) { - alt24=2; + alt22=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 2, input); + new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 2, input); throw nvae; } @@ -3238,7 +3053,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 1, input); + new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 1, input); throw nvae; } @@ -3246,31 +3061,31 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 0, input); + new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 0, input); throw nvae; } - switch (alt24) { + switch (alt22) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs { - string_literal101=(Token)input.LT(1); - match(input,86,FOLLOW_86_in_constructor1081); if (failed) return retval; - if ( backtracking==0 ) stream_86.add(string_literal101); + string_literal97=(Token)input.LT(1); + match(input,85,FOLLOW_85_in_constructor1006); if (failed) return retval; + if ( backtracking==0 ) stream_85.add(string_literal97); - pushFollow(FOLLOW_qualifiedId_in_constructor1083); - qualifiedId102=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_constructor1008); + qualifiedId98=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId102.getTree()); - pushFollow(FOLLOW_ctorArgs_in_constructor1085); - ctorArgs103=ctorArgs(); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId98.getTree()); + pushFollow(FOLLOW_ctorArgs_in_constructor1010); + ctorArgs99=ctorArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs103.getTree()); + if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs99.getTree()); // AST REWRITE - // elements: qualifiedId, ctorArgs + // elements: ctorArgs, qualifiedId // token labels: // rule labels: retval // token list labels: @@ -3280,9 +3095,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 187:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) + // 174:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:64: ^( CONSTRUCTOR qualifiedId ctorArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:64: ^( CONSTRUCTOR qualifiedId ctorArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR, "CONSTRUCTOR"), root_1); @@ -3300,15 +3115,15 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:188:6: arrayConstructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:6: arrayConstructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_arrayConstructor_in_constructor1102); - arrayConstructor104=arrayConstructor(); + pushFollow(FOLLOW_arrayConstructor_in_constructor1027); + arrayConstructor100=arrayConstructor(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, arrayConstructor104.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, arrayConstructor100.getTree()); } break; @@ -3338,60 +3153,60 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start arrayConstructor - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:1: arrayConstructor : 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:178:1: arrayConstructor : 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ; public final arrayConstructor_return arrayConstructor() throws RecognitionException { arrayConstructor_return retval = new arrayConstructor_return(); retval.start = input.LT(1); Object root_0 = null; - Token string_literal105=null; - qualifiedId_return qualifiedId106 = null; + Token string_literal101=null; + qualifiedId_return qualifiedId102 = null; - arrayRank_return arrayRank107 = null; + arrayRank_return arrayRank103 = null; - listInitializer_return listInitializer108 = null; + listInitializer_return listInitializer104 = null; - Object string_literal105_tree=null; - RewriteRuleTokenStream stream_86=new RewriteRuleTokenStream(adaptor,"token 86"); + Object string_literal101_tree=null; + RewriteRuleTokenStream stream_85=new RewriteRuleTokenStream(adaptor,"token 85"); RewriteRuleSubtreeStream stream_listInitializer=new RewriteRuleSubtreeStream(adaptor,"rule listInitializer"); RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId"); RewriteRuleSubtreeStream stream_arrayRank=new RewriteRuleSubtreeStream(adaptor,"rule arrayRank"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:2: ( 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:4: 'new' qualifiedId arrayRank ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:2: ( 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:4: 'new' qualifiedId arrayRank ( listInitializer )? { - string_literal105=(Token)input.LT(1); - match(input,86,FOLLOW_86_in_arrayConstructor1113); if (failed) return retval; - if ( backtracking==0 ) stream_86.add(string_literal105); + string_literal101=(Token)input.LT(1); + match(input,85,FOLLOW_85_in_arrayConstructor1038); if (failed) return retval; + if ( backtracking==0 ) stream_85.add(string_literal101); - pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1115); - qualifiedId106=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1040); + qualifiedId102=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId106.getTree()); - pushFollow(FOLLOW_arrayRank_in_arrayConstructor1117); - arrayRank107=arrayRank(); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId102.getTree()); + pushFollow(FOLLOW_arrayRank_in_arrayConstructor1042); + arrayRank103=arrayRank(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_arrayRank.add(arrayRank107.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:32: ( listInitializer )? - int alt25=2; - int LA25_0 = input.LA(1); + if ( backtracking==0 ) stream_arrayRank.add(arrayRank103.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:32: ( listInitializer )? + int alt23=2; + int LA23_0 = input.LA(1); - if ( (LA25_0==LCURLY) ) { - alt25=1; + if ( (LA23_0==LCURLY) ) { + alt23=1; } - switch (alt25) { + switch (alt23) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:33: listInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:33: listInitializer { - pushFollow(FOLLOW_listInitializer_in_arrayConstructor1120); - listInitializer108=listInitializer(); + pushFollow(FOLLOW_listInitializer_in_arrayConstructor1045); + listInitializer104=listInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_listInitializer.add(listInitializer108.getTree()); + if ( backtracking==0 ) stream_listInitializer.add(listInitializer104.getTree()); } break; @@ -3400,7 +3215,7 @@ public class SpringExpressionsParser extends Parser { // AST REWRITE - // elements: arrayRank, qualifiedId, listInitializer + // elements: listInitializer, qualifiedId, arrayRank // token labels: // rule labels: retval // token list labels: @@ -3410,16 +3225,16 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 193:4: -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) + // 180:4: -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:7: ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:180:7: ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR_ARRAY, "CONSTRUCTOR_ARRAY"), root_1); adaptor.addChild(root_1, stream_qualifiedId.next()); adaptor.addChild(root_1, stream_arrayRank.next()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:49: ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:180:49: ( listInitializer )? if ( stream_listInitializer.hasNext() ) { adaptor.addChild(root_1, stream_listInitializer.next()); @@ -3459,82 +3274,82 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start arrayRank - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:1: arrayRank : LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183:1: arrayRank : LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ; public final arrayRank_return arrayRank() throws RecognitionException { arrayRank_return retval = new arrayRank_return(); retval.start = input.LT(1); Object root_0 = null; - Token LBRACKET109=null; - Token COMMA111=null; - Token RBRACKET113=null; - expression_return expression110 = null; + Token LBRACKET105=null; + Token COMMA107=null; + Token RBRACKET109=null; + expression_return expression106 = null; - expression_return expression112 = null; + expression_return expression108 = null; - Object LBRACKET109_tree=null; - Object COMMA111_tree=null; - Object RBRACKET113_tree=null; + Object LBRACKET105_tree=null; + Object COMMA107_tree=null; + Object RBRACKET109_tree=null; RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleTokenStream stream_LBRACKET=new RewriteRuleTokenStream(adaptor,"token LBRACKET"); RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET"); RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:5: ( LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:5: ( LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET { - LBRACKET109=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1155); if (failed) return retval; - if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET109); + LBRACKET105=(Token)input.LT(1); + match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1080); if (failed) return retval; + if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET105); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:16: ( expression ( COMMA expression )* )? - int alt27=2; - int LA27_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:16: ( expression ( COMMA expression )* )? + int alt25=2; + int LA25_0 = input.LA(1); - if ( (LA27_0==INTEGER_LITERAL||LA27_0==LPAREN||(LA27_0>=PLUS && LA27_0<=MINUS)||LA27_0==BANG||(LA27_0>=POUND && LA27_0<=ID)||(LA27_0>=AT && LA27_0<=LBRACKET)||LA27_0==PROJECT||(LA27_0>=SELECT && LA27_0<=FALSE)||LA27_0==86) ) { - alt27=1; + if ( (LA25_0==INTEGER_LITERAL||LA25_0==LPAREN||(LA25_0>=PLUS && LA25_0<=MINUS)||LA25_0==BANG||(LA25_0>=POUND && LA25_0<=ID)||LA25_0==LBRACKET||LA25_0==PROJECT||(LA25_0>=SELECT && LA25_0<=FALSE)||LA25_0==85) ) { + alt25=1; } - switch (alt27) { + switch (alt25) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:17: expression ( COMMA expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:17: expression ( COMMA expression )* { - pushFollow(FOLLOW_expression_in_arrayRank1158); - expression110=expression(); + pushFollow(FOLLOW_expression_in_arrayRank1083); + expression106=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression110.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:28: ( COMMA expression )* - loop26: + if ( backtracking==0 ) stream_expression.add(expression106.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:28: ( COMMA expression )* + loop24: do { - int alt26=2; - int LA26_0 = input.LA(1); + int alt24=2; + int LA24_0 = input.LA(1); - if ( (LA26_0==COMMA) ) { - alt26=1; + if ( (LA24_0==COMMA) ) { + alt24=1; } - switch (alt26) { + switch (alt24) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:29: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:29: COMMA expression { - COMMA111=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_arrayRank1161); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA111); + COMMA107=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_arrayRank1086); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA107); - pushFollow(FOLLOW_expression_in_arrayRank1163); - expression112=expression(); + pushFollow(FOLLOW_expression_in_arrayRank1088); + expression108=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression112.getTree()); + if ( backtracking==0 ) stream_expression.add(expression108.getTree()); } break; default : - break loop26; + break loop24; } } while (true); @@ -3544,9 +3359,9 @@ public class SpringExpressionsParser extends Parser { } - RBRACKET113=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1169); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET113); + RBRACKET109=(Token)input.LT(1); + match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1094); if (failed) return retval; + if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET109); // AST REWRITE @@ -3560,14 +3375,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 197:59: -> ^( EXPRESSIONLIST ( expression )* ) + // 184:59: -> ^( EXPRESSIONLIST ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:62: ^( EXPRESSIONLIST ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:62: ^( EXPRESSIONLIST ( expression )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(EXPRESSIONLIST, "EXPRESSIONLIST"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:79: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:79: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3607,77 +3422,77 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start listInitializer - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:1: listInitializer : LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:1: listInitializer : LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ; public final listInitializer_return listInitializer() throws RecognitionException { listInitializer_return retval = new listInitializer_return(); retval.start = input.LT(1); Object root_0 = null; - Token LCURLY114=null; - Token COMMA116=null; - Token RCURLY118=null; - expression_return expression115 = null; + Token LCURLY110=null; + Token COMMA112=null; + Token RCURLY114=null; + expression_return expression111 = null; - expression_return expression117 = null; + expression_return expression113 = null; - Object LCURLY114_tree=null; - Object COMMA116_tree=null; - Object RCURLY118_tree=null; + Object LCURLY110_tree=null; + Object COMMA112_tree=null; + Object RCURLY114_tree=null; RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleTokenStream stream_RCURLY=new RewriteRuleTokenStream(adaptor,"token RCURLY"); RewriteRuleTokenStream stream_LCURLY=new RewriteRuleTokenStream(adaptor,"token LCURLY"); RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:5: ( LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:7: LCURLY expression ( COMMA expression )* RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:5: ( LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:7: LCURLY expression ( COMMA expression )* RCURLY { - LCURLY114=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1194); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY114); + LCURLY110=(Token)input.LT(1); + match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1119); if (failed) return retval; + if ( backtracking==0 ) stream_LCURLY.add(LCURLY110); - pushFollow(FOLLOW_expression_in_listInitializer1196); - expression115=expression(); + pushFollow(FOLLOW_expression_in_listInitializer1121); + expression111=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression115.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:25: ( COMMA expression )* - loop28: + if ( backtracking==0 ) stream_expression.add(expression111.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:25: ( COMMA expression )* + loop26: do { - int alt28=2; - int LA28_0 = input.LA(1); + int alt26=2; + int LA26_0 = input.LA(1); - if ( (LA28_0==COMMA) ) { - alt28=1; + if ( (LA26_0==COMMA) ) { + alt26=1; } - switch (alt28) { + switch (alt26) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:26: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:26: COMMA expression { - COMMA116=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_listInitializer1199); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA116); + COMMA112=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_listInitializer1124); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA112); - pushFollow(FOLLOW_expression_in_listInitializer1201); - expression117=expression(); + pushFollow(FOLLOW_expression_in_listInitializer1126); + expression113=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression117.getTree()); + if ( backtracking==0 ) stream_expression.add(expression113.getTree()); } break; default : - break loop28; + break loop26; } } while (true); - RCURLY118=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1205); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY118); + RCURLY114=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1130); if (failed) return retval; + if ( backtracking==0 ) stream_RCURLY.add(RCURLY114); // AST REWRITE @@ -3691,14 +3506,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 200:52: -> ^( LIST_INITIALIZER ( expression )* ) + // 187:52: -> ^( LIST_INITIALIZER ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:55: ^( LIST_INITIALIZER ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:55: ^( LIST_INITIALIZER ( expression )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(LIST_INITIALIZER, "LIST_INITIALIZER"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:74: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:74: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3738,84 +3553,84 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start mapInitializer - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:1: mapInitializer : POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:1: mapInitializer : POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ; public final mapInitializer_return mapInitializer() throws RecognitionException { mapInitializer_return retval = new mapInitializer_return(); retval.start = input.LT(1); Object root_0 = null; - Token POUND119=null; - Token LCURLY120=null; - Token COMMA122=null; - Token RCURLY124=null; - mapEntry_return mapEntry121 = null; + Token POUND115=null; + Token LCURLY116=null; + Token COMMA118=null; + Token RCURLY120=null; + mapEntry_return mapEntry117 = null; - mapEntry_return mapEntry123 = null; + mapEntry_return mapEntry119 = null; - Object POUND119_tree=null; - Object LCURLY120_tree=null; - Object COMMA122_tree=null; - Object RCURLY124_tree=null; + Object POUND115_tree=null; + Object LCURLY116_tree=null; + Object COMMA118_tree=null; + Object RCURLY120_tree=null; RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleTokenStream stream_RCURLY=new RewriteRuleTokenStream(adaptor,"token RCURLY"); RewriteRuleTokenStream stream_LCURLY=new RewriteRuleTokenStream(adaptor,"token LCURLY"); RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); RewriteRuleSubtreeStream stream_mapEntry=new RewriteRuleSubtreeStream(adaptor,"rule mapEntry"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:5: ( POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:5: ( POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY { - POUND119=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_mapInitializer1233); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND119); + POUND115=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_mapInitializer1158); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND115); - LCURLY120=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1235); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY120); + LCURLY116=(Token)input.LT(1); + match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1160); if (failed) return retval; + if ( backtracking==0 ) stream_LCURLY.add(LCURLY116); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1237); - mapEntry121=mapEntry(); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1162); + mapEntry117=mapEntry(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_mapEntry.add(mapEntry121.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:29: ( COMMA mapEntry )* - loop29: + if ( backtracking==0 ) stream_mapEntry.add(mapEntry117.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:29: ( COMMA mapEntry )* + loop27: do { - int alt29=2; - int LA29_0 = input.LA(1); + int alt27=2; + int LA27_0 = input.LA(1); - if ( (LA29_0==COMMA) ) { - alt29=1; + if ( (LA27_0==COMMA) ) { + alt27=1; } - switch (alt29) { + switch (alt27) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:30: COMMA mapEntry + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:30: COMMA mapEntry { - COMMA122=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1240); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA122); + COMMA118=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1165); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA118); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1242); - mapEntry123=mapEntry(); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1167); + mapEntry119=mapEntry(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_mapEntry.add(mapEntry123.getTree()); + if ( backtracking==0 ) stream_mapEntry.add(mapEntry119.getTree()); } break; default : - break loop29; + break loop27; } } while (true); - RCURLY124=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1246); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY124); + RCURLY120=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1171); if (failed) return retval; + if ( backtracking==0 ) stream_RCURLY.add(RCURLY120); // AST REWRITE @@ -3829,14 +3644,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 206:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) + // 193:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:57: ^( MAP_INITIALIZER ( mapEntry )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:57: ^( MAP_INITIALIZER ( mapEntry )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(MAP_INITIALIZER, "MAP_INITIALIZER"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:75: ( mapEntry )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:75: ( mapEntry )* while ( stream_mapEntry.hasNext() ) { adaptor.addChild(root_1, stream_mapEntry.next()); @@ -3876,40 +3691,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start mapEntry - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:1: mapEntry : expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:195:1: mapEntry : expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ; public final mapEntry_return mapEntry() throws RecognitionException { mapEntry_return retval = new mapEntry_return(); retval.start = input.LT(1); Object root_0 = null; - Token COLON126=null; - expression_return expression125 = null; + Token COLON122=null; + expression_return expression121 = null; - expression_return expression127 = null; + expression_return expression123 = null; - Object COLON126_tree=null; + Object COLON122_tree=null; RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON"); RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:5: ( expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:7: expression COLON expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:5: ( expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:7: expression COLON expression { - pushFollow(FOLLOW_expression_in_mapEntry1267); - expression125=expression(); + pushFollow(FOLLOW_expression_in_mapEntry1192); + expression121=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression125.getTree()); - COLON126=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_mapEntry1269); if (failed) return retval; - if ( backtracking==0 ) stream_COLON.add(COLON126); + if ( backtracking==0 ) stream_expression.add(expression121.getTree()); + COLON122=(Token)input.LT(1); + match(input,COLON,FOLLOW_COLON_in_mapEntry1194); if (failed) return retval; + if ( backtracking==0 ) stream_COLON.add(COLON122); - pushFollow(FOLLOW_expression_in_mapEntry1271); - expression127=expression(); + pushFollow(FOLLOW_expression_in_mapEntry1196); + expression123=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression127.getTree()); + if ( backtracking==0 ) stream_expression.add(expression123.getTree()); // AST REWRITE // elements: expression @@ -3922,14 +3737,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 209:35: -> ^( MAP_ENTRY ( expression )* ) + // 196:35: -> ^( MAP_ENTRY ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:38: ^( MAP_ENTRY ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:38: ^( MAP_ENTRY ( expression )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(MAP_ENTRY, "MAP_ENTRY"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:50: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:50: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3969,77 +3784,77 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start ctorArgs - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:211:1: ctorArgs : LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:1: ctorArgs : LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ; public final ctorArgs_return ctorArgs() throws RecognitionException { ctorArgs_return retval = new ctorArgs_return(); retval.start = input.LT(1); Object root_0 = null; - Token LPAREN128=null; - Token COMMA130=null; - Token RPAREN132=null; - namedArgument_return namedArgument129 = null; + Token LPAREN124=null; + Token COMMA126=null; + Token RPAREN128=null; + namedArgument_return namedArgument125 = null; - namedArgument_return namedArgument131 = null; + namedArgument_return namedArgument127 = null; - Object LPAREN128_tree=null; - Object COMMA130_tree=null; - Object RPAREN132_tree=null; + Object LPAREN124_tree=null; + Object COMMA126_tree=null; + Object RPAREN128_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:2: ( LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:2: ( LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN { root_0 = (Object)adaptor.nil(); - LPAREN128=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1289); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:12: ( namedArgument ( COMMA namedArgument )* )? - int alt31=2; - int LA31_0 = input.LA(1); + LPAREN124=(Token)input.LT(1); + match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1214); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:12: ( namedArgument ( COMMA namedArgument )* )? + int alt29=2; + int LA29_0 = input.LA(1); - if ( (LA31_0==INTEGER_LITERAL||LA31_0==LPAREN||(LA31_0>=PLUS && LA31_0<=MINUS)||LA31_0==BANG||(LA31_0>=POUND && LA31_0<=ID)||(LA31_0>=AT && LA31_0<=LBRACKET)||LA31_0==PROJECT||(LA31_0>=SELECT && LA31_0<=FALSE)||LA31_0==86) ) { - alt31=1; + if ( (LA29_0==INTEGER_LITERAL||LA29_0==LPAREN||(LA29_0>=PLUS && LA29_0<=MINUS)||LA29_0==BANG||(LA29_0>=POUND && LA29_0<=ID)||LA29_0==LBRACKET||LA29_0==PROJECT||(LA29_0>=SELECT && LA29_0<=FALSE)||LA29_0==85) ) { + alt29=1; } - switch (alt31) { + switch (alt29) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:13: namedArgument ( COMMA namedArgument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:13: namedArgument ( COMMA namedArgument )* { - pushFollow(FOLLOW_namedArgument_in_ctorArgs1293); - namedArgument129=namedArgument(); + pushFollow(FOLLOW_namedArgument_in_ctorArgs1218); + namedArgument125=namedArgument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument129.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:27: ( COMMA namedArgument )* - loop30: + if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument125.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:27: ( COMMA namedArgument )* + loop28: do { - int alt30=2; - int LA30_0 = input.LA(1); + int alt28=2; + int LA28_0 = input.LA(1); - if ( (LA30_0==COMMA) ) { - alt30=1; + if ( (LA28_0==COMMA) ) { + alt28=1; } - switch (alt30) { + switch (alt28) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:28: COMMA namedArgument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:28: COMMA namedArgument { - COMMA130=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1296); if (failed) return retval; - pushFollow(FOLLOW_namedArgument_in_ctorArgs1299); - namedArgument131=namedArgument(); + COMMA126=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1221); if (failed) return retval; + pushFollow(FOLLOW_namedArgument_in_ctorArgs1224); + namedArgument127=namedArgument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument131.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument127.getTree()); } break; default : - break loop30; + break loop28; } } while (true); @@ -4049,8 +3864,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN132=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1305); if (failed) return retval; + RPAREN128=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1230); if (failed) return retval; } @@ -4078,28 +3893,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start argument - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:1: argument : expression ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:1: argument : expression ; public final argument_return argument() throws RecognitionException { argument_return retval = new argument_return(); retval.start = input.LT(1); Object root_0 = null; - expression_return expression133 = null; + expression_return expression129 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:10: ( expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:12: expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:10: ( expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:12: expression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_argument1314); - expression133=expression(); + pushFollow(FOLLOW_expression_in_argument1239); + expression129=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression133.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, expression129.getTree()); } @@ -4127,7 +3942,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start namedArgument - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ); public final namedArgument_return namedArgument() throws RecognitionException { namedArgument_return retval = new namedArgument_return(); retval.start = input.LT(1); @@ -4135,80 +3950,80 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token ASSIGN134=null; - expression_return expression135 = null; + Token ASSIGN130=null; + expression_return expression131 = null; - argument_return argument136 = null; + argument_return argument132 = null; Object id_tree=null; - Object ASSIGN134_tree=null; + Object ASSIGN130_tree=null; RewriteRuleTokenStream stream_ASSIGN=new RewriteRuleTokenStream(adaptor,"token ASSIGN"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) - int alt32=2; - int LA32_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) + int alt30=2; + int LA30_0 = input.LA(1); - if ( (LA32_0==ID) ) { - int LA32_1 = input.LA(2); + if ( (LA30_0==ID) ) { + int LA30_1 = input.LA(2); - if ( (LA32_1==ASSIGN) ) { - int LA32_23 = input.LA(3); + if ( (LA30_1==ASSIGN) ) { + int LA30_22 = input.LA(3); if ( (synpred4()) ) { - alt32=1; + alt30=1; } else if ( (true) ) { - alt32=2; + alt30=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 23, input); + new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 22, input); throw nvae; } } - else if ( ((LA32_1>=DEFAULT && LA32_1<=QMARK)||(LA32_1>=LPAREN && LA32_1<=POWER)||LA32_1==DOT||LA32_1==COMMA||LA32_1==LBRACKET||(LA32_1>=EQUAL && LA32_1<=MATCHES)) ) { - alt32=2; + else if ( ((LA30_1>=DEFAULT && LA30_1<=QMARK)||(LA30_1>=LPAREN && LA30_1<=POWER)||LA30_1==DOT||(LA30_1>=COMMA && LA30_1<=LBRACKET)||(LA30_1>=EQUAL && LA30_1<=MATCHES)) ) { + alt30=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 1, input); + new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 1, input); throw nvae; } } - else if ( (LA32_0==INTEGER_LITERAL||LA32_0==LPAREN||(LA32_0>=PLUS && LA32_0<=MINUS)||LA32_0==BANG||LA32_0==POUND||(LA32_0>=AT && LA32_0<=LBRACKET)||LA32_0==PROJECT||(LA32_0>=SELECT && LA32_0<=FALSE)||LA32_0==86) ) { - alt32=2; + else if ( (LA30_0==INTEGER_LITERAL||LA30_0==LPAREN||(LA30_0>=PLUS && LA30_0<=MINUS)||LA30_0==BANG||LA30_0==POUND||LA30_0==LBRACKET||LA30_0==PROJECT||(LA30_0>=SELECT && LA30_0<=FALSE)||LA30_0==85) ) { + alt30=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 0, input); + new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 0, input); throw nvae; } - switch (alt32) { + switch (alt30) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:7: ( ID ASSIGN )=>id= ID ASSIGN expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:7: ( ID ASSIGN )=>id= ID ASSIGN expression { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_namedArgument1337); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_namedArgument1262); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - ASSIGN134=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1339); if (failed) return retval; - if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN134); + ASSIGN130=(Token)input.LT(1); + match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1264); if (failed) return retval; + if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN130); - pushFollow(FOLLOW_expression_in_namedArgument1341); - expression135=expression(); + pushFollow(FOLLOW_expression_in_namedArgument1266); + expression131=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression135.getTree()); + if ( backtracking==0 ) stream_expression.add(expression131.getTree()); // AST REWRITE // elements: expression @@ -4221,9 +4036,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 218:19: -> ^( NAMED_ARGUMENT[$id] expression ) + // 205:19: -> ^( NAMED_ARGUMENT[$id] expression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:22: ^( NAMED_ARGUMENT[$id] expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:22: ^( NAMED_ARGUMENT[$id] expression ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(NAMED_ARGUMENT, id), root_1); @@ -4240,15 +4055,15 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:7: argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:7: argument { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_argument_in_namedArgument1377); - argument136=argument(); + pushFollow(FOLLOW_argument_in_namedArgument1302); + argument132=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument136.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument132.getTree()); } break; @@ -4278,60 +4093,60 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start qualifiedId - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:1: qualifiedId : ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:1: qualifiedId : ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; public final qualifiedId_return qualifiedId() throws RecognitionException { qualifiedId_return retval = new qualifiedId_return(); retval.start = input.LT(1); Object root_0 = null; - Token ID137=null; - Token DOT138=null; - Token ID139=null; + Token ID133=null; + Token DOT134=null; + Token ID135=null; - Object ID137_tree=null; - Object DOT138_tree=null; - Object ID139_tree=null; + Object ID133_tree=null; + Object DOT134_tree=null; + Object ID135_tree=null; RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:13: ( ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:15: ID ( DOT ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:13: ( ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:15: ID ( DOT ID )* { - ID137=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1389); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID137); + ID133=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1314); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID133); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:18: ( DOT ID )* - loop33: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:18: ( DOT ID )* + loop31: do { - int alt33=2; - int LA33_0 = input.LA(1); + int alt31=2; + int LA31_0 = input.LA(1); - if ( (LA33_0==DOT) ) { - alt33=1; + if ( (LA31_0==DOT) ) { + alt31=1; } - switch (alt33) { + switch (alt31) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:19: DOT ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:19: DOT ID { - DOT138=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_qualifiedId1392); if (failed) return retval; - if ( backtracking==0 ) stream_DOT.add(DOT138); + DOT134=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_qualifiedId1317); if (failed) return retval; + if ( backtracking==0 ) stream_DOT.add(DOT134); - ID139=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1394); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID139); + ID135=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1319); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID135); } break; default : - break loop33; + break loop31; } } while (true); @@ -4347,14 +4162,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 221:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 208:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(QUALIFIED_IDENTIFIER, "QUALIFIED_IDENTIFIER"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4394,60 +4209,60 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start contextName - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:1: contextName : ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:1: contextName : ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; public final contextName_return contextName() throws RecognitionException { contextName_return retval = new contextName_return(); retval.start = input.LT(1); Object root_0 = null; - Token ID140=null; - Token DIV141=null; - Token ID142=null; + Token ID136=null; + Token DIV137=null; + Token ID138=null; - Object ID140_tree=null; - Object DIV141_tree=null; - Object ID142_tree=null; + Object ID136_tree=null; + Object DIV137_tree=null; + Object ID138_tree=null; RewriteRuleTokenStream stream_DIV=new RewriteRuleTokenStream(adaptor,"token DIV"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:13: ( ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:15: ID ( DIV ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:13: ( ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:15: ID ( DIV ID )* { - ID140=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1413); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID140); + ID136=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1338); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID136); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:18: ( DIV ID )* - loop34: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:18: ( DIV ID )* + loop32: do { - int alt34=2; - int LA34_0 = input.LA(1); + int alt32=2; + int LA32_0 = input.LA(1); - if ( (LA34_0==DIV) ) { - alt34=1; + if ( (LA32_0==DIV) ) { + alt32=1; } - switch (alt34) { + switch (alt32) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:19: DIV ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:19: DIV ID { - DIV141=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_contextName1416); if (failed) return retval; - if ( backtracking==0 ) stream_DIV.add(DIV141); + DIV137=(Token)input.LT(1); + match(input,DIV,FOLLOW_DIV_in_contextName1341); if (failed) return retval; + if ( backtracking==0 ) stream_DIV.add(DIV137); - ID142=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1418); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID142); + ID138=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1343); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID138); } break; default : - break loop34; + break loop32; } } while (true); @@ -4463,14 +4278,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 223:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 210:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(QUALIFIED_IDENTIFIER, "QUALIFIED_IDENTIFIER"), root_1); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4510,171 +4325,171 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start literal - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ); public final literal_return literal() throws RecognitionException { literal_return retval = new literal_return(); retval.start = input.LT(1); Object root_0 = null; - Token INTEGER_LITERAL143=null; - Token STRING_LITERAL144=null; - Token DQ_STRING_LITERAL145=null; - Token NULL_LITERAL147=null; - Token HEXADECIMAL_INTEGER_LITERAL148=null; - Token REAL_LITERAL149=null; - boolLiteral_return boolLiteral146 = null; + Token INTEGER_LITERAL139=null; + Token STRING_LITERAL140=null; + Token DQ_STRING_LITERAL141=null; + Token NULL_LITERAL143=null; + Token HEXADECIMAL_INTEGER_LITERAL144=null; + Token REAL_LITERAL145=null; + boolLiteral_return boolLiteral142 = null; - Object INTEGER_LITERAL143_tree=null; - Object STRING_LITERAL144_tree=null; - Object DQ_STRING_LITERAL145_tree=null; - Object NULL_LITERAL147_tree=null; - Object HEXADECIMAL_INTEGER_LITERAL148_tree=null; - Object REAL_LITERAL149_tree=null; + Object INTEGER_LITERAL139_tree=null; + Object STRING_LITERAL140_tree=null; + Object DQ_STRING_LITERAL141_tree=null; + Object NULL_LITERAL143_tree=null; + Object HEXADECIMAL_INTEGER_LITERAL144_tree=null; + Object REAL_LITERAL145_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ) - int alt35=7; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ) + int alt33=7; switch ( input.LA(1) ) { case INTEGER_LITERAL: { - alt35=1; + alt33=1; } break; case STRING_LITERAL: { - alt35=2; + alt33=2; } break; case DQ_STRING_LITERAL: { - alt35=3; + alt33=3; } break; case TRUE: case FALSE: { - alt35=4; + alt33=4; } break; case NULL_LITERAL: { - alt35=5; + alt33=5; } break; case HEXADECIMAL_INTEGER_LITERAL: { - alt35=6; + alt33=6; } break; case REAL_LITERAL: { - alt35=7; + alt33=7; } break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("225:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 35, 0, input); + new NoViableAltException("212:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 33, 0, input); throw nvae; } - switch (alt35) { + switch (alt33) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:4: INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:4: INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); - INTEGER_LITERAL143=(Token)input.LT(1); - match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1439); if (failed) return retval; + INTEGER_LITERAL139=(Token)input.LT(1); + match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1364); if (failed) return retval; if ( backtracking==0 ) { - INTEGER_LITERAL143_tree = (Object)adaptor.create(INTEGER_LITERAL143); - adaptor.addChild(root_0, INTEGER_LITERAL143_tree); + INTEGER_LITERAL139_tree = (Object)adaptor.create(INTEGER_LITERAL139); + adaptor.addChild(root_0, INTEGER_LITERAL139_tree); } } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:4: STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:4: STRING_LITERAL { root_0 = (Object)adaptor.nil(); - STRING_LITERAL144=(Token)input.LT(1); - match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1445); if (failed) return retval; + STRING_LITERAL140=(Token)input.LT(1); + match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1370); if (failed) return retval; if ( backtracking==0 ) { - STRING_LITERAL144_tree = (Object)adaptor.create(STRING_LITERAL144); - adaptor.addChild(root_0, STRING_LITERAL144_tree); + STRING_LITERAL140_tree = (Object)adaptor.create(STRING_LITERAL140); + adaptor.addChild(root_0, STRING_LITERAL140_tree); } } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:228:4: DQ_STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:4: DQ_STRING_LITERAL { root_0 = (Object)adaptor.nil(); - DQ_STRING_LITERAL145=(Token)input.LT(1); - match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1450); if (failed) return retval; + DQ_STRING_LITERAL141=(Token)input.LT(1); + match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1375); if (failed) return retval; if ( backtracking==0 ) { - DQ_STRING_LITERAL145_tree = (Object)adaptor.create(DQ_STRING_LITERAL145); - adaptor.addChild(root_0, DQ_STRING_LITERAL145_tree); + DQ_STRING_LITERAL141_tree = (Object)adaptor.create(DQ_STRING_LITERAL141); + adaptor.addChild(root_0, DQ_STRING_LITERAL141_tree); } } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:4: boolLiteral + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:4: boolLiteral { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_boolLiteral_in_literal1455); - boolLiteral146=boolLiteral(); + pushFollow(FOLLOW_boolLiteral_in_literal1380); + boolLiteral142=boolLiteral(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral146.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral142.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:4: NULL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:4: NULL_LITERAL { root_0 = (Object)adaptor.nil(); - NULL_LITERAL147=(Token)input.LT(1); - match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1460); if (failed) return retval; + NULL_LITERAL143=(Token)input.LT(1); + match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1385); if (failed) return retval; if ( backtracking==0 ) { - NULL_LITERAL147_tree = (Object)adaptor.create(NULL_LITERAL147); - adaptor.addChild(root_0, NULL_LITERAL147_tree); + NULL_LITERAL143_tree = (Object)adaptor.create(NULL_LITERAL143); + adaptor.addChild(root_0, NULL_LITERAL143_tree); } } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:4: HEXADECIMAL_INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:4: HEXADECIMAL_INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); - HEXADECIMAL_INTEGER_LITERAL148=(Token)input.LT(1); - match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1465); if (failed) return retval; + HEXADECIMAL_INTEGER_LITERAL144=(Token)input.LT(1); + match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1390); if (failed) return retval; if ( backtracking==0 ) { - HEXADECIMAL_INTEGER_LITERAL148_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL148); - adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL148_tree); + HEXADECIMAL_INTEGER_LITERAL144_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL144); + adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL144_tree); } } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:4: REAL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:4: REAL_LITERAL { root_0 = (Object)adaptor.nil(); - REAL_LITERAL149=(Token)input.LT(1); - match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1471); if (failed) return retval; + REAL_LITERAL145=(Token)input.LT(1); + match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1396); if (failed) return retval; if ( backtracking==0 ) { - REAL_LITERAL149_tree = (Object)adaptor.create(REAL_LITERAL149); - adaptor.addChild(root_0, REAL_LITERAL149_tree); + REAL_LITERAL145_tree = (Object)adaptor.create(REAL_LITERAL145); + adaptor.addChild(root_0, REAL_LITERAL145_tree); } } @@ -4705,27 +4520,27 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start boolLiteral - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:1: boolLiteral : ( TRUE | FALSE ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:222:1: boolLiteral : ( TRUE | FALSE ); public final boolLiteral_return boolLiteral() throws RecognitionException { boolLiteral_return retval = new boolLiteral_return(); retval.start = input.LT(1); Object root_0 = null; - Token set150=null; + Token set146=null; - Object set150_tree=null; + Object set146_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:12: ( TRUE | FALSE ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:222:12: ( TRUE | FALSE ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: { root_0 = (Object)adaptor.nil(); - set150=(Token)input.LT(1); + set146=(Token)input.LT(1); if ( (input.LA(1)>=TRUE && input.LA(1)<=FALSE) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set150)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set146)); errorRecovery=false;failed=false; } else { @@ -4762,27 +4577,27 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start relationalOperator - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES ); public final relationalOperator_return relationalOperator() throws RecognitionException { relationalOperator_return retval = new relationalOperator_return(); retval.start = input.LT(1); Object root_0 = null; - Token set151=null; + Token set147=null; - Object set151_tree=null; + Object set147_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES ) // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: { root_0 = (Object)adaptor.nil(); - set151=(Token)input.LT(1); + set147=(Token)input.LT(1); if ( (input.LA(1)>=EQUAL && input.LA(1)<=MATCHES) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set151)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set147)); errorRecovery=false;failed=false; } else { @@ -4815,12 +4630,12 @@ public class SpringExpressionsParser extends Parser { // $ANTLR start synpred1 public final void synpred1_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:7: ( POUND ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:8: POUND ID LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:7: ( POUND ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:8: POUND ID LPAREN { - match(input,POUND,FOLLOW_POUND_in_synpred1713); if (failed) return ; - match(input,ID,FOLLOW_ID_in_synpred1715); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred1717); if (failed) return ; + match(input,POUND,FOLLOW_POUND_in_synpred1701); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred1703); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred1705); if (failed) return ; } } @@ -4828,11 +4643,11 @@ public class SpringExpressionsParser extends Parser { // $ANTLR start synpred2 public final void synpred2_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:4: ( ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:5: ID LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:4: ( ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:5: ID LPAREN { - match(input,ID,FOLLOW_ID_in_synpred2797); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred2799); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred2785); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred2787); if (failed) return ; } } @@ -4840,15 +4655,15 @@ public class SpringExpressionsParser extends Parser { // $ANTLR start synpred3 public final void synpred3_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:4: ( 'new' qualifiedId LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:5: 'new' qualifiedId LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:4: ( 'new' qualifiedId LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:5: 'new' qualifiedId LPAREN { - match(input,86,FOLLOW_86_in_synpred31072); if (failed) return ; - pushFollow(FOLLOW_qualifiedId_in_synpred31074); + match(input,85,FOLLOW_85_in_synpred3997); if (failed) return ; + pushFollow(FOLLOW_qualifiedId_in_synpred3999); qualifiedId(); _fsp--; if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred31076); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred31001); if (failed) return ; } } @@ -4856,11 +4671,11 @@ public class SpringExpressionsParser extends Parser { // $ANTLR start synpred4 public final void synpred4_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:7: ( ID ASSIGN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:8: ID ASSIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:7: ( ID ASSIGN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:8: ID ASSIGN { - match(input,ID,FOLLOW_ID_in_synpred41328); if (failed) return ; - match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41330); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred41253); if (failed) return ; + match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41255); if (failed) return ; } } @@ -4926,176 +4741,169 @@ public class SpringExpressionsParser extends Parser { - public static final BitSet FOLLOW_expression_in_expr165 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_expr167 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression196 = new BitSet(new long[]{0x0000000038000002L}); - public static final BitSet FOLLOW_ASSIGN_in_expression205 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression208 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DEFAULT_in_expression218 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression221 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_QMARK_in_expression231 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_expression234 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_COLON_in_expression236 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_expression239 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_parenExpr250 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_parenExpr253 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_RPAREN_in_parenExpr255 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression268 = new BitSet(new long[]{0x0000000200000002L}); - public static final BitSet FOLLOW_OR_in_logicalOrExpression271 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression274 = new BitSet(new long[]{0x0000000200000002L}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression309 = new BitSet(new long[]{0x0000000400000002L}); - public static final BitSet FOLLOW_AND_in_logicalAndExpression312 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression315 = new BitSet(new long[]{0x0000000400000002L}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression326 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000FFCL}); - public static final BitSet FOLLOW_relationalOperator_in_relationalExpression329 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression332 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_productExpression_in_sumExpression343 = new BitSet(new long[]{0x0000001800000002L}); - public static final BitSet FOLLOW_PLUS_in_sumExpression348 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_MINUS_in_sumExpression353 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_productExpression_in_sumExpression357 = new BitSet(new long[]{0x0000001800000002L}); - public static final BitSet FOLLOW_powerExpr_in_productExpression369 = new BitSet(new long[]{0x000000E000000002L}); - public static final BitSet FOLLOW_STAR_in_productExpression373 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_DIV_in_productExpression378 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_MOD_in_productExpression382 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_powerExpr_in_productExpression386 = new BitSet(new long[]{0x000000E000000002L}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr398 = new BitSet(new long[]{0x0000010000000002L}); - public static final BitSet FOLLOW_POWER_in_powerExpr401 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr404 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PLUS_in_unaryExpression418 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_MINUS_in_unaryExpression423 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_BANG_in_unaryExpression428 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_unaryExpression_in_unaryExpression432 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_primaryExpression_in_unaryExpression438 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_startNode_in_primaryExpression452 = new BitSet(new long[]{0x0000840000000002L}); - public static final BitSet FOLLOW_node_in_primaryExpression455 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_parenExpr_in_startNode488 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_startNode496 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_startNode505 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_reference_in_startNode513 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_indexer_in_startNode521 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_literal_in_startNode529 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_type_in_startNode537 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_constructor_in_startNode545 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_startNode553 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_startNode562 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_startNode571 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_startNode579 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_startNode587 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_mapInitializer_in_startNode595 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOT_in_node615 = new BitSet(new long[]{0x003A180000000000L}); - public static final BitSet FOLLOW_dottedNode_in_node617 = new BitSet(new long[]{0x0000840000000002L}); - public static final BitSet FOLLOW_nonDottedNode_in_node622 = new BitSet(new long[]{0x0000840000000002L}); - public static final BitSet FOLLOW_indexer_in_nonDottedNode634 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_dottedNode647 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_dottedNode653 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_dottedNode661 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_dottedNode670 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_dottedNode679 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_dottedNode688 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_function_in_functionOrVar722 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_var_in_functionOrVar730 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_function747 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_ID_in_function751 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_methodArgs_in_function753 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_var774 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_ID_in_var778 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_methodOrProperty806 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_methodArgs_in_methodOrProperty808 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_property_in_methodOrProperty822 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_methodArgs837 = new BitSet(new long[]{0x7FFADA1980000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_argument_in_methodArgs841 = new BitSet(new long[]{0x0000200100000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs844 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_argument_in_methodArgs847 = new BitSet(new long[]{0x0000200100000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs852 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_RPAREN_in_methodArgs859 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_property872 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_AT_in_reference894 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_LPAREN_in_reference898 = new BitSet(new long[]{0x0000100100000000L}); - public static final BitSet FOLLOW_contextName_in_reference903 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_COLON_in_reference905 = new BitSet(new long[]{0x0000100100000000L}); - public static final BitSet FOLLOW_qualifiedId_in_reference912 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_RPAREN_in_reference916 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_indexer951 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_argument_in_indexer955 = new BitSet(new long[]{0x0001200000000000L}); - public static final BitSet FOLLOW_COMMA_in_indexer958 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_argument_in_indexer962 = new BitSet(new long[]{0x0001200000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_indexer966 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PROJECT_in_projection993 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_projection996 = new BitSet(new long[]{0x0004000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_projection998 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_in_selection1006 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_selection1009 = new BitSet(new long[]{0x0004000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_selection1011 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection1019 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_firstSelection1022 = new BitSet(new long[]{0x0004000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_firstSelection1024 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection1032 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_lastSelection1035 = new BitSet(new long[]{0x0004000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_lastSelection1037 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_TYPE_in_type1046 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_type1048 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_RPAREN_in_type1050 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_86_in_constructor1081 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_constructor1083 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_ctorArgs_in_constructor1085 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_arrayConstructor_in_constructor1102 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_86_in_arrayConstructor1113 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1115 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1117 = new BitSet(new long[]{0x0080000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1120 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_arrayRank1155 = new BitSet(new long[]{0x7FFBDA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_arrayRank1158 = new BitSet(new long[]{0x0001200000000000L}); - public static final BitSet FOLLOW_COMMA_in_arrayRank1161 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_arrayRank1163 = new BitSet(new long[]{0x0001200000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_arrayRank1169 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LCURLY_in_listInitializer1194 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_listInitializer1196 = new BitSet(new long[]{0x0004200000000000L}); - public static final BitSet FOLLOW_COMMA_in_listInitializer1199 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_listInitializer1201 = new BitSet(new long[]{0x0004200000000000L}); - public static final BitSet FOLLOW_RCURLY_in_listInitializer1205 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_mapInitializer1233 = new BitSet(new long[]{0x0080000000000000L}); - public static final BitSet FOLLOW_LCURLY_in_mapInitializer1235 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1237 = new BitSet(new long[]{0x0004200000000000L}); - public static final BitSet FOLLOW_COMMA_in_mapInitializer1240 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1242 = new BitSet(new long[]{0x0004200000000000L}); - public static final BitSet FOLLOW_RCURLY_in_mapInitializer1246 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_mapEntry1267 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_COLON_in_mapEntry1269 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_mapEntry1271 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_ctorArgs1289 = new BitSet(new long[]{0x7FFADA1980000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1293 = new BitSet(new long[]{0x0000200100000000L}); - public static final BitSet FOLLOW_COMMA_in_ctorArgs1296 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1299 = new BitSet(new long[]{0x0000200100000000L}); - public static final BitSet FOLLOW_RPAREN_in_ctorArgs1305 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_argument1314 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_namedArgument1337 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_ASSIGN_in_namedArgument1339 = new BitSet(new long[]{0x7FFADA1880000020L,0x0000000000400000L}); - public static final BitSet FOLLOW_expression_in_namedArgument1341 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_argument_in_namedArgument1377 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1389 = new BitSet(new long[]{0x0000040000000002L}); - public static final BitSet FOLLOW_DOT_in_qualifiedId1392 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1394 = new BitSet(new long[]{0x0000040000000002L}); - public static final BitSet FOLLOW_ID_in_contextName1413 = new BitSet(new long[]{0x0000004000000002L}); - public static final BitSet FOLLOW_DIV_in_contextName1416 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_ID_in_contextName1418 = new BitSet(new long[]{0x0000004000000002L}); - public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1439 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_STRING_LITERAL_in_literal1445 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1450 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_boolLiteral_in_literal1455 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_NULL_LITERAL_in_literal1460 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1465 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_REAL_LITERAL_in_literal1471 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_expr161 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_expr163 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression192 = new BitSet(new long[]{0x000000001C000002L}); + public static final BitSet FOLLOW_ASSIGN_in_expression201 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression204 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DEFAULT_in_expression214 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression217 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_QMARK_in_expression227 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_expression230 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_COLON_in_expression232 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_expression235 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_parenExpr246 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_parenExpr249 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_RPAREN_in_parenExpr251 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression264 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_OR_in_logicalOrExpression267 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression270 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression305 = new BitSet(new long[]{0x0000000200000002L}); + public static final BitSet FOLLOW_AND_in_logicalAndExpression308 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression311 = new BitSet(new long[]{0x0000000200000002L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression322 = new BitSet(new long[]{0x0000000000000002L,0x00000000000003FFL}); + public static final BitSet FOLLOW_relationalOperator_in_relationalExpression325 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression328 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression339 = new BitSet(new long[]{0x0000000C00000002L}); + public static final BitSet FOLLOW_PLUS_in_sumExpression344 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_MINUS_in_sumExpression349 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression353 = new BitSet(new long[]{0x0000000C00000002L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression365 = new BitSet(new long[]{0x0000007000000002L}); + public static final BitSet FOLLOW_STAR_in_productExpression369 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_DIV_in_productExpression374 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_MOD_in_productExpression378 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression382 = new BitSet(new long[]{0x0000007000000002L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr394 = new BitSet(new long[]{0x0000008000000002L}); + public static final BitSet FOLLOW_POWER_in_powerExpr397 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr400 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PLUS_in_unaryExpression414 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_MINUS_in_unaryExpression419 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_BANG_in_unaryExpression424 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_unaryExpression_in_unaryExpression428 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_primaryExpression_in_unaryExpression434 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_startNode_in_primaryExpression448 = new BitSet(new long[]{0x0000220000000002L}); + public static final BitSet FOLLOW_node_in_primaryExpression451 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_parenExpr_in_startNode484 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_startNode492 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_startNode501 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_indexer_in_startNode509 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_literal_in_startNode517 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_type_in_startNode525 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_constructor_in_startNode533 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_startNode541 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_startNode550 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_startNode559 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_startNode567 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_listInitializer_in_startNode575 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_mapInitializer_in_startNode583 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DOT_in_node603 = new BitSet(new long[]{0x000E8C0000000000L}); + public static final BitSet FOLLOW_dottedNode_in_node605 = new BitSet(new long[]{0x0000220000000002L}); + public static final BitSet FOLLOW_nonDottedNode_in_node610 = new BitSet(new long[]{0x0000220000000002L}); + public static final BitSet FOLLOW_indexer_in_nonDottedNode622 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_dottedNode635 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_dottedNode641 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_dottedNode649 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_dottedNode658 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_dottedNode667 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_dottedNode676 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_function_in_functionOrVar710 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_var_in_functionOrVar718 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_function735 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_ID_in_function739 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_methodArgs_in_function741 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_var762 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_ID_in_var766 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_methodOrProperty794 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_methodArgs_in_methodOrProperty796 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_property_in_methodOrProperty810 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_methodArgs825 = new BitSet(new long[]{0x1FFEAD0CC0000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_argument_in_methodArgs829 = new BitSet(new long[]{0x0000100080000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs832 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_argument_in_methodArgs835 = new BitSet(new long[]{0x0000100080000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs840 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_RPAREN_in_methodArgs847 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_property860 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LBRACKET_in_indexer876 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_argument_in_indexer880 = new BitSet(new long[]{0x0000500000000000L}); + public static final BitSet FOLLOW_COMMA_in_indexer883 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_argument_in_indexer887 = new BitSet(new long[]{0x0000500000000000L}); + public static final BitSet FOLLOW_RBRACKET_in_indexer891 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PROJECT_in_projection918 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_projection921 = new BitSet(new long[]{0x0001000000000000L}); + public static final BitSet FOLLOW_RCURLY_in_projection923 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_in_selection931 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_selection934 = new BitSet(new long[]{0x0001000000000000L}); + public static final BitSet FOLLOW_RCURLY_in_selection936 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection944 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_firstSelection947 = new BitSet(new long[]{0x0001000000000000L}); + public static final BitSet FOLLOW_RCURLY_in_firstSelection949 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection957 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_lastSelection960 = new BitSet(new long[]{0x0001000000000000L}); + public static final BitSet FOLLOW_RCURLY_in_lastSelection962 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_TYPE_in_type971 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_type973 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_RPAREN_in_type975 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_85_in_constructor1006 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_constructor1008 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_ctorArgs_in_constructor1010 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_arrayConstructor_in_constructor1027 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_85_in_arrayConstructor1038 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1040 = new BitSet(new long[]{0x0000200000000000L}); + public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1042 = new BitSet(new long[]{0x0020000000000002L}); + public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1045 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LBRACKET_in_arrayRank1080 = new BitSet(new long[]{0x1FFEED0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_arrayRank1083 = new BitSet(new long[]{0x0000500000000000L}); + public static final BitSet FOLLOW_COMMA_in_arrayRank1086 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_arrayRank1088 = new BitSet(new long[]{0x0000500000000000L}); + public static final BitSet FOLLOW_RBRACKET_in_arrayRank1094 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LCURLY_in_listInitializer1119 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_listInitializer1121 = new BitSet(new long[]{0x0001100000000000L}); + public static final BitSet FOLLOW_COMMA_in_listInitializer1124 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_listInitializer1126 = new BitSet(new long[]{0x0001100000000000L}); + public static final BitSet FOLLOW_RCURLY_in_listInitializer1130 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_mapInitializer1158 = new BitSet(new long[]{0x0020000000000000L}); + public static final BitSet FOLLOW_LCURLY_in_mapInitializer1160 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_mapEntry_in_mapInitializer1162 = new BitSet(new long[]{0x0001100000000000L}); + public static final BitSet FOLLOW_COMMA_in_mapInitializer1165 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_mapEntry_in_mapInitializer1167 = new BitSet(new long[]{0x0001100000000000L}); + public static final BitSet FOLLOW_RCURLY_in_mapInitializer1171 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_mapEntry1192 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_COLON_in_mapEntry1194 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_mapEntry1196 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_ctorArgs1214 = new BitSet(new long[]{0x1FFEAD0CC0000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs1218 = new BitSet(new long[]{0x0000100080000000L}); + public static final BitSet FOLLOW_COMMA_in_ctorArgs1221 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs1224 = new BitSet(new long[]{0x0000100080000000L}); + public static final BitSet FOLLOW_RPAREN_in_ctorArgs1230 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_argument1239 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_namedArgument1262 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_ASSIGN_in_namedArgument1264 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); + public static final BitSet FOLLOW_expression_in_namedArgument1266 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_argument_in_namedArgument1302 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1314 = new BitSet(new long[]{0x0000020000000002L}); + public static final BitSet FOLLOW_DOT_in_qualifiedId1317 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1319 = new BitSet(new long[]{0x0000020000000002L}); + public static final BitSet FOLLOW_ID_in_contextName1338 = new BitSet(new long[]{0x0000002000000002L}); + public static final BitSet FOLLOW_DIV_in_contextName1341 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_ID_in_contextName1343 = new BitSet(new long[]{0x0000002000000002L}); + public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1364 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_STRING_LITERAL_in_literal1370 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1375 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_boolLiteral_in_literal1380 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_NULL_LITERAL_in_literal1385 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1390 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_REAL_LITERAL_in_literal1396 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_set_in_boolLiteral0 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_set_in_relationalOperator0 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_synpred1713 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_ID_in_synpred1715 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred1717 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred2797 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred2799 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_86_in_synpred31072 = new BitSet(new long[]{0x0000100000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_synpred31074 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred31076 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred41328 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_ASSIGN_in_synpred41330 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_synpred1701 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_ID_in_synpred1703 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred1705 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred2785 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred2787 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_85_in_synpred3997 = new BitSet(new long[]{0x0000080000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_synpred3999 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred31001 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred41253 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_ASSIGN_in_synpred41255 = new BitSet(new long[]{0x0000000000000002L}); } \ No newline at end of file diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g index a09ba6c48ba..46f8766f6f8 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g @@ -5,143 +5,143 @@ options { } @header {package org.springframework.expression.spel.generated;} -T86 : 'new' ; +T85 : 'new' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 59 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 58 SEMIRPAREN : ';)'; // recoveryrelated: allows us to cope with a rogue superfluous semicolon before the rparen in an expression list -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 237 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 224 INTEGER_LITERAL : (DECIMAL_DIGIT)+ (INTEGER_TYPE_SUFFIX)?; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 240 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 227 HEXADECIMAL_INTEGER_LITERAL : ('0x' | '0X') (HEX_DIGIT)+ (INTEGER_TYPE_SUFFIX)?; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 255 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 242 ASSIGN: '='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 256 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 243 EQUAL: '=='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 257 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 244 NOT_EQUAL: '!='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 258 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 245 LESS_THAN: '<'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 259 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 246 LESS_THAN_OR_EQUAL: '<='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 260 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 247 GREATER_THAN: '>'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 261 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 248 GREATER_THAN_OR_EQUAL: '>='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 262 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 249 IN: 'in'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 250 IS: 'is'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 264 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 251 BETWEEN:'between'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 265 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 252 MATCHES:'matches'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 266 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 253 NULL_LITERAL: 'null'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 268 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 255 SEMI: ';'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 269 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 256 DOT: '.'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 270 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 257 COMMA: ','; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 271 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 258 LPAREN: '('; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 272 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 259 RPAREN: ')'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 273 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 260 LCURLY: '{'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 274 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 261 RCURLY: '}'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 275 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 262 LBRACKET: '['; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 276 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263 RBRACKET: ']'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 277 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 264 PIPE: '|'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 279 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 266 AND: 'and'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 280 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 267 OR: 'or'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 281 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 268 FALSE: 'false'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 282 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 269 TRUE: 'true'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 284 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 271 PLUS: '+'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 285 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 272 MINUS: '-'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 286 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 273 DIV: '/'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 287 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 274 STAR: '*'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 288 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 275 MOD: '%'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 289 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 276 POWER: '^'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 290 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 277 BANG: '!'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 291 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 278 POUND: '#'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 292 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 279 QMARK: '?'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 293 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 280 DEFAULT: '??'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 294 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 281 PROJECT: '!{'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 295 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 282 SELECT: '?{'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 296 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 283 SELECT_FIRST: '^{'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 297 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 284 SELECT_LAST: '${'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 298 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 285 TYPE: 'T('; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 300 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 287 STRING_LITERAL: '\''! (APOS|~'\'')* '\''!; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 301 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 288 DQ_STRING_LITERAL: '"'! (~'"')* '"'!; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 302 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 289 ID: ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|DOT_ESCAPED)*; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 303 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 290 DOT_ESCAPED: '\\.'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 304 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 291 WS: ( ' ' | '\t' | '\n' |'\r')+ { $channel=HIDDEN; } ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 305 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 292 DOLLAR: '$'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 306 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 293 AT: '@'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 307 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 294 UPTO: '..'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 308 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 295 COLON: ':'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 311 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 298 REAL_LITERAL : ('.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?) | ((DECIMAL_DIGIT)+ '.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?) | ((DECIMAL_DIGIT)+ (EXPONENT_PART) (REAL_TYPE_SUFFIX)?) | ((DECIMAL_DIGIT)+ (REAL_TYPE_SUFFIX)); -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 317 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 304 fragment APOS : '\''! '\''; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 318 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 305 fragment DECIMAL_DIGIT : '0'..'9' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 319 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 306 fragment INTEGER_TYPE_SUFFIX : ( 'L' | 'l' ); -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 320 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 307 fragment HEX_DIGIT : '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'|'A'|'B'|'C'|'D'|'E'|'F'|'a'|'b'|'c'|'d'|'e'|'f'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 322 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 309 fragment EXPONENT_PART : 'e' (SIGN)* (DECIMAL_DIGIT)+ | 'E' (SIGN)* (DECIMAL_DIGIT)+ ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 323 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 310 fragment SIGN : '+' | '-' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 324 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 311 fragment REAL_TYPE_SUFFIX : 'F' | 'f' | 'D' | 'd'; diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/internal/SpelTreeAdaptor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/internal/SpelTreeAdaptor.java index ad4a62d3089..1e734304e59 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/internal/SpelTreeAdaptor.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/internal/SpelTreeAdaptor.java @@ -55,7 +55,6 @@ import org.springframework.expression.spel.ast.Projection; import org.springframework.expression.spel.ast.PropertyOrFieldReference; import org.springframework.expression.spel.ast.QualifiedIdentifier; import org.springframework.expression.spel.ast.RealLiteral; -import org.springframework.expression.spel.ast.Reference; import org.springframework.expression.spel.ast.Selection; import org.springframework.expression.spel.ast.StringLiteral; import org.springframework.expression.spel.ast.Ternary; @@ -127,8 +126,6 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { return new MethodReference(payload); case SpringExpressionsLexer.QUALIFIED_IDENTIFIER: return new QualifiedIdentifier(payload); - case SpringExpressionsLexer.REFERENCE: - return new Reference(payload); case SpringExpressionsLexer.TYPEREF: return new TypeReference(payload); diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index f8b5b69a494..00d5f5135c2 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -346,29 +346,29 @@ public class EvaluationTests extends ExpressionTestCase { } // Bean references - public void testReferences01() { - evaluate("@(apple).name", "Apple", String.class, true); - } - - public void testReferences02() { - evaluate("@(fruits:banana).name", "Banana", String.class, true); - } - - public void testReferences03() { - evaluate("@(a.b.c)", null, null); - } // null - no context, a.b.c treated as name - - public void testReferences05() { - evaluate("@(a/b/c:orange).name", "Orange", String.class, true); - } - - public void testReferences06() { - evaluate("@(apple).color.getRGB() == T(java.awt.Color).green.getRGB()", "true", Boolean.class); - } - - public void testReferences07() { - evaluate("@(apple).color.getRGB().equals(T(java.awt.Color).green.getRGB())", "true", Boolean.class); - } + // public void testReferences01() { + // evaluate("@(apple).name", "Apple", String.class, true); + // } + // + // public void testReferences02() { + // evaluate("@(fruits:banana).name", "Banana", String.class, true); + // } + // + // public void testReferences03() { + // evaluate("@(a.b.c)", null, null); + // } // null - no context, a.b.c treated as name + // + // public void testReferences05() { + // evaluate("@(a/b/c:orange).name", "Orange", String.class, true); + // } + // + // public void testReferences06() { + // evaluate("@(apple).color.getRGB() == T(java.awt.Color).green.getRGB()", "true", Boolean.class); + // } + // + // public void testReferences07() { + // evaluate("@(apple).color.getRGB().equals(T(java.awt.Color).green.getRGB())", "true", Boolean.class); + // } // value is not public, it is accessed through getRGB() // public void testStaticRef01() { diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java index de5165e0719..950aecfbf35 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java @@ -228,18 +228,18 @@ public class ParsingTests extends TestCase { parseCheck("{'a','b','a','d','e'}.distinct()"); } - // references - public void testReferences01() { - parseCheck("@(foo)"); - } - - public void testReferences02() { - parseCheck("@(p:foo)"); - } - - public void testReferences04() { - parseCheck("@(a/b/c:foo)", "@(a.b.c:foo)"); - }// normalized to '.' for separator in QualifiedIdentifier + // // references + // public void testReferences01() { + // parseCheck("@(foo)"); + // } + // + // public void testReferences02() { + // parseCheck("@(p:foo)"); + // } + // + // public void testReferences04() { + // parseCheck("@(a/b/c:foo)", "@(a.b.c:foo)"); + // }// normalized to '.' for separator in QualifiedIdentifier // properties public void testProperties01() {