diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessages.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessages.java index fb60673c053..666a30f5c34 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessages.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessages.java @@ -24,9 +24,12 @@ import java.text.MessageFormat; *

* When a message is formatted, it will have this kind of form * - * 


+ * 
+ * <code>
  * EL1004E: (pos 34): Type cannot be found 'String'
- * 
 The prefix captures the code and the error kind, whilst the position is included if it is known and the
+ *
+ * + * The prefix captures the code and the error kind, whilst the position is included if it is known and the * message has had all relevant inserts applied to it. * * @author Andy Clement @@ -36,77 +39,84 @@ public enum SpelMessages { // TODO put keys and messages into bundles for easy NLS // TODO review if any messages are not used // TODO sort messages into better groups if possible, sharing a name prefix perhaps - - INITIALIZER_LENGTH_INCORRECT(Kind.ERROR, 1001, "Array constructor call: initializer size of {0} does not match declared length of {1}"), - TYPE_CONVERSION_ERROR(Kind.ERROR, 1002, "Type conversion problem, cannot convert from {0} to {1}"), - CONSTRUCTOR_NOT_FOUND(Kind.ERROR, 1003, "Constructor call: No suitable constructor on type {0} for arguments {1}"), - TYPE_NOT_FOUND(Kind.ERROR, 1004, "Type cannot be found ''{0}''"), - ADDITION_NOT_DEFINED(Kind.ERROR, 1005, "Addition not defined between operands of type {0} and {1}"), - METHOD_NOT_FOUND(Kind.ERROR, 1006, "Method call: Method {0} cannot be found on {1} type"), - ATTEMPTED_METHOD_CALL_ON_NULL_CONTEXT_OBJECT(Kind.ERROR, 1007, "Method call: Attempted to call method {0} on null context object"), - ATTEMPTED_PROPERTY_FIELD_REF_ON_NULL_CONTEXT_OBJECT(Kind.ERROR, 1008, "Field or property reference: Attempted to refer to field or property ''{0}'' on null context object"), - PROPERTY_OR_FIELD_NOT_FOUND(Kind.ERROR, 1009, "Field or property ''{0}'' cannot be found on object of type ''{1}''"), - PROPERTY_OR_FIELD_SETTER_NOT_FOUND(Kind.ERROR, 1010, "Field or property ''{0}'' cannot be set on object of type ''{1}''"), - MULTIPLY_NOT_DEFINED(Kind.ERROR, 1011, "Multiply not defined between operands of type {0} and {1}"), - NOT_COMPARABLE(Kind.ERROR, 1012, "Cannot compare instances of {0} and {1}"), - NOT_COMPARABLE_CANNOT_COERCE(Kind.ERROR, 1013, "Cannot compare instances of {0} and {1} because they cannot be coerced to the same type"), - VARIABLE_NOT_FOUND(Kind.ERROR, 1014, "Variable named ''{0}'' cannot be found"), - INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION(Kind.ERROR, 1015, "Incorrect number of arguments for function, {0} supplied but function takes {1}"), - NO_SUCH_FUNCTION(Kind.ERROR, 1016, "No such function named ''{0}''"), - NOT_A_FUNCTION(Kind.ERROR, 1017, "The name ''{0}'' did not map to a function, it mapped to a ''{1}''"), - INVALID_TYPE_FOR_SELECTION(Kind.ERROR, 1018, "Cannot perform selection on input data of type ''{0}''"), - RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN(Kind.ERROR, 1019, "Result of selection criteria is not boolean"), - MODULUS_NOT_DEFINED(Kind.ERROR, 1020, "Modulus not defined between operands of type ''{0}'' and ''{1}''"), - NULL_OPERAND_TO_OPERATOR(Kind.ERROR, 1021, "Operand evaluated to null and that is not supported for this operator"), - NO_SIZE_OR_INITIALIZER_FOR_ARRAY_CONSTRUCTION(Kind.ERROR, 1022, "No array size or initializer was supplied to construct the array"), - INCORRECT_ELEMENT_TYPE_FOR_ARRAY(Kind.ERROR, 1023, "The array of type ''{0}'' cannot have an element of type ''{1}'' inserted"), - BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST(Kind.ERROR, 1024, "Right operand for the 'between' operator has to be a two-element list"), - TYPE_NOT_SUPPORTED_BY_PROCESSOR(Kind.ERROR, 1025, "The collection processor ''{0}'' does not understand and input collection of elements of type {1}"), - UNABLE_TO_ACCESS_FIELD(Kind.ERROR, 1026, "Unable to access field ''{0}'' on type ''{1}''"), - UNABLE_TO_ACCESS_PROPERTY_THROUGH_GETTER(Kind.ERROR, 1027, "Unable to access property ''{0}'' through getter on type ''{1}''"), - UNABLE_TO_ACCESS_PROPERTY_THROUGH_SETTER(Kind.ERROR, 1028, "Unable to access property ''{0}'' through setter on type ''{1}''"), - INVALID_PATTERN(Kind.ERROR, 1029, "Pattern is not valid ''{0}''"), - RECOGNITION_ERROR(Kind.ERROR, 1030,"Recognition error: {0}"), // TODO poor message when a recognition exception occurs - PROJECTION_NOT_SUPPORTED_ON_TYPE(Kind.ERROR, 1031, "Projection is not supported on the type ''{0}''"), - ARGLIST_SHOULD_NOT_BE_EVALUATED(Kind.ERROR, 1032, "The argument list of a lambda expression should never have getValue() called upon it"), - MAPENTRY_SHOULD_NOT_BE_EVALUATED(Kind.ERROR, 1033, "A map entry should never have getValue() called upon it"), - EXCEPTION_DURING_PROPERTY_READ(Kind.ERROR, 1034, "A problem occurred whilst attempting to access the property ''{0}'': ''{1}''"), - EXCEPTION_DURING_CONSTRUCTOR_INVOCATION(Kind.ERROR, 1035, "A problem occurred whilst attempting to construct ''{0}'': ''{1}''"), - DATE_CANNOT_BE_PARSED(Kind.ERROR, 1036, "Unable to parse date ''{0}'' using format ''{1}''"), - FUNCTION_REFERENCE_CANNOT_BE_INVOKED(Kind.ERROR, 1037, "The function ''{0}'' mapped to an object of type ''{1}'' which cannot be invoked"), - FUNCTION_NOT_DEFINED(Kind.ERROR, 1038, "The function ''{0}'' could not be found"), - EXCEPTION_DURING_FUNCTION_CALL(Kind.ERROR, 1039, "A problem occurred whilst attempting to invoke the function ''{0}'': ''{1}''"), - ARRAY_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1040, "The array has ''{0}'' elements, index ''{1}'' is invalid"), - COLLECTION_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1041, "The collection has ''{0}'' elements, index ''{1}'' is invalid"), - STRING_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1042, "The string has ''{0}'' characters, index ''{1}'' is invalid"), - INDEXING_NOT_SUPPORTED_FOR_TYPE(Kind.ERROR, 1043, "Indexing into type ''{0}'' is not supported"), - OPERATOR_IN_CANNOT_DETERMINE_MEMBERSHIP(Kind.ERROR, 1044, "Operator 'in' not implemented for detecting membership of a ''{0}'' in a ''{1}''"), - CANNOT_NEGATE_TYPE(Kind.ERROR, 1045, "Cannot determine negation of type ''{0}''"), - CUT_ARGUMENTS_MUST_BE_INTS(Kind.ERROR, 1046, "Both arguments to the cut() processor must be Integers, but they are ''{0}'' and ''{1}''"), - SOUNDSLIKE_NEEDS_STRING_OPERAND(Kind.ERROR, 1047, "The soundslike operator needs String operands, but found a ''{0}''"), - IS_OPERATOR_NEEDS_CLASS_OPERAND(Kind.ERROR, 1048, "The operator 'is' needs the right operand to be a class, not a ''{0}''"), - LOCAL_VARIABLE_NOT_DEFINED(Kind.ERROR, 1049, "Local variable named ''{0}'' could not be found"), - EXCEPTION_DURING_METHOD_INVOCATION(Kind.ERROR, 1050,"A problem occurred when trying to execute method ''{0}'' on object of type ''{1}'': ''{2}''"), - PLACEHOLDER_SHOULD_NEVER_BE_EVALUATED(Kind.ERROR, 1051, "InternalError: A placeholder node in the Ast should never be evaluated!"), - OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES(Kind.ERROR, 1052, "The operator ''{0}'' is not supported between objects of type ''{1}'' and ''{2}''"), - UNEXPECTED_PROBLEM_INVOKING_OPERATOR(Kind.ERROR, 1054, "Unexpected problem invoking operator ''{0}'' between objects of type ''{1}'' and ''{2}'': {3}"), - PROBLEM_LOCATING_METHOD(Kind.ERROR, 1055, "Problem locating method {0} cannot on type {1}"), - PROBLEM_LOCATING_CONSTRUCTOR(Kind.ERROR, 1056, "A problem occurred whilst attempting to construct an object of type ''{0}'' using arguments ''{1}''"), - INVALID_FIRST_OPERAND_FOR_LIKE_OPERATOR(Kind.ERROR, 1057, "First operand to like operator must be a string. ''{0}'' is not"), - INVALID_SECOND_OPERAND_FOR_LIKE_OPERATOR(Kind.ERROR, 1058, "Second operand to like operator must be a string (regex). ''{0}'' is not"), - SETVALUE_NOT_SUPPORTED(Kind.ERROR, 1059, "setValue(ExpressionState, Object) not implemented for ''{0}'' (''{1}''"), - TYPE_NAME_EXPECTED_FOR_ARRAY_CONSTRUCTION(Kind.ERROR, 1060, "Expected the type of the new array to be specified as a String but found ''{0}''"), - PROBLEM_DURING_TYPE_CONVERSION(Kind.ERROR, 1061, "Problem occurred during type conversion: {0}"), - MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, 1062, "Method call of ''{0}'' is ambiguous, supported type conversions allow multiple variants to match"), - EXCEPTION_DURING_PROPERTY_WRITE(Kind.ERROR, 1063, "A problem occurred whilst attempting to set the property ''{0}'': ''{1}''"), - NOT_AN_INTEGER(Kind.ERROR, 1064, "The value ''{0}'' cannot be parsed as an int"), - NOT_A_LONG(Kind.ERROR, 1065, "The value ''{0}'' cannot be parsed as a long"), - PARSE_PROBLEM(Kind.ERROR, 1066, "Error occurred during expression parse: {0}"), - INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1067, "First operand to matches operator must be a string. ''{0}'' is not"), - INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1068, "Second operand to matches operator must be a string. ''{0}'' is not"), - FUNCTION_MUST_BE_STATIC(Kind.ERROR, 1069, "Only static methods can be called via function references. The method ''{0}'' referred to by name ''{1}'' is not static.") - ; - + + INITIALIZER_LENGTH_INCORRECT(Kind.ERROR, 1001, + "Array constructor call: initializer size of {0} does not match declared length of {1}"), TYPE_CONVERSION_ERROR( + Kind.ERROR, 1002, "Type conversion problem, cannot convert from {0} to {1}"), CONSTRUCTOR_NOT_FOUND( + Kind.ERROR, 1003, "Constructor call: No suitable constructor on type {0} for arguments {1}"), TYPE_NOT_FOUND( + Kind.ERROR, 1004, "Type cannot be found ''{0}''"), ADDITION_NOT_DEFINED(Kind.ERROR, 1005, + "Addition not defined between operands of type {0} and {1}"), METHOD_NOT_FOUND(Kind.ERROR, 1006, + "Method call: Method {0} cannot be found on {1} type"), ATTEMPTED_METHOD_CALL_ON_NULL_CONTEXT_OBJECT( + Kind.ERROR, 1007, "Method call: Attempted to call method {0} on null context object"), ATTEMPTED_PROPERTY_FIELD_REF_ON_NULL_CONTEXT_OBJECT( + Kind.ERROR, 1008, + "Field or property reference: Attempted to refer to field or property ''{0}'' on null context object"), PROPERTY_OR_FIELD_NOT_FOUND( + Kind.ERROR, 1009, "Field or property ''{0}'' cannot be found on object of type ''{1}''"), PROPERTY_OR_FIELD_SETTER_NOT_FOUND( + Kind.ERROR, 1010, "Field or property ''{0}'' cannot be set on object of type ''{1}''"), MULTIPLY_NOT_DEFINED( + Kind.ERROR, 1011, "Multiply not defined between operands of type {0} and {1}"), NOT_COMPARABLE(Kind.ERROR, + 1012, "Cannot compare instances of {0} and {1}"), NOT_COMPARABLE_CANNOT_COERCE(Kind.ERROR, 1013, + "Cannot compare instances of {0} and {1} because they cannot be coerced to the same type"), VARIABLE_NOT_FOUND( + Kind.ERROR, 1014, "Variable named ''{0}'' cannot be found"), INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION( + Kind.ERROR, 1015, "Incorrect number of arguments for function, {0} supplied but function takes {1}"), NO_SUCH_FUNCTION( + Kind.ERROR, 1016, "No such function named ''{0}''"), NOT_A_FUNCTION(Kind.ERROR, 1017, + "The name ''{0}'' did not map to a function, it mapped to a ''{1}''"), INVALID_TYPE_FOR_SELECTION( + Kind.ERROR, 1018, "Cannot perform selection on input data of type ''{0}''"), RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN( + Kind.ERROR, 1019, "Result of selection criteria is not boolean"), MODULUS_NOT_DEFINED(Kind.ERROR, 1020, + "Modulus not defined between operands of type ''{0}'' and ''{1}''"), NULL_OPERAND_TO_OPERATOR(Kind.ERROR, + 1021, "Operand evaluated to null and that is not supported for this operator"), NO_SIZE_OR_INITIALIZER_FOR_ARRAY_CONSTRUCTION( + Kind.ERROR, 1022, "No array size or initializer was supplied to construct the array"), INCORRECT_ELEMENT_TYPE_FOR_ARRAY( + Kind.ERROR, 1023, "The array of type ''{0}'' cannot have an element of type ''{1}'' inserted"), BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST( + Kind.ERROR, 1024, "Right operand for the 'between' operator has to be a two-element list"), TYPE_NOT_SUPPORTED_BY_PROCESSOR( + Kind.ERROR, 1025, + "The collection processor ''{0}'' does not understand and input collection of elements of type {1}"), UNABLE_TO_ACCESS_FIELD( + Kind.ERROR, 1026, "Unable to access field ''{0}'' on type ''{1}''"), UNABLE_TO_ACCESS_PROPERTY_THROUGH_GETTER( + Kind.ERROR, 1027, "Unable to access property ''{0}'' through getter on type ''{1}''"), UNABLE_TO_ACCESS_PROPERTY_THROUGH_SETTER( + Kind.ERROR, 1028, "Unable to access property ''{0}'' through setter on type ''{1}''"), INVALID_PATTERN( + Kind.ERROR, 1029, "Pattern is not valid ''{0}''"), RECOGNITION_ERROR(Kind.ERROR, 1030, + "Recognition error: {0}"), // TODO poor message when a recognition exception occurs + PROJECTION_NOT_SUPPORTED_ON_TYPE(Kind.ERROR, 1031, "Projection is not supported on the type ''{0}''"), ARGLIST_SHOULD_NOT_BE_EVALUATED( + Kind.ERROR, 1032, "The argument list of a lambda expression should never have getValue() called upon it"), MAPENTRY_SHOULD_NOT_BE_EVALUATED( + Kind.ERROR, 1033, "A map entry should never have getValue() called upon it"), EXCEPTION_DURING_PROPERTY_READ( + Kind.ERROR, 1034, "A problem occurred whilst attempting to access the property ''{0}'': ''{1}''"), EXCEPTION_DURING_CONSTRUCTOR_INVOCATION( + Kind.ERROR, 1035, "A problem occurred whilst attempting to construct ''{0}'': ''{1}''"), DATE_CANNOT_BE_PARSED( + Kind.ERROR, 1036, "Unable to parse date ''{0}'' using format ''{1}''"), FUNCTION_REFERENCE_CANNOT_BE_INVOKED( + Kind.ERROR, 1037, "The function ''{0}'' mapped to an object of type ''{1}'' which cannot be invoked"), FUNCTION_NOT_DEFINED( + Kind.ERROR, 1038, "The function ''{0}'' could not be found"), EXCEPTION_DURING_FUNCTION_CALL(Kind.ERROR, + 1039, "A problem occurred whilst attempting to invoke the function ''{0}'': ''{1}''"), ARRAY_INDEX_OUT_OF_BOUNDS( + Kind.ERROR, 1040, "The array has ''{0}'' elements, index ''{1}'' is invalid"), COLLECTION_INDEX_OUT_OF_BOUNDS( + Kind.ERROR, 1041, "The collection has ''{0}'' elements, index ''{1}'' is invalid"), STRING_INDEX_OUT_OF_BOUNDS( + Kind.ERROR, 1042, "The string has ''{0}'' characters, index ''{1}'' is invalid"), INDEXING_NOT_SUPPORTED_FOR_TYPE( + Kind.ERROR, 1043, "Indexing into type ''{0}'' is not supported"), OPERATOR_IN_CANNOT_DETERMINE_MEMBERSHIP( + Kind.ERROR, 1044, "Operator 'in' not implemented for detecting membership of a ''{0}'' in a ''{1}''"), CANNOT_NEGATE_TYPE( + Kind.ERROR, 1045, "Cannot determine negation of type ''{0}''"), CUT_ARGUMENTS_MUST_BE_INTS(Kind.ERROR, + 1046, "Both arguments to the cut() processor must be Integers, but they are ''{0}'' and ''{1}''"), SOUNDSLIKE_NEEDS_STRING_OPERAND( + Kind.ERROR, 1047, "The soundslike operator needs String operands, but found a ''{0}''"), INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND( + Kind.ERROR, 1048, "The operator 'instanceof' needs the right operand to be a class, not a ''{0}''"), LOCAL_VARIABLE_NOT_DEFINED( + Kind.ERROR, 1049, "Local variable named ''{0}'' could not be found"), EXCEPTION_DURING_METHOD_INVOCATION( + Kind.ERROR, 1050, + "A problem occurred when trying to execute method ''{0}'' on object of type ''{1}'': ''{2}''"), PLACEHOLDER_SHOULD_NEVER_BE_EVALUATED( + Kind.ERROR, 1051, "InternalError: A placeholder node in the Ast should never be evaluated!"), OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES( + Kind.ERROR, 1052, "The operator ''{0}'' is not supported between objects of type ''{1}'' and ''{2}''"), UNEXPECTED_PROBLEM_INVOKING_OPERATOR( + Kind.ERROR, 1054, + "Unexpected problem invoking operator ''{0}'' between objects of type ''{1}'' and ''{2}'': {3}"), PROBLEM_LOCATING_METHOD( + Kind.ERROR, 1055, "Problem locating method {0} cannot on type {1}"), PROBLEM_LOCATING_CONSTRUCTOR( + Kind.ERROR, 1056, + "A problem occurred whilst attempting to construct an object of type ''{0}'' using arguments ''{1}''"), INVALID_FIRST_OPERAND_FOR_LIKE_OPERATOR( + Kind.ERROR, 1057, "First operand to like operator must be a string. ''{0}'' is not"), INVALID_SECOND_OPERAND_FOR_LIKE_OPERATOR( + Kind.ERROR, 1058, "Second operand to like operator must be a string (regex). ''{0}'' is not"), SETVALUE_NOT_SUPPORTED( + Kind.ERROR, 1059, "setValue(ExpressionState, Object) not implemented for ''{0}'' (''{1}''"), TYPE_NAME_EXPECTED_FOR_ARRAY_CONSTRUCTION( + Kind.ERROR, 1060, "Expected the type of the new array to be specified as a String but found ''{0}''"), PROBLEM_DURING_TYPE_CONVERSION( + Kind.ERROR, 1061, "Problem occurred during type conversion: {0}"), MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, + 1062, "Method call of ''{0}'' is ambiguous, supported type conversions allow multiple variants to match"), EXCEPTION_DURING_PROPERTY_WRITE( + Kind.ERROR, 1063, "A problem occurred whilst attempting to set the property ''{0}'': ''{1}''"), NOT_AN_INTEGER( + Kind.ERROR, 1064, "The value ''{0}'' cannot be parsed as an int"), NOT_A_LONG(Kind.ERROR, 1065, + "The value ''{0}'' cannot be parsed as a long"), PARSE_PROBLEM(Kind.ERROR, 1066, + "Error occurred during expression parse: {0}"), INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, + 1067, "First operand to matches operator must be a string. ''{0}'' is not"), INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR( + Kind.ERROR, 1068, "Second operand to matches operator must be a string. ''{0}'' is not"), FUNCTION_MUST_BE_STATIC( + Kind.ERROR, + 1069, + "Only static methods can be called via function references. The method ''{0}'' referred to by name ''{1}'' is not static."); + private Kind kind; private int code; private String message; diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java similarity index 83% rename from org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java rename to org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java index 06486ae717f..29a457ddcfc 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java @@ -22,20 +22,20 @@ import org.springframework.expression.spel.SpelException; import org.springframework.expression.spel.SpelMessages; /** - * The operator 'is' checks if an object is of the class specified in the right hand operand, in the same way that - * instanceof does in Java. + * The operator 'instanceof' checks if an object is of the class specified in the right hand operand, in the same way + * that instanceof does in Java. * * @author Andy Clement */ -public class OperatorIs extends Operator { +public class OperatorInstanceof extends Operator { - public OperatorIs(Token payload) { + public OperatorInstanceof(Token payload) { super(payload); } @Override public String getOperatorName() { - return "is"; + return "instanceof"; } /** @@ -55,7 +55,7 @@ public class OperatorIs extends Operator { } if (right == null || !(right instanceof Class)) { throw new SpelException(getRightOperand().getCharPositionInLine(), - SpelMessages.IS_OPERATOR_NEEDS_CLASS_OPERAND, (right == null ? "null" : right.getClass().getName())); + SpelMessages.INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND, (right == null ? "null" : right.getClass().getName())); } Class rightClass = (Class) right; return rightClass.isAssignableFrom(left.getClass()); 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 fb6f92a78d2..43835ba9537 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 @@ -4,8 +4,6 @@ options { language = Java; output=AST; k=2; - //caseSensitive = false; - //backtrack=true; } tokens { @@ -29,9 +27,6 @@ tokens { METHOD; ADD; SUBTRACT; -// MULTIPLY; -// DIVIDE; -// MODULUS; NUMBER; } @@ -55,19 +50,15 @@ tokens { expr: expression EOF!; -SEMIRPAREN : ';)'; // recoveryrelated: allows us to cope with a rogue superfluous semicolon before the rparen in an expression list - expression : logicalOrExpression ( (ASSIGN^ logicalOrExpression) | (DEFAULT^ logicalOrExpression) | (QMARK^ expression COLON! expression))?; -parenExpr : LPAREN! expression RPAREN!;// (ROGUE! | RPAREN!); - +parenExpr : LPAREN! expression RPAREN!; logicalOrExpression -// possible extra info we could use for better error messages : logicalAndExpression (OR^ logicalAndExpression)*; logicalAndExpression @@ -78,7 +69,6 @@ relationalExpression : sumExpression (relationalOperator^ sumExpression)?; sumExpression : productExpression ( (PLUS^ | MINUS^) productExpression)*; -// TODO could really do with changing ast node types here productExpression : powerExpr ((STAR^ | DIV^| MOD^) powerExpr)* ; @@ -234,7 +224,7 @@ relationalOperator | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN - | IS + | INSTANCEOF | BETWEEN | MATCHES ; @@ -247,7 +237,7 @@ LESS_THAN_OR_EQUAL: '<='; GREATER_THAN: '>'; GREATER_THAN_OR_EQUAL: '>='; IN: 'in'; -IS: 'is'; +INSTANCEOF: 'instanceof'; BETWEEN:'between'; MATCHES:'matches'; NULL_LITERAL: 'null'; 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 5d51ef149ef..8a58fe65b97 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,82 +1,81 @@ -GREATER_THAN_OR_EQUAL=69 -SELECT_FIRST=50 -COMMA=44 +GREATER_THAN_OR_EQUAL=68 +SELECT_FIRST=49 HOLDER=11 -GREATER_THAN=68 -TYPE=52 +COMMA=43 +GREATER_THAN=67 +TYPE=51 EXPRESSIONLIST=4 -MINUS=35 +MINUS=34 MAP_ENTRY=20 -SELECT_LAST=51 +SELECT_LAST=50 NUMBER=24 -LESS_THAN=66 -BANG=40 -FALSE=60 +LESS_THAN=65 +BANG=39 +FALSE=59 METHOD=21 PROPERTY_OR_FIELD=8 -LBRACKET=45 +LBRACKET=44 INDEXER=9 -MOD=38 +MOD=37 CONSTRUCTOR_ARRAY=12 FUNCTIONREF=14 -NULL_LITERAL=56 +NULL_LITERAL=55 NAMED_ARGUMENT=13 -OR=32 -PIPE=75 -DOT=41 -RCURLY=48 +OR=31 +PIPE=74 +DOT=40 +RCURLY=47 EXPRESSION=6 -AND=33 -LCURLY=53 -REAL_TYPE_SUFFIX=83 -STRING_LITERAL=54 -SELECT=49 +AND=32 +LCURLY=52 +REAL_TYPE_SUFFIX=82 +STRING_LITERAL=53 +SELECT=48 QUALIFIED_IDENTIFIER=7 -RBRACKET=46 +RBRACKET=45 SUBTRACT=23 -ASSIGN=26 -BETWEEN=72 -RPAREN=31 -SIGN=84 -LPAREN=30 -HEX_DIGIT=63 -PLUS=34 +ASSIGN=25 +INSTANCEOF=70 +BETWEEN=71 +RPAREN=30 +SIGN=83 +LPAREN=29 +HEX_DIGIT=62 +PLUS=33 LIST_INITIALIZER=18 -APOS=76 +APOS=75 INTEGER_LITERAL=5 -AT=80 -ID=43 -NOT_EQUAL=65 +AT=79 +ID=42 +NOT_EQUAL=64 RANGE=16 -POWER=39 +POWER=38 TYPEREF=15 -DECIMAL_DIGIT=61 -WS=78 -IS=71 -DOLLAR=79 -LESS_THAN_OR_EQUAL=67 -SEMIRPAREN=25 -DQ_STRING_LITERAL=55 -HEXADECIMAL_INTEGER_LITERAL=57 +DECIMAL_DIGIT=60 +WS=77 +DOLLAR=78 +LESS_THAN_OR_EQUAL=66 +DQ_STRING_LITERAL=54 +HEXADECIMAL_INTEGER_LITERAL=56 MAP_INITIALIZER=19 -IN=70 -SEMI=74 +IN=69 +SEMI=73 CONSTRUCTOR=10 -INTEGER_TYPE_SUFFIX=62 -EQUAL=64 -MATCHES=73 -DOT_ESCAPED=77 -UPTO=81 -QMARK=28 -PROJECT=47 -DEFAULT=27 -COLON=29 -DIV=37 -STAR=36 -REAL_LITERAL=58 +INTEGER_TYPE_SUFFIX=61 +EQUAL=63 +MATCHES=72 +DOT_ESCAPED=76 +UPTO=80 +QMARK=27 +PROJECT=46 +DEFAULT=26 +COLON=28 +DIV=36 +STAR=35 +REAL_LITERAL=57 VARIABLEREF=17 -EXPONENT_PART=82 -TRUE=59 +EXPONENT_PART=81 +TRUE=58 ADD=22 -POUND=42 -'new'=85 +POUND=41 +'new'=84 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 5a0a2e57f7b..af0402c01f3 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 10:12:48 +// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 10:16:33 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -7,100 +7,99 @@ import java.util.List; import java.util.ArrayList; public class SpringExpressionsLexer extends Lexer { - public static final int GREATER_THAN_OR_EQUAL=69; - public static final int SELECT_FIRST=50; - public static final int COMMA=44; + public static final int GREATER_THAN_OR_EQUAL=68; + public static final int SELECT_FIRST=49; public static final int HOLDER=11; + public static final int COMMA=43; public static final int EXPRESSIONLIST=4; - public static final int TYPE=52; - public static final int GREATER_THAN=68; - public static final int MINUS=35; + public static final int TYPE=51; + public static final int GREATER_THAN=67; + public static final int MINUS=34; public static final int MAP_ENTRY=20; - public static final int SELECT_LAST=51; + public static final int SELECT_LAST=50; public static final int NUMBER=24; - public static final int BANG=40; - public static final int LESS_THAN=66; + public static final int BANG=39; + public static final int LESS_THAN=65; public static final int METHOD=21; - public static final int FALSE=60; + public static final int FALSE=59; public static final int PROPERTY_OR_FIELD=8; - public static final int LBRACKET=45; - public static final int T85=85; + public static final int LBRACKET=44; public static final int INDEXER=9; - public static final int MOD=38; + public static final int MOD=37; public static final int CONSTRUCTOR_ARRAY=12; public static final int FUNCTIONREF=14; - public static final int NULL_LITERAL=56; + public static final int NULL_LITERAL=55; public static final int NAMED_ARGUMENT=13; - public static final int OR=32; - public static final int PIPE=75; - public static final int DOT=41; - public static final int RCURLY=48; + public static final int OR=31; + public static final int PIPE=74; + public static final int DOT=40; + public static final int RCURLY=47; public static final int EXPRESSION=6; - public static final int AND=33; - public static final int LCURLY=53; - public static final int REAL_TYPE_SUFFIX=83; - public static final int STRING_LITERAL=54; - public static final int SELECT=49; + public static final int AND=32; + public static final int LCURLY=52; + public static final int REAL_TYPE_SUFFIX=82; + public static final int STRING_LITERAL=53; + public static final int SELECT=48; public static final int QUALIFIED_IDENTIFIER=7; - public static final int RBRACKET=46; + public static final int RBRACKET=45; public static final int SUBTRACT=23; - public static final int ASSIGN=26; - public static final int BETWEEN=72; - public static final int RPAREN=31; - public static final int LPAREN=30; - public static final int SIGN=84; - public static final int HEX_DIGIT=63; - public static final int PLUS=34; + public static final int ASSIGN=25; + public static final int INSTANCEOF=70; + public static final int BETWEEN=71; + public static final int RPAREN=30; + public static final int LPAREN=29; + public static final int SIGN=83; + public static final int HEX_DIGIT=62; + public static final int PLUS=33; public static final int LIST_INITIALIZER=18; - public static final int APOS=76; + public static final int APOS=75; public static final int INTEGER_LITERAL=5; - public static final int AT=80; - public static final int ID=43; - public static final int NOT_EQUAL=65; + public static final int AT=79; + public static final int ID=42; + public static final int NOT_EQUAL=64; public static final int RANGE=16; - public static final int POWER=39; + public static final int T84=84; + public static final int POWER=38; public static final int TYPEREF=15; - public static final int DECIMAL_DIGIT=61; - public static final int WS=78; - public static final int IS=71; - public static final int DOLLAR=79; - public static final int SEMIRPAREN=25; - public static final int LESS_THAN_OR_EQUAL=67; - public static final int DQ_STRING_LITERAL=55; + public static final int DECIMAL_DIGIT=60; + public static final int WS=77; + public static final int DOLLAR=78; + public static final int LESS_THAN_OR_EQUAL=66; + public static final int DQ_STRING_LITERAL=54; public static final int MAP_INITIALIZER=19; - public static final int HEXADECIMAL_INTEGER_LITERAL=57; - public static final int IN=70; + public static final int HEXADECIMAL_INTEGER_LITERAL=56; + public static final int IN=69; public static final int CONSTRUCTOR=10; - public static final int SEMI=74; - public static final int INTEGER_TYPE_SUFFIX=62; - public static final int EQUAL=64; - public static final int MATCHES=73; - public static final int DOT_ESCAPED=77; - public static final int QMARK=28; - public static final int UPTO=81; + public static final int SEMI=73; + public static final int INTEGER_TYPE_SUFFIX=61; + public static final int EQUAL=63; + public static final int MATCHES=72; + public static final int DOT_ESCAPED=76; + public static final int QMARK=27; + public static final int UPTO=80; public static final int EOF=-1; - public static final int Tokens=86; - public static final int COLON=29; - public static final int DEFAULT=27; - public static final int PROJECT=47; - public static final int DIV=37; - public static final int STAR=36; + public static final int Tokens=85; + public static final int COLON=28; + public static final int DEFAULT=26; + public static final int PROJECT=46; + public static final int DIV=36; + public static final int STAR=35; public static final int VARIABLEREF=17; - public static final int REAL_LITERAL=58; + public static final int REAL_LITERAL=57; public static final int ADD=22; - public static final int TRUE=59; - public static final int EXPONENT_PART=82; - public static final int POUND=42; + public static final int TRUE=58; + public static final int EXPONENT_PART=81; + public static final int POUND=41; 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 T85 - public final void mT85() throws RecognitionException { + // $ANTLR start T84 + public final void mT84() throws RecognitionException { try { - int _type = T85; + int _type = T84; // /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' { @@ -114,35 +113,16 @@ public class SpringExpressionsLexer extends Lexer { finally { } } - // $ANTLR end T85 - - // $ANTLR start SEMIRPAREN - public final void mSEMIRPAREN() throws RecognitionException { - try { - int _type = SEMIRPAREN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:12: ( ';)' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:14: ';)' - { - match(";)"); - - - } - - this.type = _type; - } - finally { - } - } - // $ANTLR end SEMIRPAREN + // $ANTLR end T84 // $ANTLR start INTEGER_LITERAL 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:225:2: ( ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:4: ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215: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:215:4: ( DECIMAL_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:4: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:4: ( DECIMAL_DIGIT )+ int cnt1=0; loop1: do { @@ -156,7 +136,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:225:5: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:5: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -172,7 +152,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:225:21: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:21: ( INTEGER_TYPE_SUFFIX )? int alt2=2; int LA2_0 = input.LA(1); @@ -181,7 +161,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:225:22: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:22: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -204,38 +184,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:227:29: ( ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:31: ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217: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:217:31: ( '0x' | '0X' ) ( HEX_DIGIT )+ ( INTEGER_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:227:31: ( '0x' | '0X' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217: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=2; - } - else if ( (LA3_1=='x') ) { + if ( (LA3_1=='x') ) { alt3=1; } + else if ( (LA3_1=='X') ) { + alt3=2; + } else { NoViableAltException nvae = - new NoViableAltException("227:31: ( '0x' | '0X' )", 3, 1, input); + new NoViableAltException("217:31: ( '0x' | '0X' )", 3, 1, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("227:31: ( '0x' | '0X' )", 3, 0, input); + new NoViableAltException("217: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:227:32: '0x' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:32: '0x' { match("0x"); @@ -243,7 +223,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:227:39: '0X' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:39: '0X' { match("0X"); @@ -253,7 +233,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:227:45: ( HEX_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:45: ( HEX_DIGIT )+ int cnt4=0; loop4: do { @@ -267,7 +247,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:227:46: HEX_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:46: HEX_DIGIT { mHEX_DIGIT(); @@ -283,7 +263,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:227:58: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:58: ( INTEGER_TYPE_SUFFIX )? int alt5=2; int LA5_0 = input.LA(1); @@ -292,7 +272,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:227:59: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:59: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -315,8 +295,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:242:7: ( '=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:9: '=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:7: ( '=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:9: '=' { match('='); @@ -333,8 +313,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:243:6: ( '==' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:8: '==' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:6: ( '==' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:8: '==' { match("=="); @@ -352,8 +332,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:244:10: ( '!=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:12: '!=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:10: ( '!=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:12: '!=' { match("!="); @@ -371,8 +351,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:245:10: ( '<' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:12: '<' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:10: ( '<' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:12: '<' { match('<'); @@ -389,8 +369,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:246:19: ( '<=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:21: '<=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:236:19: ( '<=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:236:21: '<=' { match("<="); @@ -408,8 +388,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:247:13: ( '>' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:15: '>' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:13: ( '>' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:15: '>' { match('>'); @@ -426,8 +406,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:248:22: ( '>=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:24: '>=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:22: ( '>=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:24: '>=' { match(">="); @@ -445,8 +425,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:249:3: ( 'in' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:9: 'in' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:3: ( 'in' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:9: 'in' { match("in"); @@ -460,14 +440,14 @@ public class SpringExpressionsLexer extends Lexer { } // $ANTLR end IN - // $ANTLR start IS - public final void mIS() throws RecognitionException { + // $ANTLR start INSTANCEOF + public final void mINSTANCEOF() 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:250:3: ( 'is' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:9: 'is' + int _type = INSTANCEOF; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:11: ( 'instanceof' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:17: 'instanceof' { - match("is"); + match("instanceof"); } @@ -477,14 +457,14 @@ public class SpringExpressionsLexer extends Lexer { finally { } } - // $ANTLR end IS + // $ANTLR end INSTANCEOF // $ANTLR start BETWEEN 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:251:8: ( 'between' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:9: 'between' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:241:8: ( 'between' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:241:9: 'between' { match("between"); @@ -502,8 +482,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:252:8: ( 'matches' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:9: 'matches' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:8: ( 'matches' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:9: 'matches' { match("matches"); @@ -521,8 +501,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:253:13: ( 'null' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:15: 'null' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:13: ( 'null' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:15: 'null' { match("null"); @@ -540,8 +520,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:255:5: ( ';' ) - // /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:245:5: ( ';' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:7: ';' { match(';'); @@ -558,8 +538,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:256:4: ( '.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:9: '.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:4: ( '.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:9: '.' { match('.'); @@ -576,8 +556,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:257:6: ( ',' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:8: ',' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:6: ( ',' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:8: ',' { match(','); @@ -594,8 +574,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:258:7: ( '(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:9: '(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:7: ( '(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:9: '(' { match('('); @@ -612,8 +592,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:259:7: ( ')' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:9: ')' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:7: ( ')' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:9: ')' { match(')'); @@ -630,8 +610,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:260:7: ( '{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:9: '{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:7: ( '{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:9: '{' { match('{'); @@ -648,8 +628,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:261:7: ( '}' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:9: '}' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:7: ( '}' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:9: '}' { match('}'); @@ -666,8 +646,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:262:9: ( '[' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:11: '[' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:9: ( '[' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:11: '[' { match('['); @@ -684,8 +664,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:263:9: ( ']' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:11: ']' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:9: ( ']' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:11: ']' { match(']'); @@ -702,8 +682,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:264:5: ( '|' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:7: '|' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:254:5: ( '|' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:254:7: '|' { match('|'); @@ -720,8 +700,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:266:4: ( 'and' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:9: 'and' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:4: ( 'and' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:9: 'and' { match("and"); @@ -739,8 +719,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:267:3: ( 'or' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:9: 'or' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:3: ( 'or' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:9: 'or' { match("or"); @@ -758,8 +738,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:268:6: ( 'false' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:9: 'false' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:6: ( 'false' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:9: 'false' { match("false"); @@ -777,8 +757,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:269:5: ( 'true' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:9: 'true' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:5: ( 'true' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:9: 'true' { match("true"); @@ -796,8 +776,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:271:5: ( '+' ) - // /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:261:5: ( '+' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:7: '+' { match('+'); @@ -814,8 +794,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:272:6: ( '-' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:8: '-' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:6: ( '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:8: '-' { match('-'); @@ -832,8 +812,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:273:4: ( '/' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:6: '/' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:4: ( '/' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:6: '/' { match('/'); @@ -850,8 +830,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:274:5: ( '*' ) - // /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:264:5: ( '*' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:7: '*' { match('*'); @@ -868,8 +848,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:275:4: ( '%' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:6: '%' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:4: ( '%' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:6: '%' { match('%'); @@ -886,8 +866,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:276:6: ( '^' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:276:8: '^' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:6: ( '^' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:8: '^' { match('^'); @@ -904,8 +884,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:277:5: ( '!' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:7: '!' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:5: ( '!' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:7: '!' { match('!'); @@ -922,8 +902,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:278:6: ( '#' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:8: '#' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:6: ( '#' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:8: '#' { match('#'); @@ -940,8 +920,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:279:6: ( '?' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:8: '?' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:6: ( '?' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:8: '?' { match('?'); @@ -958,8 +938,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:280:8: ( '??' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:10: '??' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:8: ( '??' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:10: '??' { match("??"); @@ -977,8 +957,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mPROJECT() throws RecognitionException { try { int _type = PROJECT; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:8: ( '!{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:10: '!{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:8: ( '!{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:10: '!{' { match("!{"); @@ -996,8 +976,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:282:7: ( '?{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282: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("?{"); @@ -1015,8 +995,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:283:13: ( '^{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:15: '^{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:13: ( '^{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:15: '^{' { match("^{"); @@ -1034,8 +1014,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:284:12: ( '${' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:14: '${' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:12: ( '${' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:14: '${' { match("${"); @@ -1053,8 +1033,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:285:5: ( 'T(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:7: 'T(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:5: ( 'T(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275:7: 'T(' { match("T("); @@ -1072,11 +1052,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:287:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:17: '\\'' ( APOS | ~ '\\'' )* '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:17: '\\'' ( APOS | ~ '\\'' )* '\\'' { match('\''); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:23: ( APOS | ~ '\\'' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:23: ( APOS | ~ '\\'' )* loop6: do { int alt6=3; @@ -1098,14 +1078,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:287:24: APOS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277: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:287:29: ~ '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:29: ~ '\\'' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1141,11 +1121,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:288:18: ( '\"' (~ '\"' )* '\"' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:20: '\"' (~ '\"' )* '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:18: ( '\"' (~ '\"' )* '\"' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:20: '\"' (~ '\"' )* '\"' { match('\"'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:25: (~ '\"' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:25: (~ '\"' )* loop7: do { int alt7=2; @@ -1158,7 +1138,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:288:26: ~ '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:26: ~ '\"' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1194,8 +1174,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:289:3: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:5: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279: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:279: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(); @@ -1207,7 +1187,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:289: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:279:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* loop8: do { int alt8=6; @@ -1301,35 +1281,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:289:30: 'a' .. 'z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279: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:289:39: 'A' .. 'Z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279: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:289:48: '_' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:48: '_' { match('_'); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:52: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279: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:289:61: DOT_ESCAPED + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:61: DOT_ESCAPED { mDOT_ESCAPED(); @@ -1355,8 +1335,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:290:12: ( '\\\\.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:14: '\\\\.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:12: ( '\\\\.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:14: '\\\\.' { match("\\."); @@ -1374,10 +1354,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:291:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:281:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ int cnt9=0; loop9: do { @@ -1431,8 +1411,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: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:282:7: ( '$' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:282:9: '$' { match('$'); @@ -1449,8 +1429,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:293:3: ( '@' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:293:5: '@' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:3: ( '@' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:5: '@' { match('@'); @@ -1467,8 +1447,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:294:5: ( '..' ) - // /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:284:5: ( '..' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:7: '..' { match(".."); @@ -1486,8 +1466,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:295:6: ( ':' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295: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(':'); @@ -1504,18 +1484,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:298:14: ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288: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:299:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:3: ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299: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:289: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:289: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:299:8: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:8: ( DECIMAL_DIGIT )+ int cnt10=0; loop10: do { @@ -1529,7 +1509,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:299:9: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:9: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1545,7 +1525,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:299:25: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:25: ( EXPONENT_PART )? int alt11=2; int LA11_0 = input.LA(1); @@ -1554,7 +1534,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:299:26: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:26: EXPONENT_PART { mEXPONENT_PART(); @@ -1563,7 +1543,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:299:42: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:42: ( REAL_TYPE_SUFFIX )? int alt12=2; int LA12_0 = input.LA(1); @@ -1572,7 +1552,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:299:43: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:43: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1588,12 +1568,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:300:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:2: ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:3: ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290: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:290:3: ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:3: ( DECIMAL_DIGIT )+ int cnt13=0; loop13: do { @@ -1607,7 +1587,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:300:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1624,7 +1604,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:300:24: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:24: ( DECIMAL_DIGIT )+ int cnt14=0; loop14: do { @@ -1638,7 +1618,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:300:25: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:25: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1654,7 +1634,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:300:41: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:41: ( EXPONENT_PART )? int alt15=2; int LA15_0 = input.LA(1); @@ -1663,7 +1643,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:300:42: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:42: EXPONENT_PART { mEXPONENT_PART(); @@ -1672,7 +1652,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:300:58: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:58: ( REAL_TYPE_SUFFIX )? int alt16=2; int LA16_0 = input.LA(1); @@ -1681,7 +1661,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:300:59: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:59: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1697,12 +1677,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:301:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:2: ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:3: ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291: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:291:3: ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:3: ( DECIMAL_DIGIT )+ int cnt17=0; loop17: do { @@ -1716,7 +1696,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:301:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1732,14 +1712,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:301:20: ( EXPONENT_PART ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:21: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:20: ( EXPONENT_PART ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:21: EXPONENT_PART { mEXPONENT_PART(); } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:36: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:36: ( REAL_TYPE_SUFFIX )? int alt18=2; int LA18_0 = input.LA(1); @@ -1748,7 +1728,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:301:37: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:37: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1764,12 +1744,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:302:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:2: ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:3: ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292: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:292:3: ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:3: ( DECIMAL_DIGIT )+ int cnt19=0; loop19: do { @@ -1783,7 +1763,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:302:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1799,8 +1779,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:302:20: ( REAL_TYPE_SUFFIX ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:21: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:20: ( REAL_TYPE_SUFFIX ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:21: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1824,8 +1804,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:304:15: ( '\\'' '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:17: '\\'' '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:15: ( '\\'' '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:17: '\\'' '\\'' { match('\''); match('\''); @@ -1841,8 +1821,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:305:24: ( '0' .. '9' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:26: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:24: ( '0' .. '9' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:26: '0' .. '9' { matchRange('0','9'); @@ -1857,8 +1837,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:306:30: ( ( 'L' | 'l' ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:32: ( 'L' | 'l' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:30: ( ( 'L' | 'l' ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:32: ( 'L' | 'l' ) { if ( input.LA(1)=='L'||input.LA(1)=='l' ) { input.consume(); @@ -1882,7 +1862,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:307:20: ( '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297: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') ) { @@ -1907,7 +1887,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:309: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:299:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ ) int alt25=2; int LA25_0 = input.LA(1); @@ -1919,16 +1899,16 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("309:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input); + new NoViableAltException("299: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:309:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299: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:309:31: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:31: ( SIGN )* loop21: do { int alt21=2; @@ -1941,7 +1921,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:309:32: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:32: SIGN { mSIGN(); @@ -1953,7 +1933,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:309:40: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:40: ( DECIMAL_DIGIT )+ int cnt22=0; loop22: do { @@ -1967,7 +1947,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:309:41: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:41: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1987,10 +1967,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:309:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299: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:309:64: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:64: ( SIGN )* loop23: do { int alt23=2; @@ -2003,7 +1983,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:309:65: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:65: SIGN { mSIGN(); @@ -2015,7 +1995,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:309:73: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:73: ( DECIMAL_DIGIT )+ int cnt24=0; loop24: do { @@ -2029,7 +2009,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:309:74: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:74: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -2059,7 +2039,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:310:15: ( '+' | '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300: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)=='-' ) { @@ -2084,7 +2064,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:311:27: ( 'F' | 'f' | 'D' | 'd' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301: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' ) { @@ -2107,390 +2087,383 @@ 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: ( T85 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL ) - int alt26=55; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:8: ( T84 | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | INSTANCEOF | 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=54; 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: T85 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:10: T84 { - mT85(); + mT84(); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:14: SEMIRPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:14: INTEGER_LITERAL { - mSEMIRPAREN(); + mINTEGER_LITERAL(); } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:25: INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:30: HEXADECIMAL_INTEGER_LITERAL { - mINTEGER_LITERAL(); + mHEXADECIMAL_INTEGER_LITERAL(); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:41: HEXADECIMAL_INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:58: ASSIGN { - mHEXADECIMAL_INTEGER_LITERAL(); + mASSIGN(); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:69: ASSIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:65: EQUAL { - mASSIGN(); + mEQUAL(); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:76: EQUAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:71: NOT_EQUAL { - mEQUAL(); + mNOT_EQUAL(); } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:82: NOT_EQUAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:81: LESS_THAN { - mNOT_EQUAL(); + mLESS_THAN(); } break; case 8 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:92: LESS_THAN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:91: LESS_THAN_OR_EQUAL { - mLESS_THAN(); + mLESS_THAN_OR_EQUAL(); } break; case 9 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:102: LESS_THAN_OR_EQUAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:110: GREATER_THAN { - mLESS_THAN_OR_EQUAL(); + mGREATER_THAN(); } break; case 10 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:121: GREATER_THAN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:123: GREATER_THAN_OR_EQUAL { - mGREATER_THAN(); + mGREATER_THAN_OR_EQUAL(); } break; case 11 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:134: GREATER_THAN_OR_EQUAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:145: IN { - mGREATER_THAN_OR_EQUAL(); + mIN(); } break; case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:156: IN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:148: INSTANCEOF { - mIN(); + mINSTANCEOF(); } break; case 13 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:159: IS - { - mIS(); - - } - break; - case 14 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:162: BETWEEN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:159: BETWEEN { mBETWEEN(); } break; - case 15 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:170: MATCHES + case 14 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:167: MATCHES { mMATCHES(); } break; - case 16 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:178: NULL_LITERAL + case 15 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:175: NULL_LITERAL { mNULL_LITERAL(); } break; - case 17 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:191: SEMI + case 16 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:188: SEMI { mSEMI(); } break; - case 18 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:196: DOT + case 17 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:193: DOT { mDOT(); } break; - case 19 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:200: COMMA + case 18 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:197: COMMA { mCOMMA(); } break; - case 20 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:206: LPAREN + case 19 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:203: LPAREN { mLPAREN(); } break; - case 21 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:213: RPAREN + case 20 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:210: RPAREN { mRPAREN(); } break; - case 22 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:220: LCURLY + case 21 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:217: LCURLY { mLCURLY(); } break; - case 23 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:227: RCURLY + case 22 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:224: RCURLY { mRCURLY(); } break; - case 24 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:234: LBRACKET + case 23 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:231: LBRACKET { mLBRACKET(); } break; - case 25 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:243: RBRACKET + case 24 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:240: RBRACKET { mRBRACKET(); } break; - case 26 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:252: PIPE + case 25 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:249: PIPE { mPIPE(); } break; - case 27 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:257: AND + case 26 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:254: AND { mAND(); } break; - case 28 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:261: OR + case 27 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:258: OR { mOR(); } break; - case 29 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:264: FALSE + case 28 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:261: FALSE { mFALSE(); } break; - case 30 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:270: TRUE + case 29 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:267: TRUE { mTRUE(); } break; - case 31 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:275: PLUS + case 30 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:272: PLUS { mPLUS(); } break; - case 32 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:280: MINUS + case 31 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:277: MINUS { mMINUS(); } break; - case 33 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:286: DIV + case 32 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:283: DIV { mDIV(); } break; - case 34 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:290: STAR + case 33 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:287: STAR { mSTAR(); } break; - case 35 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:295: MOD + case 34 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:292: MOD { mMOD(); } break; - case 36 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:299: POWER + case 35 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:296: POWER { mPOWER(); } break; - case 37 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:305: BANG + case 36 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:302: BANG { mBANG(); } break; - case 38 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:310: POUND + case 37 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:307: POUND { mPOUND(); } break; - case 39 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:316: QMARK + case 38 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:313: QMARK { mQMARK(); } break; - case 40 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:322: DEFAULT + case 39 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:319: DEFAULT { mDEFAULT(); } break; - case 41 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:330: PROJECT + case 40 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:327: PROJECT { mPROJECT(); } break; - case 42 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:338: SELECT + case 41 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:335: SELECT { mSELECT(); } 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_FIRST + case 42 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:342: SELECT_FIRST { mSELECT_FIRST(); } break; - 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 + case 43 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:355: SELECT_LAST { mSELECT_LAST(); } break; - case 45 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:370: TYPE + case 44 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:367: TYPE { mTYPE(); } break; - 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 + case 45 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:372: STRING_LITERAL { mSTRING_LITERAL(); } break; - 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 + case 46 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:387: DQ_STRING_LITERAL { mDQ_STRING_LITERAL(); } break; - case 48 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:408: ID + case 47 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:405: ID { mID(); } break; - 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 + case 48 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:408: DOT_ESCAPED { mDOT_ESCAPED(); } break; - case 50 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:423: WS + case 49 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:420: WS { mWS(); } break; - case 51 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:426: DOLLAR + case 50 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:423: DOLLAR { mDOLLAR(); } break; - case 52 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:433: AT + case 51 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:430: AT { mAT(); } break; - case 53 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:436: UPTO + case 52 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:433: UPTO { mUPTO(); } break; - case 54 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:441: COLON + case 53 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:438: COLON { mCOLON(); } break; - 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 + case 54 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:444: REAL_LITERAL { mREAL_LITERAL(); @@ -2513,13 +2486,13 @@ public class SpringExpressionsLexer extends Lexer { static final String DFA20_maxS = "\1\71\1\uffff\1\146\3\uffff"; static final String DFA20_acceptS = - "\1\uffff\1\1\1\uffff\1\4\1\2\1\3"; + "\1\uffff\1\1\1\uffff\1\3\1\4\1\2"; static final String DFA20_specialS = "\6\uffff}>"; static final String[] DFA20_transitionS = { "\1\1\1\uffff\12\2", "", - "\1\4\1\uffff\12\2\12\uffff\1\3\1\5\1\3\35\uffff\1\3\1\5\1\3", + "\1\5\1\uffff\12\2\12\uffff\1\4\1\3\1\4\35\uffff\1\4\1\3\1\4", "", "", "" @@ -2555,60 +2528,63 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA20_transition; } public String getDescription() { - return "298:1: REAL_LITERAL : ( ( '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ '.' ( DECIMAL_DIGIT )+ ( EXPONENT_PART )? ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( EXPONENT_PART ) ( REAL_TYPE_SUFFIX )? ) | ( ( DECIMAL_DIGIT )+ ( REAL_TYPE_SUFFIX ) ) );"; + return "288: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\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"; + "\1\uffff\1\45\2\55\1\60\1\63\1\65\1\67\3\45\1\uffff\1\74\10\uffff"+ + "\4\45\5\uffff\1\102\1\uffff\1\105\1\107\1\45\7\uffff\2\45\14\uffff"+ + "\1\114\2\45\2\uffff\1\45\1\120\2\45\10\uffff\1\45\1\124\1\45\1\uffff"+ + "\2\45\1\130\1\uffff\2\45\1\133\1\uffff\3\45\1\uffff\1\45\1\140\1"+ + "\uffff\3\45\1\144\1\uffff\3\45\1\uffff\1\45\1\151\1\152\1\45\2\uffff"+ + "\1\45\1\155\1\uffff"; static final String DFA26_eofS = - "\151\uffff"; + "\156\uffff"; static final String DFA26_minS = - "\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"; + "\1\11\1\145\2\56\4\75\1\156\1\145\1\141\1\uffff\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\14\uffff\1\60\2\164\2\uffff\1\144\1\60\1\154\1\165"+ + "\10\uffff\1\154\1\60\1\164\1\uffff\1\167\1\143\1\60\1\uffff\1\163"+ + "\1\145\1\60\1\uffff\1\141\1\145\1\150\1\uffff\1\145\1\60\1\uffff"+ + "\1\156\2\145\1\60\1\uffff\1\143\1\156\1\163\1\uffff\1\145\2\60\1"+ + "\157\2\uffff\1\146\1\60\1\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\175\1\165\1\170\1\146\1\75\1\173\2\75\1\156\1\145\1\141\1\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"; + "\1\50\7\uffff\1\154\1\167\14\uffff\1\172\2\164\2\uffff\1\144\1\172"+ + "\1\154\1\165\10\uffff\1\154\1\172\1\164\1\uffff\1\167\1\143\1\172"+ + "\1\uffff\1\163\1\145\1\172\1\uffff\1\141\1\145\1\150\1\uffff\1\145"+ + "\1\172\1\uffff\1\156\2\145\1\172\1\uffff\1\143\1\156\1\163\1\uffff"+ + "\1\145\2\172\1\157\2\uffff\1\146\1\172\1\uffff"; static final String DFA26_acceptS = - "\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"; + "\13\uffff\1\20\1\uffff\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\4"+ + "\uffff\1\36\1\37\1\40\1\41\1\42\1\uffff\1\45\3\uffff\1\55\1\56\1"+ + "\57\1\60\1\61\1\63\1\65\2\uffff\1\3\1\2\1\66\1\5\1\4\1\50\1\6\1"+ + "\44\1\10\1\7\1\12\1\11\3\uffff\1\64\1\21\4\uffff\1\52\1\43\1\51"+ + "\1\47\1\46\1\53\1\62\1\54\3\uffff\1\13\3\uffff\1\33\3\uffff\1\1"+ + "\3\uffff\1\32\2\uffff\1\17\4\uffff\1\35\3\uffff\1\34\4\uffff\1\15"+ + "\1\16\2\uffff\1\14"; static final String DFA26_specialS = - "\151\uffff}>"; + "\156\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"+ - "\1\2\1\7\1\5\1\10\1\40\1\50\23\45\1\42\6\45\1\22\1\46\1\23\1"+ - "\36\1\45\1\uffff\1\25\1\12\3\45\1\27\2\45\1\11\3\45\1\13\1\1"+ + "\2\47\2\uffff\1\47\22\uffff\1\47\1\5\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\2\11\3\1\51"+ + "\1\13\1\6\1\4\1\7\1\40\1\50\23\45\1\42\6\45\1\22\1\46\1\23\1"+ + "\36\1\45\1\uffff\1\25\1\11\3\45\1\27\2\45\1\10\3\45\1\12\1\1"+ "\1\26\4\45\1\30\6\45\1\20\1\24\1\21", "\1\53\17\uffff\1\52", - "\1\54", - "\1\60\1\uffff\12\4\12\uffff\3\60\21\uffff\1\56\13\uffff\3\60"+ - "\21\uffff\1\56", - "\1\60\1\uffff\12\4\12\uffff\3\60\35\uffff\3\60", - "\1\61", - "\1\63\75\uffff\1\64", + "\1\56\1\uffff\12\3\12\uffff\3\56\21\uffff\1\54\13\uffff\3\56"+ + "\21\uffff\1\54", + "\1\56\1\uffff\12\3\12\uffff\3\56\35\uffff\3\56", + "\1\57", + "\1\62\75\uffff\1\61", + "\1\64", "\1\66", "\1\70", - "\1\73\4\uffff\1\72", - "\1\74", - "\1\75", - "\1\76\1\uffff\12\60", + "\1\71", + "\1\72", + "", + "\1\73\1\uffff\12\56", "", "", "", @@ -2617,20 +2593,20 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", + "\1\75", + "\1\76", + "\1\77", "\1\100", - "\1\101", - "\1\102", - "\1\103", "", "", "", "", "", - "\1\104", + "\1\101", "", - "\1\107\73\uffff\1\106", - "\1\111", - "\1\113", + "\1\104\73\uffff\1\103", + "\1\106", + "\1\110", "", "", "", @@ -2638,8 +2614,8 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", - "\1\114", - "\1\115", + "\1\111", + "\1\112", "", "", "", @@ -2652,18 +2628,16 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\22\45"+ + "\1\113\7\45", + "\1\115", + "\1\116", "", "", + "\1\117", "\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\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", "", "", "", @@ -2672,34 +2646,42 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", - "\1\126", + "\1\123", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\125", "", + "\1\126", + "\1\127", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", - "\1\130", "\1\131", + "\1\132", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", - "\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", - "\1\137", "", - "\1\140", + "\1\137", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", + "\1\141", "\1\142", "\1\143", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", "\1\145", "\1\146", + "\1\147", "", + "\1\150", "\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\153", "", + "", + "\1\154", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "" }; @@ -2733,7 +2715,7 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA26_transition; } public String getDescription() { - return "1:1: Tokens : ( T85 | SEMIRPAREN | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES | NULL_LITERAL | SEMI | DOT | COMMA | LPAREN | RPAREN | LCURLY | RCURLY | LBRACKET | RBRACKET | PIPE | AND | OR | FALSE | TRUE | PLUS | MINUS | DIV | STAR | MOD | POWER | BANG | POUND | QMARK | DEFAULT | PROJECT | SELECT | SELECT_FIRST | SELECT_LAST | TYPE | STRING_LITERAL | DQ_STRING_LITERAL | ID | DOT_ESCAPED | WS | DOLLAR | AT | UPTO | COLON | REAL_LITERAL );"; + return "1:1: Tokens : ( T84 | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | INSTANCEOF | 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 b2d3c8fc781..dca611c886e 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 10:12:48 +// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-09-16 10:16:33 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -12,90 +12,89 @@ import org.antlr.runtime.tree.*; public class SpringExpressionsParser extends Parser { public static final String[] tokenNames = new String[] { - "", "", "", "", "EXPRESSIONLIST", "INTEGER_LITERAL", "EXPRESSION", "QUALIFIED_IDENTIFIER", "PROPERTY_OR_FIELD", "INDEXER", "CONSTRUCTOR", "HOLDER", "CONSTRUCTOR_ARRAY", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "RANGE", "VARIABLEREF", "LIST_INITIALIZER", "MAP_INITIALIZER", "MAP_ENTRY", "METHOD", "ADD", "SUBTRACT", "NUMBER", "SEMIRPAREN", "ASSIGN", "DEFAULT", "QMARK", "COLON", "LPAREN", "RPAREN", "OR", "AND", "PLUS", "MINUS", "STAR", "DIV", "MOD", "POWER", "BANG", "DOT", "POUND", "ID", "COMMA", "LBRACKET", "RBRACKET", "PROJECT", "RCURLY", "SELECT", "SELECT_FIRST", "SELECT_LAST", "TYPE", "LCURLY", "STRING_LITERAL", "DQ_STRING_LITERAL", "NULL_LITERAL", "HEXADECIMAL_INTEGER_LITERAL", "REAL_LITERAL", "TRUE", "FALSE", "DECIMAL_DIGIT", "INTEGER_TYPE_SUFFIX", "HEX_DIGIT", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_OR_EQUAL", "GREATER_THAN", "GREATER_THAN_OR_EQUAL", "IN", "IS", "BETWEEN", "MATCHES", "SEMI", "PIPE", "APOS", "DOT_ESCAPED", "WS", "DOLLAR", "AT", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" + "", "", "", "", "EXPRESSIONLIST", "INTEGER_LITERAL", "EXPRESSION", "QUALIFIED_IDENTIFIER", "PROPERTY_OR_FIELD", "INDEXER", "CONSTRUCTOR", "HOLDER", "CONSTRUCTOR_ARRAY", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "RANGE", "VARIABLEREF", "LIST_INITIALIZER", "MAP_INITIALIZER", "MAP_ENTRY", "METHOD", "ADD", "SUBTRACT", "NUMBER", "ASSIGN", "DEFAULT", "QMARK", "COLON", "LPAREN", "RPAREN", "OR", "AND", "PLUS", "MINUS", "STAR", "DIV", "MOD", "POWER", "BANG", "DOT", "POUND", "ID", "COMMA", "LBRACKET", "RBRACKET", "PROJECT", "RCURLY", "SELECT", "SELECT_FIRST", "SELECT_LAST", "TYPE", "LCURLY", "STRING_LITERAL", "DQ_STRING_LITERAL", "NULL_LITERAL", "HEXADECIMAL_INTEGER_LITERAL", "REAL_LITERAL", "TRUE", "FALSE", "DECIMAL_DIGIT", "INTEGER_TYPE_SUFFIX", "HEX_DIGIT", "EQUAL", "NOT_EQUAL", "LESS_THAN", "LESS_THAN_OR_EQUAL", "GREATER_THAN", "GREATER_THAN_OR_EQUAL", "IN", "INSTANCEOF", "BETWEEN", "MATCHES", "SEMI", "PIPE", "APOS", "DOT_ESCAPED", "WS", "DOLLAR", "AT", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" }; - public static final int GREATER_THAN_OR_EQUAL=69; - public static final int SELECT_FIRST=50; - public static final int COMMA=44; + public static final int GREATER_THAN_OR_EQUAL=68; + public static final int SELECT_FIRST=49; public static final int HOLDER=11; - public static final int GREATER_THAN=68; - public static final int TYPE=52; + public static final int COMMA=43; + public static final int GREATER_THAN=67; + public static final int TYPE=51; public static final int EXPRESSIONLIST=4; - public static final int MINUS=35; + public static final int MINUS=34; public static final int MAP_ENTRY=20; - public static final int SELECT_LAST=51; + public static final int SELECT_LAST=50; public static final int NUMBER=24; - public static final int LESS_THAN=66; - public static final int BANG=40; - public static final int FALSE=60; + public static final int LESS_THAN=65; + public static final int BANG=39; + public static final int FALSE=59; public static final int METHOD=21; public static final int PROPERTY_OR_FIELD=8; - public static final int LBRACKET=45; + public static final int LBRACKET=44; public static final int INDEXER=9; - public static final int MOD=38; + public static final int MOD=37; public static final int CONSTRUCTOR_ARRAY=12; public static final int FUNCTIONREF=14; - public static final int NULL_LITERAL=56; + public static final int NULL_LITERAL=55; public static final int NAMED_ARGUMENT=13; - public static final int OR=32; - public static final int PIPE=75; - public static final int DOT=41; - public static final int RCURLY=48; + public static final int OR=31; + public static final int PIPE=74; + public static final int DOT=40; + public static final int RCURLY=47; public static final int EXPRESSION=6; - public static final int AND=33; - public static final int LCURLY=53; - public static final int REAL_TYPE_SUFFIX=83; - public static final int STRING_LITERAL=54; - public static final int SELECT=49; + public static final int AND=32; + public static final int LCURLY=52; + public static final int REAL_TYPE_SUFFIX=82; + public static final int STRING_LITERAL=53; + public static final int SELECT=48; public static final int QUALIFIED_IDENTIFIER=7; - public static final int RBRACKET=46; + public static final int RBRACKET=45; public static final int SUBTRACT=23; - public static final int ASSIGN=26; - public static final int BETWEEN=72; - public static final int RPAREN=31; - public static final int SIGN=84; - public static final int LPAREN=30; - public static final int HEX_DIGIT=63; - public static final int PLUS=34; + public static final int ASSIGN=25; + public static final int INSTANCEOF=70; + public static final int BETWEEN=71; + public static final int RPAREN=30; + public static final int SIGN=83; + public static final int LPAREN=29; + public static final int HEX_DIGIT=62; + public static final int PLUS=33; public static final int LIST_INITIALIZER=18; - public static final int APOS=76; + public static final int APOS=75; public static final int INTEGER_LITERAL=5; - public static final int AT=80; - public static final int ID=43; - public static final int NOT_EQUAL=65; + public static final int AT=79; + public static final int ID=42; + public static final int NOT_EQUAL=64; public static final int RANGE=16; - public static final int POWER=39; + public static final int POWER=38; public static final int TYPEREF=15; - public static final int DECIMAL_DIGIT=61; - public static final int WS=78; - public static final int IS=71; - public static final int DOLLAR=79; - public static final int LESS_THAN_OR_EQUAL=67; - public static final int SEMIRPAREN=25; - public static final int DQ_STRING_LITERAL=55; - public static final int HEXADECIMAL_INTEGER_LITERAL=57; + public static final int DECIMAL_DIGIT=60; + public static final int WS=77; + public static final int DOLLAR=78; + public static final int LESS_THAN_OR_EQUAL=66; + public static final int DQ_STRING_LITERAL=54; + public static final int HEXADECIMAL_INTEGER_LITERAL=56; public static final int MAP_INITIALIZER=19; - public static final int IN=70; - public static final int SEMI=74; + public static final int IN=69; + public static final int SEMI=73; public static final int CONSTRUCTOR=10; - public static final int INTEGER_TYPE_SUFFIX=62; - public static final int EQUAL=64; - public static final int MATCHES=73; - public static final int DOT_ESCAPED=77; - public static final int UPTO=81; + public static final int INTEGER_TYPE_SUFFIX=61; + public static final int EQUAL=63; + public static final int MATCHES=72; + public static final int DOT_ESCAPED=76; + public static final int UPTO=80; public static final int EOF=-1; - public static final int QMARK=28; - public static final int PROJECT=47; - public static final int DEFAULT=27; - public static final int COLON=29; - public static final int DIV=37; - public static final int STAR=36; - public static final int REAL_LITERAL=58; + public static final int QMARK=27; + public static final int PROJECT=46; + public static final int DEFAULT=26; + public static final int COLON=28; + public static final int DIV=36; + public static final int STAR=35; + public static final int REAL_LITERAL=57; public static final int VARIABLEREF=17; - public static final int EXPONENT_PART=82; - public static final int TRUE=59; + public static final int EXPONENT_PART=81; + public static final int TRUE=58; public static final int ADD=22; - public static final int POUND=42; + public static final int POUND=41; public SpringExpressionsParser(TokenStream input) { super(input); @@ -125,7 +124,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:56:1: expr : expression EOF ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:51:1: expr : expression EOF ; public final expr_return expr() throws RecognitionException { expr_return retval = new expr_return(); retval.start = input.LT(1); @@ -139,18 +138,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:56:5: ( expression EOF ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:7: expression EOF + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:51:5: ( expression EOF ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:51:7: expression EOF { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_expr161); + pushFollow(FOLLOW_expression_in_expr154); 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_expr163); if (failed) return retval; + match(input,EOF,FOLLOW_EOF_in_expr156); if (failed) return retval; } @@ -178,7 +177,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:60: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:53: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); @@ -206,17 +205,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:60:12: ( logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:53: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:54:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalOrExpression_in_expression192); + pushFollow(FOLLOW_logicalOrExpression_in_expression176); 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:62: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:55:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? int alt1=4; switch ( input.LA(1) ) { case ASSIGN: @@ -238,18 +237,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:62:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:55:7: ( ASSIGN logicalOrExpression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:7: ( ASSIGN logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:8: ASSIGN logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:55:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:55:8: ASSIGN logicalOrExpression { ASSIGN4=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_expression201); if (failed) return retval; + match(input,ASSIGN,FOLLOW_ASSIGN_in_expression185); 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_expression204); + pushFollow(FOLLOW_logicalOrExpression_in_expression188); logicalOrExpression5=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -261,18 +260,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:63:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:6: ( DEFAULT logicalOrExpression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:6: ( DEFAULT logicalOrExpression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:7: DEFAULT logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:7: DEFAULT logicalOrExpression { DEFAULT6=(Token)input.LT(1); - match(input,DEFAULT,FOLLOW_DEFAULT_in_expression214); if (failed) return retval; + match(input,DEFAULT,FOLLOW_DEFAULT_in_expression198); 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_expression217); + pushFollow(FOLLOW_logicalOrExpression_in_expression201); logicalOrExpression7=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -284,25 +283,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:64:6: ( QMARK expression COLON expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:6: ( QMARK expression COLON expression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:6: ( QMARK expression COLON expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:7: QMARK expression COLON expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:6: ( QMARK expression COLON expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:57:7: QMARK expression COLON expression { QMARK8=(Token)input.LT(1); - match(input,QMARK,FOLLOW_QMARK_in_expression227); if (failed) return retval; + match(input,QMARK,FOLLOW_QMARK_in_expression211); 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_expression230); + pushFollow(FOLLOW_expression_in_expression214); 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_expression232); if (failed) return retval; - pushFollow(FOLLOW_expression_in_expression235); + match(input,COLON,FOLLOW_COLON_in_expression216); if (failed) return retval; + pushFollow(FOLLOW_expression_in_expression219); expression11=expression(); _fsp--; if (failed) return retval; @@ -343,7 +342,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:66:1: parenExpr : LPAREN expression RPAREN ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:1: parenExpr : LPAREN expression RPAREN ; public final parenExpr_return parenExpr() throws RecognitionException { parenExpr_return retval = new parenExpr_return(); retval.start = input.LT(1); @@ -359,20 +358,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:66:11: ( LPAREN expression RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:13: LPAREN expression RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:11: ( LPAREN expression RPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:13: LPAREN expression RPAREN { root_0 = (Object)adaptor.nil(); LPAREN12=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr246); if (failed) return retval; - pushFollow(FOLLOW_expression_in_parenExpr249); + match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr230); if (failed) return retval; + pushFollow(FOLLOW_expression_in_parenExpr233); 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_parenExpr251); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr235); if (failed) return retval; } @@ -400,7 +399,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:69:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; public final logicalOrExpression_return logicalOrExpression() throws RecognitionException { logicalOrExpression_return retval = new logicalOrExpression_return(); retval.start = input.LT(1); @@ -416,17 +415,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:71:1: ( logicalAndExpression ( OR logicalAndExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:3: logicalAndExpression ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:1: ( logicalAndExpression ( OR logicalAndExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:3: logicalAndExpression ( OR logicalAndExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression264); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression246); 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:71:24: ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:24: ( OR logicalAndExpression )* loop2: do { int alt2=2; @@ -439,15 +438,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:71:25: OR logicalAndExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:25: OR logicalAndExpression { OR16=(Token)input.LT(1); - match(input,OR,FOLLOW_OR_in_logicalOrExpression267); if (failed) return retval; + match(input,OR,FOLLOW_OR_in_logicalOrExpression249); 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_logicalOrExpression270); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression252); logicalAndExpression17=logicalAndExpression(); _fsp--; if (failed) return retval; @@ -488,7 +487,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:73:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; public final logicalAndExpression_return logicalAndExpression() throws RecognitionException { logicalAndExpression_return retval = new logicalAndExpression_return(); retval.start = input.LT(1); @@ -504,17 +503,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:74:1: ( relationalExpression ( AND relationalExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:74:3: relationalExpression ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:1: ( relationalExpression ( AND relationalExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:3: relationalExpression ( AND relationalExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression305); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression287); 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:74:24: ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:24: ( AND relationalExpression )* loop3: do { int alt3=2; @@ -527,15 +526,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:74:25: AND relationalExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:25: AND relationalExpression { AND19=(Token)input.LT(1); - match(input,AND,FOLLOW_AND_in_logicalAndExpression308); if (failed) return retval; + match(input,AND,FOLLOW_AND_in_logicalAndExpression290); 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_logicalAndExpression311); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression293); relationalExpression20=relationalExpression(); _fsp--; if (failed) return retval; @@ -576,7 +575,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:76:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; public final relationalExpression_return relationalExpression() throws RecognitionException { relationalExpression_return retval = new relationalExpression_return(); retval.start = input.LT(1); @@ -592,17 +591,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:76:22: ( sumExpression ( relationalOperator sumExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:24: sumExpression ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:22: ( sumExpression ( relationalOperator sumExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:24: sumExpression ( relationalOperator sumExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_sumExpression_in_relationalExpression322); + pushFollow(FOLLOW_sumExpression_in_relationalExpression304); 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:76:38: ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:38: ( relationalOperator sumExpression )? int alt4=2; int LA4_0 = input.LA(1); @@ -611,14 +610,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:76:39: relationalOperator sumExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:39: relationalOperator sumExpression { - pushFollow(FOLLOW_relationalOperator_in_relationalExpression325); + pushFollow(FOLLOW_relationalOperator_in_relationalExpression307); relationalOperator22=relationalOperator(); _fsp--; if (failed) return retval; if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(relationalOperator22.getTree(), root_0); - pushFollow(FOLLOW_sumExpression_in_relationalExpression328); + pushFollow(FOLLOW_sumExpression_in_relationalExpression310); sumExpression23=sumExpression(); _fsp--; if (failed) return retval; @@ -656,7 +655,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:78: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:69:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ; public final sumExpression_return sumExpression() throws RecognitionException { sumExpression_return retval = new sumExpression_return(); retval.start = input.LT(1); @@ -674,17 +673,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:79:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:4: productExpression ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:4: productExpression ( ( PLUS | MINUS ) productExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_productExpression_in_sumExpression339); + pushFollow(FOLLOW_productExpression_in_sumExpression321); 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:79:22: ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:22: ( ( PLUS | MINUS ) productExpression )* loop6: do { int alt6=2; @@ -697,9 +696,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:79:24: ( PLUS | MINUS ) productExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:24: ( PLUS | MINUS ) productExpression { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:24: ( PLUS | MINUS ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:24: ( PLUS | MINUS ) int alt5=2; int LA5_0 = input.LA(1); @@ -712,16 +711,16 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("79:24: ( PLUS | MINUS )", 5, 0, input); + new NoViableAltException("70: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:79:25: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:25: PLUS { PLUS25=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_sumExpression344); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_sumExpression326); if (failed) return retval; if ( backtracking==0 ) { PLUS25_tree = (Object)adaptor.create(PLUS25); root_0 = (Object)adaptor.becomeRoot(PLUS25_tree, root_0); @@ -730,10 +729,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:79:33: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:33: MINUS { MINUS26=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_sumExpression349); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_sumExpression331); if (failed) return retval; if ( backtracking==0 ) { MINUS26_tree = (Object)adaptor.create(MINUS26); root_0 = (Object)adaptor.becomeRoot(MINUS26_tree, root_0); @@ -744,7 +743,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_productExpression_in_sumExpression353); + pushFollow(FOLLOW_productExpression_in_sumExpression335); productExpression27=productExpression(); _fsp--; if (failed) return retval; @@ -785,7 +784,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:82: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:72: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); @@ -805,17 +804,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:83:2: ( powerExpr ( ( STAR | DIV | MOD ) powerExpr )* ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73: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:73:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_powerExpr_in_productExpression365); + pushFollow(FOLLOW_powerExpr_in_productExpression346); 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:83:14: ( ( STAR | DIV | MOD ) powerExpr )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:14: ( ( STAR | DIV | MOD ) powerExpr )* loop8: do { int alt8=2; @@ -828,9 +827,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:83:15: ( STAR | DIV | MOD ) powerExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:15: ( STAR | DIV | MOD ) powerExpr { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:15: ( STAR | DIV | MOD ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:15: ( STAR | DIV | MOD ) int alt7=3; switch ( input.LA(1) ) { case STAR: @@ -851,17 +850,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("83:15: ( STAR | DIV | MOD )", 7, 0, input); + new NoViableAltException("73: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:83:16: STAR + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:16: STAR { STAR29=(Token)input.LT(1); - match(input,STAR,FOLLOW_STAR_in_productExpression369); if (failed) return retval; + match(input,STAR,FOLLOW_STAR_in_productExpression350); if (failed) return retval; if ( backtracking==0 ) { STAR29_tree = (Object)adaptor.create(STAR29); root_0 = (Object)adaptor.becomeRoot(STAR29_tree, root_0); @@ -870,10 +869,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:24: DIV + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:24: DIV { DIV30=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_productExpression374); if (failed) return retval; + match(input,DIV,FOLLOW_DIV_in_productExpression355); if (failed) return retval; if ( backtracking==0 ) { DIV30_tree = (Object)adaptor.create(DIV30); root_0 = (Object)adaptor.becomeRoot(DIV30_tree, root_0); @@ -882,10 +881,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:83:30: MOD + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:30: MOD { MOD31=(Token)input.LT(1); - match(input,MOD,FOLLOW_MOD_in_productExpression378); if (failed) return retval; + match(input,MOD,FOLLOW_MOD_in_productExpression359); if (failed) return retval; if ( backtracking==0 ) { MOD31_tree = (Object)adaptor.create(MOD31); root_0 = (Object)adaptor.becomeRoot(MOD31_tree, root_0); @@ -896,7 +895,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_powerExpr_in_productExpression382); + pushFollow(FOLLOW_powerExpr_in_productExpression363); powerExpr32=powerExpr(); _fsp--; if (failed) return retval; @@ -937,7 +936,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:85:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; public final powerExpr_return powerExpr() throws RecognitionException { powerExpr_return retval = new powerExpr_return(); retval.start = input.LT(1); @@ -953,17 +952,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:85:12: ( unaryExpression ( POWER unaryExpression )? ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:14: unaryExpression ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:12: ( unaryExpression ( POWER unaryExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:14: unaryExpression ( POWER unaryExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_unaryExpression_in_powerExpr394); + pushFollow(FOLLOW_unaryExpression_in_powerExpr375); 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:85:30: ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:30: ( POWER unaryExpression )? int alt9=2; int LA9_0 = input.LA(1); @@ -972,15 +971,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:85:31: POWER unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:31: POWER unaryExpression { POWER34=(Token)input.LT(1); - match(input,POWER,FOLLOW_POWER_in_powerExpr397); if (failed) return retval; + match(input,POWER,FOLLOW_POWER_in_powerExpr378); 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_powerExpr400); + pushFollow(FOLLOW_unaryExpression_in_powerExpr381); unaryExpression35=unaryExpression(); _fsp--; if (failed) return retval; @@ -1018,7 +1017,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:87: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:77: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); @@ -1038,30 +1037,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:88: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:78:2: ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression ) int alt11=2; int LA11_0 = input.LA(1); if ( ((LA11_0>=PLUS && LA11_0<=MINUS)||LA11_0==BANG) ) { alt11=1; } - else if ( (LA11_0==INTEGER_LITERAL||LA11_0==LPAREN||(LA11_0>=POUND && LA11_0<=ID)||LA11_0==LBRACKET||LA11_0==PROJECT||(LA11_0>=SELECT && LA11_0<=FALSE)||LA11_0==85) ) { + else if ( (LA11_0==INTEGER_LITERAL||LA11_0==LPAREN||(LA11_0>=POUND && LA11_0<=ID)||LA11_0==LBRACKET||LA11_0==PROJECT||(LA11_0>=SELECT && LA11_0<=FALSE)||LA11_0==84) ) { alt11=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("87:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 11, 0, input); + new NoViableAltException("77: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:88:4: ( PLUS | MINUS | BANG ) unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78: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:88:4: ( PLUS | MINUS | BANG ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:4: ( PLUS | MINUS | BANG ) int alt10=3; switch ( input.LA(1) ) { case PLUS: @@ -1082,17 +1081,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("88:4: ( PLUS | MINUS | BANG )", 10, 0, input); + new NoViableAltException("78: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:88:5: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:5: PLUS { PLUS36=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_unaryExpression414); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_unaryExpression395); if (failed) return retval; if ( backtracking==0 ) { PLUS36_tree = (Object)adaptor.create(PLUS36); root_0 = (Object)adaptor.becomeRoot(PLUS36_tree, root_0); @@ -1101,10 +1100,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:88:13: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:13: MINUS { MINUS37=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_unaryExpression419); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_unaryExpression400); if (failed) return retval; if ( backtracking==0 ) { MINUS37_tree = (Object)adaptor.create(MINUS37); root_0 = (Object)adaptor.becomeRoot(MINUS37_tree, root_0); @@ -1113,10 +1112,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:88:22: BANG + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:78:22: BANG { BANG38=(Token)input.LT(1); - match(input,BANG,FOLLOW_BANG_in_unaryExpression424); if (failed) return retval; + match(input,BANG,FOLLOW_BANG_in_unaryExpression405); if (failed) return retval; if ( backtracking==0 ) { BANG38_tree = (Object)adaptor.create(BANG38); root_0 = (Object)adaptor.becomeRoot(BANG38_tree, root_0); @@ -1127,7 +1126,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_unaryExpression_in_unaryExpression428); + pushFollow(FOLLOW_unaryExpression_in_unaryExpression409); unaryExpression39=unaryExpression(); _fsp--; if (failed) return retval; @@ -1136,11 +1135,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:89:4: primaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:4: primaryExpression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_primaryExpression_in_unaryExpression434); + pushFollow(FOLLOW_primaryExpression_in_unaryExpression415); primaryExpression40=primaryExpression(); _fsp--; if (failed) return retval; @@ -1174,7 +1173,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:91: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:81: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); @@ -1189,15 +1188,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:92:5: ( startNode ( node )? -> ^( EXPRESSION startNode ( node )? ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:7: startNode ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82: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:82:7: startNode ( node )? { - pushFollow(FOLLOW_startNode_in_primaryExpression448); + pushFollow(FOLLOW_startNode_in_primaryExpression429); 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:92:17: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82:17: ( node )? int alt12=2; int LA12_0 = input.LA(1); @@ -1206,9 +1205,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:92:18: node + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82:18: node { - pushFollow(FOLLOW_node_in_primaryExpression451); + pushFollow(FOLLOW_node_in_primaryExpression432); node42=node(); _fsp--; if (failed) return retval; @@ -1231,15 +1230,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 92:25: -> ^( EXPRESSION startNode ( node )? ) + // 82:25: -> ^( EXPRESSION startNode ( node )? ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:28: ^( EXPRESSION startNode ( node )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82: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:92:51: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82:51: ( node )? if ( stream_node.hasNext() ) { adaptor.addChild(root_1, stream_node.next()); @@ -1279,7 +1278,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:94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ); public final startNode_return startNode() throws RecognitionException { startNode_return retval = new startNode_return(); retval.start = input.LT(1); @@ -1315,7 +1314,7 @@ 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:95:5: ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:5: ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ) int alt13=13; switch ( input.LA(1) ) { case LPAREN: @@ -1341,7 +1340,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); + new NoViableAltException("84:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); throw nvae; } @@ -1369,7 +1368,7 @@ public class SpringExpressionsParser extends Parser { alt13=6; } break; - case 85: + case 84: { alt13=7; } @@ -1402,18 +1401,18 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("94:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 0, input); + new NoViableAltException("84:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 0, input); throw nvae; } switch (alt13) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:5: parenExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:5: parenExpr { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_parenExpr_in_startNode484); + pushFollow(FOLLOW_parenExpr_in_startNode465); parenExpr43=parenExpr(); _fsp--; if (failed) return retval; @@ -1422,11 +1421,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:97:7: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:7: methodOrProperty { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_methodOrProperty_in_startNode492); + pushFollow(FOLLOW_methodOrProperty_in_startNode473); methodOrProperty44=methodOrProperty(); _fsp--; if (failed) return retval; @@ -1435,11 +1434,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:98:7: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:7: functionOrVar { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_functionOrVar_in_startNode501); + pushFollow(FOLLOW_functionOrVar_in_startNode482); functionOrVar45=functionOrVar(); _fsp--; if (failed) return retval; @@ -1448,11 +1447,11 @@ 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:99:7: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:7: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_startNode509); + pushFollow(FOLLOW_indexer_in_startNode490); indexer46=indexer(); _fsp--; if (failed) return retval; @@ -1461,11 +1460,11 @@ public class SpringExpressionsParser extends Parser { } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:7: literal + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:90:7: literal { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_literal_in_startNode517); + pushFollow(FOLLOW_literal_in_startNode498); literal47=literal(); _fsp--; if (failed) return retval; @@ -1474,11 +1473,11 @@ public class SpringExpressionsParser extends Parser { } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:7: type + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:91:7: type { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_type_in_startNode525); + pushFollow(FOLLOW_type_in_startNode506); type48=type(); _fsp--; if (failed) return retval; @@ -1487,11 +1486,11 @@ public class SpringExpressionsParser extends Parser { } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:7: constructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:92:7: constructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_constructor_in_startNode533); + pushFollow(FOLLOW_constructor_in_startNode514); constructor49=constructor(); _fsp--; if (failed) return retval; @@ -1500,11 +1499,11 @@ public class SpringExpressionsParser extends Parser { } break; case 8 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:7: projection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_projection_in_startNode541); + pushFollow(FOLLOW_projection_in_startNode522); projection50=projection(); _fsp--; if (failed) return retval; @@ -1513,11 +1512,11 @@ public class SpringExpressionsParser extends Parser { } break; case 9 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:7: selection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_selection_in_startNode550); + pushFollow(FOLLOW_selection_in_startNode531); selection51=selection(); _fsp--; if (failed) return retval; @@ -1526,11 +1525,11 @@ public class SpringExpressionsParser extends Parser { } break; case 10 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:95:7: firstSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_firstSelection_in_startNode559); + pushFollow(FOLLOW_firstSelection_in_startNode540); firstSelection52=firstSelection(); _fsp--; if (failed) return retval; @@ -1539,11 +1538,11 @@ public class SpringExpressionsParser extends Parser { } break; case 11 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:7: lastSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_lastSelection_in_startNode567); + pushFollow(FOLLOW_lastSelection_in_startNode548); lastSelection53=lastSelection(); _fsp--; if (failed) return retval; @@ -1552,11 +1551,11 @@ public class SpringExpressionsParser extends Parser { } break; case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: listInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:7: listInitializer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_listInitializer_in_startNode575); + pushFollow(FOLLOW_listInitializer_in_startNode556); listInitializer54=listInitializer(); _fsp--; if (failed) return retval; @@ -1565,11 +1564,11 @@ public class SpringExpressionsParser extends Parser { } break; case 13 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: mapInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:98:7: mapInitializer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_mapInitializer_in_startNode583); + pushFollow(FOLLOW_mapInitializer_in_startNode564); mapInitializer55=mapInitializer(); _fsp--; if (failed) return retval; @@ -1603,7 +1602,7 @@ 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:111:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; public final node_return node() throws RecognitionException { node_return retval = new node_return(); retval.start = input.LT(1); @@ -1619,12 +1618,12 @@ public class SpringExpressionsParser extends Parser { Object DOT56_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102: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:112:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:4: ( ( DOT dottedNode ) | nonDottedNode )+ int cnt14=0; loop14: do { @@ -1641,18 +1640,18 @@ 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:112:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:5: ( DOT dottedNode ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:5: ( DOT dottedNode ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:6: DOT dottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:6: DOT dottedNode { DOT56=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_node603); if (failed) return retval; + match(input,DOT,FOLLOW_DOT_in_node584); if (failed) return retval; if ( backtracking==0 ) { DOT56_tree = (Object)adaptor.create(DOT56); adaptor.addChild(root_0, DOT56_tree); } - pushFollow(FOLLOW_dottedNode_in_node605); + pushFollow(FOLLOW_dottedNode_in_node586); dottedNode57=dottedNode(); _fsp--; if (failed) return retval; @@ -1664,9 +1663,9 @@ 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:112:24: nonDottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:24: nonDottedNode { - pushFollow(FOLLOW_nonDottedNode_in_node610); + pushFollow(FOLLOW_nonDottedNode_in_node591); nonDottedNode58=nonDottedNode(); _fsp--; if (failed) return retval; @@ -1712,7 +1711,7 @@ 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:114:1: nonDottedNode : indexer ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:1: nonDottedNode : indexer ; public final nonDottedNode_return nonDottedNode() throws RecognitionException { nonDottedNode_return retval = new nonDottedNode_return(); retval.start = input.LT(1); @@ -1724,12 +1723,12 @@ 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:115:2: ( indexer ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:4: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:2: ( indexer ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:4: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_nonDottedNode622); + pushFollow(FOLLOW_indexer_in_nonDottedNode603); indexer59=indexer(); _fsp--; if (failed) return retval; @@ -1761,7 +1760,7 @@ 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:117: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:107: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); @@ -1783,15 +1782,15 @@ 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:118:2: ( ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108: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:109: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:119:2: ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109: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:109:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) int alt15=6; switch ( input.LA(1) ) { case ID: @@ -1827,16 +1826,16 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("119:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection )", 15, 0, input); + new NoViableAltException("109: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:119:4: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109:4: methodOrProperty { - pushFollow(FOLLOW_methodOrProperty_in_dottedNode635); + pushFollow(FOLLOW_methodOrProperty_in_dottedNode616); methodOrProperty60=methodOrProperty(); _fsp--; if (failed) return retval; @@ -1845,9 +1844,9 @@ 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:120:4: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:4: functionOrVar { - pushFollow(FOLLOW_functionOrVar_in_dottedNode641); + pushFollow(FOLLOW_functionOrVar_in_dottedNode622); functionOrVar61=functionOrVar(); _fsp--; if (failed) return retval; @@ -1856,9 +1855,9 @@ 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:121:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: projection { - pushFollow(FOLLOW_projection_in_dottedNode649); + pushFollow(FOLLOW_projection_in_dottedNode630); projection62=projection(); _fsp--; if (failed) return retval; @@ -1867,9 +1866,9 @@ 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:122:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:7: selection { - pushFollow(FOLLOW_selection_in_dottedNode658); + pushFollow(FOLLOW_selection_in_dottedNode639); selection63=selection(); _fsp--; if (failed) return retval; @@ -1878,9 +1877,9 @@ public class SpringExpressionsParser extends Parser { } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:113:7: firstSelection { - pushFollow(FOLLOW_firstSelection_in_dottedNode667); + pushFollow(FOLLOW_firstSelection_in_dottedNode648); firstSelection64=firstSelection(); _fsp--; if (failed) return retval; @@ -1889,9 +1888,9 @@ public class SpringExpressionsParser extends Parser { } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:7: lastSelection { - pushFollow(FOLLOW_lastSelection_in_dottedNode676); + pushFollow(FOLLOW_lastSelection_in_dottedNode657); lastSelection65=lastSelection(); _fsp--; if (failed) return retval; @@ -1932,7 +1931,7 @@ 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:128: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:118: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); @@ -1946,7 +1945,7 @@ 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:129: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:119:5: ( ( POUND ID LPAREN )=> function | var ) int alt16=2; int LA16_0 = input.LA(1); @@ -1965,7 +1964,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); + new NoViableAltException("118:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); throw nvae; } @@ -1973,7 +1972,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); + new NoViableAltException("118:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); throw nvae; } @@ -1981,17 +1980,17 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("128:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 0, input); + new NoViableAltException("118: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:129:7: ( POUND ID LPAREN )=> function + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:7: ( POUND ID LPAREN )=> function { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_function_in_functionOrVar710); + pushFollow(FOLLOW_function_in_functionOrVar691); function66=function(); _fsp--; if (failed) return retval; @@ -2000,11 +1999,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:130:7: var + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:120:7: var { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_var_in_functionOrVar718); + pushFollow(FOLLOW_var_in_functionOrVar699); var67=var(); _fsp--; if (failed) return retval; @@ -2038,7 +2037,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:133: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:123: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); @@ -2056,18 +2055,18 @@ public class SpringExpressionsParser extends Parser { 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:133:10: ( POUND id= ID methodArgs -> ^( FUNCTIONREF[$id] methodArgs ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:12: POUND id= ID methodArgs + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123: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:123:12: POUND id= ID methodArgs { POUND68=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_function735); if (failed) return retval; + match(input,POUND,FOLLOW_POUND_in_function716); if (failed) return retval; if ( backtracking==0 ) stream_POUND.add(POUND68); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_function739); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_function720); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_function741); + pushFollow(FOLLOW_methodArgs_in_function722); methodArgs69=methodArgs(); _fsp--; if (failed) return retval; @@ -2084,9 +2083,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 133:35: -> ^( FUNCTIONREF[$id] methodArgs ) + // 123:35: -> ^( FUNCTIONREF[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:38: ^( FUNCTIONREF[$id] methodArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:123:38: ^( FUNCTIONREF[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(FUNCTIONREF, id), root_1); @@ -2126,7 +2125,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:135: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:125: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); @@ -2142,15 +2141,15 @@ 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:135:5: ( POUND id= ID -> ^( VARIABLEREF[$id] ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:7: POUND id= ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125: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:125:7: POUND id= ID { POUND70=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_var762); if (failed) return retval; + match(input,POUND,FOLLOW_POUND_in_var743); if (failed) return retval; if ( backtracking==0 ) stream_POUND.add(POUND70); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_var766); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_var747); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2165,9 +2164,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 135:19: -> ^( VARIABLEREF[$id] ) + // 125:19: -> ^( VARIABLEREF[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:22: ^( VARIABLEREF[$id] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:22: ^( VARIABLEREF[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(VARIABLEREF, id), root_1); @@ -2205,7 +2204,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start methodOrProperty - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138: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:128: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); @@ -2222,7 +2221,7 @@ public class SpringExpressionsParser extends Parser { 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:139:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) int alt17=2; int LA17_0 = input.LA(1); @@ -2238,7 +2237,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("138:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); + new NoViableAltException("128:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); throw nvae; } @@ -2246,19 +2245,19 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("138:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); + new NoViableAltException("128:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); throw nvae; } switch (alt17) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139: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:129:4: ( ID LPAREN )=>id= ID methodArgs { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_methodOrProperty794); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_methodOrProperty775); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_methodOrProperty796); + pushFollow(FOLLOW_methodArgs_in_methodOrProperty777); methodArgs71=methodArgs(); _fsp--; if (failed) return retval; @@ -2275,9 +2274,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 139:36: -> ^( METHOD[$id] methodArgs ) + // 129:36: -> ^( METHOD[$id] methodArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:39: ^( METHOD[$id] methodArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:39: ^( METHOD[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(METHOD, id), root_1); @@ -2294,11 +2293,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:140:4: property + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:4: property { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_property_in_methodOrProperty810); + pushFollow(FOLLOW_property_in_methodOrProperty791); property72=property(); _fsp--; if (failed) return retval; @@ -2332,7 +2331,7 @@ 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:146: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:136: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); @@ -2354,30 +2353,30 @@ public class SpringExpressionsParser extends Parser { Object RPAREN78_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:12: ( LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136: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:136:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN { root_0 = (Object)adaptor.nil(); LPAREN73=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs825); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:23: ( argument ( COMMA argument )* ( COMMA )? )? + match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs806); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:23: ( argument ( COMMA argument )* ( COMMA )? )? int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==INTEGER_LITERAL||LA20_0==LPAREN||(LA20_0>=PLUS && LA20_0<=MINUS)||LA20_0==BANG||(LA20_0>=POUND && LA20_0<=ID)||LA20_0==LBRACKET||LA20_0==PROJECT||(LA20_0>=SELECT && LA20_0<=FALSE)||LA20_0==85) ) { + if ( (LA20_0==INTEGER_LITERAL||LA20_0==LPAREN||(LA20_0>=PLUS && LA20_0<=MINUS)||LA20_0==BANG||(LA20_0>=POUND && LA20_0<=ID)||LA20_0==LBRACKET||LA20_0==PROJECT||(LA20_0>=SELECT && LA20_0<=FALSE)||LA20_0==84) ) { alt20=1; } switch (alt20) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:24: argument ( COMMA argument )* ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:24: argument ( COMMA argument )* ( COMMA )? { - pushFollow(FOLLOW_argument_in_methodArgs829); + pushFollow(FOLLOW_argument_in_methodArgs810); argument74=argument(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, argument74.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:33: ( COMMA argument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:33: ( COMMA argument )* loop18: do { int alt18=2; @@ -2386,7 +2385,7 @@ public class SpringExpressionsParser extends Parser { if ( (LA18_0==COMMA) ) { int LA18_1 = input.LA(2); - if ( (LA18_1==INTEGER_LITERAL||LA18_1==LPAREN||(LA18_1>=PLUS && LA18_1<=MINUS)||LA18_1==BANG||(LA18_1>=POUND && LA18_1<=ID)||LA18_1==LBRACKET||LA18_1==PROJECT||(LA18_1>=SELECT && LA18_1<=FALSE)||LA18_1==85) ) { + if ( (LA18_1==INTEGER_LITERAL||LA18_1==LPAREN||(LA18_1>=PLUS && LA18_1<=MINUS)||LA18_1==BANG||(LA18_1>=POUND && LA18_1<=ID)||LA18_1==LBRACKET||LA18_1==PROJECT||(LA18_1>=SELECT && LA18_1<=FALSE)||LA18_1==84) ) { alt18=1; } @@ -2396,11 +2395,11 @@ public class SpringExpressionsParser extends Parser { switch (alt18) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:34: COMMA argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:34: COMMA argument { COMMA75=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs832); if (failed) return retval; - pushFollow(FOLLOW_argument_in_methodArgs835); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs813); if (failed) return retval; + pushFollow(FOLLOW_argument_in_methodArgs816); argument76=argument(); _fsp--; if (failed) return retval; @@ -2414,7 +2413,7 @@ public class SpringExpressionsParser extends Parser { } } while (true); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:52: ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:52: ( COMMA )? int alt19=2; int LA19_0 = input.LA(1); @@ -2423,10 +2422,10 @@ public class SpringExpressionsParser extends Parser { } switch (alt19) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:53: COMMA + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:53: COMMA { COMMA77=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs840); if (failed) return retval; + match(input,COMMA,FOLLOW_COMMA_in_methodArgs821); if (failed) return retval; } break; @@ -2440,7 +2439,7 @@ public class SpringExpressionsParser extends Parser { } RPAREN78=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs847); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs828); if (failed) return retval; } @@ -2468,7 +2467,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:151: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:141: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); @@ -2481,11 +2480,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:151:9: (id= ID -> ^( PROPERTY_OR_FIELD[$id] ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:11: id= ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141: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:141:11: id= ID { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_property860); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_property841); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2500,9 +2499,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 151:17: -> ^( PROPERTY_OR_FIELD[$id] ) + // 141:17: -> ^( PROPERTY_OR_FIELD[$id] ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:20: ^( PROPERTY_OR_FIELD[$id] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:20: ^( PROPERTY_OR_FIELD[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(PROPERTY_OR_FIELD, id), root_1); @@ -2540,7 +2539,7 @@ 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:155: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:145: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); @@ -2563,19 +2562,19 @@ public class SpringExpressionsParser extends Parser { 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:155:8: ( LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145: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:145:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET { LBRACKET79=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer876); if (failed) return retval; + match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer857); if (failed) return retval; if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET79); - pushFollow(FOLLOW_argument_in_indexer880); + pushFollow(FOLLOW_argument_in_indexer861); 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:155:31: ( COMMA r2= argument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145:31: ( COMMA r2= argument )* loop21: do { int alt21=2; @@ -2588,13 +2587,13 @@ public class SpringExpressionsParser extends Parser { switch (alt21) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:32: COMMA r2= argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145:32: COMMA r2= argument { COMMA80=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_indexer883); if (failed) return retval; + match(input,COMMA,FOLLOW_COMMA_in_indexer864); if (failed) return retval; if ( backtracking==0 ) stream_COMMA.add(COMMA80); - pushFollow(FOLLOW_argument_in_indexer887); + pushFollow(FOLLOW_argument_in_indexer868); r2=argument(); _fsp--; if (failed) return retval; @@ -2609,12 +2608,12 @@ public class SpringExpressionsParser extends Parser { } while (true); RBRACKET81=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer891); if (failed) return retval; + match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer872); if (failed) return retval; if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET81); // AST REWRITE - // elements: r1, r2 + // elements: r2, r1 // token labels: // rule labels: r2, retval, r1 // token list labels: @@ -2626,15 +2625,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_r1=new RewriteRuleSubtreeStream(adaptor,"token r1",r1!=null?r1.tree:null); root_0 = (Object)adaptor.nil(); - // 155:61: -> ^( INDEXER $r1 ( $r2)* ) + // 145:61: -> ^( INDEXER $r1 ( $r2)* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:64: ^( INDEXER $r1 ( $r2)* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145: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:155:78: ( $r2)* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:145:78: ( $r2)* while ( stream_r2.hasNext() ) { adaptor.addChild(root_1, stream_r2.next()); @@ -2674,7 +2673,7 @@ 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:160:1: projection : PROJECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:1: projection : PROJECT expression RCURLY ; public final projection_return projection() throws RecognitionException { projection_return retval = new projection_return(); retval.start = input.LT(1); @@ -2690,24 +2689,24 @@ public class SpringExpressionsParser extends Parser { Object RCURLY84_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:11: ( PROJECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:13: PROJECT expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:11: ( PROJECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:13: PROJECT expression RCURLY { root_0 = (Object)adaptor.nil(); PROJECT82=(Token)input.LT(1); - match(input,PROJECT,FOLLOW_PROJECT_in_projection918); if (failed) return retval; + match(input,PROJECT,FOLLOW_PROJECT_in_projection899); if (failed) return retval; if ( backtracking==0 ) { PROJECT82_tree = (Object)adaptor.create(PROJECT82); root_0 = (Object)adaptor.becomeRoot(PROJECT82_tree, root_0); } - pushFollow(FOLLOW_expression_in_projection921); + pushFollow(FOLLOW_expression_in_projection902); expression83=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression83.getTree()); RCURLY84=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_projection923); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_projection904); if (failed) return retval; } @@ -2735,7 +2734,7 @@ 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:162:1: selection : SELECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:1: selection : SELECT expression RCURLY ; public final selection_return selection() throws RecognitionException { selection_return retval = new selection_return(); retval.start = input.LT(1); @@ -2751,24 +2750,24 @@ public class SpringExpressionsParser extends Parser { Object RCURLY87_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:10: ( SELECT expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:12: SELECT expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:10: ( SELECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:12: SELECT expression RCURLY { root_0 = (Object)adaptor.nil(); SELECT85=(Token)input.LT(1); - match(input,SELECT,FOLLOW_SELECT_in_selection931); if (failed) return retval; + match(input,SELECT,FOLLOW_SELECT_in_selection912); if (failed) return retval; if ( backtracking==0 ) { SELECT85_tree = (Object)adaptor.create(SELECT85); root_0 = (Object)adaptor.becomeRoot(SELECT85_tree, root_0); } - pushFollow(FOLLOW_expression_in_selection934); + pushFollow(FOLLOW_expression_in_selection915); expression86=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression86.getTree()); RCURLY87=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_selection936); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_selection917); if (failed) return retval; } @@ -2796,7 +2795,7 @@ 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:164: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:154:1: firstSelection : SELECT_FIRST expression RCURLY ; public final firstSelection_return firstSelection() throws RecognitionException { firstSelection_return retval = new firstSelection_return(); retval.start = input.LT(1); @@ -2812,24 +2811,24 @@ public class SpringExpressionsParser extends Parser { Object RCURLY90_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:15: ( SELECT_FIRST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:17: SELECT_FIRST expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154:15: ( SELECT_FIRST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154:17: SELECT_FIRST expression RCURLY { root_0 = (Object)adaptor.nil(); SELECT_FIRST88=(Token)input.LT(1); - match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection944); if (failed) return retval; + match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection925); if (failed) return retval; if ( backtracking==0 ) { SELECT_FIRST88_tree = (Object)adaptor.create(SELECT_FIRST88); root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST88_tree, root_0); } - pushFollow(FOLLOW_expression_in_firstSelection947); + pushFollow(FOLLOW_expression_in_firstSelection928); expression89=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression89.getTree()); RCURLY90=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection949); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection930); if (failed) return retval; } @@ -2857,7 +2856,7 @@ 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:166: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:156:1: lastSelection : SELECT_LAST expression RCURLY ; public final lastSelection_return lastSelection() throws RecognitionException { lastSelection_return retval = new lastSelection_return(); retval.start = input.LT(1); @@ -2873,24 +2872,24 @@ public class SpringExpressionsParser extends Parser { Object RCURLY93_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:14: ( SELECT_LAST expression RCURLY ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:16: SELECT_LAST expression RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:156:14: ( SELECT_LAST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:156:16: SELECT_LAST expression RCURLY { root_0 = (Object)adaptor.nil(); SELECT_LAST91=(Token)input.LT(1); - match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection957); if (failed) return retval; + match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection938); if (failed) return retval; if ( backtracking==0 ) { SELECT_LAST91_tree = (Object)adaptor.create(SELECT_LAST91); root_0 = (Object)adaptor.becomeRoot(SELECT_LAST91_tree, root_0); } - pushFollow(FOLLOW_expression_in_lastSelection960); + pushFollow(FOLLOW_expression_in_lastSelection941); expression92=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, expression92.getTree()); RCURLY93=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection962); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection943); if (failed) return retval; } @@ -2918,7 +2917,7 @@ 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:169: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:159: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); @@ -2936,20 +2935,20 @@ public class SpringExpressionsParser extends Parser { 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:169:5: ( TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:7: TYPE qualifiedId RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:159: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:159:7: TYPE qualifiedId RPAREN { TYPE94=(Token)input.LT(1); - match(input,TYPE,FOLLOW_TYPE_in_type971); if (failed) return retval; + match(input,TYPE,FOLLOW_TYPE_in_type952); if (failed) return retval; if ( backtracking==0 ) stream_TYPE.add(TYPE94); - pushFollow(FOLLOW_qualifiedId_in_type973); + pushFollow(FOLLOW_qualifiedId_in_type954); qualifiedId95=qualifiedId(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId95.getTree()); RPAREN96=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_type975); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_type956); if (failed) return retval; if ( backtracking==0 ) stream_RPAREN.add(RPAREN96); @@ -2964,9 +2963,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 169:31: -> ^( TYPEREF qualifiedId ) + // 159:31: -> ^( TYPEREF qualifiedId ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:34: ^( TYPEREF qualifiedId ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:159:34: ^( TYPEREF qualifiedId ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(TYPEREF, "TYPEREF"), root_1); @@ -3006,7 +3005,7 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start constructor - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173: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:163: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); @@ -3022,15 +3021,15 @@ public class SpringExpressionsParser extends Parser { Object string_literal97_tree=null; - RewriteRuleTokenStream stream_85=new RewriteRuleTokenStream(adaptor,"token 85"); + RewriteRuleTokenStream stream_84=new RewriteRuleTokenStream(adaptor,"token 84"); 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:174:2: ( ( '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:164:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) int alt22=2; int LA22_0 = input.LA(1); - if ( (LA22_0==85) ) { + if ( (LA22_0==84) ) { int LA22_1 = input.LA(2); if ( (LA22_1==ID) ) { @@ -3045,7 +3044,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 2, input); + new NoViableAltException("163:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 2, input); throw nvae; } @@ -3053,7 +3052,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 1, input); + new NoViableAltException("163:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 1, input); throw nvae; } @@ -3061,24 +3060,24 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("173:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 0, input); + new NoViableAltException("163:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 0, input); throw nvae; } switch (alt22) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs { string_literal97=(Token)input.LT(1); - match(input,85,FOLLOW_85_in_constructor1006); if (failed) return retval; - if ( backtracking==0 ) stream_85.add(string_literal97); + match(input,84,FOLLOW_84_in_constructor987); if (failed) return retval; + if ( backtracking==0 ) stream_84.add(string_literal97); - pushFollow(FOLLOW_qualifiedId_in_constructor1008); + pushFollow(FOLLOW_qualifiedId_in_constructor989); qualifiedId98=qualifiedId(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId98.getTree()); - pushFollow(FOLLOW_ctorArgs_in_constructor1010); + pushFollow(FOLLOW_ctorArgs_in_constructor991); ctorArgs99=ctorArgs(); _fsp--; if (failed) return retval; @@ -3095,9 +3094,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 174:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) + // 164:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:64: ^( CONSTRUCTOR qualifiedId ctorArgs ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:64: ^( CONSTRUCTOR qualifiedId ctorArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR, "CONSTRUCTOR"), root_1); @@ -3115,11 +3114,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:175:6: arrayConstructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:165:6: arrayConstructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_arrayConstructor_in_constructor1027); + pushFollow(FOLLOW_arrayConstructor_in_constructor1008); arrayConstructor100=arrayConstructor(); _fsp--; if (failed) return retval; @@ -3153,7 +3152,7 @@ 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:178: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:168: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); @@ -3169,29 +3168,29 @@ public class SpringExpressionsParser extends Parser { Object string_literal101_tree=null; - RewriteRuleTokenStream stream_85=new RewriteRuleTokenStream(adaptor,"token 85"); + RewriteRuleTokenStream stream_84=new RewriteRuleTokenStream(adaptor,"token 84"); 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:179:2: ( 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:4: 'new' qualifiedId arrayRank ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169: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:169:4: 'new' qualifiedId arrayRank ( listInitializer )? { string_literal101=(Token)input.LT(1); - match(input,85,FOLLOW_85_in_arrayConstructor1038); if (failed) return retval; - if ( backtracking==0 ) stream_85.add(string_literal101); + match(input,84,FOLLOW_84_in_arrayConstructor1019); if (failed) return retval; + if ( backtracking==0 ) stream_84.add(string_literal101); - pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1040); + pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1021); qualifiedId102=qualifiedId(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId102.getTree()); - pushFollow(FOLLOW_arrayRank_in_arrayConstructor1042); + pushFollow(FOLLOW_arrayRank_in_arrayConstructor1023); arrayRank103=arrayRank(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_arrayRank.add(arrayRank103.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:32: ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:32: ( listInitializer )? int alt23=2; int LA23_0 = input.LA(1); @@ -3200,9 +3199,9 @@ public class SpringExpressionsParser extends Parser { } switch (alt23) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:179:33: listInitializer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:33: listInitializer { - pushFollow(FOLLOW_listInitializer_in_arrayConstructor1045); + pushFollow(FOLLOW_listInitializer_in_arrayConstructor1026); listInitializer104=listInitializer(); _fsp--; if (failed) return retval; @@ -3225,16 +3224,16 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 180:4: -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) + // 170: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:180: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:170: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:180:49: ( listInitializer )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:170:49: ( listInitializer )? if ( stream_listInitializer.hasNext() ) { adaptor.addChild(root_1, stream_listInitializer.next()); @@ -3274,7 +3273,7 @@ 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:183: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:173: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); @@ -3297,30 +3296,30 @@ public class SpringExpressionsParser extends Parser { 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:184:5: ( LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174: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:174:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET { LBRACKET105=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1080); if (failed) return retval; + match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1061); if (failed) return retval; if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET105); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:16: ( expression ( COMMA expression )* )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:16: ( expression ( COMMA expression )* )? int alt25=2; int LA25_0 = input.LA(1); - if ( (LA25_0==INTEGER_LITERAL||LA25_0==LPAREN||(LA25_0>=PLUS && LA25_0<=MINUS)||LA25_0==BANG||(LA25_0>=POUND && LA25_0<=ID)||LA25_0==LBRACKET||LA25_0==PROJECT||(LA25_0>=SELECT && LA25_0<=FALSE)||LA25_0==85) ) { + if ( (LA25_0==INTEGER_LITERAL||LA25_0==LPAREN||(LA25_0>=PLUS && LA25_0<=MINUS)||LA25_0==BANG||(LA25_0>=POUND && LA25_0<=ID)||LA25_0==LBRACKET||LA25_0==PROJECT||(LA25_0>=SELECT && LA25_0<=FALSE)||LA25_0==84) ) { 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:184:17: expression ( COMMA expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:17: expression ( COMMA expression )* { - pushFollow(FOLLOW_expression_in_arrayRank1083); + pushFollow(FOLLOW_expression_in_arrayRank1064); expression106=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_expression.add(expression106.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:28: ( COMMA expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:28: ( COMMA expression )* loop24: do { int alt24=2; @@ -3333,13 +3332,13 @@ public class SpringExpressionsParser extends Parser { switch (alt24) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:29: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:29: COMMA expression { COMMA107=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_arrayRank1086); if (failed) return retval; + match(input,COMMA,FOLLOW_COMMA_in_arrayRank1067); if (failed) return retval; if ( backtracking==0 ) stream_COMMA.add(COMMA107); - pushFollow(FOLLOW_expression_in_arrayRank1088); + pushFollow(FOLLOW_expression_in_arrayRank1069); expression108=expression(); _fsp--; if (failed) return retval; @@ -3360,7 +3359,7 @@ public class SpringExpressionsParser extends Parser { } RBRACKET109=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1094); if (failed) return retval; + match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1075); if (failed) return retval; if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET109); @@ -3375,14 +3374,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 184:59: -> ^( EXPRESSIONLIST ( expression )* ) + // 174:59: -> ^( EXPRESSIONLIST ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:62: ^( EXPRESSIONLIST ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174: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:184:79: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:79: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3422,7 +3421,7 @@ 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:186: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:176: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); @@ -3445,19 +3444,19 @@ public class SpringExpressionsParser extends Parser { 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:187:5: ( LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:7: LCURLY expression ( COMMA expression )* RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177: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:177:7: LCURLY expression ( COMMA expression )* RCURLY { LCURLY110=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1119); if (failed) return retval; + match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1100); if (failed) return retval; if ( backtracking==0 ) stream_LCURLY.add(LCURLY110); - pushFollow(FOLLOW_expression_in_listInitializer1121); + pushFollow(FOLLOW_expression_in_listInitializer1102); expression111=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_expression.add(expression111.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:25: ( COMMA expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:25: ( COMMA expression )* loop26: do { int alt26=2; @@ -3470,13 +3469,13 @@ public class SpringExpressionsParser extends Parser { switch (alt26) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:26: COMMA expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:26: COMMA expression { COMMA112=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_listInitializer1124); if (failed) return retval; + match(input,COMMA,FOLLOW_COMMA_in_listInitializer1105); if (failed) return retval; if ( backtracking==0 ) stream_COMMA.add(COMMA112); - pushFollow(FOLLOW_expression_in_listInitializer1126); + pushFollow(FOLLOW_expression_in_listInitializer1107); expression113=expression(); _fsp--; if (failed) return retval; @@ -3491,7 +3490,7 @@ public class SpringExpressionsParser extends Parser { } while (true); RCURLY114=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1130); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1111); if (failed) return retval; if ( backtracking==0 ) stream_RCURLY.add(RCURLY114); @@ -3506,14 +3505,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 187:52: -> ^( LIST_INITIALIZER ( expression )* ) + // 177:52: -> ^( LIST_INITIALIZER ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:55: ^( LIST_INITIALIZER ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177: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:187:74: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:74: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3553,7 +3552,7 @@ 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:192: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:182: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); @@ -3579,23 +3578,23 @@ public class SpringExpressionsParser extends Parser { 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:193:5: ( POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183: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:183:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY { POUND115=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_mapInitializer1158); if (failed) return retval; + match(input,POUND,FOLLOW_POUND_in_mapInitializer1139); if (failed) return retval; if ( backtracking==0 ) stream_POUND.add(POUND115); LCURLY116=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1160); if (failed) return retval; + match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1141); if (failed) return retval; if ( backtracking==0 ) stream_LCURLY.add(LCURLY116); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1162); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1143); mapEntry117=mapEntry(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_mapEntry.add(mapEntry117.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:29: ( COMMA mapEntry )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183:29: ( COMMA mapEntry )* loop27: do { int alt27=2; @@ -3608,13 +3607,13 @@ public class SpringExpressionsParser extends Parser { switch (alt27) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:30: COMMA mapEntry + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183:30: COMMA mapEntry { COMMA118=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1165); if (failed) return retval; + match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1146); if (failed) return retval; if ( backtracking==0 ) stream_COMMA.add(COMMA118); - pushFollow(FOLLOW_mapEntry_in_mapInitializer1167); + pushFollow(FOLLOW_mapEntry_in_mapInitializer1148); mapEntry119=mapEntry(); _fsp--; if (failed) return retval; @@ -3629,7 +3628,7 @@ public class SpringExpressionsParser extends Parser { } while (true); RCURLY120=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1171); if (failed) return retval; + match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1152); if (failed) return retval; if ( backtracking==0 ) stream_RCURLY.add(RCURLY120); @@ -3644,14 +3643,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 193:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) + // 183:54: -> ^( MAP_INITIALIZER ( mapEntry )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:57: ^( MAP_INITIALIZER ( mapEntry )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183: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:193:75: ( mapEntry )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:183:75: ( mapEntry )* while ( stream_mapEntry.hasNext() ) { adaptor.addChild(root_1, stream_mapEntry.next()); @@ -3691,7 +3690,7 @@ 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:195: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:185: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); @@ -3708,19 +3707,19 @@ public class SpringExpressionsParser extends Parser { 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:196:5: ( expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:7: expression COLON expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186: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:186:7: expression COLON expression { - pushFollow(FOLLOW_expression_in_mapEntry1192); + pushFollow(FOLLOW_expression_in_mapEntry1173); expression121=expression(); _fsp--; if (failed) return retval; if ( backtracking==0 ) stream_expression.add(expression121.getTree()); COLON122=(Token)input.LT(1); - match(input,COLON,FOLLOW_COLON_in_mapEntry1194); if (failed) return retval; + match(input,COLON,FOLLOW_COLON_in_mapEntry1175); if (failed) return retval; if ( backtracking==0 ) stream_COLON.add(COLON122); - pushFollow(FOLLOW_expression_in_mapEntry1196); + pushFollow(FOLLOW_expression_in_mapEntry1177); expression123=expression(); _fsp--; if (failed) return retval; @@ -3737,14 +3736,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 196:35: -> ^( MAP_ENTRY ( expression )* ) + // 186:35: -> ^( MAP_ENTRY ( expression )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:38: ^( MAP_ENTRY ( expression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186: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:196:50: ( expression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:50: ( expression )* while ( stream_expression.hasNext() ) { adaptor.addChild(root_1, stream_expression.next()); @@ -3784,7 +3783,7 @@ 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:198: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:188: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); @@ -3804,30 +3803,30 @@ public class SpringExpressionsParser extends Parser { Object RPAREN128_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:2: ( LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189: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:189:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN { root_0 = (Object)adaptor.nil(); LPAREN124=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1214); if (failed) return retval; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:12: ( namedArgument ( COMMA namedArgument )* )? + match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1195); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:12: ( namedArgument ( COMMA namedArgument )* )? int alt29=2; int LA29_0 = input.LA(1); - if ( (LA29_0==INTEGER_LITERAL||LA29_0==LPAREN||(LA29_0>=PLUS && LA29_0<=MINUS)||LA29_0==BANG||(LA29_0>=POUND && LA29_0<=ID)||LA29_0==LBRACKET||LA29_0==PROJECT||(LA29_0>=SELECT && LA29_0<=FALSE)||LA29_0==85) ) { + if ( (LA29_0==INTEGER_LITERAL||LA29_0==LPAREN||(LA29_0>=PLUS && LA29_0<=MINUS)||LA29_0==BANG||(LA29_0>=POUND && LA29_0<=ID)||LA29_0==LBRACKET||LA29_0==PROJECT||(LA29_0>=SELECT && LA29_0<=FALSE)||LA29_0==84) ) { alt29=1; } switch (alt29) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:13: namedArgument ( COMMA namedArgument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:13: namedArgument ( COMMA namedArgument )* { - pushFollow(FOLLOW_namedArgument_in_ctorArgs1218); + pushFollow(FOLLOW_namedArgument_in_ctorArgs1199); namedArgument125=namedArgument(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument125.getTree()); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:27: ( COMMA namedArgument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:27: ( COMMA namedArgument )* loop28: do { int alt28=2; @@ -3840,11 +3839,11 @@ public class SpringExpressionsParser extends Parser { switch (alt28) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:199:28: COMMA namedArgument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:28: COMMA namedArgument { COMMA126=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1221); if (failed) return retval; - pushFollow(FOLLOW_namedArgument_in_ctorArgs1224); + match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1202); if (failed) return retval; + pushFollow(FOLLOW_namedArgument_in_ctorArgs1205); namedArgument127=namedArgument(); _fsp--; if (failed) return retval; @@ -3865,7 +3864,7 @@ public class SpringExpressionsParser extends Parser { } RPAREN128=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1230); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1211); if (failed) return retval; } @@ -3893,7 +3892,7 @@ 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:201:1: argument : expression ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:1: argument : expression ; public final argument_return argument() throws RecognitionException { argument_return retval = new argument_return(); retval.start = input.LT(1); @@ -3905,12 +3904,12 @@ 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:201:10: ( expression ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:12: expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:10: ( expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:12: expression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_argument1239); + pushFollow(FOLLOW_expression_in_argument1220); expression129=expression(); _fsp--; if (failed) return retval; @@ -3942,7 +3941,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:203: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:193: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); @@ -3962,7 +3961,7 @@ public class SpringExpressionsParser extends Parser { 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:204:5: ( ( 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:194:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) int alt30=2; int LA30_0 = input.LA(1); @@ -3981,7 +3980,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 22, input); + new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 22, input); throw nvae; } @@ -3992,34 +3991,34 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 1, input); + new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 1, input); throw nvae; } } - else if ( (LA30_0==INTEGER_LITERAL||LA30_0==LPAREN||(LA30_0>=PLUS && LA30_0<=MINUS)||LA30_0==BANG||LA30_0==POUND||LA30_0==LBRACKET||LA30_0==PROJECT||(LA30_0>=SELECT && LA30_0<=FALSE)||LA30_0==85) ) { + else if ( (LA30_0==INTEGER_LITERAL||LA30_0==LPAREN||(LA30_0>=PLUS && LA30_0<=MINUS)||LA30_0==BANG||LA30_0==POUND||LA30_0==LBRACKET||LA30_0==PROJECT||(LA30_0>=SELECT && LA30_0<=FALSE)||LA30_0==84) ) { alt30=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("203:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 0, input); + new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 0, input); throw nvae; } switch (alt30) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:7: ( ID ASSIGN )=>id= ID ASSIGN expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:194:7: ( ID ASSIGN )=>id= ID ASSIGN expression { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_namedArgument1262); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_namedArgument1243); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); ASSIGN130=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1264); if (failed) return retval; + match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1245); if (failed) return retval; if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN130); - pushFollow(FOLLOW_expression_in_namedArgument1266); + pushFollow(FOLLOW_expression_in_namedArgument1247); expression131=expression(); _fsp--; if (failed) return retval; @@ -4036,9 +4035,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 205:19: -> ^( NAMED_ARGUMENT[$id] expression ) + // 195:19: -> ^( NAMED_ARGUMENT[$id] expression ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:22: ^( NAMED_ARGUMENT[$id] expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:195:22: ^( NAMED_ARGUMENT[$id] expression ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(NAMED_ARGUMENT, id), root_1); @@ -4055,11 +4054,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:206:7: argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:7: argument { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_argument_in_namedArgument1302); + pushFollow(FOLLOW_argument_in_namedArgument1283); argument132=argument(); _fsp--; if (failed) return retval; @@ -4093,7 +4092,7 @@ 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:208: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:198: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); @@ -4111,14 +4110,14 @@ public class SpringExpressionsParser extends Parser { 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:208:13: ( ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:15: ID ( DOT ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198: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:198:15: ID ( DOT ID )* { ID133=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1314); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_qualifiedId1295); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(ID133); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:18: ( DOT ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:18: ( DOT ID )* loop31: do { int alt31=2; @@ -4131,14 +4130,14 @@ public class SpringExpressionsParser extends Parser { switch (alt31) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:19: DOT ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:19: DOT ID { DOT134=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_qualifiedId1317); if (failed) return retval; + match(input,DOT,FOLLOW_DOT_in_qualifiedId1298); if (failed) return retval; if ( backtracking==0 ) stream_DOT.add(DOT134); ID135=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1319); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_qualifiedId1300); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(ID135); @@ -4162,14 +4161,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 208:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 198:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198: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:208:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4209,7 +4208,7 @@ 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:210: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:200: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); @@ -4227,14 +4226,14 @@ 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:210:13: ( ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:15: ID ( DIV ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200: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:200:15: ID ( DIV ID )* { ID136=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1338); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_contextName1319); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(ID136); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:18: ( DIV ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:18: ( DIV ID )* loop32: do { int alt32=2; @@ -4247,14 +4246,14 @@ public class SpringExpressionsParser extends Parser { switch (alt32) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:19: DIV ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:19: DIV ID { DIV137=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_contextName1341); if (failed) return retval; + match(input,DIV,FOLLOW_DIV_in_contextName1322); if (failed) return retval; if ( backtracking==0 ) stream_DIV.add(DIV137); ID138=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1343); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_contextName1324); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(ID138); @@ -4278,14 +4277,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 210:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 200:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:31: ^( QUALIFIED_IDENTIFIER ( ID )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200: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:210:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4325,7 +4324,7 @@ 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:212: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:202: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); @@ -4349,7 +4348,7 @@ public class SpringExpressionsParser extends Parser { Object REAL_LITERAL145_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:2: ( 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:203:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ) int alt33=7; switch ( input.LA(1) ) { case INTEGER_LITERAL: @@ -4391,19 +4390,19 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("212:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 33, 0, input); + new NoViableAltException("202:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 33, 0, input); throw nvae; } switch (alt33) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:4: INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:4: INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); INTEGER_LITERAL139=(Token)input.LT(1); - match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1364); if (failed) return retval; + match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1345); if (failed) return retval; if ( backtracking==0 ) { INTEGER_LITERAL139_tree = (Object)adaptor.create(INTEGER_LITERAL139); adaptor.addChild(root_0, INTEGER_LITERAL139_tree); @@ -4412,12 +4411,12 @@ 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:214:4: STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:4: STRING_LITERAL { root_0 = (Object)adaptor.nil(); STRING_LITERAL140=(Token)input.LT(1); - match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1370); if (failed) return retval; + match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1351); if (failed) return retval; if ( backtracking==0 ) { STRING_LITERAL140_tree = (Object)adaptor.create(STRING_LITERAL140); adaptor.addChild(root_0, STRING_LITERAL140_tree); @@ -4426,12 +4425,12 @@ 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:215:4: DQ_STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:4: DQ_STRING_LITERAL { root_0 = (Object)adaptor.nil(); DQ_STRING_LITERAL141=(Token)input.LT(1); - match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1375); if (failed) return retval; + match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1356); if (failed) return retval; if ( backtracking==0 ) { DQ_STRING_LITERAL141_tree = (Object)adaptor.create(DQ_STRING_LITERAL141); adaptor.addChild(root_0, DQ_STRING_LITERAL141_tree); @@ -4440,11 +4439,11 @@ 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:216:4: boolLiteral + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:4: boolLiteral { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_boolLiteral_in_literal1380); + pushFollow(FOLLOW_boolLiteral_in_literal1361); boolLiteral142=boolLiteral(); _fsp--; if (failed) return retval; @@ -4453,12 +4452,12 @@ public class SpringExpressionsParser extends Parser { } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:4: NULL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:4: NULL_LITERAL { root_0 = (Object)adaptor.nil(); NULL_LITERAL143=(Token)input.LT(1); - match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1385); if (failed) return retval; + match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1366); if (failed) return retval; if ( backtracking==0 ) { NULL_LITERAL143_tree = (Object)adaptor.create(NULL_LITERAL143); adaptor.addChild(root_0, NULL_LITERAL143_tree); @@ -4467,12 +4466,12 @@ public class SpringExpressionsParser extends Parser { } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:4: HEXADECIMAL_INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:4: HEXADECIMAL_INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); HEXADECIMAL_INTEGER_LITERAL144=(Token)input.LT(1); - match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1390); if (failed) return retval; + match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1371); if (failed) return retval; if ( backtracking==0 ) { HEXADECIMAL_INTEGER_LITERAL144_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL144); adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL144_tree); @@ -4481,12 +4480,12 @@ public class SpringExpressionsParser extends Parser { } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:4: REAL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:4: REAL_LITERAL { root_0 = (Object)adaptor.nil(); REAL_LITERAL145=(Token)input.LT(1); - match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1396); if (failed) return retval; + match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1377); if (failed) return retval; if ( backtracking==0 ) { REAL_LITERAL145_tree = (Object)adaptor.create(REAL_LITERAL145); adaptor.addChild(root_0, REAL_LITERAL145_tree); @@ -4520,7 +4519,7 @@ 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:222:1: boolLiteral : ( TRUE | FALSE ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:1: boolLiteral : ( TRUE | FALSE ); public final boolLiteral_return boolLiteral() throws RecognitionException { boolLiteral_return retval = new boolLiteral_return(); retval.start = input.LT(1); @@ -4532,7 +4531,7 @@ public class SpringExpressionsParser extends Parser { Object set146_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:222:12: ( TRUE | FALSE ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212: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(); @@ -4577,7 +4576,7 @@ 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:229: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:219:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | INSTANCEOF | BETWEEN | MATCHES ); public final relationalOperator_return relationalOperator() throws RecognitionException { relationalOperator_return retval = new relationalOperator_return(); retval.start = input.LT(1); @@ -4589,7 +4588,7 @@ public class SpringExpressionsParser extends Parser { Object set147_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | MATCHES ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | INSTANCEOF | 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(); @@ -4630,12 +4629,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:129:7: ( POUND ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:8: POUND ID LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:7: ( POUND ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:8: POUND ID LPAREN { - match(input,POUND,FOLLOW_POUND_in_synpred1701); if (failed) return ; - match(input,ID,FOLLOW_ID_in_synpred1703); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred1705); if (failed) return ; + match(input,POUND,FOLLOW_POUND_in_synpred1682); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred1684); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred1686); if (failed) return ; } } @@ -4643,11 +4642,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:139:4: ( ID LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:5: ID LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:4: ( ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:5: ID LPAREN { - match(input,ID,FOLLOW_ID_in_synpred2785); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred2787); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred2766); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred2768); if (failed) return ; } } @@ -4655,15 +4654,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:174:4: ( 'new' qualifiedId LPAREN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:5: 'new' qualifiedId LPAREN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:4: ( 'new' qualifiedId LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:5: 'new' qualifiedId LPAREN { - match(input,85,FOLLOW_85_in_synpred3997); if (failed) return ; - pushFollow(FOLLOW_qualifiedId_in_synpred3999); + match(input,84,FOLLOW_84_in_synpred3978); if (failed) return ; + pushFollow(FOLLOW_qualifiedId_in_synpred3980); qualifiedId(); _fsp--; if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred31001); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred3982); if (failed) return ; } } @@ -4671,11 +4670,11 @@ public class SpringExpressionsParser extends Parser { // $ANTLR start synpred4 public final void synpred4_fragment() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:7: ( ID ASSIGN ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:8: ID ASSIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:194:7: ( ID ASSIGN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:194:8: ID ASSIGN { - match(input,ID,FOLLOW_ID_in_synpred41253); if (failed) return ; - match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41255); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred41234); if (failed) return ; + match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41236); if (failed) return ; } } @@ -4741,169 +4740,169 @@ public class SpringExpressionsParser extends Parser { - public static final BitSet FOLLOW_expression_in_expr161 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_expr163 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression192 = new BitSet(new long[]{0x000000001C000002L}); - public static final BitSet FOLLOW_ASSIGN_in_expression201 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression204 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DEFAULT_in_expression214 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_logicalOrExpression_in_expression217 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_QMARK_in_expression227 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_expression230 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_COLON_in_expression232 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_expression235 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_parenExpr246 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_parenExpr249 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_RPAREN_in_parenExpr251 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression264 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_OR_in_logicalOrExpression267 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression270 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression305 = new BitSet(new long[]{0x0000000200000002L}); - public static final BitSet FOLLOW_AND_in_logicalAndExpression308 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression311 = new BitSet(new long[]{0x0000000200000002L}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression322 = new BitSet(new long[]{0x0000000000000002L,0x00000000000003FFL}); - public static final BitSet FOLLOW_relationalOperator_in_relationalExpression325 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_sumExpression_in_relationalExpression328 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_productExpression_in_sumExpression339 = new BitSet(new long[]{0x0000000C00000002L}); - public static final BitSet FOLLOW_PLUS_in_sumExpression344 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_MINUS_in_sumExpression349 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_productExpression_in_sumExpression353 = new BitSet(new long[]{0x0000000C00000002L}); - public static final BitSet FOLLOW_powerExpr_in_productExpression365 = new BitSet(new long[]{0x0000007000000002L}); - public static final BitSet FOLLOW_STAR_in_productExpression369 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_DIV_in_productExpression374 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_MOD_in_productExpression378 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_powerExpr_in_productExpression382 = new BitSet(new long[]{0x0000007000000002L}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr394 = new BitSet(new long[]{0x0000008000000002L}); - public static final BitSet FOLLOW_POWER_in_powerExpr397 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_unaryExpression_in_powerExpr400 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PLUS_in_unaryExpression414 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_MINUS_in_unaryExpression419 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_BANG_in_unaryExpression424 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_unaryExpression_in_unaryExpression428 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_primaryExpression_in_unaryExpression434 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_startNode_in_primaryExpression448 = new BitSet(new long[]{0x0000220000000002L}); - public static final BitSet FOLLOW_node_in_primaryExpression451 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_parenExpr_in_startNode484 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_startNode492 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_startNode501 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_indexer_in_startNode509 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_literal_in_startNode517 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_type_in_startNode525 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_constructor_in_startNode533 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_startNode541 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_startNode550 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_startNode559 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_startNode567 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_startNode575 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_mapInitializer_in_startNode583 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DOT_in_node603 = new BitSet(new long[]{0x000E8C0000000000L}); - public static final BitSet FOLLOW_dottedNode_in_node605 = new BitSet(new long[]{0x0000220000000002L}); - public static final BitSet FOLLOW_nonDottedNode_in_node610 = new BitSet(new long[]{0x0000220000000002L}); - public static final BitSet FOLLOW_indexer_in_nonDottedNode622 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_methodOrProperty_in_dottedNode635 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_functionOrVar_in_dottedNode641 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_projection_in_dottedNode649 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_selection_in_dottedNode658 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_firstSelection_in_dottedNode667 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_lastSelection_in_dottedNode676 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_function_in_functionOrVar710 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_var_in_functionOrVar718 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_function735 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_ID_in_function739 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_methodArgs_in_function741 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_var762 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_ID_in_var766 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_methodOrProperty794 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_methodArgs_in_methodOrProperty796 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_property_in_methodOrProperty810 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_methodArgs825 = new BitSet(new long[]{0x1FFEAD0CC0000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_argument_in_methodArgs829 = new BitSet(new long[]{0x0000100080000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs832 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_argument_in_methodArgs835 = new BitSet(new long[]{0x0000100080000000L}); - public static final BitSet FOLLOW_COMMA_in_methodArgs840 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_RPAREN_in_methodArgs847 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_property860 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_indexer876 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_argument_in_indexer880 = new BitSet(new long[]{0x0000500000000000L}); - public static final BitSet FOLLOW_COMMA_in_indexer883 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_argument_in_indexer887 = new BitSet(new long[]{0x0000500000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_indexer891 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_PROJECT_in_projection918 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_projection921 = new BitSet(new long[]{0x0001000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_projection923 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_in_selection931 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_selection934 = new BitSet(new long[]{0x0001000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_selection936 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection944 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_firstSelection947 = new BitSet(new long[]{0x0001000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_firstSelection949 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection957 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_lastSelection960 = new BitSet(new long[]{0x0001000000000000L}); - public static final BitSet FOLLOW_RCURLY_in_lastSelection962 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_TYPE_in_type971 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_type973 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_RPAREN_in_type975 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_85_in_constructor1006 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_constructor1008 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_ctorArgs_in_constructor1010 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_arrayConstructor_in_constructor1027 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_85_in_arrayConstructor1038 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1040 = new BitSet(new long[]{0x0000200000000000L}); - public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1042 = new BitSet(new long[]{0x0020000000000002L}); - public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1045 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LBRACKET_in_arrayRank1080 = new BitSet(new long[]{0x1FFEED0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_arrayRank1083 = new BitSet(new long[]{0x0000500000000000L}); - public static final BitSet FOLLOW_COMMA_in_arrayRank1086 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_arrayRank1088 = new BitSet(new long[]{0x0000500000000000L}); - public static final BitSet FOLLOW_RBRACKET_in_arrayRank1094 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LCURLY_in_listInitializer1119 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_listInitializer1121 = new BitSet(new long[]{0x0001100000000000L}); - public static final BitSet FOLLOW_COMMA_in_listInitializer1124 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_listInitializer1126 = new BitSet(new long[]{0x0001100000000000L}); - public static final BitSet FOLLOW_RCURLY_in_listInitializer1130 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_POUND_in_mapInitializer1158 = new BitSet(new long[]{0x0020000000000000L}); - public static final BitSet FOLLOW_LCURLY_in_mapInitializer1160 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1162 = new BitSet(new long[]{0x0001100000000000L}); - public static final BitSet FOLLOW_COMMA_in_mapInitializer1165 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_mapEntry_in_mapInitializer1167 = new BitSet(new long[]{0x0001100000000000L}); - public static final BitSet FOLLOW_RCURLY_in_mapInitializer1171 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_mapEntry1192 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_COLON_in_mapEntry1194 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_mapEntry1196 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_LPAREN_in_ctorArgs1214 = new BitSet(new long[]{0x1FFEAD0CC0000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1218 = new BitSet(new long[]{0x0000100080000000L}); - public static final BitSet FOLLOW_COMMA_in_ctorArgs1221 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_namedArgument_in_ctorArgs1224 = new BitSet(new long[]{0x0000100080000000L}); - public static final BitSet FOLLOW_RPAREN_in_ctorArgs1230 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_expression_in_argument1239 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_namedArgument1262 = new BitSet(new long[]{0x0000000004000000L}); - public static final BitSet FOLLOW_ASSIGN_in_namedArgument1264 = new BitSet(new long[]{0x1FFEAD0C40000020L,0x0000000000200000L}); - public static final BitSet FOLLOW_expression_in_namedArgument1266 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_argument_in_namedArgument1302 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1314 = new BitSet(new long[]{0x0000020000000002L}); - public static final BitSet FOLLOW_DOT_in_qualifiedId1317 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_ID_in_qualifiedId1319 = new BitSet(new long[]{0x0000020000000002L}); - public static final BitSet FOLLOW_ID_in_contextName1338 = new BitSet(new long[]{0x0000002000000002L}); - public static final BitSet FOLLOW_DIV_in_contextName1341 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_ID_in_contextName1343 = new BitSet(new long[]{0x0000002000000002L}); - public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1364 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_STRING_LITERAL_in_literal1370 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1375 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_boolLiteral_in_literal1380 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_NULL_LITERAL_in_literal1385 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1390 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_REAL_LITERAL_in_literal1396 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_expr154 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_expr156 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression176 = new BitSet(new long[]{0x000000000E000002L}); + public static final BitSet FOLLOW_ASSIGN_in_expression185 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression188 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DEFAULT_in_expression198 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression201 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_QMARK_in_expression211 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_expression214 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_COLON_in_expression216 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_expression219 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_parenExpr230 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_parenExpr233 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_RPAREN_in_parenExpr235 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression246 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_OR_in_logicalOrExpression249 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression252 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression287 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_AND_in_logicalAndExpression290 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression293 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression304 = new BitSet(new long[]{0x8000000000000002L,0x00000000000001FFL}); + public static final BitSet FOLLOW_relationalOperator_in_relationalExpression307 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression310 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression321 = new BitSet(new long[]{0x0000000600000002L}); + public static final BitSet FOLLOW_PLUS_in_sumExpression326 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_MINUS_in_sumExpression331 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression335 = new BitSet(new long[]{0x0000000600000002L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression346 = new BitSet(new long[]{0x0000003800000002L}); + public static final BitSet FOLLOW_STAR_in_productExpression350 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_DIV_in_productExpression355 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_MOD_in_productExpression359 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression363 = new BitSet(new long[]{0x0000003800000002L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr375 = new BitSet(new long[]{0x0000004000000002L}); + public static final BitSet FOLLOW_POWER_in_powerExpr378 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr381 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PLUS_in_unaryExpression395 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_MINUS_in_unaryExpression400 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_BANG_in_unaryExpression405 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_unaryExpression_in_unaryExpression409 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_primaryExpression_in_unaryExpression415 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_startNode_in_primaryExpression429 = new BitSet(new long[]{0x0000110000000002L}); + public static final BitSet FOLLOW_node_in_primaryExpression432 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_parenExpr_in_startNode465 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_startNode473 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_startNode482 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_indexer_in_startNode490 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_literal_in_startNode498 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_type_in_startNode506 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_constructor_in_startNode514 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_startNode522 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_startNode531 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_startNode540 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_startNode548 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_listInitializer_in_startNode556 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_mapInitializer_in_startNode564 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DOT_in_node584 = new BitSet(new long[]{0x0007460000000000L}); + public static final BitSet FOLLOW_dottedNode_in_node586 = new BitSet(new long[]{0x0000110000000002L}); + public static final BitSet FOLLOW_nonDottedNode_in_node591 = new BitSet(new long[]{0x0000110000000002L}); + public static final BitSet FOLLOW_indexer_in_nonDottedNode603 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_dottedNode616 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_dottedNode622 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_dottedNode630 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_dottedNode639 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_dottedNode648 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_dottedNode657 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_function_in_functionOrVar691 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_var_in_functionOrVar699 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_function716 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_ID_in_function720 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_methodArgs_in_function722 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_var743 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_ID_in_var747 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_methodOrProperty775 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_methodArgs_in_methodOrProperty777 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_property_in_methodOrProperty791 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_methodArgs806 = new BitSet(new long[]{0x0FFF568660000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_argument_in_methodArgs810 = new BitSet(new long[]{0x0000080040000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs813 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_argument_in_methodArgs816 = new BitSet(new long[]{0x0000080040000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs821 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_RPAREN_in_methodArgs828 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_property841 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LBRACKET_in_indexer857 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_argument_in_indexer861 = new BitSet(new long[]{0x0000280000000000L}); + public static final BitSet FOLLOW_COMMA_in_indexer864 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_argument_in_indexer868 = new BitSet(new long[]{0x0000280000000000L}); + public static final BitSet FOLLOW_RBRACKET_in_indexer872 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PROJECT_in_projection899 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_projection902 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_RCURLY_in_projection904 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_in_selection912 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_selection915 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_RCURLY_in_selection917 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection925 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_firstSelection928 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_RCURLY_in_firstSelection930 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection938 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_lastSelection941 = new BitSet(new long[]{0x0000800000000000L}); + public static final BitSet FOLLOW_RCURLY_in_lastSelection943 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_TYPE_in_type952 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_type954 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_RPAREN_in_type956 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_84_in_constructor987 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_constructor989 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_ctorArgs_in_constructor991 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_arrayConstructor_in_constructor1008 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_84_in_arrayConstructor1019 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1021 = new BitSet(new long[]{0x0000100000000000L}); + public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1023 = new BitSet(new long[]{0x0010000000000002L}); + public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1026 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LBRACKET_in_arrayRank1061 = new BitSet(new long[]{0x0FFF768620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_arrayRank1064 = new BitSet(new long[]{0x0000280000000000L}); + public static final BitSet FOLLOW_COMMA_in_arrayRank1067 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_arrayRank1069 = new BitSet(new long[]{0x0000280000000000L}); + public static final BitSet FOLLOW_RBRACKET_in_arrayRank1075 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LCURLY_in_listInitializer1100 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_listInitializer1102 = new BitSet(new long[]{0x0000880000000000L}); + public static final BitSet FOLLOW_COMMA_in_listInitializer1105 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_listInitializer1107 = new BitSet(new long[]{0x0000880000000000L}); + public static final BitSet FOLLOW_RCURLY_in_listInitializer1111 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_mapInitializer1139 = new BitSet(new long[]{0x0010000000000000L}); + public static final BitSet FOLLOW_LCURLY_in_mapInitializer1141 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_mapEntry_in_mapInitializer1143 = new BitSet(new long[]{0x0000880000000000L}); + public static final BitSet FOLLOW_COMMA_in_mapInitializer1146 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_mapEntry_in_mapInitializer1148 = new BitSet(new long[]{0x0000880000000000L}); + public static final BitSet FOLLOW_RCURLY_in_mapInitializer1152 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_mapEntry1173 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_COLON_in_mapEntry1175 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_mapEntry1177 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_ctorArgs1195 = new BitSet(new long[]{0x0FFF568660000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs1199 = new BitSet(new long[]{0x0000080040000000L}); + public static final BitSet FOLLOW_COMMA_in_ctorArgs1202 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs1205 = new BitSet(new long[]{0x0000080040000000L}); + public static final BitSet FOLLOW_RPAREN_in_ctorArgs1211 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_argument1220 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_namedArgument1243 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_ASSIGN_in_namedArgument1245 = new BitSet(new long[]{0x0FFF568620000020L,0x0000000000100000L}); + public static final BitSet FOLLOW_expression_in_namedArgument1247 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_argument_in_namedArgument1283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1295 = new BitSet(new long[]{0x0000010000000002L}); + public static final BitSet FOLLOW_DOT_in_qualifiedId1298 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1300 = new BitSet(new long[]{0x0000010000000002L}); + public static final BitSet FOLLOW_ID_in_contextName1319 = new BitSet(new long[]{0x0000001000000002L}); + public static final BitSet FOLLOW_DIV_in_contextName1322 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_ID_in_contextName1324 = new BitSet(new long[]{0x0000001000000002L}); + public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1345 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_STRING_LITERAL_in_literal1351 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1356 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_boolLiteral_in_literal1361 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_NULL_LITERAL_in_literal1366 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1371 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_REAL_LITERAL_in_literal1377 = 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_synpred1701 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_ID_in_synpred1703 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred1705 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred2785 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred2787 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_85_in_synpred3997 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_qualifiedId_in_synpred3999 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_LPAREN_in_synpred31001 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ID_in_synpred41253 = new BitSet(new long[]{0x0000000004000000L}); - public static final BitSet FOLLOW_ASSIGN_in_synpred41255 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_synpred1682 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_ID_in_synpred1684 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred1686 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred2766 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred2768 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_84_in_synpred3978 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_synpred3980 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred3982 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred41234 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_ASSIGN_in_synpred41236 = 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 46f8766f6f8..4758af6e6c9 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions__.g @@ -5,143 +5,140 @@ options { } @header {package org.springframework.expression.spel.generated;} -T85 : 'new' ; +T84 : 'new' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 58 -SEMIRPAREN : ';)'; // recoveryrelated: allows us to cope with a rogue superfluous semicolon before the rparen in an expression list - -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 224 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 214 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" 227 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 217 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" 242 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 232 ASSIGN: '='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 243 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 233 EQUAL: '=='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 244 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 234 NOT_EQUAL: '!='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 245 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 235 LESS_THAN: '<'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 246 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 236 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" 247 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 237 GREATER_THAN: '>'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 248 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 238 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" 249 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 239 IN: 'in'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 250 -IS: 'is'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 251 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 240 +INSTANCEOF: 'instanceof'; +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 241 BETWEEN:'between'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 252 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 242 MATCHES:'matches'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 253 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 243 NULL_LITERAL: 'null'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 255 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 245 SEMI: ';'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 256 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 246 DOT: '.'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 257 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 247 COMMA: ','; -// $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" 248 LPAREN: '('; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 259 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 249 RPAREN: ')'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 260 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 250 LCURLY: '{'; -// $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" 251 RCURLY: '}'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 262 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 252 LBRACKET: '['; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 253 RBRACKET: ']'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 264 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 254 PIPE: '|'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 266 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 256 AND: 'and'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 267 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 257 OR: 'or'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 268 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 258 FALSE: 'false'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 269 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 259 TRUE: 'true'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 271 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 261 PLUS: '+'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 272 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 262 MINUS: '-'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 273 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263 DIV: '/'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 274 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 264 STAR: '*'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 275 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 265 MOD: '%'; -// $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" 266 POWER: '^'; -// $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" 267 BANG: '!'; -// $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" 268 POUND: '#'; -// $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" 269 QMARK: '?'; -// $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" 270 DEFAULT: '??'; -// $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" 271 PROJECT: '!{'; -// $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" 272 SELECT: '?{'; -// $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" 273 SELECT_FIRST: '^{'; -// $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" 274 SELECT_LAST: '${'; -// $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" 275 TYPE: 'T('; -// $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" 277 STRING_LITERAL: '\''! (APOS|~'\'')* '\''!; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 288 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 278 DQ_STRING_LITERAL: '"'! (~'"')* '"'!; -// $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" 279 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" 290 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 280 DOT_ESCAPED: '\\.'; -// $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" 281 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" 292 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 282 DOLLAR: '$'; -// $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" 283 AT: '@'; -// $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" 284 UPTO: '..'; -// $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" 285 COLON: ':'; -// $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" 288 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" 304 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 294 fragment APOS : '\''! '\''; -// $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" 295 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" 306 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 296 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" 307 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 297 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" 309 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 299 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" 310 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 300 fragment SIGN : '+' | '-' ; -// $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" 301 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 1e734304e59..91271311359 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 @@ -40,7 +40,7 @@ import org.springframework.expression.spel.ast.OperatorGreaterThan; import org.springframework.expression.spel.ast.OperatorGreaterThanOrEqual; import org.springframework.expression.spel.ast.OperatorIn; import org.springframework.expression.spel.ast.OperatorInequality; -import org.springframework.expression.spel.ast.OperatorIs; +import org.springframework.expression.spel.ast.OperatorInstanceof; import org.springframework.expression.spel.ast.OperatorLessThan; import org.springframework.expression.spel.ast.OperatorLessThanOrEqual; import org.springframework.expression.spel.ast.OperatorMatches; @@ -170,8 +170,8 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { return new OperatorBetween(payload); case SpringExpressionsLexer.MATCHES: return new OperatorMatches(payload); - case SpringExpressionsLexer.IS: - return new OperatorIs(payload); + case SpringExpressionsLexer.INSTANCEOF: + return new OperatorInstanceof(payload); case SpringExpressionsLexer.RPAREN: return new Placeholder(payload); diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 00d5f5135c2..99372256cbd 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 @@ -72,27 +72,27 @@ public class EvaluationTests extends ExpressionTestCase { } public void testRelOperatorsIs01() { - evaluate("'xyz' is T(int)", "false", Boolean.class); + evaluate("'xyz' instanceof T(int)", "false", Boolean.class); } public void testRelOperatorsIs02() { - evaluate("{1, 2, 3, 4, 5} is T(List)", "true", Boolean.class); + evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); } public void testRelOperatorsIs03() { - evaluate("{1, 2, 3, 4, 5} is T(List)", "true", Boolean.class); + evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); } public void testRelOperatorsIs04() { - evaluate("null is T(String)", "false", Boolean.class); + evaluate("null instanceof T(String)", "false", Boolean.class); } public void testRelOperatorsIs05() { - evaluate("null is T(Integer)", "false", Boolean.class); + evaluate("null instanceof T(Integer)", "false", Boolean.class); } public void testRelOperatorsIs06() { - evaluateAndCheckError("'A' is null", SpelMessages.IS_OPERATOR_NEEDS_CLASS_OPERAND, 7, "null"); + evaluateAndCheckError("'A' instanceof null", SpelMessages.INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND, 15, "null"); } public void testRelOperatorsMatches01() { diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java index 1606673c859..7c2d6ef2ad2 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java @@ -48,7 +48,8 @@ public class ParserErrorMessagesTests extends ExpressionTestCase { public void testBrokenExpression07() { // T() can only take an identifier (possibly qualified), not a literal // message ought to say identifier rather than ID - parseAndCheckError("null is T('a')", SpelMessages.PARSE_PROBLEM, 10, "mismatched input ''a'' expecting ID"); // POOR + parseAndCheckError("null instanceof T('a')", SpelMessages.PARSE_PROBLEM, 18, + "mismatched input ''a'' expecting ID"); // POOR } } 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 950aecfbf35..6b497b20f4b 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 @@ -146,11 +146,11 @@ public class ParsingTests extends TestCase { }// true public void testRelOperatorsIs01() { - parseCheck("'xyz' is int", "('xyz' is int)"); + parseCheck("'xyz' instanceof int", "('xyz' instanceof int)"); }// false public void testRelOperatorsIs02() { - parseCheck("{1, 2, 3, 4, 5} is List", "({1,2,3,4,5} is List)"); + parseCheck("{1, 2, 3, 4, 5} instanceof List", "({1,2,3,4,5} instanceof List)"); }// true public void testRelOperatorsMatches01() {