diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ArgList.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ArgList.java deleted file mode 100644 index 5030f2962e2414369d3d61307a168b7a28c262c6..0000000000000000000000000000000000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ArgList.java +++ /dev/null @@ -1,69 +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 java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.antlr.runtime.Token; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -/** - * Represents the list of arguments supplied to a lambda expression. For an expression "{|x,y| $x > $y ? $x : $y }" the - * argument list is x,y - * - * @author Andy Clement - * - */ -public class ArgList extends SpelNode { - - public ArgList(Token payload) { - super(payload); - } - - /** - * @return a list of the argument names captured in this ArgList - */ - public List getArgumentNames() { - if (getChildCount() == 0) - return Collections.emptyList(); - List result = new ArrayList(); - for (int i = 0; i < getChildCount(); i++) { - result.add(getChild(i).getText()); - } - return result; - } - - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < getChildCount(); i++) { - if (i > 0) - sb.append(","); - sb.append(getChild(i).toStringAST()); - } - return sb.toString(); - } - - @Override - public Object getValue(ExpressionState state) throws SpelException { - throw new SpelException(SpelMessages.ARGLIST_SHOULD_NOT_BE_EVALUATED); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java index 3fceb12856c8f4c3ba2494a102cb4a03f573a6a1..185deb055c2c3ce84ffe6926aaa93d942c38a12c 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java @@ -18,9 +18,6 @@ package org.springframework.expression.spel.ast; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.antlr.runtime.Token; import org.springframework.expression.EvaluationContext; @@ -35,7 +32,7 @@ import org.springframework.expression.spel.reflection.ReflectionUtils; * A function reference is of the form "#someFunction(a,b,c)". Functions may be defined in the context prior to the * expression being evaluated or within the expression itself using a lambda function definition. For example: Lambda * function definition in an expression: "(#max = {|x,y|$x>$y?$x:$y};max(2,3))" Calling context defined function: - * "#isEven(37)". Functions may also be static java methods, registered in the context prior to invocation of the + * "#isEven(37)". Functions may also be static java methods, registered in the context prior to invocation of the * expression. * * Functions are very simplistic, the arguments are not part of the definition (right now), so the names must be unique. @@ -57,17 +54,13 @@ public class FunctionReference extends SpelNode { if (o == null) { throw new SpelException(SpelMessages.FUNCTION_NOT_DEFINED, name); } - + // Two possibilities: a lambda function or a Java static method registered as a function - if (!(o instanceof Lambda || o instanceof Method)) { + if (!(o instanceof Method)) { throw new SpelException(SpelMessages.FUNCTION_REFERENCE_CANNOT_BE_INVOKED, name, o.getClass()); } - - if (o instanceof Lambda) { - return executeLambdaFunction(state, (Lambda) o); - } else { // o instanceof Method - return executeFunctionJLRMethod(state, (Method) o); - } + + return executeFunctionJLRMethod(state, (Method) o); } /** @@ -80,20 +73,23 @@ public class FunctionReference extends SpelNode { */ private Object executeFunctionJLRMethod(ExpressionState state, Method m) throws EvaluationException { Object[] functionArgs = getArguments(state); - + if (!m.isVarArgs() && m.getParameterTypes().length != functionArgs.length) { - throw new SpelException(SpelMessages.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION, functionArgs.length, m.getParameterTypes().length); + throw new SpelException(SpelMessages.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION, functionArgs.length, m + .getParameterTypes().length); } // Only static methods can be called in this way if (!Modifier.isStatic(m.getModifiers())) { - throw new SpelException(getCharPositionInLine(),SpelMessages.FUNCTION_MUST_BE_STATIC,m.getDeclaringClass().getName()+"."+m.getName(),name); + throw new SpelException(getCharPositionInLine(), SpelMessages.FUNCTION_MUST_BE_STATIC, m + .getDeclaringClass().getName() + + "." + m.getName(), name); } // Convert arguments if necessary and remap them for varargs if required if (functionArgs != null) { EvaluationContext ctx = state.getEvaluationContext(); TypeConverter converter = null; - if (ctx.getTypeUtils()!=null) { + if (ctx.getTypeUtils() != null) { converter = ctx.getTypeUtils().getTypeConverter(); } ReflectionUtils.convertArguments(m.getParameterTypes(), m.isVarArgs(), converter, functionArgs); @@ -101,7 +97,7 @@ public class FunctionReference extends SpelNode { if (m.isVarArgs()) { functionArgs = ReflectionUtils.setupArgumentsForVarargsInvocation(m.getParameterTypes(), functionArgs); } - + try { return m.invoke(m.getClass(), functionArgs); } catch (IllegalArgumentException e) { @@ -116,29 +112,6 @@ public class FunctionReference extends SpelNode { } } - - /* - * Execute a function that was defined as a lambda function. - */ - private Object executeLambdaFunction(ExpressionState state, Lambda lambdaExpression) throws EvaluationException { - Object[] functionArgs = getArguments(state); - List args = lambdaExpression.getArguments(); - if (args.size() != functionArgs.length) { - throw new SpelException(SpelMessages.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION, functionArgs.length, args - .size()); - } - Map argMap = new HashMap(); - for (int i = 0; i < args.size(); i++) { - argMap.put(args.get(i), functionArgs[i]); - } - try { - state.enterScope(argMap); - return ((SpelNode) lambdaExpression.getExpression()).getValue(state); - } finally { - state.exitScope(); - } - } - @Override public String toStringAST() { StringBuilder sb = new StringBuilder("#").append(name); diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Lambda.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Lambda.java deleted file mode 100644 index 2f5eac2175b5df5705163e3d131f7eb7f3de0ed2..0000000000000000000000000000000000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Lambda.java +++ /dev/null @@ -1,83 +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 java.util.Collections; -import java.util.List; - -import org.antlr.runtime.Token; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -/** - * Represent a Lambda expression, eg. "{|x,y| $x > $y ? $x : $y }". It is possible for an expression to have zero - * arguments in which case this expression node only has one child. - * - * @author Andy Clement - */ -public class Lambda extends SpelNode { - - public Lambda(Token payload) { - super(payload); - // payload.setText("LambdaExpression"); - } - - @Override - public Object getValue(ExpressionState state) throws SpelException { - return this; - } - - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder(); - if (getChildCount() == 1) { // there are no arguments - sb.append("{|| "); - sb.append(getChild(0).toStringAST()); - sb.append(" }"); - } else { - sb.append("{|"); - sb.append(getChild(0).toStringAST()); - sb.append("| "); - sb.append(getChild(1).toStringAST()); - sb.append(" }"); - } - return sb.toString(); - } - - @Override - public String toString() { - return toStringAST(); - } - - public List getArguments() { - // Only one child means there are no arguments - if (getChildCount() < 2) { - return Collections.emptyList(); - } - ArgList args = (ArgList) getChild(0); - return args.getArgumentNames(); - } - - public Object getExpression() { - return (getChildCount() > 1 ? getChild(1) : getChild(0)); - } - - @Override - public boolean isWritable(ExpressionState expressionState) throws SpelException { - return false; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalFunctionReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalFunctionReference.java deleted file mode 100644 index b14f967555754f256354135523b1ed1f24193e60..0000000000000000000000000000000000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalFunctionReference.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 java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -/** - * Local functions are references like $fn() where fn is the 'local' to lookup in the local scope Example: "(#sqrt={|n| - * T(Math).sqrt($n)};#delegate={|f,n| $f($n)};#delegate(#sqrt,4))" - * - * @author Andy Clement - */ -public class LocalFunctionReference extends SpelNode { - - private final String name; - - public LocalFunctionReference(Token payload) { - super(payload); - name = payload.getText(); - } - - @Override - public Object getValue(ExpressionState state) throws EvaluationException { - Object o = state.lookupLocalVariable(name); - if (o == null) { - throw new SpelException(SpelMessages.FUNCTION_NOT_DEFINED, name); - } - if (!(o instanceof Lambda)) { - throw new SpelException(SpelMessages.FUNCTION_REFERENCE_CANNOT_BE_INVOKED, name, o.getClass().getName()); - } - - Object[] arguments = new Object[getChildCount()]; - for (int i = 0; i < arguments.length; i++) { - arguments[i] = getChild(i).getValue(state); - } - Lambda lambdaExpression = (Lambda) o; - List args = lambdaExpression.getArguments(); - Map argMap = new HashMap(); - if (args.size() != arguments.length) { - throw new SpelException(getCharPositionInLine(), SpelMessages.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION, - arguments.length, args.size()); - } - for (int i = 0; i < args.size(); i++) { - argMap.put(args.get(i), arguments[i]); - } - try { - state.enterScope(argMap); - return ((SpelNode) lambdaExpression.getExpression()).getValue(state); - } finally { - state.exitScope(); - } - } - - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder("$").append(name); - sb.append("("); - for (int i = 0; i < getChildCount(); i++) { - if (i > 0) - sb.append(","); - sb.append(getChild(i).toStringAST()); - } - sb.append(")"); - return sb.toString(); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalVariableReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalVariableReference.java deleted file mode 100644 index 6cffeb01e7cccdb7aaf2cb11d57276a13df9f3a4..0000000000000000000000000000000000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/LocalVariableReference.java +++ /dev/null @@ -1,64 +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.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -/** - * A variable reference such as $someVar. Local variables are only visible at the current scoping level or below within - * an expression. Calling a function introduces a new nested scope. - * - * @author Andy Clement - * - */ -public class LocalVariableReference extends SpelNode { - - private final String name; - - public LocalVariableReference(Token payload) { - super(payload); - name = payload.getText(); - } - - @Override - public Object getValue(ExpressionState state) throws SpelException { - Object result = state.lookupLocalVariable(name); - if (result == null) { - throw new SpelException(getCharPositionInLine(), SpelMessages.LOCAL_VARIABLE_NOT_DEFINED, name); - } - return result; - } - - @Override - public void setValue(ExpressionState state, Object value) throws SpelException { - // Object oldValue = state.lookupVariable(name); - state.setLocalVariable(name, value); - } - - @Override - public String toStringAST() { - return new StringBuilder("$").append(name).toString(); - } - - @Override - public boolean isWritable(ExpressionState expressionState) throws SpelException { - return true; - } - -} 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 721c5177459ae197f80e756716227a29e2d9a5f6..aff8bf6f1438823e40b9371ec80055bacf1daa41 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 @@ -16,7 +16,6 @@ tokens { REFERENCE; PROPERTY_OR_FIELD; INDEXER; - ARGLIST; CONSTRUCTOR; HOLDER; CONSTRUCTOR_ARRAY; @@ -27,8 +26,6 @@ tokens { VARIABLEREF; LIST_INITIALIZER; MAP_INITIALIZER; - LOCALVAR; - LOCALFUNC; MAP_ENTRY; METHOD; ADD; @@ -100,7 +97,6 @@ startNode parenExpr | methodOrProperty | functionOrVar - | localFunctionOrVar | reference | indexer | literal @@ -112,7 +108,6 @@ startNode | lastSelection | listInitializer | mapInitializer - | lambda ; node @@ -141,13 +136,6 @@ function : POUND id=ID methodArgs -> ^(FUNCTIONREF[$id] methodArgs); var : POUND id=ID -> ^(VARIABLEREF[$id]); -localFunctionOrVar - : (DOLLAR ID LPAREN) => localFunction - | localVar - ; - -localFunction : DOLLAR id=ID methodArgs -> ^(LOCALFUNC[$id] methodArgs); -localVar: DOLLAR id=ID -> ^(LOCALVAR[$id]); methodOrProperty : (ID LPAREN) => id=ID methodArgs -> ^(METHOD[$id] methodArgs) @@ -194,15 +182,6 @@ lastSelection: SELECT_LAST^ expression RCURLY!; type: TYPE qualifiedId RPAREN -> ^(TYPEREF qualifiedId); //type: TYPE tn=qualifiedId (LBRACKET RBRACKET)? (COMMA qid=qualifiedId)? RPAREN -//attribute -// : AT! LBRACKET! tn:qualifiedId! (ctorArgs)? RBRACKET! -// { #attribute = #([EXPR, tn_AST.getText(), "Spring.Expressions.AttributeNode"], #attribute); } -// ; - -lambda - : LAMBDA (argList)? PIPE expression RCURLY -> ^(LAMBDA (argList)? expression); - -argList : (id+=ID (COMMA id+=ID)*) -> ^(ARGLIST ($id)*); constructor : ('new' qualifiedId LPAREN) => 'new' qualifiedId ctorArgs -> ^(CONSTRUCTOR qualifiedId ctorArgs) @@ -312,7 +291,6 @@ BANG: '!'; POUND: '#'; QMARK: '?'; DEFAULT: '??'; -LAMBDA: '{|'; PROJECT: '!{'; SELECT: '?{'; SELECT_FIRST: '^{'; 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 10b57e9857becd2af8b55f06cbc5eeca05802cf6..246e965b3f0c5e41957530e39dced61dd259a3bd 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,87 +1,83 @@ -GREATER_THAN_OR_EQUAL=77 -SELECT_FIRST=56 -COMMA=49 -HOLDER=13 -GREATER_THAN=76 -TYPE=58 +GREATER_THAN_OR_EQUAL=71 +SELECT_FIRST=52 +COMMA=45 +HOLDER=12 +GREATER_THAN=70 +TYPE=54 EXPRESSIONLIST=4 -MINUS=39 -MAP_ENTRY=24 -SELECT_LAST=57 -NUMBER=28 -LESS_THAN=74 -BANG=44 -ARGLIST=11 -FALSE=68 -METHOD=25 +MINUS=36 +MAP_ENTRY=21 +SELECT_LAST=53 +NUMBER=25 +LESS_THAN=68 +BANG=41 +FALSE=62 +METHOD=22 PROPERTY_OR_FIELD=9 -LBRACKET=51 +LBRACKET=47 INDEXER=10 -MOD=42 -CONSTRUCTOR_ARRAY=14 -FUNCTIONREF=16 -NULL_LITERAL=64 -NAMED_ARGUMENT=15 -OR=36 -PIPE=60 -DOT=45 -RCURLY=54 +MOD=39 +CONSTRUCTOR_ARRAY=13 +FUNCTIONREF=15 +NULL_LITERAL=58 +NAMED_ARGUMENT=14 +OR=33 +PIPE=77 +DOT=42 +RCURLY=50 EXPRESSION=6 -AND=37 -LCURLY=61 -REAL_TYPE_SUFFIX=88 -STRING_LITERAL=62 -SELECT=55 +AND=34 +LCURLY=55 +REAL_TYPE_SUFFIX=84 +STRING_LITERAL=56 +SELECT=51 QUALIFIED_IDENTIFIER=7 -RBRACKET=52 -SUBTRACT=27 -ASSIGN=30 -BETWEEN=80 -RPAREN=35 -SIGN=89 -LPAREN=34 -HEX_DIGIT=71 -PLUS=38 -LIST_INITIALIZER=20 -APOS=83 +RBRACKET=48 +SUBTRACT=24 +ASSIGN=27 +BETWEEN=74 +RPAREN=32 +SIGN=85 +LPAREN=31 +HEX_DIGIT=65 +PLUS=35 +LIST_INITIALIZER=19 +APOS=78 INTEGER_LITERAL=5 -AT=50 -ID=47 -NOT_EQUAL=73 -RANGE=18 -POWER=43 -TYPEREF=17 -DECIMAL_DIGIT=69 -WS=85 -IS=79 -DOLLAR=48 -LESS_THAN_OR_EQUAL=75 -SEMIRPAREN=29 -DQ_STRING_LITERAL=63 -HEXADECIMAL_INTEGER_LITERAL=65 -MAP_INITIALIZER=21 -LAMBDA=59 -LOCALFUNC=23 -IN=78 -SEMI=82 -CONSTRUCTOR=12 -INTEGER_TYPE_SUFFIX=70 -EQUAL=72 -MATCHES=81 -DOT_ESCAPED=84 -UPTO=86 -QMARK=32 +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=53 -DEFAULT=31 -COLON=33 -DIV=41 -LOCALVAR=22 -STAR=40 -REAL_LITERAL=66 -VARIABLEREF=19 -EXPONENT_PART=87 -TRUE=67 -ADD=26 -POUND=46 -'new'=90 +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 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 a5de2c76a1486a31f72c7a49e1fc7626920b8494..b1a40bff861466f67bd2422badc61a14bc1cf9c5 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:47:51 +// $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 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -7,105 +7,101 @@ import java.util.List; import java.util.ArrayList; public class SpringExpressionsLexer extends Lexer { - public static final int COMMA=49; - public static final int GREATER_THAN_OR_EQUAL=77; - public static final int GREATER_THAN=76; + 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 EXPRESSIONLIST=4; - public static final int MINUS=39; - public static final int NUMBER=28; - public static final int LESS_THAN=74; - public static final int BANG=44; - public static final int ARGLIST=11; - public static final int FALSE=68; - public static final int METHOD=25; + 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 CONSTRUCTOR_ARRAY=14; - public static final int NULL_LITERAL=64; - public static final int NAMED_ARGUMENT=15; - public static final int PIPE=60; - public static final int DOT=45; - public static final int AND=37; + 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 EXPRESSION=6; - public static final int LCURLY=61; + 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 QUALIFIED_IDENTIFIER=7; - public static final int SELECT=55; - public static final int STRING_LITERAL=62; - public static final int REAL_TYPE_SUFFIX=88; - public static final int SUBTRACT=27; - public static final int RBRACKET=52; - public static final int RPAREN=35; - public static final int BETWEEN=80; - public static final int SIGN=89; - public static final int PLUS=38; + 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 INTEGER_LITERAL=5; - public static final int AT=50; - public static final int RANGE=18; - public static final int WS=85; - public static final int DOLLAR=48; - public static final int LESS_THAN_OR_EQUAL=75; - public static final int HEXADECIMAL_INTEGER_LITERAL=65; - public static final int LAMBDA=59; - public static final int SEMI=82; - public static final int EQUAL=72; - public static final int DOT_ESCAPED=84; - public static final int QMARK=32; - public static final int PROJECT=53; - public static final int COLON=33; - public static final int DIV=41; - public static final int REAL_LITERAL=66; - public static final int EXPONENT_PART=87; - public static final int TRUE=67; - public static final int ADD=26; - public static final int POUND=46; - public static final int HOLDER=13; - public static final int SELECT_FIRST=56; - public static final int TYPE=58; - public static final int MAP_ENTRY=24; - public static final int SELECT_LAST=57; - public static final int LBRACKET=51; - public static final int MOD=42; - public static final int FUNCTIONREF=16; - public static final int OR=36; - public static final int RCURLY=54; - public static final int ASSIGN=30; - public static final int LPAREN=34; - public static final int HEX_DIGIT=71; - public static final int LIST_INITIALIZER=20; - public static final int APOS=83; - public static final int ID=47; - public static final int NOT_EQUAL=73; - public static final int POWER=43; - public static final int TYPEREF=17; - public static final int DECIMAL_DIGIT=69; - public static final int IS=79; - public static final int SEMIRPAREN=29; - public static final int DQ_STRING_LITERAL=63; - public static final int MAP_INITIALIZER=21; - public static final int LOCALFUNC=23; - public static final int IN=78; - public static final int CONSTRUCTOR=12; - public static final int INTEGER_TYPE_SUFFIX=70; - public static final int MATCHES=81; + 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 EOF=-1; - public static final int UPTO=86; public static final int REFERENCE=8; - public static final int Tokens=91; - public static final int DEFAULT=31; - public static final int LOCALVAR=22; - public static final int STAR=40; - public static final int VARIABLEREF=19; - public static final int T90=90; + 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 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 T90 - public final void mT90() throws RecognitionException { + // $ANTLR start T86 + public final void mT86() throws RecognitionException { try { - int _type = T90; + int _type = T86; // /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' { @@ -119,14 +115,14 @@ public class SpringExpressionsLexer extends Lexer { finally { } } - // $ANTLR end T90 + // $ANTLR end T86 // $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:62:12: ( ';)' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:14: ';)' + // /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: ';)' { match(";)"); @@ -144,10 +140,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:259: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:259: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: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:259:4: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:4: ( DECIMAL_DIGIT )+ int cnt1=0; loop1: do { @@ -161,7 +157,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:259:5: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:5: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -177,7 +173,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:259:21: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:21: ( INTEGER_TYPE_SUFFIX )? int alt2=2; int LA2_0 = input.LA(1); @@ -186,7 +182,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:259:22: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:22: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -209,38 +205,38 @@ 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:261: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:261: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: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:261:31: ( '0x' | '0X' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:31: ( '0x' | '0X' ) int alt3=2; int LA3_0 = input.LA(1); if ( (LA3_0=='0') ) { int LA3_1 = input.LA(2); - if ( (LA3_1=='x') ) { - alt3=1; - } - else if ( (LA3_1=='X') ) { + if ( (LA3_1=='X') ) { alt3=2; } + else if ( (LA3_1=='x') ) { + alt3=1; + } else { NoViableAltException nvae = - new NoViableAltException("261:31: ( '0x' | '0X' )", 3, 1, input); + new NoViableAltException("240:31: ( '0x' | '0X' )", 3, 1, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("261:31: ( '0x' | '0X' )", 3, 0, input); + new NoViableAltException("240: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:261:32: '0x' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:32: '0x' { match("0x"); @@ -248,7 +244,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:261:39: '0X' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:39: '0X' { match("0X"); @@ -258,7 +254,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:261:45: ( HEX_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:45: ( HEX_DIGIT )+ int cnt4=0; loop4: do { @@ -272,7 +268,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:261:46: HEX_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:46: HEX_DIGIT { mHEX_DIGIT(); @@ -288,7 +284,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:261:58: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:58: ( INTEGER_TYPE_SUFFIX )? int alt5=2; int LA5_0 = input.LA(1); @@ -297,7 +293,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:261:59: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:59: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -320,8 +316,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:276:7: ( '=' ) - // /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:255:7: ( '=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:9: '=' { match('='); @@ -338,8 +334,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:277:6: ( '==' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:8: '==' + // /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: '==' { match("=="); @@ -357,8 +353,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:278:10: ( '!=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:12: '!=' + // /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: '!=' { match("!="); @@ -376,8 +372,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:279:10: ( '<' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:12: '<' + // /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: '<' { match('<'); @@ -394,8 +390,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:280:19: ( '<=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:21: '<=' + // /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: '<=' { match("<="); @@ -413,8 +409,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:281:13: ( '>' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:15: '>' + // /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: '>' { match('>'); @@ -431,8 +427,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:282:22: ( '>=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:24: '>=' + // /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: '>=' { match(">="); @@ -450,8 +446,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:283:3: ( 'in' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:9: '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' { match("in"); @@ -469,8 +465,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:284:3: ( 'is' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:9: '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' { match("is"); @@ -488,8 +484,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:285:8: ( 'between' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:9: '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' { match("between"); @@ -507,8 +503,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:286:8: ( 'matches' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:286:9: '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' { match("matches"); @@ -526,8 +522,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:287:13: ( 'null' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:15: 'null' + // /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' { match("null"); @@ -545,8 +541,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:289:5: ( ';' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:7: ';' + // /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: ';' { match(';'); @@ -563,8 +559,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:290:4: ( '.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:9: '.' + // /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: '.' { match('.'); @@ -581,8 +577,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: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:270:6: ( ',' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:8: ',' { match(','); @@ -599,8 +595,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:292:7: ( '(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:9: '(' + // /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: '(' { match('('); @@ -617,8 +613,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:293:7: ( ')' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:9: ')' + // /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: ')' { match(')'); @@ -635,8 +631,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:294:7: ( '{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:9: '{' + // /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: '{' { match('{'); @@ -653,8 +649,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: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:274:7: ( '}' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:9: '}' { match('}'); @@ -671,8 +667,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:296:9: ( '[' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:11: '[' + // /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: '[' { match('['); @@ -689,8 +685,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:297:9: ( ']' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:11: ']' + // /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: ']' { match(']'); @@ -707,8 +703,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:298:5: ( '|' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298: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('|'); @@ -725,8 +721,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:300:4: ( 'and' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:9: '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' { match("and"); @@ -744,8 +740,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:301:3: ( 'or' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:9: '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' { match("or"); @@ -763,8 +759,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:302:6: ( 'false' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:9: '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' { match("false"); @@ -782,8 +778,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:303:5: ( 'true' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:9: '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' { match("true"); @@ -801,8 +797,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:305:5: ( '+' ) - // /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:284:5: ( '+' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:7: '+' { match('+'); @@ -819,8 +815,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:306:6: ( '-' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:8: '-' + // /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: '-' { match('-'); @@ -837,8 +833,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:307:4: ( '/' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:6: '/' + // /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: '/' { match('/'); @@ -855,8 +851,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:308:5: ( '*' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:7: '*' + // /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: '*' { match('*'); @@ -873,8 +869,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:309:4: ( '%' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:6: '%' + // /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: '%' { match('%'); @@ -891,8 +887,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:310:6: ( '^' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:310:8: '^' + // /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: '^' { match('^'); @@ -909,8 +905,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:311:5: ( '!' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:7: '!' + // /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: '!' { match('!'); @@ -927,8 +923,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:312:6: ( '#' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:8: '#' + // /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: '#' { match('#'); @@ -945,8 +941,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:313:6: ( '?' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:8: '?' + // /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: '?' { match('?'); @@ -963,8 +959,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:314:8: ( '??' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:10: '??' + // /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: '??' { match("??"); @@ -978,31 +974,12 @@ public class SpringExpressionsLexer extends Lexer { } // $ANTLR end DEFAULT - // $ANTLR start LAMBDA - public final void mLAMBDA() throws RecognitionException { - try { - int _type = LAMBDA; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:7: ( '{|' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:9: '{|' - { - match("{|"); - - - } - - this.type = _type; - } - finally { - } - } - // $ANTLR end LAMBDA - // $ANTLR start PROJECT 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:316:8: ( '!{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:316:10: '!{' + // /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: '!{' { match("!{"); @@ -1020,8 +997,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:317:7: ( '?{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:317:9: '?{' + // /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: '?{' { match("?{"); @@ -1039,8 +1016,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:318:13: ( '^{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:15: '^{' + // /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: '^{' { match("^{"); @@ -1058,8 +1035,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:319:12: ( '${' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:14: '${' + // /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: '${' { match("${"); @@ -1077,8 +1054,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:320:5: ( 'T(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:320:7: 'T(' + // /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(' { match("T("); @@ -1096,11 +1073,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:322:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:17: '\\'' ( APOS | ~ '\\'' )* '\\'' + // /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 | ~ '\\'' )* '\\'' { match('\''); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:23: ( APOS | ~ '\\'' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:23: ( APOS | ~ '\\'' )* loop6: do { int alt6=3; @@ -1122,14 +1099,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:322:24: APOS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300: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:322:29: ~ '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:29: ~ '\\'' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1165,11 +1142,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:323:18: ( '\"' (~ '\"' )* '\"' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:323:20: '\"' (~ '\"' )* '\"' + // /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: '\"' (~ '\"' )* '\"' { match('\"'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:323:25: (~ '\"' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:25: (~ '\"' )* loop7: do { int alt7=2; @@ -1182,7 +1159,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:323:26: ~ '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:26: ~ '\"' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1218,8 +1195,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:324: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:324: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: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 )* { if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -1231,7 +1208,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:324: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:302:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* loop8: do { int alt8=6; @@ -1325,35 +1302,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:324:30: 'a' .. 'z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302: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:324:39: 'A' .. 'Z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302: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:324:48: '_' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:48: '_' { match('_'); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:324:52: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302: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:324:61: DOT_ESCAPED + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:61: DOT_ESCAPED { mDOT_ESCAPED(); @@ -1379,8 +1356,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:325:12: ( '\\\\.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:325:14: '\\\\.' + // /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: '\\\\.' { match("\\."); @@ -1398,10 +1375,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:326:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:326:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ + // /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:326: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' )+ int cnt9=0; loop9: do { @@ -1455,8 +1432,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:327:7: ( '$' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:327:9: '$' + // /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: '$' { match('$'); @@ -1473,8 +1450,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:328:3: ( '@' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:328:5: '@' + // /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: '@' { match('@'); @@ -1491,8 +1468,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:329:5: ( '..' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:329:7: '..' + // /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: '..' { match(".."); @@ -1510,8 +1487,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:330:6: ( ':' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:330:8: ':' + // /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: ':' { match(':'); @@ -1528,18 +1505,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:333: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: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 ) ) ) 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:334: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:334: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:334: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: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 )? { match('.'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:334:8: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:8: ( DECIMAL_DIGIT )+ int cnt10=0; loop10: do { @@ -1553,7 +1530,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:334:9: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:9: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1569,7 +1546,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:334:25: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:25: ( EXPONENT_PART )? int alt11=2; int LA11_0 = input.LA(1); @@ -1578,7 +1555,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:334:26: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:26: EXPONENT_PART { mEXPONENT_PART(); @@ -1587,7 +1564,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:334:42: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:42: ( REAL_TYPE_SUFFIX )? int alt12=2; int LA12_0 = input.LA(1); @@ -1596,7 +1573,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:334:43: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:312:43: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1612,12 +1589,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:335: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:335: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:335: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: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:335:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:3: ( DECIMAL_DIGIT )+ int cnt13=0; loop13: do { @@ -1631,7 +1608,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:335:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1648,7 +1625,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:335:24: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:24: ( DECIMAL_DIGIT )+ int cnt14=0; loop14: do { @@ -1662,7 +1639,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:335:25: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:25: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1678,7 +1655,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:335:41: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:41: ( EXPONENT_PART )? int alt15=2; int LA15_0 = input.LA(1); @@ -1687,7 +1664,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:335:42: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:42: EXPONENT_PART { mEXPONENT_PART(); @@ -1696,7 +1673,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:335:58: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:58: ( REAL_TYPE_SUFFIX )? int alt16=2; int LA16_0 = input.LA(1); @@ -1705,7 +1682,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:335:59: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:59: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1721,12 +1698,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:336: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:336: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:336: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: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:336:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:3: ( DECIMAL_DIGIT )+ int cnt17=0; loop17: do { @@ -1740,7 +1717,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:336:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1756,14 +1733,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:336:20: ( EXPONENT_PART ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:21: EXPONENT_PART + // /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 { mEXPONENT_PART(); } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:36: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:36: ( REAL_TYPE_SUFFIX )? int alt18=2; int LA18_0 = input.LA(1); @@ -1772,7 +1749,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:336:37: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:37: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1788,12 +1765,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:337: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:337: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:337: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: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:337:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:3: ( DECIMAL_DIGIT )+ int cnt19=0; loop19: do { @@ -1807,7 +1784,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:337:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1823,8 +1800,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:337:20: ( REAL_TYPE_SUFFIX ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337:21: REAL_TYPE_SUFFIX + // /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 { mREAL_TYPE_SUFFIX(); @@ -1848,8 +1825,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:339:15: ( '\\'' '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:339:17: '\\'' '\\'' + // /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: '\\'' '\\'' { match('\''); match('\''); @@ -1865,8 +1842,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:340:24: ( '0' .. '9' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:340:26: '0' .. '9' + // /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' { matchRange('0','9'); @@ -1881,8 +1858,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:341:30: ( ( 'L' | 'l' ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:341:32: ( 'L' | 'l' ) + // /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' ) { if ( input.LA(1)=='L'||input.LA(1)=='l' ) { input.consume(); @@ -1906,7 +1883,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:342: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: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: { 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') ) { @@ -1931,7 +1908,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:344: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:322:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ ) int alt25=2; int LA25_0 = input.LA(1); @@ -1943,16 +1920,16 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("344:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input); + new NoViableAltException("322: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:344:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+ + // /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 )+ { match('e'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:344:31: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:31: ( SIGN )* loop21: do { int alt21=2; @@ -1965,7 +1942,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:344:32: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:32: SIGN { mSIGN(); @@ -1977,7 +1954,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:344:40: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:40: ( DECIMAL_DIGIT )+ int cnt22=0; loop22: do { @@ -1991,7 +1968,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:344:41: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:41: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -2011,10 +1988,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:344:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+ + // /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 )+ { match('E'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:344:64: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:64: ( SIGN )* loop23: do { int alt23=2; @@ -2027,7 +2004,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:344:65: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:65: SIGN { mSIGN(); @@ -2039,7 +2016,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:344:73: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:73: ( DECIMAL_DIGIT )+ int cnt24=0; loop24: do { @@ -2053,7 +2030,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:344:74: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:74: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -2083,7 +2060,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:345:15: ( '+' | '-' ) + // /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: { if ( input.LA(1)=='+'||input.LA(1)=='-' ) { @@ -2108,7 +2085,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:346:27: ( 'F' | 'f' | 'D' | 'd' ) + // /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: { if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) { @@ -2131,14 +2108,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: ( T90 | 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 | LAMBDA | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL ) - int alt26=56; + // /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 ) + 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: T90 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:10: T86 { - mT90(); + mT86(); } break; @@ -2416,112 +2393,105 @@ public class SpringExpressionsLexer extends Lexer { } break; case 41 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:330: LAMBDA - { - mLAMBDA(); - - } - break; - case 42 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:337: PROJECT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:330: PROJECT { mPROJECT(); } break; - case 43 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:345: SELECT + case 42 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:338: SELECT { mSELECT(); } break; - case 44 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:352: SELECT_FIRST + case 43 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:345: SELECT_FIRST { mSELECT_FIRST(); } break; - case 45 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:365: SELECT_LAST + case 44 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:358: SELECT_LAST { mSELECT_LAST(); } break; - case 46 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:377: TYPE + case 45 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:370: TYPE { mTYPE(); } break; - case 47 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:382: STRING_LITERAL + case 46 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:375: STRING_LITERAL { mSTRING_LITERAL(); } break; - case 48 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:397: DQ_STRING_LITERAL + case 47 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:390: DQ_STRING_LITERAL { mDQ_STRING_LITERAL(); } break; - case 49 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:415: ID + case 48 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:408: ID { mID(); } break; - case 50 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:418: DOT_ESCAPED + case 49 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:411: DOT_ESCAPED { mDOT_ESCAPED(); } break; - case 51 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:430: WS + case 50 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:423: WS { mWS(); } break; - case 52 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:433: DOLLAR + case 51 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:426: DOLLAR { mDOLLAR(); } break; - case 53 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:440: AT + case 52 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:433: AT { mAT(); } break; - case 54 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:443: UPTO + case 53 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:436: UPTO { mUPTO(); } break; - case 55 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:448: COLON + case 54 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:441: COLON { mCOLON(); } break; - case 56 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:454: REAL_LITERAL + case 55 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:447: REAL_LITERAL { mREAL_LITERAL(); @@ -2586,42 +2556,41 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA20_transition; } public String getDescription() { - return "333: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 "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 ) ) );"; } } static final String DFA26_eotS = - "\1\uffff\1\45\1\55\2\57\1\62\1\65\1\67\1\71\3\45\1\77\3\uffff\1"+ - "\101\4\uffff\4\45\5\uffff\1\107\1\uffff\1\112\1\114\1\45\7\uffff"+ - "\2\45\16\uffff\1\120\1\121\2\45\4\uffff\1\45\1\125\2\45\10\uffff"+ - "\1\45\1\131\2\uffff\2\45\1\134\1\uffff\2\45\1\137\1\uffff\2\45\1"+ - "\uffff\1\45\1\143\1\uffff\2\45\1\146\1\uffff\2\45\1\uffff\1\151"+ - "\1\152\2\uffff"; + "\1\uffff\1\45\1\55\2\57\1\62\1\65\1\67\1\71\3\45\1\77\10\uffff\4"+ + "\45\5\uffff\1\105\1\uffff\1\110\1\112\1\45\7\uffff\2\45\16\uffff"+ + "\1\116\1\117\2\45\2\uffff\1\45\1\123\2\45\10\uffff\1\45\1\127\2"+ + "\uffff\2\45\1\132\1\uffff\2\45\1\135\1\uffff\2\45\1\uffff\1\45\1"+ + "\141\1\uffff\2\45\1\144\1\uffff\2\45\1\uffff\1\147\1\150\2\uffff"; static final String DFA26_eofS = - "\153\uffff"; + "\151\uffff"; static final String DFA26_minS = - "\1\11\1\145\1\51\2\56\4\75\1\156\1\145\1\141\1\56\3\uffff\1\174"+ - "\4\uffff\1\156\1\162\1\141\1\162\5\uffff\1\173\1\uffff\1\77\1\173"+ - "\1\50\7\uffff\1\154\1\167\16\uffff\2\60\2\164\4\uffff\1\144\1\60"+ - "\1\154\1\165\10\uffff\1\154\1\60\2\uffff\1\167\1\143\1\60\1\uffff"+ - "\1\163\1\145\1\60\1\uffff\1\145\1\150\1\uffff\1\145\1\60\1\uffff"+ - "\2\145\1\60\1\uffff\1\156\1\163\1\uffff\2\60\2\uffff"; + "\1\11\1\145\1\51\2\56\4\75\1\156\1\145\1\141\1\56\10\uffff\1\156"+ + "\1\162\1\141\1\162\5\uffff\1\173\1\uffff\1\77\1\173\1\50\7\uffff"+ + "\1\154\1\167\16\uffff\2\60\2\164\2\uffff\1\144\1\60\1\154\1\165"+ + "\10\uffff\1\154\1\60\2\uffff\1\167\1\143\1\60\1\uffff\1\163\1\145"+ + "\1\60\1\uffff\1\145\1\150\1\uffff\1\145\1\60\1\uffff\2\145\1\60"+ + "\1\uffff\1\156\1\163\1\uffff\2\60\2\uffff"; static final String DFA26_maxS = "\1\175\1\165\1\51\1\170\1\146\1\75\1\173\2\75\1\163\1\145\1\141"+ - "\1\71\3\uffff\1\174\4\uffff\1\156\1\162\1\141\1\162\5\uffff\1\173"+ - "\1\uffff\2\173\1\50\7\uffff\1\154\1\167\16\uffff\2\172\2\164\4\uffff"+ - "\1\144\1\172\1\154\1\165\10\uffff\1\154\1\172\2\uffff\1\167\1\143"+ - "\1\172\1\uffff\1\163\1\145\1\172\1\uffff\1\145\1\150\1\uffff\1\145"+ - "\1\172\1\uffff\2\145\1\172\1\uffff\1\156\1\163\1\uffff\2\172\2\uffff"; + "\1\71\10\uffff\1\156\1\162\1\141\1\162\5\uffff\1\173\1\uffff\2\173"+ + "\1\50\7\uffff\1\154\1\167\16\uffff\2\172\2\164\2\uffff\1\144\1\172"+ + "\1\154\1\165\10\uffff\1\154\1\172\2\uffff\1\167\1\143\1\172\1\uffff"+ + "\1\163\1\145\1\172\1\uffff\1\145\1\150\1\uffff\1\145\1\172\1\uffff"+ + "\2\145\1\172\1\uffff\1\156\1\163\1\uffff\2\172\2\uffff"; static final String DFA26_acceptS = - "\15\uffff\1\23\1\24\1\25\1\uffff\1\27\1\30\1\31\1\32\4\uffff\1\37"+ - "\1\40\1\41\1\42\1\43\1\uffff\1\46\3\uffff\1\57\1\60\1\61\1\62\1"+ - "\63\1\65\1\67\2\uffff\1\2\1\21\1\4\1\3\1\70\1\6\1\5\1\7\1\52\1\45"+ - "\1\11\1\10\1\13\1\12\4\uffff\1\66\1\22\1\51\1\26\4\uffff\1\54\1"+ - "\44\1\50\1\53\1\47\1\55\1\64\1\56\2\uffff\1\14\1\15\3\uffff\1\34"+ - "\3\uffff\1\1\2\uffff\1\33\2\uffff\1\20\3\uffff\1\36\2\uffff\1\35"+ - "\2\uffff\1\16\1\17"; + "\15\uffff\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\4\uffff\1\37\1"+ + "\40\1\41\1\42\1\43\1\uffff\1\46\3\uffff\1\56\1\57\1\60\1\61\1\62"+ + "\1\64\1\66\2\uffff\1\2\1\21\1\4\1\3\1\67\1\6\1\5\1\7\1\51\1\45\1"+ + "\11\1\10\1\13\1\12\4\uffff\1\65\1\22\4\uffff\1\53\1\44\1\52\1\50"+ + "\1\47\1\54\1\63\1\55\2\uffff\1\15\1\14\3\uffff\1\34\3\uffff\1\1"+ + "\2\uffff\1\33\2\uffff\1\20\3\uffff\1\36\2\uffff\1\35\2\uffff\1\16"+ + "\1\17"; static final String DFA26_specialS = - "\153\uffff}>"; + "\151\uffff}>"; static final String[] DFA26_transitionS = { "\2\47\2\uffff\1\47\22\uffff\1\47\1\6\1\44\1\37\1\41\1\35\1\uffff"+ "\1\43\1\16\1\17\1\34\1\31\1\15\1\32\1\14\1\33\1\3\11\4\1\51"+ @@ -2637,32 +2606,32 @@ public class SpringExpressionsLexer extends Lexer { "\1\63\75\uffff\1\64", "\1\66", "\1\70", - "\1\72\4\uffff\1\73", + "\1\73\4\uffff\1\72", "\1\74", "\1\75", "\1\76\1\uffff\12\60", "", "", "", - "\1\100", "", "", "", "", + "", + "\1\100", + "\1\101", "\1\102", "\1\103", - "\1\104", - "\1\105", "", "", "", "", "", - "\1\106", + "\1\104", "", - "\1\110\73\uffff\1\111", + "\1\107\73\uffff\1\106", + "\1\111", "\1\113", - "\1\115", "", "", "", @@ -2670,8 +2639,8 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", - "\1\116", - "\1\117", + "\1\114", + "\1\115", "", "", "", @@ -2688,48 +2657,46 @@ public class SpringExpressionsLexer extends Lexer { "", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", - "\1\122", - "\1\123", + "\1\120", + "\1\121", "", "", + "\1\122", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\124", + "\1\125", "", "", - "\1\124", - "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", - "\1\126", - "\1\127", "", "", "", "", "", "", + "\1\126", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", "", "\1\130", + "\1\131", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", - "", - "\1\132", "\1\133", + "\1\134", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", - "\1\135", "\1\136", - "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\137", "", "\1\140", - "\1\141", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", "\1\142", + "\1\143", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", - "\1\144", "\1\145", - "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", - "", - "\1\147", - "\1\150", + "\1\146", "", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", @@ -2767,7 +2734,7 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA26_transition; } public String getDescription() { - return "1:1: Tokens : ( T90 | 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 | LAMBDA | 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 : ( 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 );"; } } 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 9895e2f7f974c0d35d1aab80dac3530eaaca02ae..696e8206acd296a9bfd5e9d35ce6bf785532d305 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:47:51 +// $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 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -12,99 +12,95 @@ 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", "ARGLIST", "CONSTRUCTOR", "HOLDER", "CONSTRUCTOR_ARRAY", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "RANGE", "VARIABLEREF", "LIST_INITIALIZER", "MAP_INITIALIZER", "LOCALVAR", "LOCALFUNC", "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", "DOLLAR", "COMMA", "AT", "LBRACKET", "RBRACKET", "PROJECT", "RCURLY", "SELECT", "SELECT_FIRST", "SELECT_LAST", "TYPE", "LAMBDA", "PIPE", "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", "APOS", "DOT_ESCAPED", "WS", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" + "", "", "", "", "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'" }; - public static final int GREATER_THAN_OR_EQUAL=77; - public static final int SELECT_FIRST=56; - public static final int COMMA=49; - public static final int HOLDER=13; - public static final int GREATER_THAN=76; - public static final int TYPE=58; + 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 EXPRESSIONLIST=4; - public static final int MINUS=39; - public static final int MAP_ENTRY=24; - public static final int SELECT_LAST=57; - public static final int NUMBER=28; - public static final int LESS_THAN=74; - public static final int BANG=44; - public static final int ARGLIST=11; - public static final int FALSE=68; - public static final int METHOD=25; + 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=51; + public static final int LBRACKET=47; public static final int INDEXER=10; - public static final int MOD=42; - public static final int CONSTRUCTOR_ARRAY=14; - public static final int FUNCTIONREF=16; - public static final int NULL_LITERAL=64; - public static final int NAMED_ARGUMENT=15; - public static final int OR=36; - public static final int PIPE=60; - public static final int DOT=45; - public static final int RCURLY=54; + 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 EXPRESSION=6; - public static final int AND=37; - public static final int LCURLY=61; - public static final int REAL_TYPE_SUFFIX=88; - public static final int STRING_LITERAL=62; - public static final int SELECT=55; + 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 QUALIFIED_IDENTIFIER=7; - public static final int RBRACKET=52; - public static final int SUBTRACT=27; - public static final int ASSIGN=30; - public static final int BETWEEN=80; - public static final int RPAREN=35; - public static final int SIGN=89; - public static final int LPAREN=34; - public static final int HEX_DIGIT=71; - public static final int PLUS=38; - public static final int LIST_INITIALIZER=20; - public static final int APOS=83; + 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 INTEGER_LITERAL=5; - public static final int AT=50; - public static final int ID=47; - public static final int NOT_EQUAL=73; - public static final int RANGE=18; - public static final int POWER=43; - public static final int TYPEREF=17; - public static final int DECIMAL_DIGIT=69; - public static final int WS=85; - public static final int IS=79; - public static final int DOLLAR=48; - public static final int LESS_THAN_OR_EQUAL=75; - public static final int SEMIRPAREN=29; - public static final int DQ_STRING_LITERAL=63; - public static final int HEXADECIMAL_INTEGER_LITERAL=65; - public static final int MAP_INITIALIZER=21; - public static final int LAMBDA=59; - public static final int LOCALFUNC=23; - public static final int IN=78; - public static final int SEMI=82; - public static final int CONSTRUCTOR=12; - public static final int INTEGER_TYPE_SUFFIX=70; - public static final int EQUAL=72; - public static final int MATCHES=81; - public static final int DOT_ESCAPED=84; - public static final int UPTO=86; + 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 EOF=-1; - public static final int QMARK=32; + public static final int QMARK=29; public static final int REFERENCE=8; - public static final int PROJECT=53; - public static final int DEFAULT=31; - public static final int COLON=33; - public static final int DIV=41; - public static final int LOCALVAR=22; - public static final int STAR=40; - public static final int REAL_LITERAL=66; - public static final int VARIABLEREF=19; - public static final int EXPONENT_PART=87; - public static final int TRUE=67; - public static final int ADD=26; - public static final int POUND=46; + 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 SpringExpressionsParser(TokenStream input) { super(input); - ruleMemo = new HashMap[52+1]; + ruleMemo = new HashMap[46+1]; } protected TreeAdaptor adaptor = new CommonTreeAdaptor(); @@ -130,7 +126,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:60:1: expr : expression EOF ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:1: expr : expression EOF ; public final expr_return expr() throws RecognitionException { expr_return retval = new expr_return(); retval.start = input.LT(1); @@ -144,18 +140,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:60:5: ( expression EOF ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:60:7: expression EOF + // /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 { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_expr177); + pushFollow(FOLLOW_expression_in_expr165); 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_expr179); if (failed) return retval; + match(input,EOF,FOLLOW_EOF_in_expr167); if (failed) return retval; } @@ -183,7 +179,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:64: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:61: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); @@ -211,17 +207,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:64: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:65: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: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 ) )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalOrExpression_in_expression208); + pushFollow(FOLLOW_logicalOrExpression_in_expression196); 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:66: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:63:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? int alt1=4; switch ( input.LA(1) ) { case ASSIGN: @@ -243,18 +239,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:66: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:66:7: ( ASSIGN logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:8: 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 { ASSIGN4=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_expression217); if (failed) return retval; + match(input,ASSIGN,FOLLOW_ASSIGN_in_expression205); 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_expression220); + pushFollow(FOLLOW_logicalOrExpression_in_expression208); logicalOrExpression5=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -266,18 +262,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:67: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:67:6: ( DEFAULT logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:7: 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 { DEFAULT6=(Token)input.LT(1); - match(input,DEFAULT,FOLLOW_DEFAULT_in_expression230); if (failed) return retval; + match(input,DEFAULT,FOLLOW_DEFAULT_in_expression218); 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_expression233); + pushFollow(FOLLOW_logicalOrExpression_in_expression221); logicalOrExpression7=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -289,25 +285,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:68: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:68:6: ( QMARK expression COLON expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:68:7: 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 { QMARK8=(Token)input.LT(1); - match(input,QMARK,FOLLOW_QMARK_in_expression243); if (failed) return retval; + match(input,QMARK,FOLLOW_QMARK_in_expression231); 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_expression246); + pushFollow(FOLLOW_expression_in_expression234); 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_expression248); if (failed) return retval; - pushFollow(FOLLOW_expression_in_expression251); + match(input,COLON,FOLLOW_COLON_in_expression236); if (failed) return retval; + pushFollow(FOLLOW_expression_in_expression239); expression11=expression(); _fsp--; if (failed) return retval; @@ -348,7 +344,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:70:1: parenExpr : LPAREN expression RPAREN ; + // /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 ; public final parenExpr_return parenExpr() throws RecognitionException { parenExpr_return retval = new parenExpr_return(); retval.start = input.LT(1); @@ -364,20 +360,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:70:11: ( LPAREN expression RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:13: LPAREN expression RPAREN + // /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 { root_0 = (Object)adaptor.nil(); LPAREN12=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr262); if (failed) return retval; - pushFollow(FOLLOW_expression_in_parenExpr265); + match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr250); if (failed) return retval; + pushFollow(FOLLOW_expression_in_parenExpr253); 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_parenExpr267); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr255); if (failed) return retval; } @@ -405,7 +401,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:73:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; + // /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 )* ; public final logicalOrExpression_return logicalOrExpression() throws RecognitionException { logicalOrExpression_return retval = new logicalOrExpression_return(); retval.start = input.LT(1); @@ -421,17 +417,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:75:1: ( logicalAndExpression ( OR logicalAndExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:3: logicalAndExpression ( OR logicalAndExpression )* + // /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 )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression280); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression268); 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:75:24: ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:24: ( OR logicalAndExpression )* loop2: do { int alt2=2; @@ -444,15 +440,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:75:25: OR logicalAndExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:25: OR logicalAndExpression { OR16=(Token)input.LT(1); - match(input,OR,FOLLOW_OR_in_logicalOrExpression283); if (failed) return retval; + match(input,OR,FOLLOW_OR_in_logicalOrExpression271); 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_logicalOrExpression286); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression274); logicalAndExpression17=logicalAndExpression(); _fsp--; if (failed) return retval; @@ -493,7 +489,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:77:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; + // /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 )* ; public final logicalAndExpression_return logicalAndExpression() throws RecognitionException { logicalAndExpression_return retval = new logicalAndExpression_return(); retval.start = input.LT(1); @@ -509,17 +505,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:78:1: ( relationalExpression ( AND relationalExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:3: relationalExpression ( AND relationalExpression )* + // /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 )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression321); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression309); 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:78:24: ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:24: ( AND relationalExpression )* loop3: do { int alt3=2; @@ -532,15 +528,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:78:25: AND relationalExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:25: AND relationalExpression { AND19=(Token)input.LT(1); - match(input,AND,FOLLOW_AND_in_logicalAndExpression324); if (failed) return retval; + match(input,AND,FOLLOW_AND_in_logicalAndExpression312); 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_logicalAndExpression327); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression315); relationalExpression20=relationalExpression(); _fsp--; if (failed) return retval; @@ -581,7 +577,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:80:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; + // /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 )? ; public final relationalExpression_return relationalExpression() throws RecognitionException { relationalExpression_return retval = new relationalExpression_return(); retval.start = input.LT(1); @@ -597,17 +593,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:80:22: ( sumExpression ( relationalOperator sumExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: sumExpression ( relationalOperator sumExpression )? + // /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 )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_sumExpression_in_relationalExpression338); + pushFollow(FOLLOW_sumExpression_in_relationalExpression326); 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:80:38: ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:38: ( relationalOperator sumExpression )? int alt4=2; int LA4_0 = input.LA(1); @@ -616,14 +612,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:80:39: relationalOperator sumExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:39: relationalOperator sumExpression { - pushFollow(FOLLOW_relationalOperator_in_relationalExpression341); + pushFollow(FOLLOW_relationalOperator_in_relationalExpression329); relationalOperator22=relationalOperator(); _fsp--; if (failed) return retval; if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(relationalOperator22.getTree(), root_0); - pushFollow(FOLLOW_sumExpression_in_relationalExpression344); + pushFollow(FOLLOW_sumExpression_in_relationalExpression332); sumExpression23=sumExpression(); _fsp--; if (failed) return retval; @@ -661,7 +657,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:82: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:79:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ; public final sumExpression_return sumExpression() throws RecognitionException { sumExpression_return retval = new sumExpression_return(); retval.start = input.LT(1); @@ -679,17 +675,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:83:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:4: productExpression ( ( PLUS | MINUS ) productExpression )* + // /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 )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_productExpression_in_sumExpression355); + pushFollow(FOLLOW_productExpression_in_sumExpression343); 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:83:22: ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:22: ( ( PLUS | MINUS ) productExpression )* loop6: do { int alt6=2; @@ -702,9 +698,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:83: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 ) productExpression { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:24: ( PLUS | MINUS ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: ( PLUS | MINUS ) int alt5=2; int LA5_0 = input.LA(1); @@ -717,16 +713,16 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("83:24: ( PLUS | MINUS )", 5, 0, input); + new NoViableAltException("80: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:83:25: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:25: PLUS { PLUS25=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_sumExpression360); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_sumExpression348); if (failed) return retval; if ( backtracking==0 ) { PLUS25_tree = (Object)adaptor.create(PLUS25); root_0 = (Object)adaptor.becomeRoot(PLUS25_tree, root_0); @@ -735,10 +731,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:83:33: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:33: MINUS { MINUS26=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_sumExpression365); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_sumExpression353); if (failed) return retval; if ( backtracking==0 ) { MINUS26_tree = (Object)adaptor.create(MINUS26); root_0 = (Object)adaptor.becomeRoot(MINUS26_tree, root_0); @@ -749,7 +745,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_productExpression_in_sumExpression369); + pushFollow(FOLLOW_productExpression_in_sumExpression357); productExpression27=productExpression(); _fsp--; if (failed) return retval; @@ -790,7 +786,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:86: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:83: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); @@ -810,17 +806,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:87: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:87: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: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 )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_powerExpr_in_productExpression381); + pushFollow(FOLLOW_powerExpr_in_productExpression369); 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:87:14: ( ( STAR | DIV | MOD ) powerExpr )* + // /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 )* loop8: do { int alt8=2; @@ -833,9 +829,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:87: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 ) powerExpr { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:15: ( STAR | DIV | MOD ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:15: ( STAR | DIV | MOD ) int alt7=3; switch ( input.LA(1) ) { case STAR: @@ -856,17 +852,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("87:15: ( STAR | DIV | MOD )", 7, 0, input); + new NoViableAltException("84: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:87:16: STAR + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:16: STAR { STAR29=(Token)input.LT(1); - match(input,STAR,FOLLOW_STAR_in_productExpression385); if (failed) return retval; + match(input,STAR,FOLLOW_STAR_in_productExpression373); if (failed) return retval; if ( backtracking==0 ) { STAR29_tree = (Object)adaptor.create(STAR29); root_0 = (Object)adaptor.becomeRoot(STAR29_tree, root_0); @@ -875,10 +871,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:87:24: DIV + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:24: DIV { DIV30=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_productExpression390); if (failed) return retval; + match(input,DIV,FOLLOW_DIV_in_productExpression378); if (failed) return retval; if ( backtracking==0 ) { DIV30_tree = (Object)adaptor.create(DIV30); root_0 = (Object)adaptor.becomeRoot(DIV30_tree, root_0); @@ -887,10 +883,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:87:30: MOD + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:30: MOD { MOD31=(Token)input.LT(1); - match(input,MOD,FOLLOW_MOD_in_productExpression394); if (failed) return retval; + match(input,MOD,FOLLOW_MOD_in_productExpression382); if (failed) return retval; if ( backtracking==0 ) { MOD31_tree = (Object)adaptor.create(MOD31); root_0 = (Object)adaptor.becomeRoot(MOD31_tree, root_0); @@ -901,7 +897,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_powerExpr_in_productExpression398); + pushFollow(FOLLOW_powerExpr_in_productExpression386); powerExpr32=powerExpr(); _fsp--; if (failed) return retval; @@ -942,7 +938,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:89:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; + // /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 )? ; public final powerExpr_return powerExpr() throws RecognitionException { powerExpr_return retval = new powerExpr_return(); retval.start = input.LT(1); @@ -958,17 +954,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:89:12: ( unaryExpression ( POWER unaryExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:14: unaryExpression ( POWER unaryExpression )? + // /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 )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_unaryExpression_in_powerExpr410); + pushFollow(FOLLOW_unaryExpression_in_powerExpr398); 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:89:30: ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:30: ( POWER unaryExpression )? int alt9=2; int LA9_0 = input.LA(1); @@ -977,15 +973,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:89:31: POWER unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:31: POWER unaryExpression { POWER34=(Token)input.LT(1); - match(input,POWER,FOLLOW_POWER_in_powerExpr413); if (failed) return retval; + match(input,POWER,FOLLOW_POWER_in_powerExpr401); 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_powerExpr416); + pushFollow(FOLLOW_unaryExpression_in_powerExpr404); unaryExpression35=unaryExpression(); _fsp--; if (failed) return retval; @@ -1023,7 +1019,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:91: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:88: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); @@ -1043,30 +1039,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:92: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:89: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<=DOLLAR)||(LA11_0>=AT && LA11_0<=LBRACKET)||LA11_0==PROJECT||(LA11_0>=SELECT && LA11_0<=LAMBDA)||(LA11_0>=LCURLY && LA11_0<=FALSE)||LA11_0==90) ) { + 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) ) { alt11=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("91:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 11, 0, input); + new NoViableAltException("88: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:92:4: ( PLUS | MINUS | BANG ) unaryExpression + // /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 { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:4: ( PLUS | MINUS | BANG ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:4: ( PLUS | MINUS | BANG ) int alt10=3; switch ( input.LA(1) ) { case PLUS: @@ -1087,17 +1083,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("92:4: ( PLUS | MINUS | BANG )", 10, 0, input); + new NoViableAltException("89: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:92:5: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:5: PLUS { PLUS36=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_unaryExpression430); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_unaryExpression418); if (failed) return retval; if ( backtracking==0 ) { PLUS36_tree = (Object)adaptor.create(PLUS36); root_0 = (Object)adaptor.becomeRoot(PLUS36_tree, root_0); @@ -1106,10 +1102,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:92:13: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:13: MINUS { MINUS37=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_unaryExpression435); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_unaryExpression423); if (failed) return retval; if ( backtracking==0 ) { MINUS37_tree = (Object)adaptor.create(MINUS37); root_0 = (Object)adaptor.becomeRoot(MINUS37_tree, root_0); @@ -1118,10 +1114,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:92:22: BANG + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:22: BANG { BANG38=(Token)input.LT(1); - match(input,BANG,FOLLOW_BANG_in_unaryExpression440); if (failed) return retval; + match(input,BANG,FOLLOW_BANG_in_unaryExpression428); if (failed) return retval; if ( backtracking==0 ) { BANG38_tree = (Object)adaptor.create(BANG38); root_0 = (Object)adaptor.becomeRoot(BANG38_tree, root_0); @@ -1132,7 +1128,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_unaryExpression_in_unaryExpression444); + pushFollow(FOLLOW_unaryExpression_in_unaryExpression432); unaryExpression39=unaryExpression(); _fsp--; if (failed) return retval; @@ -1141,11 +1137,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:93:4: primaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:90:4: primaryExpression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_primaryExpression_in_unaryExpression450); + pushFollow(FOLLOW_primaryExpression_in_unaryExpression438); primaryExpression40=primaryExpression(); _fsp--; if (failed) return retval; @@ -1179,7 +1175,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:95: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:92: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); @@ -1194,15 +1190,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:96: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:96:7: startNode ( node )? + // /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 )? { - pushFollow(FOLLOW_startNode_in_primaryExpression464); + pushFollow(FOLLOW_startNode_in_primaryExpression452); 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:96:17: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:17: ( node )? int alt12=2; int LA12_0 = input.LA(1); @@ -1211,9 +1207,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:96:18: node + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:18: node { - pushFollow(FOLLOW_node_in_primaryExpression467); + pushFollow(FOLLOW_node_in_primaryExpression455); node42=node(); _fsp--; if (failed) return retval; @@ -1236,15 +1232,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 96:25: -> ^( EXPRESSION startNode ( node )? ) + // 93:25: -> ^( EXPRESSION startNode ( node )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:28: ^( 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 )? ) { 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:96:51: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:51: ( node )? if ( stream_node.hasNext() ) { adaptor.addChild(root_1, stream_node.next()); @@ -1284,7 +1280,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:98:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda ); + // /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 ); public final startNode_return startNode() throws RecognitionException { startNode_return retval = new startNode_return(); retval.start = input.LT(1); @@ -1297,37 +1293,33 @@ public class SpringExpressionsParser extends Parser { functionOrVar_return functionOrVar45 = null; - localFunctionOrVar_return localFunctionOrVar46 = null; + reference_return reference46 = null; - reference_return reference47 = null; + indexer_return indexer47 = null; - indexer_return indexer48 = null; + literal_return literal48 = null; - literal_return literal49 = null; + type_return type49 = null; - type_return type50 = null; + constructor_return constructor50 = null; - constructor_return constructor51 = null; + projection_return projection51 = null; - projection_return projection52 = null; + selection_return selection52 = null; - selection_return selection53 = null; + firstSelection_return firstSelection53 = null; - firstSelection_return firstSelection54 = null; + lastSelection_return lastSelection54 = null; - lastSelection_return lastSelection55 = null; + listInitializer_return listInitializer55 = null; - listInitializer_return listInitializer56 = null; - - mapInitializer_return mapInitializer57 = null; - - lambda_return lambda58 = null; + mapInitializer_return mapInitializer56 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:5: ( parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda ) - int alt13=16; + // /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; switch ( input.LA(1) ) { case LPAREN: { @@ -1343,34 +1335,29 @@ public class SpringExpressionsParser extends Parser { { int LA13_3 = input.LA(2); - if ( (LA13_3==LCURLY) ) { - alt13=15; - } - else if ( (LA13_3==ID) ) { + if ( (LA13_3==ID) ) { alt13=3; } + else if ( (LA13_3==LCURLY) ) { + alt13=14; + } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("98:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 13, 3, input); + new NoViableAltException("95:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); throw nvae; } } break; - case DOLLAR: - { - alt13=4; - } - break; case AT: { - alt13=5; + alt13=4; } break; case LBRACKET: { - alt13=6; + alt13=5; } break; case INTEGER_LITERAL: @@ -1382,64 +1369,59 @@ public class SpringExpressionsParser extends Parser { case TRUE: case FALSE: { - alt13=7; + alt13=6; } break; case TYPE: { - alt13=8; + alt13=7; } break; - case 90: + case 86: { - alt13=9; + alt13=8; } break; case PROJECT: { - alt13=10; + alt13=9; } break; case SELECT: { - alt13=11; + alt13=10; } break; case SELECT_FIRST: { - alt13=12; + alt13=11; } break; case SELECT_LAST: { - alt13=13; + alt13=12; } break; case LCURLY: { - alt13=14; - } - break; - case LAMBDA: - { - alt13=16; + alt13=13; } break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("98:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 13, 0, input); + new NoViableAltException("95:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | reference | 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:100:5: parenExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:5: parenExpr { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_parenExpr_in_startNode500); + pushFollow(FOLLOW_parenExpr_in_startNode488); parenExpr43=parenExpr(); _fsp--; if (failed) return retval; @@ -1448,11 +1430,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:101:7: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:98:7: methodOrProperty { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_methodOrProperty_in_startNode508); + pushFollow(FOLLOW_methodOrProperty_in_startNode496); methodOrProperty44=methodOrProperty(); _fsp--; if (failed) return retval; @@ -1461,11 +1443,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:102:7: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:7: functionOrVar { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_functionOrVar_in_startNode517); + pushFollow(FOLLOW_functionOrVar_in_startNode505); functionOrVar45=functionOrVar(); _fsp--; if (failed) return retval; @@ -1474,171 +1456,145 @@ 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:103:7: localFunctionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:7: reference { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_localFunctionOrVar_in_startNode525); - localFunctionOrVar46=localFunctionOrVar(); + pushFollow(FOLLOW_reference_in_startNode513); + reference46=reference(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, localFunctionOrVar46.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, reference46.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: reference + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:7: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_reference_in_startNode533); - reference47=reference(); + pushFollow(FOLLOW_indexer_in_startNode521); + indexer47=indexer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, reference47.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, indexer47.getTree()); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:7: literal { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_startNode541); - indexer48=indexer(); + pushFollow(FOLLOW_literal_in_startNode529); + literal48=literal(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, indexer48.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, literal48.getTree()); } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: literal + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:7: type { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_literal_in_startNode549); - literal49=literal(); + pushFollow(FOLLOW_type_in_startNode537); + type49=type(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, literal49.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, type49.getTree()); } break; case 8 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: type + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: constructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_type_in_startNode557); - type50=type(); + pushFollow(FOLLOW_constructor_in_startNode545); + constructor50=constructor(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, type50.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, constructor50.getTree()); } break; case 9 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: constructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: projection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_constructor_in_startNode565); - constructor51=constructor(); + pushFollow(FOLLOW_projection_in_startNode553); + projection51=projection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, constructor51.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, projection51.getTree()); } break; case 10 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: selection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_projection_in_startNode573); - projection52=projection(); + pushFollow(FOLLOW_selection_in_startNode562); + selection52=selection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, projection52.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, selection52.getTree()); } break; case 11 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: firstSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_selection_in_startNode582); - selection53=selection(); + pushFollow(FOLLOW_firstSelection_in_startNode571); + firstSelection53=firstSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, selection53.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection53.getTree()); } break; case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: lastSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_firstSelection_in_startNode591); - firstSelection54=firstSelection(); + pushFollow(FOLLOW_lastSelection_in_startNode579); + lastSelection54=lastSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection54.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection54.getTree()); } break; case 13 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:7: lastSelection + // /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_lastSelection_in_startNode599); - lastSelection55=lastSelection(); + pushFollow(FOLLOW_listInitializer_in_startNode587); + listInitializer55=listInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection55.getTree()); + 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:113:7: listInitializer - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_listInitializer_in_startNode607); - listInitializer56=listInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, listInitializer56.getTree()); - - } - break; - case 15 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:7: mapInitializer - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_mapInitializer_in_startNode615); - mapInitializer57=mapInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, mapInitializer57.getTree()); - - } - break; - case 16 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:7: lambda + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:7: mapInitializer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_lambda_in_startNode623); - lambda58=lambda(); + pushFollow(FOLLOW_mapInitializer_in_startNode595); + mapInitializer56=mapInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lambda58.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, mapInitializer56.getTree()); } break; @@ -1668,28 +1624,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:118:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; + // /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 )+ ; public final node_return node() throws RecognitionException { node_return retval = new node_return(); retval.start = input.LT(1); Object root_0 = null; - Token DOT59=null; - dottedNode_return dottedNode60 = null; + Token DOT57=null; + dottedNode_return dottedNode58 = null; - nonDottedNode_return nonDottedNode61 = null; + nonDottedNode_return nonDottedNode59 = null; - Object DOT59_tree=null; + Object DOT57_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /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 )+ { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:4: ( ( 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 )+ int cnt14=0; loop14: do { @@ -1706,22 +1662,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:119: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:119:5: ( DOT dottedNode ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:6: 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 { - DOT59=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_node643); if (failed) return retval; + DOT57=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_node615); if (failed) return retval; if ( backtracking==0 ) { - DOT59_tree = (Object)adaptor.create(DOT59); - adaptor.addChild(root_0, DOT59_tree); + DOT57_tree = (Object)adaptor.create(DOT57); + adaptor.addChild(root_0, DOT57_tree); } - pushFollow(FOLLOW_dottedNode_in_node645); - dottedNode60=dottedNode(); + pushFollow(FOLLOW_dottedNode_in_node617); + dottedNode58=dottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode60.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode58.getTree()); } @@ -1729,13 +1685,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:119:24: nonDottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:24: nonDottedNode { - pushFollow(FOLLOW_nonDottedNode_in_node650); - nonDottedNode61=nonDottedNode(); + pushFollow(FOLLOW_nonDottedNode_in_node622); + nonDottedNode59=nonDottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode61.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode59.getTree()); } break; @@ -1777,28 +1733,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:121:1: nonDottedNode : indexer ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:116: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 indexer62 = null; + indexer_return indexer60 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:2: ( indexer ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:4: indexer + // /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 { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_nonDottedNode662); - indexer62=indexer(); + pushFollow(FOLLOW_indexer_in_nonDottedNode634); + indexer60=indexer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, indexer62.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, indexer60.getTree()); } @@ -1826,37 +1782,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:124: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:119: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 methodOrProperty63 = null; + methodOrProperty_return methodOrProperty61 = null; - functionOrVar_return functionOrVar64 = null; + functionOrVar_return functionOrVar62 = null; - projection_return projection65 = null; + projection_return projection63 = null; - selection_return selection66 = null; + selection_return selection64 = null; - firstSelection_return firstSelection67 = null; + firstSelection_return firstSelection65 = null; - lastSelection_return lastSelection68 = null; + lastSelection_return lastSelection66 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125: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:126: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: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 ) ) { root_0 = (Object)adaptor.nil(); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:126: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:126: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: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:126: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 ) int alt15=6; switch ( input.LA(1) ) { case ID: @@ -1892,75 +1848,75 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("126:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection )", 15, 0, input); + new NoViableAltException("121: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:126:4: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:4: methodOrProperty { - pushFollow(FOLLOW_methodOrProperty_in_dottedNode675); - methodOrProperty63=methodOrProperty(); + pushFollow(FOLLOW_methodOrProperty_in_dottedNode647); + methodOrProperty61=methodOrProperty(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty63.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty61.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:127:4: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:4: functionOrVar { - pushFollow(FOLLOW_functionOrVar_in_dottedNode681); - functionOrVar64=functionOrVar(); + pushFollow(FOLLOW_functionOrVar_in_dottedNode653); + functionOrVar62=functionOrVar(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar64.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar62.getTree()); } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123:7: projection { - pushFollow(FOLLOW_projection_in_dottedNode689); - projection65=projection(); + pushFollow(FOLLOW_projection_in_dottedNode661); + projection63=projection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, projection65.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, projection63.getTree()); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:7: selection { - pushFollow(FOLLOW_selection_in_dottedNode698); - selection66=selection(); + pushFollow(FOLLOW_selection_in_dottedNode670); + selection64=selection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, selection66.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, selection64.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:7: firstSelection { - pushFollow(FOLLOW_firstSelection_in_dottedNode707); - firstSelection67=firstSelection(); + pushFollow(FOLLOW_firstSelection_in_dottedNode679); + firstSelection65=firstSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection67.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection65.getTree()); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:126:7: lastSelection { - pushFollow(FOLLOW_lastSelection_in_dottedNode716); - lastSelection68=lastSelection(); + pushFollow(FOLLOW_lastSelection_in_dottedNode688); + lastSelection66=lastSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection68.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection66.getTree()); } break; @@ -1997,21 +1953,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:135: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:130: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 function69 = null; + function_return function67 = null; - var_return var70 = null; + var_return var68 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136: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:131:5: ( ( POUND ID LPAREN )=> function | var ) int alt16=2; int LA16_0 = input.LA(1); @@ -2030,7 +1986,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("135:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); + new NoViableAltException("130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); throw nvae; } @@ -2038,7 +1994,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("135:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); + new NoViableAltException("130:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); throw nvae; } @@ -2046,34 +2002,34 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("135:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 0, input); + new NoViableAltException("130: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:136:7: ( POUND ID LPAREN )=> function + // /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 { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_function_in_functionOrVar750); - function69=function(); + pushFollow(FOLLOW_function_in_functionOrVar722); + function67=function(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, function69.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, function67.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:7: var + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:132:7: var { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_var_in_functionOrVar758); - var70=var(); + pushFollow(FOLLOW_var_in_functionOrVar730); + var68=var(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, var70.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, var68.getTree()); } break; @@ -2103,7 +2059,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:140: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:135: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); @@ -2111,32 +2067,32 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND71=null; - methodArgs_return methodArgs72 = null; + Token POUND69=null; + methodArgs_return methodArgs70 = null; Object id_tree=null; - Object POUND71_tree=null; + Object POUND69_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:140: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:140:12: POUND id= ID methodArgs + // /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 { - POUND71=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_function775); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND71); + POUND69=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_function747); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND69); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_function779); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_function751); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_function781); - methodArgs72=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_function753); + methodArgs70=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs72.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs70.getTree()); // AST REWRITE // elements: methodArgs @@ -2149,9 +2105,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 140:35: -> ^( FUNCTIONREF[$id] methodArgs ) + // 135:35: -> ^( FUNCTIONREF[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:38: ^( 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 ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(FUNCTIONREF, id), root_1); @@ -2191,7 +2147,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:142: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:137: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); @@ -2199,23 +2155,23 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND73=null; + Token POUND71=null; Object id_tree=null; - Object POUND73_tree=null; + Object POUND71_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:142: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:142:7: POUND id= ID + // /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 { - POUND73=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_var802); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND73); + POUND71=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_var774); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND71); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_var806); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_var778); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2230,9 +2186,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 142:19: -> ^( VARIABLEREF[$id] ) + // 137:19: -> ^( VARIABLEREF[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:22: ^( 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] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(VARIABLEREF, id), root_1); @@ -2264,286 +2220,13 @@ public class SpringExpressionsParser extends Parser { } // $ANTLR end var - public static class localFunctionOrVar_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start localFunctionOrVar - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:144:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar ); - public final localFunctionOrVar_return localFunctionOrVar() throws RecognitionException { - localFunctionOrVar_return retval = new localFunctionOrVar_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - localFunction_return localFunction74 = null; - - localVar_return localVar75 = null; - - - - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145:2: ( ( DOLLAR ID LPAREN )=> localFunction | localVar ) - int alt17=2; - int LA17_0 = input.LA(1); - - if ( (LA17_0==DOLLAR) ) { - int LA17_1 = input.LA(2); - - if ( (LA17_1==ID) ) { - int LA17_2 = input.LA(3); - - if ( (synpred2()) ) { - alt17=1; - } - else if ( (true) ) { - alt17=2; - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("144:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 17, 2, input); - - throw nvae; - } - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("144:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 17, 1, input); - - throw nvae; - } - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("144:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 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:145:4: ( DOLLAR ID LPAREN )=> localFunction - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_localFunction_in_localFunctionOrVar833); - localFunction74=localFunction(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, localFunction74.getTree()); - - } - break; - case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:4: localVar - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_localVar_in_localFunctionOrVar838); - localVar75=localVar(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, localVar75.getTree()); - - } - break; - - } - 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 localFunctionOrVar - - public static class localFunction_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start localFunction - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149:1: localFunction : DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) ; - public final localFunction_return localFunction() throws RecognitionException { - localFunction_return retval = new localFunction_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token id=null; - Token DOLLAR76=null; - methodArgs_return methodArgs77 = null; - - - Object id_tree=null; - Object DOLLAR76_tree=null; - RewriteRuleTokenStream stream_DOLLAR=new RewriteRuleTokenStream(adaptor,"token DOLLAR"); - 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:149:15: ( DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149:17: DOLLAR id= ID methodArgs - { - DOLLAR76=(Token)input.LT(1); - match(input,DOLLAR,FOLLOW_DOLLAR_in_localFunction848); if (failed) return retval; - if ( backtracking==0 ) stream_DOLLAR.add(DOLLAR76); - - id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_localFunction852); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(id); - - pushFollow(FOLLOW_methodArgs_in_localFunction854); - methodArgs77=methodArgs(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs77.getTree()); - - // AST REWRITE - // elements: methodArgs - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 149:41: -> ^( LOCALFUNC[$id] methodArgs ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149:44: ^( LOCALFUNC[$id] methodArgs ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot(adaptor.create(LOCALFUNC, id), root_1); - - adaptor.addChild(root_1, stream_methodArgs.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 localFunction - - public static class localVar_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start localVar - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:1: localVar : DOLLAR id= ID -> ^( LOCALVAR[$id] ) ; - public final localVar_return localVar() throws RecognitionException { - localVar_return retval = new localVar_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token id=null; - Token DOLLAR78=null; - - Object id_tree=null; - Object DOLLAR78_tree=null; - RewriteRuleTokenStream stream_DOLLAR=new RewriteRuleTokenStream(adaptor,"token DOLLAR"); - 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:150:9: ( DOLLAR id= ID -> ^( LOCALVAR[$id] ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:11: DOLLAR id= ID - { - DOLLAR78=(Token)input.LT(1); - match(input,DOLLAR,FOLLOW_DOLLAR_in_localVar869); if (failed) return retval; - if ( backtracking==0 ) stream_DOLLAR.add(DOLLAR78); - - id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_localVar873); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(id); - - - // AST REWRITE - // elements: - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 150:24: -> ^( LOCALVAR[$id] ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:27: ^( LOCALVAR[$id] ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot(adaptor.create(LOCALVAR, id), root_1); - - 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 localVar - public static class methodOrProperty_return extends ParserRuleReturnScope { Object tree; public Object getTree() { return tree; } }; // $ANTLR start methodOrProperty - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152: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:140: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); @@ -2551,32 +2234,32 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - methodArgs_return methodArgs79 = null; + methodArgs_return methodArgs72 = null; - property_return property80 = null; + property_return property73 = 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:153:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) - int alt18=2; - int LA18_0 = input.LA(1); + // /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 ) + int alt17=2; + int LA17_0 = input.LA(1); - if ( (LA18_0==ID) ) { - int LA18_1 = input.LA(2); + if ( (LA17_0==ID) ) { + int LA17_1 = input.LA(2); - if ( (LA18_1==EOF||(LA18_1>=ASSIGN && LA18_1<=COLON)||(LA18_1>=RPAREN && LA18_1<=POWER)||LA18_1==DOT||LA18_1==COMMA||(LA18_1>=LBRACKET && LA18_1<=RBRACKET)||LA18_1==RCURLY||(LA18_1>=EQUAL && LA18_1<=MATCHES)) ) { - alt18=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)) ) { + alt17=2; } - else if ( (LA18_1==LPAREN) && (synpred3())) { - alt18=1; + else if ( (LA17_1==LPAREN) && (synpred2())) { + alt17=1; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("152:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 18, 1, input); + new NoViableAltException("140:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); throw nvae; } @@ -2584,23 +2267,23 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("152:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 18, 0, input); + new NoViableAltException("140:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); throw nvae; } - switch (alt18) { + switch (alt17) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153: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:141:4: ( ID LPAREN )=>id= ID methodArgs { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_methodOrProperty899); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_methodOrProperty806); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_methodOrProperty901); - methodArgs79=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_methodOrProperty808); + methodArgs72=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs79.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs72.getTree()); // AST REWRITE // elements: methodArgs @@ -2613,9 +2296,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:36: -> ^( METHOD[$id] methodArgs ) + // 141:36: -> ^( METHOD[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:39: ^( 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 ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(METHOD, id), root_1); @@ -2632,15 +2315,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:154:4: property + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:4: property { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_property_in_methodOrProperty915); - property80=property(); + pushFollow(FOLLOW_property_in_methodOrProperty822); + property73=property(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, property80.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, property73.getTree()); } break; @@ -2670,101 +2353,101 @@ 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:160: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:148: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 LPAREN81=null; - Token COMMA83=null; - Token COMMA85=null; - Token RPAREN86=null; - argument_return argument82 = null; + Token LPAREN74=null; + Token COMMA76=null; + Token COMMA78=null; + Token RPAREN79=null; + argument_return argument75 = null; - argument_return argument84 = null; + argument_return argument77 = null; - Object LPAREN81_tree=null; - Object COMMA83_tree=null; - Object COMMA85_tree=null; - Object RPAREN86_tree=null; + Object LPAREN74_tree=null; + Object COMMA76_tree=null; + Object COMMA78_tree=null; + Object RPAREN79_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160: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:160: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: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 { root_0 = (Object)adaptor.nil(); - LPAREN81=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs930); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:23: ( argument ( COMMA argument )* ( COMMA )? )? - int alt21=2; - int LA21_0 = input.LA(1); + 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 )? )? + int alt20=2; + int LA20_0 = input.LA(1); - if ( (LA21_0==INTEGER_LITERAL||LA21_0==LPAREN||(LA21_0>=PLUS && LA21_0<=MINUS)||LA21_0==BANG||(LA21_0>=POUND && LA21_0<=DOLLAR)||(LA21_0>=AT && LA21_0<=LBRACKET)||LA21_0==PROJECT||(LA21_0>=SELECT && LA21_0<=LAMBDA)||(LA21_0>=LCURLY && LA21_0<=FALSE)||LA21_0==90) ) { - alt21=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) ) { + alt20=1; } - switch (alt21) { + switch (alt20) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:24: argument ( COMMA argument )* ( COMMA )? + // /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 )? { - pushFollow(FOLLOW_argument_in_methodArgs934); - argument82=argument(); + pushFollow(FOLLOW_argument_in_methodArgs841); + argument75=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument82.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:33: ( COMMA argument )* - loop19: + 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 )* + loop18: do { - int alt19=2; - int LA19_0 = input.LA(1); + int alt18=2; + int LA18_0 = input.LA(1); - if ( (LA19_0==COMMA) ) { - int LA19_1 = input.LA(2); + if ( (LA18_0==COMMA) ) { + int LA18_1 = input.LA(2); - if ( (LA19_1==INTEGER_LITERAL||LA19_1==LPAREN||(LA19_1>=PLUS && LA19_1<=MINUS)||LA19_1==BANG||(LA19_1>=POUND && LA19_1<=DOLLAR)||(LA19_1>=AT && LA19_1<=LBRACKET)||LA19_1==PROJECT||(LA19_1>=SELECT && LA19_1<=LAMBDA)||(LA19_1>=LCURLY && LA19_1<=FALSE)||LA19_1==90) ) { - alt19=1; + 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) ) { + alt18=1; } } - switch (alt19) { + switch (alt18) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:34: COMMA argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:34: COMMA argument { - COMMA83=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs937); if (failed) return retval; - pushFollow(FOLLOW_argument_in_methodArgs940); - argument84=argument(); + COMMA76=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs844); if (failed) return retval; + pushFollow(FOLLOW_argument_in_methodArgs847); + argument77=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument84.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument77.getTree()); } break; default : - break loop19; + break loop18; } } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:52: ( COMMA )? - int alt20=2; - int LA20_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:52: ( COMMA )? + int alt19=2; + int LA19_0 = input.LA(1); - if ( (LA20_0==COMMA) ) { - alt20=1; + if ( (LA19_0==COMMA) ) { + alt19=1; } - switch (alt20) { + switch (alt19) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:53: COMMA + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:53: COMMA { - COMMA85=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs945); if (failed) return retval; + COMMA78=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs852); if (failed) return retval; } break; @@ -2777,8 +2460,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN86=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs952); if (failed) return retval; + RPAREN79=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs859); if (failed) return retval; } @@ -2806,7 +2489,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:165: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:153: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); @@ -2819,11 +2502,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:165: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:165:11: id= ID + // /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 { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_property965); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_property872); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2838,9 +2521,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 165:17: -> ^( PROPERTY_OR_FIELD[$id] ) + // 153:17: -> ^( PROPERTY_OR_FIELD[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:165:20: ^( 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] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(PROPERTY_OR_FIELD, id), root_1); @@ -2878,7 +2561,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start reference - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:172:1: reference : 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: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); @@ -2886,18 +2569,18 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token pos=null; - Token AT87=null; - Token COLON88=null; - Token RPAREN89=null; + Token AT80=null; + Token COLON81=null; + Token RPAREN82=null; contextName_return cn = null; qualifiedId_return q = null; Object pos_tree=null; - Object AT87_tree=null; - Object COLON88_tree=null; - Object RPAREN89_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"); @@ -2905,40 +2588,40 @@ public class SpringExpressionsParser extends Parser { 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:173: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:173:5: AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN + // /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 { - AT87=(Token)input.LT(1); - match(input,AT,FOLLOW_AT_in_reference987); if (failed) return retval; - if ( backtracking==0 ) stream_AT.add(AT87); + 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_reference991); if (failed) return retval; + 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:173:19: (cn= contextName COLON )? - int alt22=2; - int LA22_0 = input.LA(1); + // /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 ( (LA22_0==ID) ) { - int LA22_1 = input.LA(2); + if ( (LA21_0==ID) ) { + int LA21_1 = input.LA(2); - if ( (LA22_1==COLON||LA22_1==DIV) ) { - alt22=1; + if ( (LA21_1==COLON||LA21_1==DIV) ) { + alt21=1; } } - switch (alt22) { + switch (alt21) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:20: cn= contextName COLON + // /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_reference996); + pushFollow(FOLLOW_contextName_in_reference903); cn=contextName(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_contextName.add(cn.getTree()); - COLON88=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_reference998); if (failed) return retval; - if ( backtracking==0 ) stream_COLON.add(COLON88); + COLON81=(Token)input.LT(1); + match(input,COLON,FOLLOW_COLON_in_reference905); if (failed) return retval; + if ( backtracking==0 ) stream_COLON.add(COLON81); } @@ -2946,18 +2629,18 @@ public class SpringExpressionsParser extends Parser { } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:43: (q= qualifiedId )? - int alt23=2; - int LA23_0 = input.LA(1); + // /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 ( (LA23_0==ID) ) { - alt23=1; + if ( (LA22_0==ID) ) { + alt22=1; } - switch (alt23) { + switch (alt22) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:44: q= qualifiedId + // /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_reference1005); + pushFollow(FOLLOW_qualifiedId_in_reference912); q=qualifiedId(); _fsp--; if (failed) return retval; @@ -2968,13 +2651,13 @@ public class SpringExpressionsParser extends Parser { } - RPAREN89=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_reference1009); if (failed) return retval; - if ( backtracking==0 ) stream_RPAREN.add(RPAREN89); + 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: cn, RPAREN, COLON, q + // elements: RPAREN, cn, COLON, q // token labels: // rule labels: cn, retval, q // token list labels: @@ -2986,14 +2669,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_q=new RewriteRuleSubtreeStream(adaptor,"token q",q!=null?q.tree:null); root_0 = (Object)adaptor.nil(); - // 174:4: -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) + // 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:174:7: ^( 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:174:25: ( $cn COLON )? + // /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()); @@ -3001,7 +2684,7 @@ public class SpringExpressionsParser extends Parser { } 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:174:38: ( $q)? + // /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()); @@ -3042,61 +2725,61 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start indexer - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:180: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:168: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 LBRACKET90=null; - Token COMMA91=null; - Token RBRACKET92=null; + Token LBRACKET83=null; + Token COMMA84=null; + Token RBRACKET85=null; argument_return r1 = null; argument_return r2 = null; - Object LBRACKET90_tree=null; - Object COMMA91_tree=null; - Object RBRACKET92_tree=null; + Object LBRACKET83_tree=null; + Object COMMA84_tree=null; + Object RBRACKET85_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:180: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:180: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: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 { - LBRACKET90=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer1044); if (failed) return retval; - if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET90); + LBRACKET83=(Token)input.LT(1); + match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer951); if (failed) return retval; + if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET83); - pushFollow(FOLLOW_argument_in_indexer1048); + pushFollow(FOLLOW_argument_in_indexer955); 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:180:31: ( COMMA r2= argument )* - loop24: + // /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: do { - int alt24=2; - int LA24_0 = input.LA(1); + int alt23=2; + int LA23_0 = input.LA(1); - if ( (LA24_0==COMMA) ) { - alt24=1; + if ( (LA23_0==COMMA) ) { + alt23=1; } - switch (alt24) { + switch (alt23) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:180:32: COMMA r2= argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:32: COMMA r2= argument { - COMMA91=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_indexer1051); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA91); + COMMA84=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_indexer958); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA84); - pushFollow(FOLLOW_argument_in_indexer1055); + pushFollow(FOLLOW_argument_in_indexer962); r2=argument(); _fsp--; if (failed) return retval; @@ -3106,17 +2789,17 @@ public class SpringExpressionsParser extends Parser { break; default : - break loop24; + break loop23; } } while (true); - RBRACKET92=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer1059); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET92); + RBRACKET85=(Token)input.LT(1); + match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer966); if (failed) return retval; + if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET85); // AST REWRITE - // elements: r2, r1 + // elements: r1, r2 // token labels: // rule labels: r2, retval, r1 // token list labels: @@ -3128,15 +2811,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_r1=new RewriteRuleSubtreeStream(adaptor,"token r1",r1!=null?r1.tree:null); root_0 = (Object)adaptor.nil(); - // 180:61: -> ^( INDEXER $r1 ( $r2)* ) + // 168:61: -> ^( INDEXER $r1 ( $r2)* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:180:64: ^( 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)* ) { 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:180:78: ( $r2)* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:168:78: ( $r2)* while ( stream_r2.hasNext() ) { adaptor.addChild(root_1, stream_r2.next()); @@ -3176,40 +2859,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:185:1: projection : PROJECT expression RCURLY ; + // /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 ; public final projection_return projection() throws RecognitionException { projection_return retval = new projection_return(); retval.start = input.LT(1); Object root_0 = null; - Token PROJECT93=null; - Token RCURLY95=null; - expression_return expression94 = null; + Token PROJECT86=null; + Token RCURLY88=null; + expression_return expression87 = null; - Object PROJECT93_tree=null; - Object RCURLY95_tree=null; + Object PROJECT86_tree=null; + Object RCURLY88_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:185:11: ( PROJECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:185:13: PROJECT expression RCURLY + // /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 { root_0 = (Object)adaptor.nil(); - PROJECT93=(Token)input.LT(1); - match(input,PROJECT,FOLLOW_PROJECT_in_projection1086); if (failed) return retval; + PROJECT86=(Token)input.LT(1); + match(input,PROJECT,FOLLOW_PROJECT_in_projection993); if (failed) return retval; if ( backtracking==0 ) { - PROJECT93_tree = (Object)adaptor.create(PROJECT93); - root_0 = (Object)adaptor.becomeRoot(PROJECT93_tree, root_0); + PROJECT86_tree = (Object)adaptor.create(PROJECT86); + root_0 = (Object)adaptor.becomeRoot(PROJECT86_tree, root_0); } - pushFollow(FOLLOW_expression_in_projection1089); - expression94=expression(); + pushFollow(FOLLOW_expression_in_projection996); + expression87=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression94.getTree()); - RCURLY95=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_projection1091); 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; } @@ -3237,40 +2920,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:187:1: selection : SELECT expression RCURLY ; + // /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 ; public final selection_return selection() throws RecognitionException { selection_return retval = new selection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT96=null; - Token RCURLY98=null; - expression_return expression97 = null; + Token SELECT89=null; + Token RCURLY91=null; + expression_return expression90 = null; - Object SELECT96_tree=null; - Object RCURLY98_tree=null; + Object SELECT89_tree=null; + Object RCURLY91_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:10: ( SELECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:12: SELECT expression RCURLY + // /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 { root_0 = (Object)adaptor.nil(); - SELECT96=(Token)input.LT(1); - match(input,SELECT,FOLLOW_SELECT_in_selection1099); if (failed) return retval; + SELECT89=(Token)input.LT(1); + match(input,SELECT,FOLLOW_SELECT_in_selection1006); if (failed) return retval; if ( backtracking==0 ) { - SELECT96_tree = (Object)adaptor.create(SELECT96); - root_0 = (Object)adaptor.becomeRoot(SELECT96_tree, root_0); + SELECT89_tree = (Object)adaptor.create(SELECT89); + root_0 = (Object)adaptor.becomeRoot(SELECT89_tree, root_0); } - pushFollow(FOLLOW_expression_in_selection1102); - expression97=expression(); + pushFollow(FOLLOW_expression_in_selection1009); + expression90=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression97.getTree()); - RCURLY98=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_selection1104); 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; } @@ -3298,40 +2981,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:189: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:177: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_FIRST99=null; - Token RCURLY101=null; - expression_return expression100 = null; + Token SELECT_FIRST92=null; + Token RCURLY94=null; + expression_return expression93 = null; - Object SELECT_FIRST99_tree=null; - Object RCURLY101_tree=null; + Object SELECT_FIRST92_tree=null; + Object RCURLY94_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:15: ( SELECT_FIRST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:17: SELECT_FIRST expression RCURLY + // /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 { root_0 = (Object)adaptor.nil(); - SELECT_FIRST99=(Token)input.LT(1); - match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection1112); if (failed) return retval; + SELECT_FIRST92=(Token)input.LT(1); + match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection1019); if (failed) return retval; if ( backtracking==0 ) { - SELECT_FIRST99_tree = (Object)adaptor.create(SELECT_FIRST99); - root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST99_tree, root_0); + SELECT_FIRST92_tree = (Object)adaptor.create(SELECT_FIRST92); + root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST92_tree, root_0); } - pushFollow(FOLLOW_expression_in_firstSelection1115); - expression100=expression(); + pushFollow(FOLLOW_expression_in_firstSelection1022); + expression93=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression100.getTree()); - RCURLY101=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection1117); 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; } @@ -3359,40 +3042,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:191: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:179: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_LAST102=null; - Token RCURLY104=null; - expression_return expression103 = null; + Token SELECT_LAST95=null; + Token RCURLY97=null; + expression_return expression96 = null; - Object SELECT_LAST102_tree=null; - Object RCURLY104_tree=null; + Object SELECT_LAST95_tree=null; + Object RCURLY97_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:14: ( SELECT_LAST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:16: SELECT_LAST expression RCURLY + // /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 { root_0 = (Object)adaptor.nil(); - SELECT_LAST102=(Token)input.LT(1); - match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection1125); if (failed) return retval; + SELECT_LAST95=(Token)input.LT(1); + match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection1032); if (failed) return retval; if ( backtracking==0 ) { - SELECT_LAST102_tree = (Object)adaptor.create(SELECT_LAST102); - root_0 = (Object)adaptor.becomeRoot(SELECT_LAST102_tree, root_0); + SELECT_LAST95_tree = (Object)adaptor.create(SELECT_LAST95); + root_0 = (Object)adaptor.becomeRoot(SELECT_LAST95_tree, root_0); } - pushFollow(FOLLOW_expression_in_lastSelection1128); - expression103=expression(); + pushFollow(FOLLOW_expression_in_lastSelection1035); + expression96=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression103.getTree()); - RCURLY104=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection1130); 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; } @@ -3420,39 +3103,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:194: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:182: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 TYPE105=null; - Token RPAREN107=null; - qualifiedId_return qualifiedId106 = null; + Token TYPE98=null; + Token RPAREN100=null; + qualifiedId_return qualifiedId99 = null; - Object TYPE105_tree=null; - Object RPAREN107_tree=null; + Object TYPE98_tree=null; + Object RPAREN100_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:194: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:194:7: TYPE qualifiedId RPAREN + // /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 { - TYPE105=(Token)input.LT(1); - match(input,TYPE,FOLLOW_TYPE_in_type1139); if (failed) return retval; - if ( backtracking==0 ) stream_TYPE.add(TYPE105); + TYPE98=(Token)input.LT(1); + match(input,TYPE,FOLLOW_TYPE_in_type1046); if (failed) return retval; + if ( backtracking==0 ) stream_TYPE.add(TYPE98); - pushFollow(FOLLOW_qualifiedId_in_type1141); - qualifiedId106=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_type1048); + qualifiedId99=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId106.getTree()); - RPAREN107=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_type1143); if (failed) return retval; - if ( backtracking==0 ) stream_RPAREN.add(RPAREN107); + 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); // AST REWRITE @@ -3466,9 +3149,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 194:31: -> ^( TYPEREF qualifiedId ) + // 182:31: -> ^( TYPEREF qualifiedId ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:194:34: ^( 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 ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(TYPEREF, "TYPEREF"), root_1); @@ -3502,306 +3185,52 @@ public class SpringExpressionsParser extends Parser { } // $ANTLR end type - public static class lambda_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start lambda - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202:1: lambda : LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) ; - public final lambda_return lambda() throws RecognitionException { - lambda_return retval = new lambda_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token LAMBDA108=null; - Token PIPE110=null; - Token RCURLY112=null; - argList_return argList109 = null; - - expression_return expression111 = null; - - - Object LAMBDA108_tree=null; - Object PIPE110_tree=null; - Object RCURLY112_tree=null; - RewriteRuleTokenStream stream_RCURLY=new RewriteRuleTokenStream(adaptor,"token RCURLY"); - RewriteRuleTokenStream stream_PIPE=new RewriteRuleTokenStream(adaptor,"token PIPE"); - RewriteRuleTokenStream stream_LAMBDA=new RewriteRuleTokenStream(adaptor,"token LAMBDA"); - RewriteRuleSubtreeStream stream_argList=new RewriteRuleSubtreeStream(adaptor,"rule argList"); - 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:203:4: ( LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:8: LAMBDA ( argList )? PIPE expression RCURLY - { - LAMBDA108=(Token)input.LT(1); - match(input,LAMBDA,FOLLOW_LAMBDA_in_lambda1170); if (failed) return retval; - if ( backtracking==0 ) stream_LAMBDA.add(LAMBDA108); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:15: ( argList )? - int alt25=2; - int LA25_0 = input.LA(1); - - if ( (LA25_0==ID) ) { - alt25=1; - } - switch (alt25) { - case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:16: argList - { - pushFollow(FOLLOW_argList_in_lambda1173); - argList109=argList(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_argList.add(argList109.getTree()); - - } - break; - - } - - PIPE110=(Token)input.LT(1); - match(input,PIPE,FOLLOW_PIPE_in_lambda1177); if (failed) return retval; - if ( backtracking==0 ) stream_PIPE.add(PIPE110); - - pushFollow(FOLLOW_expression_in_lambda1179); - expression111=expression(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression111.getTree()); - RCURLY112=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_lambda1181); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY112); - - - // AST REWRITE - // elements: LAMBDA, argList, expression - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 203:49: -> ^( LAMBDA ( argList )? expression ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:52: ^( LAMBDA ( argList )? expression ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot(stream_LAMBDA.next(), root_1); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:61: ( argList )? - if ( stream_argList.hasNext() ) { - adaptor.addChild(root_1, stream_argList.next()); - - } - stream_argList.reset(); - adaptor.addChild(root_1, stream_expression.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 lambda - - public static class argList_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start argList - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:1: argList : (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) ; - public final argList_return argList() throws RecognitionException { - argList_return retval = new argList_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token COMMA113=null; - Token id=null; - List list_id=null; - - Object COMMA113_tree=null; - Object id_tree=null; - RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); - 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:205:9: ( (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:11: (id+= ID ( COMMA id+= ID )* ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:11: (id+= ID ( COMMA id+= ID )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:12: id+= ID ( COMMA id+= ID )* - { - id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_argList1205); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(id); - - if (list_id==null) list_id=new ArrayList(); - list_id.add(id); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:19: ( COMMA id+= ID )* - loop26: - do { - int alt26=2; - int LA26_0 = input.LA(1); - - if ( (LA26_0==COMMA) ) { - alt26=1; - } - - - switch (alt26) { - case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:20: COMMA id+= ID - { - COMMA113=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_argList1208); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA113); - - id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_argList1212); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(id); - - if (list_id==null) list_id=new ArrayList(); - list_id.add(id); - - - } - break; - - default : - break loop26; - } - } while (true); - - - } - - - // AST REWRITE - // elements: id - // token labels: - // rule labels: retval - // token list labels: id - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleTokenStream stream_id=new RewriteRuleTokenStream(adaptor,"token id", list_id); - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 205:36: -> ^( ARGLIST ( $id)* ) - { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:39: ^( ARGLIST ( $id)* ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot(adaptor.create(ARGLIST, "ARGLIST"), root_1); - - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:49: ( $id)* - while ( stream_id.hasNext() ) { - adaptor.addChild(root_1, stream_id.next()); - - } - stream_id.reset(); - - 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 argList - public static class constructor_return extends ParserRuleReturnScope { Object tree; public Object getTree() { return tree; } }; // $ANTLR start constructor - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207: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:186: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_literal114=null; - qualifiedId_return qualifiedId115 = null; + Token string_literal101=null; + qualifiedId_return qualifiedId102 = null; - ctorArgs_return ctorArgs116 = null; + ctorArgs_return ctorArgs103 = null; - arrayConstructor_return arrayConstructor117 = null; + arrayConstructor_return arrayConstructor104 = null; - Object string_literal114_tree=null; - RewriteRuleTokenStream stream_90=new RewriteRuleTokenStream(adaptor,"token 90"); + Object string_literal101_tree=null; + RewriteRuleTokenStream stream_86=new RewriteRuleTokenStream(adaptor,"token 86"); 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:208:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) - 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:187:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) + int alt24=2; + int LA24_0 = input.LA(1); - if ( (LA27_0==90) ) { - int LA27_1 = input.LA(2); + if ( (LA24_0==86) ) { + int LA24_1 = input.LA(2); - if ( (LA27_1==ID) ) { - int LA27_2 = input.LA(3); + if ( (LA24_1==ID) ) { + int LA24_2 = input.LA(3); - if ( (synpred4()) ) { - alt27=1; + if ( (synpred3()) ) { + alt24=1; } else if ( (true) ) { - alt27=2; + alt24=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("207:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 27, 2, input); + new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 2, input); throw nvae; } @@ -3809,7 +3238,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("207:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 27, 1, input); + new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 1, input); throw nvae; } @@ -3817,31 +3246,31 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("207:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 27, 0, input); + new NoViableAltException("186:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 24, 0, input); throw nvae; } - switch (alt27) { + switch (alt24) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208: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:187:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs { - string_literal114=(Token)input.LT(1); - match(input,90,FOLLOW_90_in_constructor1248); if (failed) return retval; - if ( backtracking==0 ) stream_90.add(string_literal114); + 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); - pushFollow(FOLLOW_qualifiedId_in_constructor1250); - qualifiedId115=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_constructor1083); + qualifiedId102=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId115.getTree()); - pushFollow(FOLLOW_ctorArgs_in_constructor1252); - ctorArgs116=ctorArgs(); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId102.getTree()); + pushFollow(FOLLOW_ctorArgs_in_constructor1085); + ctorArgs103=ctorArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs116.getTree()); + if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs103.getTree()); // AST REWRITE - // elements: ctorArgs, qualifiedId + // elements: qualifiedId, ctorArgs // token labels: // rule labels: retval // token list labels: @@ -3851,9 +3280,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 208:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) + // 187:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:64: ^( 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 ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR, "CONSTRUCTOR"), root_1); @@ -3871,15 +3300,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:209:6: arrayConstructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:188:6: arrayConstructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_arrayConstructor_in_constructor1269); - arrayConstructor117=arrayConstructor(); + pushFollow(FOLLOW_arrayConstructor_in_constructor1102); + arrayConstructor104=arrayConstructor(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, arrayConstructor117.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, arrayConstructor104.getTree()); } break; @@ -3909,60 +3338,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:212: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:191: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_literal118=null; - qualifiedId_return qualifiedId119 = null; + Token string_literal105=null; + qualifiedId_return qualifiedId106 = null; - arrayRank_return arrayRank120 = null; + arrayRank_return arrayRank107 = null; - listInitializer_return listInitializer121 = null; + listInitializer_return listInitializer108 = null; - Object string_literal118_tree=null; - RewriteRuleTokenStream stream_90=new RewriteRuleTokenStream(adaptor,"token 90"); + Object string_literal105_tree=null; + RewriteRuleTokenStream stream_86=new RewriteRuleTokenStream(adaptor,"token 86"); 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:213: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:213:4: 'new' qualifiedId arrayRank ( listInitializer )? + // /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 )? { - string_literal118=(Token)input.LT(1); - match(input,90,FOLLOW_90_in_arrayConstructor1280); if (failed) return retval; - if ( backtracking==0 ) stream_90.add(string_literal118); + 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); - pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1282); - qualifiedId119=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1115); + qualifiedId106=qualifiedId(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId119.getTree()); - pushFollow(FOLLOW_arrayRank_in_arrayConstructor1284); - arrayRank120=arrayRank(); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId106.getTree()); + pushFollow(FOLLOW_arrayRank_in_arrayConstructor1117); + arrayRank107=arrayRank(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_arrayRank.add(arrayRank120.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:32: ( listInitializer )? - int alt28=2; - int LA28_0 = input.LA(1); + 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 ( (LA28_0==LCURLY) ) { - alt28=1; + if ( (LA25_0==LCURLY) ) { + alt25=1; } - switch (alt28) { + switch (alt25) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:33: listInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:192:33: listInitializer { - pushFollow(FOLLOW_listInitializer_in_arrayConstructor1287); - listInitializer121=listInitializer(); + pushFollow(FOLLOW_listInitializer_in_arrayConstructor1120); + listInitializer108=listInitializer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_listInitializer.add(listInitializer121.getTree()); + if ( backtracking==0 ) stream_listInitializer.add(listInitializer108.getTree()); } break; @@ -3981,16 +3410,16 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 214:4: -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) + // 193: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:214: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:193: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:214:49: ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:49: ( listInitializer )? if ( stream_listInitializer.hasNext() ) { adaptor.addChild(root_1, stream_listInitializer.next()); @@ -4030,82 +3459,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:217: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:196: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 LBRACKET122=null; - Token COMMA124=null; - Token RBRACKET126=null; - expression_return expression123 = null; + Token LBRACKET109=null; + Token COMMA111=null; + Token RBRACKET113=null; + expression_return expression110 = null; - expression_return expression125 = null; + expression_return expression112 = null; - Object LBRACKET122_tree=null; - Object COMMA124_tree=null; - Object RBRACKET126_tree=null; + Object LBRACKET109_tree=null; + Object COMMA111_tree=null; + Object RBRACKET113_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:218: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:218: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: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 { - LBRACKET122=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1322); if (failed) return retval; - if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET122); + LBRACKET109=(Token)input.LT(1); + match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1155); if (failed) return retval; + if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET109); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:16: ( expression ( COMMA expression )* )? - int alt30=2; - int LA30_0 = input.LA(1); + // /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); - if ( (LA30_0==INTEGER_LITERAL||LA30_0==LPAREN||(LA30_0>=PLUS && LA30_0<=MINUS)||LA30_0==BANG||(LA30_0>=POUND && LA30_0<=DOLLAR)||(LA30_0>=AT && LA30_0<=LBRACKET)||LA30_0==PROJECT||(LA30_0>=SELECT && LA30_0<=LAMBDA)||(LA30_0>=LCURLY && LA30_0<=FALSE)||LA30_0==90) ) { - alt30=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; } - switch (alt30) { + switch (alt27) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:17: expression ( COMMA expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:17: expression ( COMMA expression )* { - pushFollow(FOLLOW_expression_in_arrayRank1325); - expression123=expression(); + pushFollow(FOLLOW_expression_in_arrayRank1158); + expression110=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression123.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:28: ( COMMA expression )* - loop29: + 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: do { - int alt29=2; - int LA29_0 = input.LA(1); + int alt26=2; + int LA26_0 = input.LA(1); - if ( (LA29_0==COMMA) ) { - alt29=1; + if ( (LA26_0==COMMA) ) { + alt26=1; } - switch (alt29) { + switch (alt26) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:29: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:29: COMMA expression { - COMMA124=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_arrayRank1328); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA124); + COMMA111=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_arrayRank1161); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA111); - pushFollow(FOLLOW_expression_in_arrayRank1330); - expression125=expression(); + pushFollow(FOLLOW_expression_in_arrayRank1163); + expression112=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression125.getTree()); + if ( backtracking==0 ) stream_expression.add(expression112.getTree()); } break; default : - break loop29; + break loop26; } } while (true); @@ -4115,9 +3544,9 @@ public class SpringExpressionsParser extends Parser { } - RBRACKET126=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1336); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET126); + RBRACKET113=(Token)input.LT(1); + match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1169); if (failed) return retval; + if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET113); // AST REWRITE @@ -4131,14 +3560,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 218:59: -> ^( EXPRESSIONLIST ( expression )* ) + // 197:59: -> ^( EXPRESSIONLIST ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:62: ^( 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 )* ) { 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:218:79: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:197:79: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -4178,77 +3607,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:220: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:199: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 LCURLY127=null; - Token COMMA129=null; - Token RCURLY131=null; - expression_return expression128 = null; + Token LCURLY114=null; + Token COMMA116=null; + Token RCURLY118=null; + expression_return expression115 = null; - expression_return expression130 = null; + expression_return expression117 = null; - Object LCURLY127_tree=null; - Object COMMA129_tree=null; - Object RCURLY131_tree=null; + Object LCURLY114_tree=null; + Object COMMA116_tree=null; + Object RCURLY118_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:221: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:221: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: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 { - LCURLY127=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1361); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY127); + LCURLY114=(Token)input.LT(1); + match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1194); if (failed) return retval; + if ( backtracking==0 ) stream_LCURLY.add(LCURLY114); - pushFollow(FOLLOW_expression_in_listInitializer1363); - expression128=expression(); + pushFollow(FOLLOW_expression_in_listInitializer1196); + expression115=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression128.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:25: ( COMMA expression )* - loop31: + 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: do { - int alt31=2; - int LA31_0 = input.LA(1); + int alt28=2; + int LA28_0 = input.LA(1); - if ( (LA31_0==COMMA) ) { - alt31=1; + if ( (LA28_0==COMMA) ) { + alt28=1; } - switch (alt31) { + switch (alt28) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:26: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:26: COMMA expression { - COMMA129=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_listInitializer1366); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA129); + COMMA116=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_listInitializer1199); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA116); - pushFollow(FOLLOW_expression_in_listInitializer1368); - expression130=expression(); + pushFollow(FOLLOW_expression_in_listInitializer1201); + expression117=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression130.getTree()); + if ( backtracking==0 ) stream_expression.add(expression117.getTree()); } break; default : - break loop31; + break loop28; } } while (true); - RCURLY131=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1372); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY131); + RCURLY118=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1205); if (failed) return retval; + if ( backtracking==0 ) stream_RCURLY.add(RCURLY118); // AST REWRITE @@ -4262,14 +3691,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:52: -> ^( LIST_INITIALIZER ( expression )* ) + // 200:52: -> ^( LIST_INITIALIZER ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:55: ^( 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 )* ) { 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:221:74: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:74: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -4309,84 +3738,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:226: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:205: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 POUND132=null; - Token LCURLY133=null; - Token COMMA135=null; - Token RCURLY137=null; - mapEntry_return mapEntry134 = null; + Token POUND119=null; + Token LCURLY120=null; + Token COMMA122=null; + Token RCURLY124=null; + mapEntry_return mapEntry121 = null; - mapEntry_return mapEntry136 = null; + mapEntry_return mapEntry123 = null; - Object POUND132_tree=null; - Object LCURLY133_tree=null; - Object COMMA135_tree=null; - Object RCURLY137_tree=null; + Object POUND119_tree=null; + Object LCURLY120_tree=null; + Object COMMA122_tree=null; + Object RCURLY124_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:227: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:227: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: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 { - POUND132=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_mapInitializer1400); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND132); + POUND119=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_mapInitializer1233); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND119); - LCURLY133=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1402); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY133); + LCURLY120=(Token)input.LT(1); + match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1235); if (failed) return retval; + if ( backtracking==0 ) stream_LCURLY.add(LCURLY120); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1404); - mapEntry134=mapEntry(); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1237); + mapEntry121=mapEntry(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_mapEntry.add(mapEntry134.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:29: ( COMMA mapEntry )* - loop32: + 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: do { - int alt32=2; - int LA32_0 = input.LA(1); + int alt29=2; + int LA29_0 = input.LA(1); - if ( (LA32_0==COMMA) ) { - alt32=1; + if ( (LA29_0==COMMA) ) { + alt29=1; } - switch (alt32) { + switch (alt29) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:30: COMMA mapEntry + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:30: COMMA mapEntry { - COMMA135=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1407); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA135); + COMMA122=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1240); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA122); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1409); - mapEntry136=mapEntry(); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1242); + mapEntry123=mapEntry(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_mapEntry.add(mapEntry136.getTree()); + if ( backtracking==0 ) stream_mapEntry.add(mapEntry123.getTree()); } break; default : - break loop32; + break loop29; } } while (true); - RCURLY137=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1413); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY137); + RCURLY124=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1246); if (failed) return retval; + if ( backtracking==0 ) stream_RCURLY.add(RCURLY124); // AST REWRITE @@ -4400,14 +3829,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 227:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) + // 206:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:57: ^( 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 )* ) { 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:227:75: ( mapEntry )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:75: ( mapEntry )* while ( stream_mapEntry.hasNext() ) { adaptor.addChild(root_1, stream_mapEntry.next()); @@ -4447,40 +3876,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:229: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:208: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 COLON139=null; - expression_return expression138 = null; + Token COLON126=null; + expression_return expression125 = null; - expression_return expression140 = null; + expression_return expression127 = null; - Object COLON139_tree=null; + Object COLON126_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:230: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:230:7: expression COLON expression + // /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 { - pushFollow(FOLLOW_expression_in_mapEntry1434); - expression138=expression(); + pushFollow(FOLLOW_expression_in_mapEntry1267); + expression125=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression138.getTree()); - COLON139=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_mapEntry1436); if (failed) return retval; - if ( backtracking==0 ) stream_COLON.add(COLON139); + 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); - pushFollow(FOLLOW_expression_in_mapEntry1438); - expression140=expression(); + pushFollow(FOLLOW_expression_in_mapEntry1271); + expression127=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression140.getTree()); + if ( backtracking==0 ) stream_expression.add(expression127.getTree()); // AST REWRITE // elements: expression @@ -4493,14 +3922,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 230:35: -> ^( MAP_ENTRY ( expression )* ) + // 209:35: -> ^( MAP_ENTRY ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:38: ^( 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 )* ) { 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:230:50: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:50: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -4540,77 +3969,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:232: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:211: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 LPAREN141=null; - Token COMMA143=null; - Token RPAREN145=null; - namedArgument_return namedArgument142 = null; + Token LPAREN128=null; + Token COMMA130=null; + Token RPAREN132=null; + namedArgument_return namedArgument129 = null; - namedArgument_return namedArgument144 = null; + namedArgument_return namedArgument131 = null; - Object LPAREN141_tree=null; - Object COMMA143_tree=null; - Object RPAREN145_tree=null; + Object LPAREN128_tree=null; + Object COMMA130_tree=null; + Object RPAREN132_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233: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:233: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: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 { root_0 = (Object)adaptor.nil(); - LPAREN141=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1456); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:12: ( namedArgument ( COMMA namedArgument )* )? - int alt34=2; - int LA34_0 = input.LA(1); + 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); - if ( (LA34_0==INTEGER_LITERAL||LA34_0==LPAREN||(LA34_0>=PLUS && LA34_0<=MINUS)||LA34_0==BANG||(LA34_0>=POUND && LA34_0<=DOLLAR)||(LA34_0>=AT && LA34_0<=LBRACKET)||LA34_0==PROJECT||(LA34_0>=SELECT && LA34_0<=LAMBDA)||(LA34_0>=LCURLY && LA34_0<=FALSE)||LA34_0==90) ) { - alt34=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; } - switch (alt34) { + switch (alt31) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:13: namedArgument ( COMMA namedArgument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:13: namedArgument ( COMMA namedArgument )* { - pushFollow(FOLLOW_namedArgument_in_ctorArgs1460); - namedArgument142=namedArgument(); + pushFollow(FOLLOW_namedArgument_in_ctorArgs1293); + namedArgument129=namedArgument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument142.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:27: ( COMMA namedArgument )* - loop33: + 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: do { - int alt33=2; - int LA33_0 = input.LA(1); + int alt30=2; + int LA30_0 = input.LA(1); - if ( (LA33_0==COMMA) ) { - alt33=1; + if ( (LA30_0==COMMA) ) { + alt30=1; } - switch (alt33) { + switch (alt30) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:28: COMMA namedArgument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:28: COMMA namedArgument { - COMMA143=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1463); if (failed) return retval; - pushFollow(FOLLOW_namedArgument_in_ctorArgs1466); - namedArgument144=namedArgument(); + COMMA130=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1296); if (failed) return retval; + pushFollow(FOLLOW_namedArgument_in_ctorArgs1299); + namedArgument131=namedArgument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument144.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument131.getTree()); } break; default : - break loop33; + break loop30; } } while (true); @@ -4620,8 +4049,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN145=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1472); if (failed) return retval; + RPAREN132=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1305); if (failed) return retval; } @@ -4649,28 +4078,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:235:1: argument : expression ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214: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 expression146 = null; + expression_return expression133 = null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:10: ( expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:12: expression + // /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 { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_argument1481); - expression146=expression(); + pushFollow(FOLLOW_expression_in_argument1314); + expression133=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression146.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, expression133.getTree()); } @@ -4698,7 +4127,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:237: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:216: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); @@ -4706,80 +4135,80 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token ASSIGN147=null; - expression_return expression148 = null; + Token ASSIGN134=null; + expression_return expression135 = null; - argument_return argument149 = null; + argument_return argument136 = null; Object id_tree=null; - Object ASSIGN147_tree=null; + Object ASSIGN134_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:238:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) - int alt35=2; - int LA35_0 = input.LA(1); + // /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); - if ( (LA35_0==ID) ) { - int LA35_1 = input.LA(2); + if ( (LA32_0==ID) ) { + int LA32_1 = input.LA(2); - if ( (LA35_1==ASSIGN) ) { - int LA35_25 = input.LA(3); + if ( (LA32_1==ASSIGN) ) { + int LA32_23 = input.LA(3); - if ( (synpred5()) ) { - alt35=1; + if ( (synpred4()) ) { + alt32=1; } else if ( (true) ) { - alt35=2; + alt32=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("237:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 35, 25, input); + new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 23, input); throw nvae; } } - else if ( ((LA35_1>=DEFAULT && LA35_1<=QMARK)||(LA35_1>=LPAREN && LA35_1<=POWER)||LA35_1==DOT||LA35_1==COMMA||LA35_1==LBRACKET||(LA35_1>=EQUAL && LA35_1<=MATCHES)) ) { - alt35=2; + 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 (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("237:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 35, 1, input); + new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 1, input); throw nvae; } } - else if ( (LA35_0==INTEGER_LITERAL||LA35_0==LPAREN||(LA35_0>=PLUS && LA35_0<=MINUS)||LA35_0==BANG||LA35_0==POUND||LA35_0==DOLLAR||(LA35_0>=AT && LA35_0<=LBRACKET)||LA35_0==PROJECT||(LA35_0>=SELECT && LA35_0<=LAMBDA)||(LA35_0>=LCURLY && LA35_0<=FALSE)||LA35_0==90) ) { - alt35=2; + 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 (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("237:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 35, 0, input); + new NoViableAltException("216:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 32, 0, input); throw nvae; } - switch (alt35) { + switch (alt32) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238: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:217:7: ( ID ASSIGN )=>id= ID ASSIGN expression { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_namedArgument1504); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_namedArgument1337); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - ASSIGN147=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1506); if (failed) return retval; - if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN147); + ASSIGN134=(Token)input.LT(1); + match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1339); if (failed) return retval; + if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN134); - pushFollow(FOLLOW_expression_in_namedArgument1508); - expression148=expression(); + pushFollow(FOLLOW_expression_in_namedArgument1341); + expression135=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression148.getTree()); + if ( backtracking==0 ) stream_expression.add(expression135.getTree()); // AST REWRITE // elements: expression @@ -4792,9 +4221,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 239:19: -> ^( NAMED_ARGUMENT[$id] expression ) + // 218:19: -> ^( NAMED_ARGUMENT[$id] expression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:22: ^( 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 ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(NAMED_ARGUMENT, id), root_1); @@ -4811,15 +4240,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:240:7: argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:7: argument { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_argument_in_namedArgument1544); - argument149=argument(); + pushFollow(FOLLOW_argument_in_namedArgument1377); + argument136=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument149.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument136.getTree()); } break; @@ -4849,60 +4278,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:242: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:221: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 ID150=null; - Token DOT151=null; - Token ID152=null; + Token ID137=null; + Token DOT138=null; + Token ID139=null; - Object ID150_tree=null; - Object DOT151_tree=null; - Object ID152_tree=null; + Object ID137_tree=null; + Object DOT138_tree=null; + Object ID139_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:242: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:242:15: ID ( DOT ID )* + // /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 )* { - ID150=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1556); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID150); + ID137=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1389); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID137); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:18: ( DOT ID )* - loop36: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:18: ( DOT ID )* + loop33: do { - int alt36=2; - int LA36_0 = input.LA(1); + int alt33=2; + int LA33_0 = input.LA(1); - if ( (LA36_0==DOT) ) { - alt36=1; + if ( (LA33_0==DOT) ) { + alt33=1; } - switch (alt36) { + switch (alt33) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:19: DOT ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:19: DOT ID { - DOT151=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_qualifiedId1559); if (failed) return retval; - if ( backtracking==0 ) stream_DOT.add(DOT151); + DOT138=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_qualifiedId1392); if (failed) return retval; + if ( backtracking==0 ) stream_DOT.add(DOT138); - ID152=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1561); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID152); + ID139=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1394); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID139); } break; default : - break loop36; + break loop33; } } while (true); @@ -4918,14 +4347,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 242:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 221:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:31: ^( 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 )* ) { 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:242:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4965,60 +4394,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:244: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:223: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 ID153=null; - Token DIV154=null; - Token ID155=null; + Token ID140=null; + Token DIV141=null; + Token ID142=null; - Object ID153_tree=null; - Object DIV154_tree=null; - Object ID155_tree=null; + Object ID140_tree=null; + Object DIV141_tree=null; + Object ID142_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:244: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:244:15: ID ( DIV ID )* + // /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 )* { - ID153=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1580); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID153); + ID140=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1413); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID140); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:18: ( DIV ID )* - loop37: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:18: ( DIV ID )* + loop34: do { - int alt37=2; - int LA37_0 = input.LA(1); + int alt34=2; + int LA34_0 = input.LA(1); - if ( (LA37_0==DIV) ) { - alt37=1; + if ( (LA34_0==DIV) ) { + alt34=1; } - switch (alt37) { + switch (alt34) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:19: DIV ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:19: DIV ID { - DIV154=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_contextName1583); if (failed) return retval; - if ( backtracking==0 ) stream_DIV.add(DIV154); + DIV141=(Token)input.LT(1); + match(input,DIV,FOLLOW_DIV_in_contextName1416); if (failed) return retval; + if ( backtracking==0 ) stream_DIV.add(DIV141); - ID155=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1585); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID155); + ID142=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1418); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID142); } break; default : - break loop37; + break loop34; } } while (true); @@ -5034,14 +4463,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 244:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 223:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:31: ^( 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 )* ) { 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:244:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -5081,171 +4510,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:246: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:225: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_LITERAL156=null; - Token STRING_LITERAL157=null; - Token DQ_STRING_LITERAL158=null; - Token NULL_LITERAL160=null; - Token HEXADECIMAL_INTEGER_LITERAL161=null; - Token REAL_LITERAL162=null; - boolLiteral_return boolLiteral159 = 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; - Object INTEGER_LITERAL156_tree=null; - Object STRING_LITERAL157_tree=null; - Object DQ_STRING_LITERAL158_tree=null; - Object NULL_LITERAL160_tree=null; - Object HEXADECIMAL_INTEGER_LITERAL161_tree=null; - Object REAL_LITERAL162_tree=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; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ) - int alt38=7; + // /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; switch ( input.LA(1) ) { case INTEGER_LITERAL: { - alt38=1; + alt35=1; } break; case STRING_LITERAL: { - alt38=2; + alt35=2; } break; case DQ_STRING_LITERAL: { - alt38=3; + alt35=3; } break; case TRUE: case FALSE: { - alt38=4; + alt35=4; } break; case NULL_LITERAL: { - alt38=5; + alt35=5; } break; case HEXADECIMAL_INTEGER_LITERAL: { - alt38=6; + alt35=6; } break; case REAL_LITERAL: { - alt38=7; + alt35=7; } break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("246:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 38, 0, input); + new NoViableAltException("225:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 35, 0, input); throw nvae; } - switch (alt38) { + switch (alt35) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:4: INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:4: INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); - INTEGER_LITERAL156=(Token)input.LT(1); - match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1606); if (failed) return retval; + INTEGER_LITERAL143=(Token)input.LT(1); + match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1439); if (failed) return retval; if ( backtracking==0 ) { - INTEGER_LITERAL156_tree = (Object)adaptor.create(INTEGER_LITERAL156); - adaptor.addChild(root_0, INTEGER_LITERAL156_tree); + INTEGER_LITERAL143_tree = (Object)adaptor.create(INTEGER_LITERAL143); + adaptor.addChild(root_0, INTEGER_LITERAL143_tree); } } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:4: STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:4: STRING_LITERAL { root_0 = (Object)adaptor.nil(); - STRING_LITERAL157=(Token)input.LT(1); - match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1612); if (failed) return retval; + STRING_LITERAL144=(Token)input.LT(1); + match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1445); if (failed) return retval; if ( backtracking==0 ) { - STRING_LITERAL157_tree = (Object)adaptor.create(STRING_LITERAL157); - adaptor.addChild(root_0, STRING_LITERAL157_tree); + STRING_LITERAL144_tree = (Object)adaptor.create(STRING_LITERAL144); + adaptor.addChild(root_0, STRING_LITERAL144_tree); } } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:4: DQ_STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:228:4: DQ_STRING_LITERAL { root_0 = (Object)adaptor.nil(); - DQ_STRING_LITERAL158=(Token)input.LT(1); - match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1617); if (failed) return retval; + DQ_STRING_LITERAL145=(Token)input.LT(1); + match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1450); if (failed) return retval; if ( backtracking==0 ) { - DQ_STRING_LITERAL158_tree = (Object)adaptor.create(DQ_STRING_LITERAL158); - adaptor.addChild(root_0, DQ_STRING_LITERAL158_tree); + DQ_STRING_LITERAL145_tree = (Object)adaptor.create(DQ_STRING_LITERAL145); + adaptor.addChild(root_0, DQ_STRING_LITERAL145_tree); } } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:4: boolLiteral + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:4: boolLiteral { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_boolLiteral_in_literal1622); - boolLiteral159=boolLiteral(); + pushFollow(FOLLOW_boolLiteral_in_literal1455); + boolLiteral146=boolLiteral(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral159.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral146.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:4: NULL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:4: NULL_LITERAL { root_0 = (Object)adaptor.nil(); - NULL_LITERAL160=(Token)input.LT(1); - match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1627); if (failed) return retval; + NULL_LITERAL147=(Token)input.LT(1); + match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1460); if (failed) return retval; if ( backtracking==0 ) { - NULL_LITERAL160_tree = (Object)adaptor.create(NULL_LITERAL160); - adaptor.addChild(root_0, NULL_LITERAL160_tree); + NULL_LITERAL147_tree = (Object)adaptor.create(NULL_LITERAL147); + adaptor.addChild(root_0, NULL_LITERAL147_tree); } } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:4: HEXADECIMAL_INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:4: HEXADECIMAL_INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); - HEXADECIMAL_INTEGER_LITERAL161=(Token)input.LT(1); - match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1632); if (failed) return retval; + HEXADECIMAL_INTEGER_LITERAL148=(Token)input.LT(1); + match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1465); if (failed) return retval; if ( backtracking==0 ) { - HEXADECIMAL_INTEGER_LITERAL161_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL161); - adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL161_tree); + HEXADECIMAL_INTEGER_LITERAL148_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL148); + adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL148_tree); } } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:4: REAL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:4: REAL_LITERAL { root_0 = (Object)adaptor.nil(); - REAL_LITERAL162=(Token)input.LT(1); - match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1638); if (failed) return retval; + REAL_LITERAL149=(Token)input.LT(1); + match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1471); if (failed) return retval; if ( backtracking==0 ) { - REAL_LITERAL162_tree = (Object)adaptor.create(REAL_LITERAL162); - adaptor.addChild(root_0, REAL_LITERAL162_tree); + REAL_LITERAL149_tree = (Object)adaptor.create(REAL_LITERAL149); + adaptor.addChild(root_0, REAL_LITERAL149_tree); } } @@ -5276,27 +4705,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:256:1: boolLiteral : ( TRUE | FALSE ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235: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 set163=null; + Token set150=null; - Object set163_tree=null; + Object set150_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:12: ( TRUE | FALSE ) + // /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: { root_0 = (Object)adaptor.nil(); - set163=(Token)input.LT(1); + set150=(Token)input.LT(1); if ( (input.LA(1)>=TRUE && input.LA(1)<=FALSE) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set163)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set150)); errorRecovery=false;failed=false; } else { @@ -5333,27 +4762,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:263: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:242: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 set164=null; + Token set151=null; - Object set164_tree=null; + Object set151_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264: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: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: { root_0 = (Object)adaptor.nil(); - set164=(Token)input.LT(1); + set151=(Token)input.LT(1); if ( (input.LA(1)>=EQUAL && input.LA(1)<=MATCHES) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set164)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set151)); errorRecovery=false;failed=false; } else { @@ -5386,12 +4815,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:136:7: ( POUND ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:8: POUND ID LPAREN + // /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 { - match(input,POUND,FOLLOW_POUND_in_synpred1741); if (failed) return ; - match(input,ID,FOLLOW_ID_in_synpred1743); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred1745); if (failed) return ; + 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 ; } } @@ -5399,12 +4828,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:145:4: ( DOLLAR ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145:5: DOLLAR ID LPAREN + // /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 { - match(input,DOLLAR,FOLLOW_DOLLAR_in_synpred2824); if (failed) return ; - match(input,ID,FOLLOW_ID_in_synpred2826); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred2828); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred2797); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred2799); if (failed) return ; } } @@ -5412,11 +4840,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:153:4: ( ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:5: ID LPAREN + // /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 { - match(input,ID,FOLLOW_ID_in_synpred3890); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred3892); if (failed) return ; + match(input,86,FOLLOW_86_in_synpred31072); if (failed) return ; + pushFollow(FOLLOW_qualifiedId_in_synpred31074); + qualifiedId(); + _fsp--; + if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred31076); if (failed) return ; } } @@ -5424,32 +4856,16 @@ 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:208:4: ( 'new' qualifiedId LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:5: 'new' qualifiedId LPAREN + // /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 { - match(input,90,FOLLOW_90_in_synpred41239); if (failed) return ; - pushFollow(FOLLOW_qualifiedId_in_synpred41241); - qualifiedId(); - _fsp--; - if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred41243); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred41328); if (failed) return ; + match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41330); if (failed) return ; } } // $ANTLR end synpred4 - // $ANTLR start synpred5 - public final void synpred5_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:7: ( ID ASSIGN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:8: ID ASSIGN - { - match(input,ID,FOLLOW_ID_in_synpred51495); if (failed) return ; - match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred51497); if (failed) return ; - - } - } - // $ANTLR end synpred5 - public final boolean synpred4() { backtracking++; int start = input.mark(); @@ -5506,214 +4922,180 @@ public class SpringExpressionsParser extends Parser { failed=false; return success; } - public final boolean synpred5() { - backtracking++; - int start = input.mark(); - try { - synpred5_fragment(); // can never throw exception - } catch (RecognitionException re) { - System.err.println("impossible: "+re); - } - boolean success = !failed; - input.rewind(start); - backtracking--; - failed=false; - return success; - } - public static final BitSet FOLLOW_expression_in_expr177 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_expr179 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression208 = new BitSet(new long[]{0x00000001C0000002L}); - public static final BitSet FOLLOW_ASSIGN_in_expression217 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression220 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DEFAULT_in_expression230 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression233 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_QMARK_in_expression243 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_expression246 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_COLON_in_expression248 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_expression251 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_parenExpr262 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_parenExpr265 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_RPAREN_in_parenExpr267 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression280 = new BitSet(new long[]{0x0000001000000002L}); - public static final BitSet FOLLOW_OR_in_logicalOrExpression283 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression286 = new BitSet(new long[]{0x0000001000000002L}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression321 = new BitSet(new long[]{0x0000002000000002L}); - public static final BitSet FOLLOW_AND_in_logicalAndExpression324 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression327 = new BitSet(new long[]{0x0000002000000002L}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression338 = new BitSet(new long[]{0x0000000000000002L,0x000000000003FF00L}); - public static final BitSet FOLLOW_relationalOperator_in_relationalExpression341 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression344 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_productExpression_in_sumExpression355 = new BitSet(new long[]{0x000000C000000002L}); - public static final BitSet FOLLOW_PLUS_in_sumExpression360 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_MINUS_in_sumExpression365 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_productExpression_in_sumExpression369 = new BitSet(new long[]{0x000000C000000002L}); - public static final BitSet FOLLOW_powerExpr_in_productExpression381 = new BitSet(new long[]{0x0000070000000002L}); - public static final BitSet FOLLOW_STAR_in_productExpression385 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_DIV_in_productExpression390 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_MOD_in_productExpression394 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_powerExpr_in_productExpression398 = new BitSet(new long[]{0x0000070000000002L}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr410 = new BitSet(new long[]{0x0000080000000002L}); - public static final BitSet FOLLOW_POWER_in_powerExpr413 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr416 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PLUS_in_unaryExpression430 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_MINUS_in_unaryExpression435 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_BANG_in_unaryExpression440 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_unaryExpression_in_unaryExpression444 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_primaryExpression_in_unaryExpression450 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_startNode_in_primaryExpression464 = new BitSet(new long[]{0x0008200000000002L}); - public static final BitSet FOLLOW_node_in_primaryExpression467 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_parenExpr_in_startNode500 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_startNode508 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_startNode517 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_localFunctionOrVar_in_startNode525 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_reference_in_startNode533 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_indexer_in_startNode541 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_literal_in_startNode549 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_type_in_startNode557 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_constructor_in_startNode565 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_startNode573 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_startNode582 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_startNode591 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_startNode599 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_startNode607 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_mapInitializer_in_startNode615 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lambda_in_startNode623 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOT_in_node643 = new BitSet(new long[]{0x03A0C00000000000L}); - public static final BitSet FOLLOW_dottedNode_in_node645 = new BitSet(new long[]{0x0008200000000002L}); - public static final BitSet FOLLOW_nonDottedNode_in_node650 = new BitSet(new long[]{0x0008200000000002L}); - public static final BitSet FOLLOW_indexer_in_nonDottedNode662 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_dottedNode675 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_dottedNode681 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_dottedNode689 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_dottedNode698 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_dottedNode707 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_dottedNode716 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_function_in_functionOrVar750 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_var_in_functionOrVar758 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_function775 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_function779 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_methodArgs_in_function781 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_var802 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_var806 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_localFunction_in_localFunctionOrVar833 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_localVar_in_localFunctionOrVar838 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOLLAR_in_localFunction848 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_localFunction852 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_methodArgs_in_localFunction854 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOLLAR_in_localVar869 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_localVar873 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_methodOrProperty899 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_methodArgs_in_methodOrProperty901 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_property_in_methodOrProperty915 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_methodArgs930 = new BitSet(new long[]{0xEFADD0CC00000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_argument_in_methodArgs934 = new BitSet(new long[]{0x0002000800000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs937 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_argument_in_methodArgs940 = new BitSet(new long[]{0x0002000800000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs945 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_RPAREN_in_methodArgs952 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_property965 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_AT_in_reference987 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_LPAREN_in_reference991 = new BitSet(new long[]{0x0000800800000000L}); - public static final BitSet FOLLOW_contextName_in_reference996 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_COLON_in_reference998 = new BitSet(new long[]{0x0000800800000000L}); - public static final BitSet FOLLOW_qualifiedId_in_reference1005 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_RPAREN_in_reference1009 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_indexer1044 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_argument_in_indexer1048 = new BitSet(new long[]{0x0012000000000000L}); - public static final BitSet FOLLOW_COMMA_in_indexer1051 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_argument_in_indexer1055 = new BitSet(new long[]{0x0012000000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_indexer1059 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PROJECT_in_projection1086 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_projection1089 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_projection1091 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_in_selection1099 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_selection1102 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_selection1104 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection1112 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_firstSelection1115 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_firstSelection1117 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection1125 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_lastSelection1128 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_lastSelection1130 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_TYPE_in_type1139 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_type1141 = new BitSet(new long[]{0x0000000800000000L}); - public static final BitSet FOLLOW_RPAREN_in_type1143 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LAMBDA_in_lambda1170 = new BitSet(new long[]{0x1000800000000000L}); - public static final BitSet FOLLOW_argList_in_lambda1173 = new BitSet(new long[]{0x1000000000000000L}); - public static final BitSet FOLLOW_PIPE_in_lambda1177 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_lambda1179 = new BitSet(new long[]{0x0040000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_lambda1181 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_argList1205 = new BitSet(new long[]{0x0002000000000002L}); - public static final BitSet FOLLOW_COMMA_in_argList1208 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_argList1212 = new BitSet(new long[]{0x0002000000000002L}); - public static final BitSet FOLLOW_90_in_constructor1248 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_constructor1250 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_ctorArgs_in_constructor1252 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_arrayConstructor_in_constructor1269 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_90_in_arrayConstructor1280 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1282 = new BitSet(new long[]{0x0008000000000000L}); - public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1284 = new BitSet(new long[]{0x2000000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1287 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_arrayRank1322 = new BitSet(new long[]{0xEFBDD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_arrayRank1325 = new BitSet(new long[]{0x0012000000000000L}); - public static final BitSet FOLLOW_COMMA_in_arrayRank1328 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_arrayRank1330 = new BitSet(new long[]{0x0012000000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_arrayRank1336 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LCURLY_in_listInitializer1361 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_listInitializer1363 = new BitSet(new long[]{0x0042000000000000L}); - public static final BitSet FOLLOW_COMMA_in_listInitializer1366 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_listInitializer1368 = new BitSet(new long[]{0x0042000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_listInitializer1372 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_mapInitializer1400 = new BitSet(new long[]{0x2000000000000000L}); - public static final BitSet FOLLOW_LCURLY_in_mapInitializer1402 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1404 = new BitSet(new long[]{0x0042000000000000L}); - public static final BitSet FOLLOW_COMMA_in_mapInitializer1407 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1409 = new BitSet(new long[]{0x0042000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_mapInitializer1413 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_mapEntry1434 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_COLON_in_mapEntry1436 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_mapEntry1438 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_ctorArgs1456 = new BitSet(new long[]{0xEFADD0CC00000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1460 = new BitSet(new long[]{0x0002000800000000L}); - public static final BitSet FOLLOW_COMMA_in_ctorArgs1463 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1466 = new BitSet(new long[]{0x0002000800000000L}); - public static final BitSet FOLLOW_RPAREN_in_ctorArgs1472 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_argument1481 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_namedArgument1504 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_ASSIGN_in_namedArgument1506 = new BitSet(new long[]{0xEFADD0C400000020L,0x000000000400001FL}); - public static final BitSet FOLLOW_expression_in_namedArgument1508 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_argument_in_namedArgument1544 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1556 = new BitSet(new long[]{0x0000200000000002L}); - public static final BitSet FOLLOW_DOT_in_qualifiedId1559 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1561 = new BitSet(new long[]{0x0000200000000002L}); - public static final BitSet FOLLOW_ID_in_contextName1580 = new BitSet(new long[]{0x0000020000000002L}); - public static final BitSet FOLLOW_DIV_in_contextName1583 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_contextName1585 = new BitSet(new long[]{0x0000020000000002L}); - public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1606 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_STRING_LITERAL_in_literal1612 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1617 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_boolLiteral_in_literal1622 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_NULL_LITERAL_in_literal1627 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1632 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_REAL_LITERAL_in_literal1638 = new BitSet(new long[]{0x0000000000000002L}); + 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_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_synpred1741 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_synpred1743 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred1745 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOLLAR_in_synpred2824 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_ID_in_synpred2826 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred2828 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred3890 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred3892 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_90_in_synpred41239 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_synpred41241 = new BitSet(new long[]{0x0000000400000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred41243 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred51495 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_ASSIGN_in_synpred51497 = 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}); } \ 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 a0952dc2fbf7851e797573ff6fb68370a8badfa5..a09ba6c48ba15d21db9364fb7a4249b91608662c 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,145 +5,143 @@ options { } @header {package org.springframework.expression.spel.generated;} -T90 : 'new' ; +T86 : 'new' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 62 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 59 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" 258 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 237 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" 261 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 240 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" 276 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 255 ASSIGN: '='; -// $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" 256 EQUAL: '=='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 278 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 257 NOT_EQUAL: '!='; -// $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" 258 LESS_THAN: '<'; -// $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" 259 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" 281 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 260 GREATER_THAN: '>'; -// $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" 261 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" 283 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 262 IN: 'in'; -// $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" 263 IS: 'is'; -// $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" 264 BETWEEN:'between'; -// $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" 265 MATCHES:'matches'; -// $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" 266 NULL_LITERAL: 'null'; -// $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" 268 SEMI: ';'; -// $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" 269 DOT: '.'; -// $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" 270 COMMA: ','; -// $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" 271 LPAREN: '('; -// $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" 272 RPAREN: ')'; -// $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" 273 LCURLY: '{'; -// $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" 274 RCURLY: '}'; -// $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" 275 LBRACKET: '['; -// $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" 276 RBRACKET: ']'; -// $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" 277 PIPE: '|'; -// $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" 279 AND: 'and'; -// $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" 280 OR: 'or'; -// $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" 281 FALSE: 'false'; -// $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" 282 TRUE: 'true'; -// $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" 284 PLUS: '+'; -// $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" 285 MINUS: '-'; -// $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" 286 DIV: '/'; -// $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" 287 STAR: '*'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 309 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 288 MOD: '%'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 310 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 289 POWER: '^'; -// $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" 290 BANG: '!'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 312 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 291 POUND: '#'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 313 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 292 QMARK: '?'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 314 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 293 DEFAULT: '??'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 315 -LAMBDA: '{|'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 316 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 294 PROJECT: '!{'; -// $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" 295 SELECT: '?{'; -// $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" 296 SELECT_FIRST: '^{'; -// $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" 297 SELECT_LAST: '${'; -// $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" 298 TYPE: 'T('; -// $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" 300 STRING_LITERAL: '\''! (APOS|~'\'')* '\''!; -// $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" 301 DQ_STRING_LITERAL: '"'! (~'"')* '"'!; -// $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" 302 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" 325 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 303 DOT_ESCAPED: '\\.'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 326 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 304 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" 327 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 305 DOLLAR: '$'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 328 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 306 AT: '@'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 329 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 307 UPTO: '..'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 330 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 308 COLON: ':'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 333 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 311 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" 339 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 317 fragment APOS : '\''! '\''; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 340 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 318 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" 341 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 319 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" 342 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 320 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" 344 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 322 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" 345 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 323 fragment SIGN : '+' | '-' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 346 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 324 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 d3dccadae18db6b974b58c07a2a1e51eaad3b964..ad4a62d30897a75168da358786f84555f5a89192 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 @@ -17,7 +17,6 @@ package org.springframework.expression.spel.internal; import org.antlr.runtime.Token; import org.antlr.runtime.tree.CommonTreeAdaptor; -import org.springframework.expression.spel.ast.ArgList; import org.springframework.expression.spel.ast.Assign; import org.springframework.expression.spel.ast.BooleanLiteral; import org.springframework.expression.spel.ast.CompoundExpression; @@ -27,11 +26,8 @@ import org.springframework.expression.spel.ast.ExpressionListNode; import org.springframework.expression.spel.ast.FunctionReference; import org.springframework.expression.spel.ast.Identifier; import org.springframework.expression.spel.ast.Indexer; -import org.springframework.expression.spel.ast.Lambda; import org.springframework.expression.spel.ast.ListInitializer; import org.springframework.expression.spel.ast.Literal; -import org.springframework.expression.spel.ast.LocalFunctionReference; -import org.springframework.expression.spel.ast.LocalVariableReference; import org.springframework.expression.spel.ast.MapEntry; import org.springframework.expression.spel.ast.MapInitializer; import org.springframework.expression.spel.ast.MethodReference; @@ -150,10 +146,6 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { return new ConstructorReference(payload, false); case SpringExpressionsLexer.CONSTRUCTOR_ARRAY: return new ConstructorReference(payload, true); - case SpringExpressionsLexer.LOCALFUNC: - return new LocalFunctionReference(payload); - case SpringExpressionsLexer.LOCALVAR: - return new LocalVariableReference(payload); case SpringExpressionsLexer.VARIABLEREF: return new VariableReference(payload); case SpringExpressionsLexer.FUNCTIONREF: @@ -184,11 +176,6 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { case SpringExpressionsLexer.IS: return new OperatorIs(payload); - case SpringExpressionsLexer.ARGLIST: - return new ArgList(payload); - case SpringExpressionsLexer.LAMBDA: - return new Lambda(payload); - case SpringExpressionsLexer.RPAREN: return new Placeholder(payload); case SpringExpressionsLexer.COLON: 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 897bfa9b63a7cae5476cfba22b82e8852e53c6b0..f8b5b69a4944b7291c83cb96f80015044a7e54a7 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 @@ -18,8 +18,6 @@ package org.springframework.expression.spel; import java.util.ArrayList; import java.util.HashMap; -import org.springframework.expression.spel.ast.Lambda; - /** * Tests the evaluation of real expressions in a real context. * @@ -285,9 +283,9 @@ public class EvaluationTests extends ExpressionTestCase { "[false, false, false, false, false, true, true, true, true, true]", ArrayList.class); } - public void testProjection04() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.!{$index>5?'y':'n'}", "[n, n, n, n, n, n, y, y, y, y]", ArrayList.class); - } + // public void testProjection04() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.!{$index>5?'y':'n'}", "[n, n, n, n, n, n, y, y, y, y]", ArrayList.class); + // } public void testSelection01() { evaluate("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", "[2, 4, 6, 8, 10]", ArrayList.class); @@ -298,9 +296,9 @@ public class EvaluationTests extends ExpressionTestCase { SpelMessages.RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN); } - public void testSelectionUsingIndex() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.?{$index > 5 }", "[7, 8, 9, 10]", ArrayList.class); - } + // public void testSelectionUsingIndex() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.?{$index > 5 }", "[7, 8, 9, 10]", ArrayList.class); + // } public void testSelectionFirst01() { evaluate("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", "2", Integer.class); @@ -394,16 +392,6 @@ public class EvaluationTests extends ExpressionTestCase { evaluate("#reverseString('hello')", "olleh", String.class); } - // lambda - public void testLambdaNoArgs() { - evaluate("{|| true }", "{|| true }", Lambda.class); - } - - public void testLambda01() { - evaluate("{|x,y| $x > $y ? $x : $y }", "{|x,y| ($x > $y) ? $x : $y }", - org.springframework.expression.spel.ast.Lambda.class); - } - // // public void testLambda02() { // evaluate("(#max={|x,y| $x > $y ? $x : $y };true)", "true", Boolean.class); 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 05b8b5756150e4fd804e387d892a32f3db13ef5b..de5165e0719d8c65ea20575f8da2a0648599d377 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 @@ -355,11 +355,6 @@ public class ParsingTests extends TestCase { "({1}.#isEven(#this) == 'y') ? 'it is even' : 'it is odd'"); } - // lambda - public void testLambda01() { - parseCheck("{|x,y| $x > $y ? $x : $y }", "{|x,y| ($x > $y) ? $x : $y }"); - } - // // public void testLambdaMax() { // parseCheck("(#max = {|x,y| $x > $y ? $x : $y }; #max(5,25))", "(#max={|x,y| ($x > $y) ? $x : $y };#max(5,25))");