From 769e706be7d2e8a8deeb819c9215e7cd21d48414 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 17 Sep 2008 15:23:15 +0000 Subject: [PATCH] removing: initializers/processors/in operator --- .../spel/ast/ExpressionListNode.java | 75 - .../expression/spel/ast/ListInitializer.java | 67 - .../expression/spel/ast/MapEntry.java | 65 - .../expression/spel/ast/MapInitializer.java | 63 - .../expression/spel/ast/MethodReference.java | 168 -- .../expression/spel/ast/OperatorIn.java | 60 - .../spel/generated/SpringExpressions.g | 33 - .../spel/generated/SpringExpressions.tokens | 155 +- .../generated/SpringExpressionsLexer.java | 836 +++--- .../generated/SpringExpressionsParser.java | 2611 ++++++----------- .../spel/generated/SpringExpressions__.g | 122 +- .../spel/internal/SpelTreeAdaptor.java | 20 - .../spel/processors/AverageProcessor.java | 59 - .../spel/processors/CountProcessor.java | 35 - .../spel/processors/CutProcessor.java | 54 - .../spel/processors/DataProcessor.java | 35 - .../spel/processors/DistinctProcessor.java | 43 - .../spel/processors/MaxProcessor.java | 47 - .../spel/processors/MinProcessor.java | 47 - .../spel/processors/NonNullProcessor.java | 42 - .../spel/processors/SortProcessor.java | 66 - .../expression/spel/processors/package.html | 14 - .../spel/ConstructorInvocationTests.java | 84 +- .../expression/spel/EvaluationTests.java | 320 +- .../spel/MethodInvocationTests.java | 24 +- .../expression/spel/ParsingTests.java | 190 +- 26 files changed, 1749 insertions(+), 3586 deletions(-) delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ExpressionListNode.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ListInitializer.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapEntry.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapInitializer.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIn.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/AverageProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CountProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CutProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DataProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DistinctProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MaxProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MinProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/NonNullProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/SortProcessor.java delete mode 100644 org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/package.html diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ExpressionListNode.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ExpressionListNode.java deleted file mode 100644 index 7272d1770b9..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ExpressionListNode.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.ExpressionState; - -/** - * Represents a list of expressions of the form "(expression1;expression2;expression3)". The expressions are always - * evaluated from left to right, due to possible side effects that earlier expressions may have that influence the - * evaluation of later expressions (defining functions, setting variables, etc). - * - * @author Andy Clement - * - */ -public class ExpressionListNode extends SpelNode { - - public ExpressionListNode(Token payload) { - super(payload); - } - - @Override - public Object getValue(ExpressionState state) throws EvaluationException { - Object result = null; - for (int i = 0; i < getChildCount(); i++) { - result = getChild(i).getValue(state); - } - return result; - } - - @Override - public boolean isWritable(ExpressionState state) throws EvaluationException { - boolean isWritable = false; - if (getChildCount() > 0) { - // Evaluate all but the last one - for (int i = 0; i < getChildCount() - 1; i++) { - getChild(i).getValue(state); - } - isWritable = getChild(getChildCount() - 1).isWritable(state); - } - return isWritable; - } - - @Override - public String toStringAST() { - StringBuffer sb = new StringBuffer(); - if (getChildCount() == 1) { - sb.append(getChild(0).toStringAST()); - } else { - sb.append("("); - for (int i = 0; i < getChildCount(); i++) { - if (i > 0) - sb.append(";"); - sb.append(getChild(i).toStringAST()); - } - sb.append(")"); - } - return sb.toString(); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ListInitializer.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ListInitializer.java deleted file mode 100644 index 73f995a5159..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/ListInitializer.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import java.util.ArrayList; -import java.util.List; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -public class ListInitializer extends SpelNode { - - public ListInitializer(Token payload) { - super(payload); - } - - /** - * Evaluate the list initializer, returning a List - */ - @Override - public List getValue(ExpressionState state) throws EvaluationException { - List result = new ArrayList(); - for (int i = 0; i < getChildCount(); i++) { - Object element = getChild(i).getValue(state); - result.add(element); - } - return result; - } - - /** - * Return string form of this node {,,} - */ - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder(); - sb.append("{"); - for (int i = 0; i < getChildCount(); i++) { - if (i > 0) { - sb.append(","); - } - sb.append(getChild(i).toStringAST()); - } - sb.append("}"); - return sb.toString(); - } - - @Override - public boolean isWritable(ExpressionState expressionState) throws SpelException { - return false; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapEntry.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapEntry.java deleted file mode 100644 index 3fe1e3b891c..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapEntry.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -/** - * Represents an entry in a map initializer structure like "#{'a':3,'b':2}" Both "'a':3" and "'b':2" would be MapEntry - * instances. - * - * @author Andy Clement - * - */ -public class MapEntry extends SpelNode { - - public MapEntry(Token payload) { - super(payload); - } - - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder(); - String k = getChild(0).toStringAST(); - String v = getChild(1).toStringAST(); - sb.append(k).append(":").append(v); - return sb.toString(); - } - - @Override - public Object getValue(ExpressionState state) throws EvaluationException { - throw new SpelException(SpelMessages.MAPENTRY_SHOULD_NOT_BE_EVALUATED); - } - - /** - * Return the value of the key for this map entry. - */ - public Object getKeyValue(ExpressionState state) throws EvaluationException { - return getChild(0).getValue(state); - } - - /** - * Return the value of the value for this map entry. - */ - public Object getValueValue(ExpressionState state) throws EvaluationException { - return getChild(1).getValue(state); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapInitializer.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapInitializer.java deleted file mode 100644 index 76b659aff4f..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MapInitializer.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import java.util.HashMap; -import java.util.Map; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -public class MapInitializer extends SpelNode { - - public MapInitializer(Token payload) { - super(payload); - } - - @Override - public Map getValue(ExpressionState state) throws EvaluationException { - Map result = new HashMap(); - for (int i = 0; i < getChildCount(); i++) { - MapEntry mEntry = (MapEntry) getChild(i); - result.put(mEntry.getKeyValue(state), mEntry.getValueValue(state)); - } - return result; - } - - /** - * Return string form of this node #{a:b,c:d,...} - */ - @Override - public String toStringAST() { - StringBuilder sb = new StringBuilder(); - sb.append("#{"); - for (int i = 0; i < getChildCount(); i++) { - if (i > 0) - sb.append(", "); - sb.append(getChild(i).toStringAST()); - } - sb.append("}"); - return sb.toString(); - } - - @Override - public boolean isWritable(ExpressionState expressionState) throws SpelException { - return false; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java index 480b8b158b2..36b6694e90c 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java @@ -15,13 +15,7 @@ */ package org.springframework.expression.spel.ast; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.antlr.runtime.Token; import org.springframework.expression.AccessException; @@ -33,173 +27,17 @@ import org.springframework.expression.spel.ExpressionState; import org.springframework.expression.spel.SpelException; import org.springframework.expression.spel.SpelMessages; import org.springframework.expression.spel.internal.Utils; -import org.springframework.expression.spel.processors.AverageProcessor; -import org.springframework.expression.spel.processors.CountProcessor; -import org.springframework.expression.spel.processors.CutProcessor; -import org.springframework.expression.spel.processors.DataProcessor; -import org.springframework.expression.spel.processors.DistinctProcessor; -import org.springframework.expression.spel.processors.MaxProcessor; -import org.springframework.expression.spel.processors.MinProcessor; -import org.springframework.expression.spel.processors.NonNullProcessor; -import org.springframework.expression.spel.processors.SortProcessor; public class MethodReference extends SpelNode { - private static Map registeredProcessers = new HashMap(); - private final String name; private MethodExecutor fastInvocationAccessor; - static { - registeredProcessers.put("count", new CountProcessor()); - registeredProcessers.put("max", new MaxProcessor()); - registeredProcessers.put("min", new MinProcessor()); - registeredProcessers.put("average", new AverageProcessor()); - registeredProcessers.put("sort", new SortProcessor()); - registeredProcessers.put("nonnull", new NonNullProcessor()); - registeredProcessers.put("distinct", new DistinctProcessor()); - registeredProcessers.put("cut", new CutProcessor()); - } - public MethodReference(Token payload) { super(payload); name = payload.getText(); } - @SuppressWarnings("unchecked") - private Object invokeDataProcessor(Object[] arguments, ExpressionState state) throws EvaluationException { - DataProcessor processor = registeredProcessers.get(name); - - Object target = state.getActiveContextObject(); - - // Prepare the input, translating arrays to lists - boolean wasArray = false; - Class arrayElementType = null; - Collection dataToProcess = null; - if (target instanceof Collection) { - dataToProcess = (Collection) target; - } else { - wasArray = true; - arrayElementType = target.getClass().getComponentType(); - if (arrayElementType.equals(Integer.TYPE)) { - int[] data = (int[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Byte.TYPE)) { - byte[] data = (byte[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Character.TYPE)) { - char[] data = (char[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Double.TYPE)) { - double[] data = (double[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Long.TYPE)) { - long[] data = (long[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Float.TYPE)) { - float[] data = (float[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Short.TYPE)) { - short[] data = (short[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else if (arrayElementType.equals(Boolean.TYPE)) { - boolean[] data = (boolean[]) target; - dataToProcess = new ArrayList(); - for (int i = 0; i < data.length; i++) { - dataToProcess.add(data[i]); - } - } else { - dataToProcess = Arrays.asList((Object[]) target); - } - } - - Object result = processor.process(dataToProcess, arguments, state); - - // Convert the result back if necessary - if (wasArray && (result instanceof Collection)) { - Collection c = (Collection) result; - - if (arrayElementType.equals(Integer.TYPE)) { - int[] newArray = (int[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Integer) i).intValue(); - return newArray; - } else if (arrayElementType.equals(Byte.TYPE)) { - byte[] newArray = (byte[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Byte) i).byteValue(); - return newArray; - } else if (arrayElementType.equals(Character.TYPE)) { - char[] newArray = (char[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Character) i).charValue(); - return newArray; - } else if (arrayElementType.equals(Double.TYPE)) { - double[] newArray = (double[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Double) i).doubleValue(); - return newArray; - } else if (arrayElementType.equals(Long.TYPE)) { - long[] newArray = (long[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Long) i).longValue(); - return newArray; - } else if (arrayElementType.equals(Float.TYPE)) { - float[] newArray = (float[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Float) i).floatValue(); - return newArray; - } else if (arrayElementType.equals(Short.TYPE)) { - short[] newArray = (short[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Short) i).shortValue(); - return newArray; - } else if (arrayElementType.equals(Boolean.TYPE)) { - boolean[] newArray = (boolean[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) - newArray[idx++] = ((Boolean) i).booleanValue(); - return newArray; - } else { - Object[] newArray = (Object[]) Array.newInstance(arrayElementType, c.size()); - int idx = 0; - for (Object i : c) { - newArray[idx++] = i; - } - return newArray; - } - } - return result; - } - @Override public Object getValue(ExpressionState state) throws EvaluationException { Object currentContext = state.getActiveContextObject(); @@ -212,12 +50,6 @@ public class MethodReference extends SpelNode { formatMethodForMessage(name, getTypes(arguments))); } - boolean usingProcessor = registeredProcessers.containsKey(name); - if ((currentContext.getClass().isArray() && usingProcessor) - || (currentContext instanceof Collection && registeredProcessers.containsKey(name))) { - return invokeDataProcessor(arguments, state); - } - if (fastInvocationAccessor != null) { try { return fastInvocationAccessor.execute(state.getEvaluationContext(), state.getActiveContextObject(), diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIn.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIn.java deleted file mode 100644 index 58d0593822f..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIn.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.ast; - -import java.util.Collection; - -import org.antlr.runtime.Token; -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -/** - * Represents the 'in' operator and returns true if the left operand can be found within the collection passed as the - * right operand. - * - * @author Andy Clement - */ -public class OperatorIn extends Operator { - - public OperatorIn(Token payload) { - super(payload); - } - - @Override - public String getOperatorName() { - return "in"; - } - - @Override - public Object getValue(ExpressionState state) throws EvaluationException { - Object left = getLeftOperand().getValue(state); - Object right = getRightOperand().getValue(state); - if (right instanceof Collection) { - Collection c = (Collection) right; - for (Object element : c) { - if (state.getTypeComparator().compare(left, element) == 0) { - return true; - } - } - return false; - } - throw new SpelException(SpelMessages.OPERATOR_IN_CANNOT_DETERMINE_MEMBERSHIP, left.getClass().getName(), right - .getClass().getName()); - } - -} 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 43835ba9537..d7d375c264c 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 @@ -7,7 +7,6 @@ options { } tokens { - EXPRESSIONLIST; INTEGER_LITERAL; EXPRESSION; QUALIFIED_IDENTIFIER; @@ -15,15 +14,10 @@ tokens { INDEXER; CONSTRUCTOR; HOLDER; - CONSTRUCTOR_ARRAY; NAMED_ARGUMENT; FUNCTIONREF; TYPEREF; - RANGE; VARIABLEREF; - LIST_INITIALIZER; - MAP_INITIALIZER; - MAP_ENTRY; METHOD; ADD; SUBTRACT; @@ -94,8 +88,6 @@ startNode | selection | firstSelection | lastSelection - | listInitializer - | mapInitializer ; node @@ -141,10 +133,8 @@ methodArgs : LPAREN! (argument (COMMA! argument)* (COMMA!)?)? RPAREN!; property: id=ID -> ^(PROPERTY_OR_FIELD[$id]); -//indexer: LBRACKET r1=range (COMMA r2=range)* RBRACKET -> ^(INDEXER $r1 ($r2)*); indexer: LBRACKET r1=argument (COMMA r2=argument)* RBRACKET -> ^(INDEXER $r1 ($r2)*); -//range: INTEGER_LITERAL UPTO^ INTEGER_LITERAL | // argument; // TODO make expression conditional with ? if want completion for when the RCURLY is missing projection: PROJECT^ expression RCURLY!; @@ -162,29 +152,8 @@ type: TYPE qualifiedId RPAREN -> ^(TYPEREF qualifiedId); constructor : ('new' qualifiedId LPAREN) => 'new' qualifiedId ctorArgs -> ^(CONSTRUCTOR qualifiedId ctorArgs) - | arrayConstructor - ; - -arrayConstructor - : 'new' qualifiedId arrayRank (listInitializer)? - -> ^(CONSTRUCTOR_ARRAY qualifiedId arrayRank (listInitializer)?) ; -arrayRank - : LBRACKET (expression (COMMA expression)*)? RBRACKET -> ^(EXPRESSIONLIST expression*); - -listInitializer - : LCURLY expression (COMMA expression)* RCURLY -> ^(LIST_INITIALIZER expression*); - -//arrayInitializer -// : LCURLY expression (COMMA expression)* RCURLY -> ^(ARRAY_INITIALIZER expression*); - -mapInitializer - : POUND LCURLY mapEntry (COMMA mapEntry)* RCURLY -> ^(MAP_INITIALIZER mapEntry*); - -mapEntry - : expression COLON expression -> ^(MAP_ENTRY expression*); - ctorArgs : LPAREN! (namedArgument (COMMA! namedArgument)*)? RPAREN!; @@ -223,7 +192,6 @@ relationalOperator | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL - | IN | INSTANCEOF | BETWEEN | MATCHES @@ -236,7 +204,6 @@ LESS_THAN: '<'; LESS_THAN_OR_EQUAL: '<='; GREATER_THAN: '>'; GREATER_THAN_OR_EQUAL: '>='; -IN: 'in'; INSTANCEOF: 'instanceof'; BETWEEN:'between'; MATCHES:'matches'; 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 8a58fe65b97..285a0d880f0 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,81 +1,74 @@ -GREATER_THAN_OR_EQUAL=68 -SELECT_FIRST=49 -HOLDER=11 -COMMA=43 -GREATER_THAN=67 -TYPE=51 -EXPRESSIONLIST=4 -MINUS=34 -MAP_ENTRY=20 -SELECT_LAST=50 -NUMBER=24 -LESS_THAN=65 -BANG=39 -FALSE=59 -METHOD=21 -PROPERTY_OR_FIELD=8 -LBRACKET=44 -INDEXER=9 -MOD=37 -CONSTRUCTOR_ARRAY=12 -FUNCTIONREF=14 -NULL_LITERAL=55 -NAMED_ARGUMENT=13 -OR=31 -PIPE=74 -DOT=40 -RCURLY=47 -EXPRESSION=6 -AND=32 -LCURLY=52 -REAL_TYPE_SUFFIX=82 -STRING_LITERAL=53 -SELECT=48 -QUALIFIED_IDENTIFIER=7 -RBRACKET=45 -SUBTRACT=23 -ASSIGN=25 -INSTANCEOF=70 -BETWEEN=71 -RPAREN=30 -SIGN=83 -LPAREN=29 -HEX_DIGIT=62 -PLUS=33 -LIST_INITIALIZER=18 -APOS=75 -INTEGER_LITERAL=5 -AT=79 -ID=42 -NOT_EQUAL=64 -RANGE=16 -POWER=38 -TYPEREF=15 -DECIMAL_DIGIT=60 -WS=77 -DOLLAR=78 -LESS_THAN_OR_EQUAL=66 -DQ_STRING_LITERAL=54 -HEXADECIMAL_INTEGER_LITERAL=56 -MAP_INITIALIZER=19 -IN=69 -SEMI=73 -CONSTRUCTOR=10 -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=81 -TRUE=58 -ADD=22 -POUND=41 -'new'=84 +GREATER_THAN_OR_EQUAL=61 +HOLDER=10 +COMMA=37 +SELECT_FIRST=43 +GREATER_THAN=60 +TYPE=45 +MINUS=28 +SELECT_LAST=44 +NUMBER=18 +LESS_THAN=58 +BANG=33 +FALSE=52 +METHOD=15 +PROPERTY_OR_FIELD=7 +LBRACKET=38 +INDEXER=8 +MOD=31 +FUNCTIONREF=12 +NULL_LITERAL=48 +NAMED_ARGUMENT=11 +OR=25 +PIPE=67 +DOT=34 +RCURLY=41 +EXPRESSION=5 +AND=26 +LCURLY=66 +REAL_TYPE_SUFFIX=75 +STRING_LITERAL=46 +QUALIFIED_IDENTIFIER=6 +SELECT=42 +ASSIGN=19 +SUBTRACT=17 +RBRACKET=39 +INSTANCEOF=62 +BETWEEN=63 +RPAREN=24 +SIGN=76 +LPAREN=23 +HEX_DIGIT=55 +PLUS=27 +APOS=68 +INTEGER_LITERAL=4 +AT=72 +ID=36 +NOT_EQUAL=57 +POWER=32 +TYPEREF=13 +DECIMAL_DIGIT=53 +WS=70 +DOLLAR=71 +LESS_THAN_OR_EQUAL=59 +DQ_STRING_LITERAL=47 +HEXADECIMAL_INTEGER_LITERAL=49 +SEMI=65 +CONSTRUCTOR=9 +INTEGER_TYPE_SUFFIX=54 +EQUAL=56 +MATCHES=64 +DOT_ESCAPED=69 +UPTO=73 +QMARK=21 +DEFAULT=20 +COLON=22 +PROJECT=40 +DIV=30 +STAR=29 +REAL_LITERAL=50 +VARIABLEREF=14 +EXPONENT_PART=74 +TRUE=51 +ADD=16 +POUND=35 +'new'=77 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 af0402c01f3..6a38e22c56b 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:16:33 +// $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 19:06:07 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -7,99 +7,92 @@ import java.util.List; import java.util.ArrayList; public class SpringExpressionsLexer extends Lexer { - 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=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=50; - public static final int NUMBER=24; - public static final int BANG=39; - public static final int LESS_THAN=65; - public static final int METHOD=21; - public static final int FALSE=59; - public static final int PROPERTY_OR_FIELD=8; - public static final int LBRACKET=44; - public static final int INDEXER=9; - 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=55; - public static final int NAMED_ARGUMENT=13; - 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=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=45; - public static final int SUBTRACT=23; - 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=75; - public static final int INTEGER_LITERAL=5; - 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 T84=84; - public static final int POWER=38; - public static final int TYPEREF=15; - 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=56; - public static final int IN=69; - public static final int CONSTRUCTOR=10; - 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 GREATER_THAN_OR_EQUAL=61; + public static final int HOLDER=10; + public static final int COMMA=37; + public static final int SELECT_FIRST=43; + public static final int TYPE=45; + public static final int GREATER_THAN=60; + public static final int MINUS=28; + public static final int SELECT_LAST=44; + public static final int NUMBER=18; + public static final int BANG=33; + public static final int LESS_THAN=58; + public static final int METHOD=15; + public static final int FALSE=52; + public static final int PROPERTY_OR_FIELD=7; + public static final int LBRACKET=38; + public static final int INDEXER=8; + public static final int MOD=31; + public static final int FUNCTIONREF=12; + public static final int NULL_LITERAL=48; + public static final int NAMED_ARGUMENT=11; + public static final int OR=25; + public static final int PIPE=67; + public static final int DOT=34; + public static final int RCURLY=41; + public static final int EXPRESSION=5; + public static final int AND=26; + public static final int LCURLY=66; + public static final int REAL_TYPE_SUFFIX=75; + public static final int STRING_LITERAL=46; + public static final int QUALIFIED_IDENTIFIER=6; + public static final int SELECT=42; + public static final int ASSIGN=19; + public static final int SUBTRACT=17; + public static final int RBRACKET=39; + public static final int INSTANCEOF=62; + public static final int BETWEEN=63; + public static final int RPAREN=24; + public static final int SIGN=76; + public static final int LPAREN=23; + public static final int T77=77; + public static final int HEX_DIGIT=55; + public static final int PLUS=27; + public static final int APOS=68; + public static final int INTEGER_LITERAL=4; + public static final int AT=72; + public static final int ID=36; + public static final int NOT_EQUAL=57; + public static final int POWER=32; + public static final int TYPEREF=13; + public static final int DECIMAL_DIGIT=53; + public static final int WS=70; + public static final int DOLLAR=71; + public static final int LESS_THAN_OR_EQUAL=59; + public static final int DQ_STRING_LITERAL=47; + public static final int HEXADECIMAL_INTEGER_LITERAL=49; + public static final int CONSTRUCTOR=9; + public static final int SEMI=65; + public static final int INTEGER_TYPE_SUFFIX=54; + public static final int EQUAL=56; + public static final int MATCHES=64; + public static final int DOT_ESCAPED=69; + public static final int QMARK=21; + public static final int UPTO=73; public static final int EOF=-1; - 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=57; - public static final int ADD=22; - public static final int TRUE=58; - public static final int EXPONENT_PART=81; - public static final int POUND=41; + public static final int Tokens=78; + public static final int PROJECT=40; + public static final int COLON=22; + public static final int DEFAULT=20; + public static final int DIV=30; + public static final int STAR=29; + public static final int VARIABLEREF=14; + public static final int REAL_LITERAL=50; + public static final int ADD=16; + public static final int TRUE=51; + public static final int EXPONENT_PART=74; + public static final int POUND=35; 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 T84 - public final void mT84() throws RecognitionException { + // $ANTLR start T77 + public final void mT77() throws RecognitionException { try { - int _type = T84; + int _type = T77; // /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' { @@ -113,16 +106,16 @@ public class SpringExpressionsLexer extends Lexer { finally { } } - // $ANTLR end T84 + // $ANTLR end T77 // $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: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:184: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:184: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:4: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:4: ( DECIMAL_DIGIT )+ int cnt1=0; loop1: do { @@ -136,7 +129,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:215:5: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:5: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -152,7 +145,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:215:21: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:21: ( INTEGER_TYPE_SUFFIX )? int alt2=2; int LA2_0 = input.LA(1); @@ -161,7 +154,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:215:22: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:184:22: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -184,10 +177,10 @@ public class SpringExpressionsLexer extends Lexer { public final void mHEXADECIMAL_INTEGER_LITERAL() throws RecognitionException { try { int _type = HEXADECIMAL_INTEGER_LITERAL; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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:186: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:186: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:31: ( '0x' | '0X' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:31: ( '0x' | '0X' ) int alt3=2; int LA3_0 = input.LA(1); @@ -202,20 +195,20 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("217:31: ( '0x' | '0X' )", 3, 1, input); + new NoViableAltException("186:31: ( '0x' | '0X' )", 3, 1, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("217:31: ( '0x' | '0X' )", 3, 0, input); + new NoViableAltException("186: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:217:32: '0x' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:32: '0x' { match("0x"); @@ -223,7 +216,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:217:39: '0X' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:39: '0X' { match("0X"); @@ -233,7 +226,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:217:45: ( HEX_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:45: ( HEX_DIGIT )+ int cnt4=0; loop4: do { @@ -247,7 +240,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:217:46: HEX_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:46: HEX_DIGIT { mHEX_DIGIT(); @@ -263,7 +256,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:217:58: ( INTEGER_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:58: ( INTEGER_TYPE_SUFFIX )? int alt5=2; int LA5_0 = input.LA(1); @@ -272,7 +265,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:217:59: INTEGER_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:59: INTEGER_TYPE_SUFFIX { mINTEGER_TYPE_SUFFIX(); @@ -295,8 +288,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:232:7: ( '=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:9: '=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:7: ( '=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:9: '=' { match('='); @@ -313,8 +306,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:233:6: ( '==' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:8: '==' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:6: ( '==' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:201:8: '==' { match("=="); @@ -332,8 +325,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:234:10: ( '!=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:12: '!=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202:10: ( '!=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202:12: '!=' { match("!="); @@ -351,8 +344,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:235:10: ( '<' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:12: '<' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:10: ( '<' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:12: '<' { match('<'); @@ -369,8 +362,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:236:19: ( '<=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:236:21: '<=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:19: ( '<=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:21: '<=' { match("<="); @@ -388,8 +381,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:237:13: ( '>' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:15: '>' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:13: ( '>' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:15: '>' { match('>'); @@ -406,8 +399,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:238:22: ( '>=' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:24: '>=' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:22: ( '>=' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:24: '>=' { match(">="); @@ -421,31 +414,12 @@ public class SpringExpressionsLexer extends Lexer { } // $ANTLR end GREATER_THAN_OR_EQUAL - // $ANTLR start IN - 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: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"); - - - } - - this.type = _type; - } - finally { - } - } - // $ANTLR end IN - // $ANTLR start INSTANCEOF public final void mINSTANCEOF() throws RecognitionException { try { 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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:11: ( 'instanceof' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:17: 'instanceof' { match("instanceof"); @@ -463,8 +437,8 @@ public class SpringExpressionsLexer extends Lexer { public final void mBETWEEN() throws RecognitionException { try { int _type = BETWEEN; - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:8: ( 'between' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:9: 'between' { match("between"); @@ -482,8 +456,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:8: ( 'matches' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:9: 'matches' { match("matches"); @@ -501,8 +475,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:13: ( 'null' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:15: 'null' { match("null"); @@ -520,8 +494,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:245:5: ( ';' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:7: ';' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:5: ( ';' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:7: ';' { match(';'); @@ -538,8 +512,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:246:4: ( '.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:9: '.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:4: ( '.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:213:9: '.' { match('.'); @@ -556,8 +530,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:247:6: ( ',' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:8: ',' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:6: ( ',' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214:8: ',' { match(','); @@ -574,8 +548,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:248:7: ( '(' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:9: '(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:7: ( '(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:9: '(' { match('('); @@ -592,8 +566,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:249:7: ( ')' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:9: ')' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:7: ( ')' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:9: ')' { match(')'); @@ -610,8 +584,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:250:7: ( '{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:9: '{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:7: ( '{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:217:9: '{' { match('{'); @@ -628,8 +602,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:251:7: ( '}' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:9: '}' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:7: ( '}' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:9: '}' { match('}'); @@ -646,8 +620,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:252:9: ( '[' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:11: '[' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:9: ( '[' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:11: '[' { match('['); @@ -664,8 +638,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:253:9: ( ']' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:11: ']' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:9: ( ']' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:11: ']' { match(']'); @@ -682,8 +656,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:254:5: ( '|' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:254:7: '|' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:5: ( '|' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:7: '|' { match('|'); @@ -700,8 +674,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:4: ( 'and' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:9: 'and' { match("and"); @@ -719,8 +693,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:224:3: ( 'or' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:224:9: 'or' { match("or"); @@ -738,8 +712,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:6: ( 'false' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:9: 'false' { match("false"); @@ -757,8 +731,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:5: ( 'true' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:9: 'true' { match("true"); @@ -776,8 +750,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:261:5: ( '+' ) - // /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:228:5: ( '+' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:228:7: '+' { match('+'); @@ -794,8 +768,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:262:6: ( '-' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:8: '-' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:6: ( '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:8: '-' { match('-'); @@ -812,8 +786,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:263:4: ( '/' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:6: '/' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:4: ( '/' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:6: '/' { match('/'); @@ -830,8 +804,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: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:231:5: ( '*' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:7: '*' { match('*'); @@ -848,8 +822,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:265:4: ( '%' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:6: '%' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:4: ( '%' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:6: '%' { match('%'); @@ -866,8 +840,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:266:6: ( '^' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266: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('^'); @@ -884,8 +858,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:267:5: ( '!' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267:7: '!' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:5: ( '!' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:7: '!' { match('!'); @@ -902,8 +876,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:268:6: ( '#' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:8: '#' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:6: ( '#' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:8: '#' { match('#'); @@ -920,8 +894,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:269:6: ( '?' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:8: '?' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:236:6: ( '?' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:236:8: '?' { match('?'); @@ -938,8 +912,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:270:8: ( '??' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:10: '??' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:8: ( '??' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:10: '??' { match("??"); @@ -957,8 +931,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:271:8: ( '!{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:271:10: '!{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:8: ( '!{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:238:10: '!{' { match("!{"); @@ -976,8 +950,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:272:7: ( '?{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:9: '?{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:7: ( '?{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:9: '?{' { match("?{"); @@ -995,8 +969,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:273:13: ( '^{' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:273:15: '^{' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:13: ( '^{' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:15: '^{' { match("^{"); @@ -1014,8 +988,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:274:12: ( '${' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:274:14: '${' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:241:12: ( '${' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:241:14: '${' { match("${"); @@ -1033,8 +1007,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: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(' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:5: ( 'T(' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:7: 'T(' { match("T("); @@ -1052,11 +1026,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: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 | ~ '\\'' )* '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:17: '\\'' ( APOS | ~ '\\'' )* '\\'' { match('\''); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:277:23: ( APOS | ~ '\\'' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:23: ( APOS | ~ '\\'' )* loop6: do { int alt6=3; @@ -1078,14 +1052,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:277:24: APOS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244: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:277:29: ~ '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:29: ~ '\\'' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1121,11 +1095,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:278:18: ( '\"' (~ '\"' )* '\"' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:20: '\"' (~ '\"' )* '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:18: ( '\"' (~ '\"' )* '\"' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:20: '\"' (~ '\"' )* '\"' { match('\"'); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:278:25: (~ '\"' )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:25: (~ '\"' )* loop7: do { int alt7=2; @@ -1138,7 +1112,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:278:26: ~ '\"' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245:26: ~ '\"' { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1174,8 +1148,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: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:246: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(); @@ -1187,7 +1161,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:279: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:246:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )* loop8: do { int alt8=6; @@ -1281,35 +1255,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:279:30: 'a' .. 'z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:279:39: 'A' .. 'Z' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:279:48: '_' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:48: '_' { match('_'); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:52: '0' .. '9' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:279:61: DOT_ESCAPED + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:61: DOT_ESCAPED { mDOT_ESCAPED(); @@ -1335,8 +1309,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:280:12: ( '\\\\.' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:14: '\\\\.' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:12: ( '\\\\.' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:247:14: '\\\\.' { match("\\."); @@ -1354,10 +1328,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: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:248:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248: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' )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:5: ( ' ' | '\\t' | '\\n' | '\\r' )+ int cnt9=0; loop9: do { @@ -1411,8 +1385,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: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:249:7: ( '$' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:9: '$' { match('$'); @@ -1429,8 +1403,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:283:3: ( '@' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:283:5: '@' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:3: ( '@' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:5: '@' { match('@'); @@ -1447,8 +1421,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:284:5: ( '..' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:7: '..' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:5: ( '..' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:7: '..' { match(".."); @@ -1466,8 +1440,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:285:6: ( ':' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:8: ':' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:6: ( ':' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:8: ':' { match(':'); @@ -1484,18 +1458,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: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 ) ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255: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: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:256: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:289: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:256: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:256: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:289:8: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:8: ( DECIMAL_DIGIT )+ int cnt10=0; loop10: do { @@ -1509,7 +1483,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:289:9: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:9: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1525,7 +1499,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:289:25: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:25: ( EXPONENT_PART )? int alt11=2; int LA11_0 = input.LA(1); @@ -1534,7 +1508,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:289:26: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:26: EXPONENT_PART { mEXPONENT_PART(); @@ -1543,7 +1517,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:289:42: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:42: ( REAL_TYPE_SUFFIX )? int alt12=2; int LA12_0 = input.LA(1); @@ -1552,7 +1526,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:289:43: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:43: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1568,12 +1542,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: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:257: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: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:257: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:257: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:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:3: ( DECIMAL_DIGIT )+ int cnt13=0; loop13: do { @@ -1587,7 +1561,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:290:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1604,7 +1578,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:290:24: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:24: ( DECIMAL_DIGIT )+ int cnt14=0; loop14: do { @@ -1618,7 +1592,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:290:25: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:25: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1634,7 +1608,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:290:41: ( EXPONENT_PART )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:41: ( EXPONENT_PART )? int alt15=2; int LA15_0 = input.LA(1); @@ -1643,7 +1617,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:290:42: EXPONENT_PART + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:42: EXPONENT_PART { mEXPONENT_PART(); @@ -1652,7 +1626,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:290:58: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:58: ( REAL_TYPE_SUFFIX )? int alt16=2; int LA16_0 = input.LA(1); @@ -1661,7 +1635,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:290:59: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:59: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1677,12 +1651,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: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:258: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: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:258: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:258: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:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:3: ( DECIMAL_DIGIT )+ int cnt17=0; loop17: do { @@ -1696,7 +1670,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:291:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1712,14 +1686,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:20: ( EXPONENT_PART ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:21: EXPONENT_PART { mEXPONENT_PART(); } - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:291:36: ( REAL_TYPE_SUFFIX )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:36: ( REAL_TYPE_SUFFIX )? int alt18=2; int LA18_0 = input.LA(1); @@ -1728,7 +1702,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:291:37: REAL_TYPE_SUFFIX + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:258:37: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1744,12 +1718,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: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:259: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: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:259: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:259: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:3: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:3: ( DECIMAL_DIGIT )+ int cnt19=0; loop19: do { @@ -1763,7 +1737,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:292:4: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:4: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1779,8 +1753,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:20: ( REAL_TYPE_SUFFIX ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:21: REAL_TYPE_SUFFIX { mREAL_TYPE_SUFFIX(); @@ -1804,8 +1778,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:294:15: ( '\\'' '\\'' ) - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:17: '\\'' '\\'' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:15: ( '\\'' '\\'' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:17: '\\'' '\\'' { match('\''); match('\''); @@ -1821,8 +1795,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: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' + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:24: ( '0' .. '9' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:26: '0' .. '9' { matchRange('0','9'); @@ -1837,8 +1811,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: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' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:30: ( ( 'L' | 'l' ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:263:32: ( 'L' | 'l' ) { if ( input.LA(1)=='L'||input.LA(1)=='l' ) { input.consume(); @@ -1862,7 +1836,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: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:264: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') ) { @@ -1887,7 +1861,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:299: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:266:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ ) int alt25=2; int LA25_0 = input.LA(1); @@ -1899,16 +1873,16 @@ public class SpringExpressionsLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("299:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input); + new NoViableAltException("266: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:299:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266: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:299:31: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:31: ( SIGN )* loop21: do { int alt21=2; @@ -1921,7 +1895,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:299:32: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:32: SIGN { mSIGN(); @@ -1933,7 +1907,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:299:40: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:40: ( DECIMAL_DIGIT )+ int cnt22=0; loop22: do { @@ -1947,7 +1921,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:299:41: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:41: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -1967,10 +1941,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:299:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266: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:299:64: ( SIGN )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:64: ( SIGN )* loop23: do { int alt23=2; @@ -1983,7 +1957,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:299:65: SIGN + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:65: SIGN { mSIGN(); @@ -1995,7 +1969,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:299:73: ( DECIMAL_DIGIT )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:73: ( DECIMAL_DIGIT )+ int cnt24=0; loop24: do { @@ -2009,7 +1983,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:299:74: DECIMAL_DIGIT + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:74: DECIMAL_DIGIT { mDECIMAL_DIGIT(); @@ -2039,7 +2013,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:300:15: ( '+' | '-' ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:267: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)=='-' ) { @@ -2064,7 +2038,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: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:268: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' ) { @@ -2087,14 +2061,14 @@ public class SpringExpressionsLexer extends Lexer { // $ANTLR end REAL_TYPE_SUFFIX public void mTokens() throws RecognitionException { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:8: ( 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; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:8: ( T77 | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | 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=53; 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: T84 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:10: T77 { - mT84(); + mT77(); } break; @@ -2162,308 +2136,301 @@ public class SpringExpressionsLexer extends Lexer { } break; case 11 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:145: IN - { - mIN(); - - } - break; - case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:148: INSTANCEOF + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:145: INSTANCEOF { 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: BETWEEN + case 12 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:156: BETWEEN { mBETWEEN(); } break; - case 14 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:167: MATCHES + case 13 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:164: MATCHES { mMATCHES(); } break; - 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 + case 14 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:172: NULL_LITERAL { mNULL_LITERAL(); } break; - case 16 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:188: SEMI + case 15 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:185: SEMI { mSEMI(); } break; - case 17 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:193: DOT + case 16 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:190: DOT { mDOT(); } break; - case 18 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:197: COMMA + case 17 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:194: COMMA { mCOMMA(); } break; - case 19 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:203: LPAREN + case 18 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:200: LPAREN { mLPAREN(); } break; - case 20 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:210: RPAREN + case 19 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:207: RPAREN { mRPAREN(); } break; - case 21 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:217: LCURLY + case 20 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:214: LCURLY { mLCURLY(); } break; - case 22 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:224: RCURLY + case 21 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:221: RCURLY { mRCURLY(); } break; - case 23 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:231: LBRACKET + case 22 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:228: LBRACKET { mLBRACKET(); } break; - case 24 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:240: RBRACKET + case 23 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:237: RBRACKET { mRBRACKET(); } break; - case 25 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:249: PIPE + case 24 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:246: PIPE { mPIPE(); } break; - case 26 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:254: AND + case 25 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:251: AND { mAND(); } break; - case 27 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:258: OR + case 26 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:255: OR { mOR(); } break; - case 28 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:261: FALSE + case 27 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:258: FALSE { mFALSE(); } break; - case 29 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:267: TRUE + case 28 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:264: TRUE { mTRUE(); } break; - case 30 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:272: PLUS + case 29 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:269: PLUS { mPLUS(); } break; - case 31 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:277: MINUS + case 30 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:274: MINUS { mMINUS(); } break; - case 32 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:283: DIV + case 31 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:280: DIV { mDIV(); } break; - case 33 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:287: STAR + case 32 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:284: STAR { mSTAR(); } break; - case 34 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:292: MOD + case 33 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:289: MOD { mMOD(); } break; - case 35 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:296: POWER + case 34 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:293: POWER { mPOWER(); } break; - case 36 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:302: BANG + case 35 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:299: BANG { mBANG(); } break; - case 37 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:307: POUND + case 36 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:304: POUND { mPOUND(); } break; - case 38 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:313: QMARK + case 37 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:310: QMARK { mQMARK(); } break; - case 39 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:319: DEFAULT + case 38 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:316: DEFAULT { mDEFAULT(); } break; - case 40 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:327: PROJECT + case 39 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:324: PROJECT { mPROJECT(); } break; - case 41 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:335: SELECT + case 40 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:332: SELECT { mSELECT(); } break; - 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 + case 41 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:339: SELECT_FIRST { mSELECT_FIRST(); } break; - 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 + case 42 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:352: SELECT_LAST { mSELECT_LAST(); } break; - case 44 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:367: TYPE + case 43 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:364: TYPE { mTYPE(); } break; - 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 + case 44 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:369: STRING_LITERAL { mSTRING_LITERAL(); } break; - 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 + case 45 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:384: DQ_STRING_LITERAL { mDQ_STRING_LITERAL(); } break; - case 47 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:405: ID + case 46 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:402: ID { mID(); } break; - 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 + case 47 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:405: DOT_ESCAPED { mDOT_ESCAPED(); } break; - case 49 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:420: WS + case 48 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:417: WS { mWS(); } break; - case 50 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:423: DOLLAR + case 49 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:420: DOLLAR { mDOLLAR(); } break; - case 51 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:430: AT + case 50 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:427: AT { mAT(); } break; - case 52 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:433: UPTO + case 51 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:430: UPTO { mUPTO(); } break; - case 53 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:438: COLON + case 52 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:435: COLON { mCOLON(); } break; - 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 + case 53 : + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:1:441: REAL_LITERAL { mREAL_LITERAL(); @@ -2486,13 +2453,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\3\1\4\1\2"; + "\1\uffff\1\1\1\uffff\1\4\1\3\1\2"; static final String DFA20_specialS = "\6\uffff}>"; static final String[] DFA20_transitionS = { "\1\1\1\uffff\12\2", "", - "\1\5\1\uffff\12\2\12\uffff\1\4\1\3\1\4\35\uffff\1\4\1\3\1\4", + "\1\5\1\uffff\12\2\12\uffff\1\3\1\4\1\3\35\uffff\1\3\1\4\1\3", "", "", "" @@ -2528,51 +2495,50 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA20_transition; } public String getDescription() { - 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 ) ) );"; + return "255: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\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"; + "\3\45\2\uffff\1\45\1\117\2\45\10\uffff\1\122\4\45\1\127\1\uffff"+ + "\2\45\1\uffff\1\132\3\45\1\uffff\1\45\1\137\1\uffff\3\45\1\143\1"+ + "\uffff\3\45\1\uffff\1\45\1\150\1\151\1\45\2\uffff\1\45\1\154\1\uffff"; static final String DFA26_eofS = - "\156\uffff"; + "\155\uffff"; static final String DFA26_minS = "\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"; + "\1\167\1\154\14\uffff\1\163\2\164\2\uffff\1\144\1\60\1\154\1\165"+ + "\10\uffff\1\60\1\154\1\164\1\167\1\143\1\60\1\uffff\1\163\1\145"+ + "\1\uffff\1\60\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\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\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"; + "\1\50\7\uffff\1\167\1\154\14\uffff\1\163\2\164\2\uffff\1\144\1\172"+ + "\1\154\1\165\10\uffff\1\172\1\154\1\164\1\167\1\143\1\172\1\uffff"+ + "\1\163\1\145\1\uffff\1\172\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 = - "\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"; + "\13\uffff\1\17\1\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\4"+ + "\uffff\1\35\1\36\1\37\1\40\1\41\1\uffff\1\44\3\uffff\1\54\1\55\1"+ + "\56\1\57\1\60\1\62\1\64\2\uffff\1\3\1\2\1\65\1\5\1\4\1\47\1\6\1"+ + "\43\1\10\1\7\1\12\1\11\3\uffff\1\63\1\20\4\uffff\1\51\1\42\1\46"+ + "\1\50\1\45\1\52\1\61\1\53\6\uffff\1\32\2\uffff\1\1\4\uffff\1\31"+ + "\2\uffff\1\16\4\uffff\1\34\3\uffff\1\33\4\uffff\1\14\1\15\2\uffff"+ + "\1\13"; static final String DFA26_specialS = - "\156\uffff}>"; + "\155\uffff}>"; static final String[] DFA26_transitionS = { "\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\52\17\uffff\1\53", "\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", @@ -2604,7 +2570,7 @@ public class SpringExpressionsLexer extends Lexer { "", "\1\101", "", - "\1\104\73\uffff\1\103", + "\1\103\73\uffff\1\104", "\1\106", "\1\110", "", @@ -2628,16 +2594,15 @@ 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\113", + "\1\114", "\1\115", + "", + "", "\1\116", - "", - "", - "\1\117", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\120", "\1\121", - "\1\122", "", "", "", @@ -2646,41 +2611,40 @@ public class SpringExpressionsLexer extends Lexer { "", "", "", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "\1\123", - "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\124", "\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", "", + "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", + "\1\133", "\1\134", "\1\135", - "\1\136", "", - "\1\137", + "\1\136", "\12\45\7\uffff\32\45\1\uffff\1\45\2\uffff\1\45\1\uffff\32\45", "", + "\1\140", "\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\144", "\1\145", "\1\146", + "", "\1\147", + "\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\152", + "", "", - "\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", "" }; @@ -2715,7 +2679,7 @@ public class SpringExpressionsLexer extends Lexer { this.transition = DFA26_transition; } public String getDescription() { - 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 );"; + return "1:1: Tokens : ( T77 | INTEGER_LITERAL | HEXADECIMAL_INTEGER_LITERAL | ASSIGN | EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | 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 dca611c886e..33cc0da81ce 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:16:33 +// $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 19:06:07 package org.springframework.expression.spel.generated; import org.antlr.runtime.*; @@ -12,93 +12,86 @@ 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", "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'" + "", "", "", "", "INTEGER_LITERAL", "EXPRESSION", "QUALIFIED_IDENTIFIER", "PROPERTY_OR_FIELD", "INDEXER", "CONSTRUCTOR", "HOLDER", "NAMED_ARGUMENT", "FUNCTIONREF", "TYPEREF", "VARIABLEREF", "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", "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", "INSTANCEOF", "BETWEEN", "MATCHES", "SEMI", "LCURLY", "PIPE", "APOS", "DOT_ESCAPED", "WS", "DOLLAR", "AT", "UPTO", "EXPONENT_PART", "REAL_TYPE_SUFFIX", "SIGN", "'new'" }; - 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 GREATER_THAN=67; - public static final int TYPE=51; - public static final int EXPRESSIONLIST=4; - public static final int MINUS=34; - public static final int MAP_ENTRY=20; - public static final int SELECT_LAST=50; - public static final int NUMBER=24; - 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=44; - public static final int INDEXER=9; - 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=55; - public static final int NAMED_ARGUMENT=13; - 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=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=45; - public static final int SUBTRACT=23; - 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=75; - public static final int INTEGER_LITERAL=5; - 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=38; - public static final int TYPEREF=15; - 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=69; - public static final int SEMI=73; - public static final int CONSTRUCTOR=10; - 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 GREATER_THAN_OR_EQUAL=61; + public static final int HOLDER=10; + public static final int COMMA=37; + public static final int SELECT_FIRST=43; + public static final int GREATER_THAN=60; + public static final int TYPE=45; + public static final int MINUS=28; + public static final int SELECT_LAST=44; + public static final int NUMBER=18; + public static final int LESS_THAN=58; + public static final int BANG=33; + public static final int FALSE=52; + public static final int METHOD=15; + public static final int PROPERTY_OR_FIELD=7; + public static final int LBRACKET=38; + public static final int INDEXER=8; + public static final int MOD=31; + public static final int FUNCTIONREF=12; + public static final int NULL_LITERAL=48; + public static final int NAMED_ARGUMENT=11; + public static final int OR=25; + public static final int PIPE=67; + public static final int DOT=34; + public static final int RCURLY=41; + public static final int EXPRESSION=5; + public static final int AND=26; + public static final int LCURLY=66; + public static final int REAL_TYPE_SUFFIX=75; + public static final int STRING_LITERAL=46; + public static final int QUALIFIED_IDENTIFIER=6; + public static final int SELECT=42; + public static final int ASSIGN=19; + public static final int SUBTRACT=17; + public static final int RBRACKET=39; + public static final int INSTANCEOF=62; + public static final int BETWEEN=63; + public static final int RPAREN=24; + public static final int SIGN=76; + public static final int LPAREN=23; + public static final int HEX_DIGIT=55; + public static final int PLUS=27; + public static final int APOS=68; + public static final int INTEGER_LITERAL=4; + public static final int AT=72; + public static final int ID=36; + public static final int NOT_EQUAL=57; + public static final int POWER=32; + public static final int TYPEREF=13; + public static final int DECIMAL_DIGIT=53; + public static final int WS=70; + public static final int DOLLAR=71; + public static final int LESS_THAN_OR_EQUAL=59; + public static final int DQ_STRING_LITERAL=47; + public static final int HEXADECIMAL_INTEGER_LITERAL=49; + public static final int SEMI=65; + public static final int CONSTRUCTOR=9; + public static final int INTEGER_TYPE_SUFFIX=54; + public static final int EQUAL=56; + public static final int MATCHES=64; + public static final int DOT_ESCAPED=69; + public static final int UPTO=73; public static final int EOF=-1; - 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=81; - public static final int TRUE=58; - public static final int ADD=22; - public static final int POUND=41; + public static final int QMARK=21; + public static final int DEFAULT=20; + public static final int COLON=22; + public static final int PROJECT=40; + public static final int DIV=30; + public static final int STAR=29; + public static final int REAL_LITERAL=50; + public static final int VARIABLEREF=14; + public static final int EXPONENT_PART=74; + public static final int TRUE=51; + public static final int ADD=16; + public static final int POUND=35; public SpringExpressionsParser(TokenStream input) { super(input); - ruleMemo = new HashMap[45+1]; + ruleMemo = new HashMap[40+1]; } protected TreeAdaptor adaptor = new CommonTreeAdaptor(); @@ -124,7 +117,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:51:1: expr : expression EOF ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:45:1: expr : expression EOF ; public final expr_return expr() throws RecognitionException { expr_return retval = new expr_return(); retval.start = input.LT(1); @@ -138,18 +131,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:45:5: ( expression EOF ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:45:7: expression EOF { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_expr154); + pushFollow(FOLLOW_expression_in_expr130); 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_expr156); if (failed) return retval; + match(input,EOF,FOLLOW_EOF_in_expr132); if (failed) return retval; } @@ -177,7 +170,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:53: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:47: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); @@ -205,17 +198,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: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 ) )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:47: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:48:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalOrExpression_in_expression176); + pushFollow(FOLLOW_logicalOrExpression_in_expression152); 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:55: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:49:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? int alt1=4; switch ( input.LA(1) ) { case ASSIGN: @@ -237,18 +230,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:55:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:49: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:55:8: ASSIGN logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:49:7: ( ASSIGN logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:49:8: ASSIGN logicalOrExpression { ASSIGN4=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_expression185); if (failed) return retval; + match(input,ASSIGN,FOLLOW_ASSIGN_in_expression161); 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_expression188); + pushFollow(FOLLOW_logicalOrExpression_in_expression164); logicalOrExpression5=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -260,18 +253,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:56:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:50: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:56:7: DEFAULT logicalOrExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:50:6: ( DEFAULT logicalOrExpression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:50:7: DEFAULT logicalOrExpression { DEFAULT6=(Token)input.LT(1); - match(input,DEFAULT,FOLLOW_DEFAULT_in_expression198); if (failed) return retval; + match(input,DEFAULT,FOLLOW_DEFAULT_in_expression174); 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_expression201); + pushFollow(FOLLOW_logicalOrExpression_in_expression177); logicalOrExpression7=logicalOrExpression(); _fsp--; if (failed) return retval; @@ -283,25 +276,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: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:51: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:57:7: QMARK expression COLON expression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:51:6: ( QMARK expression COLON expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:51:7: QMARK expression COLON expression { QMARK8=(Token)input.LT(1); - match(input,QMARK,FOLLOW_QMARK_in_expression211); if (failed) return retval; + match(input,QMARK,FOLLOW_QMARK_in_expression187); 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_expression214); + pushFollow(FOLLOW_expression_in_expression190); 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_expression216); if (failed) return retval; - pushFollow(FOLLOW_expression_in_expression219); + match(input,COLON,FOLLOW_COLON_in_expression192); if (failed) return retval; + pushFollow(FOLLOW_expression_in_expression195); expression11=expression(); _fsp--; if (failed) return retval; @@ -342,7 +335,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:59:1: parenExpr : LPAREN expression RPAREN ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:53:1: parenExpr : LPAREN expression RPAREN ; public final parenExpr_return parenExpr() throws RecognitionException { parenExpr_return retval = new parenExpr_return(); retval.start = input.LT(1); @@ -358,20 +351,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:53:11: ( LPAREN expression RPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:53:13: LPAREN expression RPAREN { root_0 = (Object)adaptor.nil(); LPAREN12=(Token)input.LT(1); - match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr230); if (failed) return retval; - pushFollow(FOLLOW_expression_in_parenExpr233); + match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr206); if (failed) return retval; + pushFollow(FOLLOW_expression_in_parenExpr209); 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_parenExpr235); if (failed) return retval; + match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr211); if (failed) return retval; } @@ -399,7 +392,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:61:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:55:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ; public final logicalOrExpression_return logicalOrExpression() throws RecognitionException { logicalOrExpression_return retval = new logicalOrExpression_return(); retval.start = input.LT(1); @@ -415,17 +408,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: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:1: ( logicalAndExpression ( OR logicalAndExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:3: logicalAndExpression ( OR logicalAndExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression246); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression222); 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:62:24: ( OR logicalAndExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:24: ( OR logicalAndExpression )* loop2: do { int alt2=2; @@ -438,15 +431,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:62:25: OR logicalAndExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:25: OR logicalAndExpression { OR16=(Token)input.LT(1); - match(input,OR,FOLLOW_OR_in_logicalOrExpression249); if (failed) return retval; + match(input,OR,FOLLOW_OR_in_logicalOrExpression225); 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_logicalOrExpression252); + pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression228); logicalAndExpression17=logicalAndExpression(); _fsp--; if (failed) return retval; @@ -487,7 +480,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:64:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ; public final logicalAndExpression_return logicalAndExpression() throws RecognitionException { logicalAndExpression_return retval = new logicalAndExpression_return(); retval.start = input.LT(1); @@ -503,17 +496,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: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:1: ( relationalExpression ( AND relationalExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:3: relationalExpression ( AND relationalExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression287); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression263); 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:65:24: ( AND relationalExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:24: ( AND relationalExpression )* loop3: do { int alt3=2; @@ -526,15 +519,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:65:25: AND relationalExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:25: AND relationalExpression { AND19=(Token)input.LT(1); - match(input,AND,FOLLOW_AND_in_logicalAndExpression290); if (failed) return retval; + match(input,AND,FOLLOW_AND_in_logicalAndExpression266); 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_logicalAndExpression293); + pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression269); relationalExpression20=relationalExpression(); _fsp--; if (failed) return retval; @@ -575,7 +568,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:67:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ; public final relationalExpression_return relationalExpression() throws RecognitionException { relationalExpression_return retval = new relationalExpression_return(); retval.start = input.LT(1); @@ -591,17 +584,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: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 )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:22: ( sumExpression ( relationalOperator sumExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:24: sumExpression ( relationalOperator sumExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_sumExpression_in_relationalExpression304); + pushFollow(FOLLOW_sumExpression_in_relationalExpression280); 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:67:38: ( relationalOperator sumExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:38: ( relationalOperator sumExpression )? int alt4=2; int LA4_0 = input.LA(1); @@ -610,14 +603,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:67:39: relationalOperator sumExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:39: relationalOperator sumExpression { - pushFollow(FOLLOW_relationalOperator_in_relationalExpression307); + pushFollow(FOLLOW_relationalOperator_in_relationalExpression283); relationalOperator22=relationalOperator(); _fsp--; if (failed) return retval; if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(relationalOperator22.getTree(), root_0); - pushFollow(FOLLOW_sumExpression_in_relationalExpression310); + pushFollow(FOLLOW_sumExpression_in_relationalExpression286); sumExpression23=sumExpression(); _fsp--; if (failed) return retval; @@ -655,7 +648,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:69: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:63:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ; public final sumExpression_return sumExpression() throws RecognitionException { sumExpression_return retval = new sumExpression_return(); retval.start = input.LT(1); @@ -673,17 +666,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: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:4: productExpression ( ( PLUS | MINUS ) productExpression )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_productExpression_in_sumExpression321); + pushFollow(FOLLOW_productExpression_in_sumExpression297); 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:70:22: ( ( PLUS | MINUS ) productExpression )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:22: ( ( PLUS | MINUS ) productExpression )* loop6: do { int alt6=2; @@ -696,9 +689,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:70:24: ( PLUS | MINUS ) productExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64: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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:24: ( PLUS | MINUS ) int alt5=2; int LA5_0 = input.LA(1); @@ -711,16 +704,16 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("70:24: ( PLUS | MINUS )", 5, 0, input); + new NoViableAltException("64: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:70:25: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:25: PLUS { PLUS25=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_sumExpression326); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_sumExpression302); if (failed) return retval; if ( backtracking==0 ) { PLUS25_tree = (Object)adaptor.create(PLUS25); root_0 = (Object)adaptor.becomeRoot(PLUS25_tree, root_0); @@ -729,10 +722,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:70:33: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:64:33: MINUS { MINUS26=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_sumExpression331); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_sumExpression307); if (failed) return retval; if ( backtracking==0 ) { MINUS26_tree = (Object)adaptor.create(MINUS26); root_0 = (Object)adaptor.becomeRoot(MINUS26_tree, root_0); @@ -743,7 +736,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_productExpression_in_sumExpression335); + pushFollow(FOLLOW_productExpression_in_sumExpression311); productExpression27=productExpression(); _fsp--; if (failed) return retval; @@ -784,7 +777,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:72: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:66: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); @@ -804,17 +797,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: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67: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:67:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )* { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_powerExpr_in_productExpression346); + pushFollow(FOLLOW_powerExpr_in_productExpression322); 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:73:14: ( ( STAR | DIV | MOD ) powerExpr )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:14: ( ( STAR | DIV | MOD ) powerExpr )* loop8: do { int alt8=2; @@ -827,9 +820,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: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:67: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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:15: ( STAR | DIV | MOD ) int alt7=3; switch ( input.LA(1) ) { case STAR: @@ -850,17 +843,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("73:15: ( STAR | DIV | MOD )", 7, 0, input); + new NoViableAltException("67: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:73:16: STAR + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:16: STAR { STAR29=(Token)input.LT(1); - match(input,STAR,FOLLOW_STAR_in_productExpression350); if (failed) return retval; + match(input,STAR,FOLLOW_STAR_in_productExpression326); if (failed) return retval; if ( backtracking==0 ) { STAR29_tree = (Object)adaptor.create(STAR29); root_0 = (Object)adaptor.becomeRoot(STAR29_tree, root_0); @@ -869,10 +862,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:73:24: DIV + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:24: DIV { DIV30=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_productExpression355); if (failed) return retval; + match(input,DIV,FOLLOW_DIV_in_productExpression331); if (failed) return retval; if ( backtracking==0 ) { DIV30_tree = (Object)adaptor.create(DIV30); root_0 = (Object)adaptor.becomeRoot(DIV30_tree, root_0); @@ -881,10 +874,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:73:30: MOD + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:30: MOD { MOD31=(Token)input.LT(1); - match(input,MOD,FOLLOW_MOD_in_productExpression359); if (failed) return retval; + match(input,MOD,FOLLOW_MOD_in_productExpression335); if (failed) return retval; if ( backtracking==0 ) { MOD31_tree = (Object)adaptor.create(MOD31); root_0 = (Object)adaptor.becomeRoot(MOD31_tree, root_0); @@ -895,7 +888,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_powerExpr_in_productExpression363); + pushFollow(FOLLOW_powerExpr_in_productExpression339); powerExpr32=powerExpr(); _fsp--; if (failed) return retval; @@ -936,7 +929,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:75:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:1: powerExpr : unaryExpression ( POWER unaryExpression )? ; public final powerExpr_return powerExpr() throws RecognitionException { powerExpr_return retval = new powerExpr_return(); retval.start = input.LT(1); @@ -952,17 +945,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: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 )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:12: ( unaryExpression ( POWER unaryExpression )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:14: unaryExpression ( POWER unaryExpression )? { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_unaryExpression_in_powerExpr375); + pushFollow(FOLLOW_unaryExpression_in_powerExpr351); 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:75:30: ( POWER unaryExpression )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:30: ( POWER unaryExpression )? int alt9=2; int LA9_0 = input.LA(1); @@ -971,15 +964,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:75:31: POWER unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:31: POWER unaryExpression { POWER34=(Token)input.LT(1); - match(input,POWER,FOLLOW_POWER_in_powerExpr378); if (failed) return retval; + match(input,POWER,FOLLOW_POWER_in_powerExpr354); 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_powerExpr381); + pushFollow(FOLLOW_unaryExpression_in_powerExpr357); unaryExpression35=unaryExpression(); _fsp--; if (failed) return retval; @@ -1017,7 +1010,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:77: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:71: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); @@ -1037,30 +1030,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:78: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:72: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==84) ) { + 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==77) ) { alt11=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("77:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 11, 0, input); + new NoViableAltException("71: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:78:4: ( PLUS | MINUS | BANG ) unaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72: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:78:4: ( PLUS | MINUS | BANG ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:4: ( PLUS | MINUS | BANG ) int alt10=3; switch ( input.LA(1) ) { case PLUS: @@ -1081,17 +1074,17 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("78:4: ( PLUS | MINUS | BANG )", 10, 0, input); + new NoViableAltException("72: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:78:5: PLUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:5: PLUS { PLUS36=(Token)input.LT(1); - match(input,PLUS,FOLLOW_PLUS_in_unaryExpression395); if (failed) return retval; + match(input,PLUS,FOLLOW_PLUS_in_unaryExpression371); if (failed) return retval; if ( backtracking==0 ) { PLUS36_tree = (Object)adaptor.create(PLUS36); root_0 = (Object)adaptor.becomeRoot(PLUS36_tree, root_0); @@ -1100,10 +1093,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:78:13: MINUS + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:13: MINUS { MINUS37=(Token)input.LT(1); - match(input,MINUS,FOLLOW_MINUS_in_unaryExpression400); if (failed) return retval; + match(input,MINUS,FOLLOW_MINUS_in_unaryExpression376); if (failed) return retval; if ( backtracking==0 ) { MINUS37_tree = (Object)adaptor.create(MINUS37); root_0 = (Object)adaptor.becomeRoot(MINUS37_tree, root_0); @@ -1112,10 +1105,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:78:22: BANG + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:72:22: BANG { BANG38=(Token)input.LT(1); - match(input,BANG,FOLLOW_BANG_in_unaryExpression405); if (failed) return retval; + match(input,BANG,FOLLOW_BANG_in_unaryExpression381); if (failed) return retval; if ( backtracking==0 ) { BANG38_tree = (Object)adaptor.create(BANG38); root_0 = (Object)adaptor.becomeRoot(BANG38_tree, root_0); @@ -1126,7 +1119,7 @@ public class SpringExpressionsParser extends Parser { } - pushFollow(FOLLOW_unaryExpression_in_unaryExpression409); + pushFollow(FOLLOW_unaryExpression_in_unaryExpression385); unaryExpression39=unaryExpression(); _fsp--; if (failed) return retval; @@ -1135,11 +1128,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:79:4: primaryExpression + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:4: primaryExpression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_primaryExpression_in_unaryExpression415); + pushFollow(FOLLOW_primaryExpression_in_unaryExpression391); primaryExpression40=primaryExpression(); _fsp--; if (failed) return retval; @@ -1173,7 +1166,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:81: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:75: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); @@ -1188,15 +1181,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: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 )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76: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:76:7: startNode ( node )? { - pushFollow(FOLLOW_startNode_in_primaryExpression429); + pushFollow(FOLLOW_startNode_in_primaryExpression405); 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:82:17: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:17: ( node )? int alt12=2; int LA12_0 = input.LA(1); @@ -1205,9 +1198,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:82:18: node + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:18: node { - pushFollow(FOLLOW_node_in_primaryExpression432); + pushFollow(FOLLOW_node_in_primaryExpression408); node42=node(); _fsp--; if (failed) return retval; @@ -1230,15 +1223,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 82:25: -> ^( EXPRESSION startNode ( node )? ) + // 76:25: -> ^( 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 )? ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76: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:82:51: ( node )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:76:51: ( node )? if ( stream_node.hasNext() ) { adaptor.addChild(root_1, stream_node.next()); @@ -1278,7 +1271,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:84: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:78:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection ); public final startNode_return startNode() throws RecognitionException { startNode_return retval = new startNode_return(); retval.start = input.LT(1); @@ -1307,15 +1300,11 @@ public class SpringExpressionsParser extends Parser { lastSelection_return lastSelection53 = null; - listInitializer_return listInitializer54 = null; - - mapInitializer_return mapInitializer55 = null; - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:5: ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer ) - int alt13=13; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:5: ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection ) + int alt13=11; switch ( input.LA(1) ) { case LPAREN: { @@ -1329,21 +1318,7 @@ public class SpringExpressionsParser extends Parser { break; case POUND: { - int LA13_3 = input.LA(2); - - if ( (LA13_3==ID) ) { - alt13=3; - } - else if ( (LA13_3==LCURLY) ) { - alt13=13; - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("84:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 3, input); - - throw nvae; - } + alt13=3; } break; case LBRACKET: @@ -1368,7 +1343,7 @@ public class SpringExpressionsParser extends Parser { alt13=6; } break; - case 84: + case 77: { alt13=7; } @@ -1393,26 +1368,21 @@ public class SpringExpressionsParser extends Parser { alt13=11; } break; - case LCURLY: - { - alt13=12; - } - break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("84:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer );", 13, 0, input); + new NoViableAltException("78:1: startNode : ( parenExpr | methodOrProperty | functionOrVar | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection );", 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:86:5: parenExpr + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:5: parenExpr { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_parenExpr_in_startNode465); + pushFollow(FOLLOW_parenExpr_in_startNode441); parenExpr43=parenExpr(); _fsp--; if (failed) return retval; @@ -1421,11 +1391,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:87:7: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:81:7: methodOrProperty { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_methodOrProperty_in_startNode473); + pushFollow(FOLLOW_methodOrProperty_in_startNode449); methodOrProperty44=methodOrProperty(); _fsp--; if (failed) return retval; @@ -1434,11 +1404,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:88:7: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:82:7: functionOrVar { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_functionOrVar_in_startNode482); + pushFollow(FOLLOW_functionOrVar_in_startNode458); functionOrVar45=functionOrVar(); _fsp--; if (failed) return retval; @@ -1447,11 +1417,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:89:7: indexer + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:7: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_startNode490); + pushFollow(FOLLOW_indexer_in_startNode466); indexer46=indexer(); _fsp--; if (failed) return retval; @@ -1460,11 +1430,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:90:7: literal + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:84:7: literal { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_literal_in_startNode498); + pushFollow(FOLLOW_literal_in_startNode474); literal47=literal(); _fsp--; if (failed) return retval; @@ -1473,11 +1443,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:91:7: type + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:85:7: type { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_type_in_startNode506); + pushFollow(FOLLOW_type_in_startNode482); type48=type(); _fsp--; if (failed) return retval; @@ -1486,11 +1456,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:92:7: constructor + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:7: constructor { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_constructor_in_startNode514); + pushFollow(FOLLOW_constructor_in_startNode490); constructor49=constructor(); _fsp--; if (failed) return retval; @@ -1499,11 +1469,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:93:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:7: projection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_projection_in_startNode522); + pushFollow(FOLLOW_projection_in_startNode498); projection50=projection(); _fsp--; if (failed) return retval; @@ -1512,11 +1482,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:94:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:88:7: selection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_selection_in_startNode531); + pushFollow(FOLLOW_selection_in_startNode507); selection51=selection(); _fsp--; if (failed) return retval; @@ -1525,11 +1495,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:95:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:89:7: firstSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_firstSelection_in_startNode540); + pushFollow(FOLLOW_firstSelection_in_startNode516); firstSelection52=firstSelection(); _fsp--; if (failed) return retval; @@ -1538,42 +1508,16 @@ 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:96:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:90:7: lastSelection { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_lastSelection_in_startNode548); + pushFollow(FOLLOW_lastSelection_in_startNode524); lastSelection53=lastSelection(); _fsp--; if (failed) return retval; if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection53.getTree()); - } - break; - case 12 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:7: listInitializer - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_listInitializer_in_startNode556); - listInitializer54=listInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, listInitializer54.getTree()); - - } - break; - case 13 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:98:7: mapInitializer - { - root_0 = (Object)adaptor.nil(); - - pushFollow(FOLLOW_mapInitializer_in_startNode564); - mapInitializer55=mapInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, mapInitializer55.getTree()); - } break; @@ -1602,28 +1546,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start node - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:1: node : ( ( DOT dottedNode ) | nonDottedNode )+ ; public final node_return node() throws RecognitionException { node_return retval = new node_return(); retval.start = input.LT(1); Object root_0 = null; - Token DOT56=null; - dottedNode_return dottedNode57 = null; + Token DOT54=null; + dottedNode_return dottedNode55 = null; - nonDottedNode_return nonDottedNode58 = null; + nonDottedNode_return nonDottedNode56 = null; - Object DOT56_tree=null; + Object DOT54_tree=null; try { - // /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 )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:2: ( ( ( DOT dottedNode ) | nonDottedNode )+ ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94: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:102:4: ( ( DOT dottedNode ) | nonDottedNode )+ + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:4: ( ( DOT dottedNode ) | nonDottedNode )+ int cnt14=0; loop14: do { @@ -1640,22 +1584,22 @@ public class SpringExpressionsParser extends Parser { switch (alt14) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94: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:102:6: DOT dottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:5: ( DOT dottedNode ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:6: DOT dottedNode { - DOT56=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_node584); if (failed) return retval; + DOT54=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_node544); if (failed) return retval; if ( backtracking==0 ) { - DOT56_tree = (Object)adaptor.create(DOT56); - adaptor.addChild(root_0, DOT56_tree); + DOT54_tree = (Object)adaptor.create(DOT54); + adaptor.addChild(root_0, DOT54_tree); } - pushFollow(FOLLOW_dottedNode_in_node586); - dottedNode57=dottedNode(); + pushFollow(FOLLOW_dottedNode_in_node546); + dottedNode55=dottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode57.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, dottedNode55.getTree()); } @@ -1663,13 +1607,13 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:24: nonDottedNode + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:94:24: nonDottedNode { - pushFollow(FOLLOW_nonDottedNode_in_node591); - nonDottedNode58=nonDottedNode(); + pushFollow(FOLLOW_nonDottedNode_in_node551); + nonDottedNode56=nonDottedNode(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode58.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, nonDottedNode56.getTree()); } break; @@ -1711,28 +1655,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start nonDottedNode - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:1: nonDottedNode : indexer ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:1: nonDottedNode : indexer ; public final nonDottedNode_return nonDottedNode() throws RecognitionException { nonDottedNode_return retval = new nonDottedNode_return(); retval.start = input.LT(1); Object root_0 = null; - indexer_return indexer59 = null; + indexer_return indexer57 = null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:2: ( indexer ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:4: indexer { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_indexer_in_nonDottedNode603); - indexer59=indexer(); + pushFollow(FOLLOW_indexer_in_nonDottedNode563); + indexer57=indexer(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, indexer59.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, indexer57.getTree()); } @@ -1760,37 +1704,37 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start dottedNode - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107: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:99:1: dottedNode : ( ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) ) ; public final dottedNode_return dottedNode() throws RecognitionException { dottedNode_return retval = new dottedNode_return(); retval.start = input.LT(1); Object root_0 = null; - methodOrProperty_return methodOrProperty60 = null; + methodOrProperty_return methodOrProperty58 = null; - functionOrVar_return functionOrVar61 = null; + functionOrVar_return functionOrVar59 = null; - projection_return projection62 = null; + projection_return projection60 = null; - selection_return selection63 = null; + selection_return selection61 = null; - firstSelection_return firstSelection64 = null; + firstSelection_return firstSelection62 = null; - lastSelection_return lastSelection65 = null; + lastSelection_return lastSelection63 = null; try { - // /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 ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100: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:101: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: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:101: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:101: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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection ) int alt15=6; switch ( input.LA(1) ) { case ID: @@ -1826,75 +1770,75 @@ public class SpringExpressionsParser extends Parser { default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("109:3: ( methodOrProperty | functionOrVar | projection | selection | firstSelection | lastSelection )", 15, 0, input); + new NoViableAltException("101: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:109:4: methodOrProperty + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:101:4: methodOrProperty { - pushFollow(FOLLOW_methodOrProperty_in_dottedNode616); - methodOrProperty60=methodOrProperty(); + pushFollow(FOLLOW_methodOrProperty_in_dottedNode576); + methodOrProperty58=methodOrProperty(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty60.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, methodOrProperty58.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:4: functionOrVar + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:4: functionOrVar { - pushFollow(FOLLOW_functionOrVar_in_dottedNode622); - functionOrVar61=functionOrVar(); + pushFollow(FOLLOW_functionOrVar_in_dottedNode582); + functionOrVar59=functionOrVar(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar61.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, functionOrVar59.getTree()); } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: projection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:7: projection { - pushFollow(FOLLOW_projection_in_dottedNode630); - projection62=projection(); + pushFollow(FOLLOW_projection_in_dottedNode590); + projection60=projection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, projection62.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, projection60.getTree()); } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:7: selection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:7: selection { - pushFollow(FOLLOW_selection_in_dottedNode639); - selection63=selection(); + pushFollow(FOLLOW_selection_in_dottedNode599); + selection61=selection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, selection63.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, selection61.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:113:7: firstSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: firstSelection { - pushFollow(FOLLOW_firstSelection_in_dottedNode648); - firstSelection64=firstSelection(); + pushFollow(FOLLOW_firstSelection_in_dottedNode608); + firstSelection62=firstSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection64.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, firstSelection62.getTree()); } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:7: lastSelection + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: lastSelection { - pushFollow(FOLLOW_lastSelection_in_dottedNode657); - lastSelection65=lastSelection(); + pushFollow(FOLLOW_lastSelection_in_dottedNode617); + lastSelection63=lastSelection(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection65.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, lastSelection63.getTree()); } break; @@ -1931,21 +1875,21 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start functionOrVar - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:118: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:110:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var ); public final functionOrVar_return functionOrVar() throws RecognitionException { functionOrVar_return retval = new functionOrVar_return(); retval.start = input.LT(1); Object root_0 = null; - function_return function66 = null; + function_return function64 = null; - var_return var67 = null; + var_return var65 = null; try { - // /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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:5: ( ( POUND ID LPAREN )=> function | var ) int alt16=2; int LA16_0 = input.LA(1); @@ -1964,7 +1908,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("118:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); + new NoViableAltException("110:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 2, input); throw nvae; } @@ -1972,7 +1916,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("118:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); + new NoViableAltException("110:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 1, input); throw nvae; } @@ -1980,34 +1924,34 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("118:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 16, 0, input); + new NoViableAltException("110: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:119:7: ( POUND ID LPAREN )=> function + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: ( POUND ID LPAREN )=> function { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_function_in_functionOrVar691); - function66=function(); + pushFollow(FOLLOW_function_in_functionOrVar651); + function64=function(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, function66.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, function64.getTree()); } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:120:7: var + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:7: var { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_var_in_functionOrVar699); - var67=var(); + pushFollow(FOLLOW_var_in_functionOrVar659); + var65=var(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, var67.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, var65.getTree()); } break; @@ -2037,7 +1981,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:123: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:115: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); @@ -2045,32 +1989,32 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND68=null; - methodArgs_return methodArgs69 = null; + Token POUND66=null; + methodArgs_return methodArgs67 = null; Object id_tree=null; - Object POUND68_tree=null; + Object POUND66_tree=null; RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115: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:115:12: POUND id= ID methodArgs { - POUND68=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_function716); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND68); + POUND66=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_function676); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND66); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_function720); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_function680); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_function722); - methodArgs69=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_function682); + methodArgs67=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs69.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs67.getTree()); // AST REWRITE // elements: methodArgs @@ -2083,9 +2027,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 123:35: -> ^( FUNCTIONREF[$id] methodArgs ) + // 115:35: -> ^( 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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:38: ^( FUNCTIONREF[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(FUNCTIONREF, id), root_1); @@ -2125,7 +2069,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:125: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:117: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); @@ -2133,23 +2077,23 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token POUND70=null; + Token POUND68=null; Object id_tree=null; - Object POUND70_tree=null; + Object POUND68_tree=null; RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117: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:117:7: POUND id= ID { - POUND70=(Token)input.LT(1); - match(input,POUND,FOLLOW_POUND_in_var743); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND70); + POUND68=(Token)input.LT(1); + match(input,POUND,FOLLOW_POUND_in_var703); if (failed) return retval; + if ( backtracking==0 ) stream_POUND.add(POUND68); id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_var747); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_var707); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2164,9 +2108,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 125:19: -> ^( VARIABLEREF[$id] ) + // 117:19: -> ^( 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] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117:22: ^( VARIABLEREF[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(VARIABLEREF, id), root_1); @@ -2204,7 +2148,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:128: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:120: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); @@ -2212,16 +2156,16 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - methodArgs_return methodArgs71 = null; + methodArgs_return methodArgs69 = null; - property_return property72 = null; + property_return property70 = null; Object id_tree=null; RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129: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:121:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property ) int alt17=2; int LA17_0 = input.LA(1); @@ -2237,7 +2181,7 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("128:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); + new NoViableAltException("120:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 1, input); throw nvae; } @@ -2245,23 +2189,23 @@ public class SpringExpressionsParser extends Parser { else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("128:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 17, 0, input); + new NoViableAltException("120: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:129: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:121:4: ( ID LPAREN )=>id= ID methodArgs { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_methodOrProperty775); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_methodOrProperty735); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - pushFollow(FOLLOW_methodArgs_in_methodOrProperty777); - methodArgs71=methodArgs(); + pushFollow(FOLLOW_methodArgs_in_methodOrProperty737); + methodArgs69=methodArgs(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_methodArgs.add(methodArgs71.getTree()); + if ( backtracking==0 ) stream_methodArgs.add(methodArgs69.getTree()); // AST REWRITE // elements: methodArgs @@ -2274,9 +2218,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 129:36: -> ^( METHOD[$id] methodArgs ) + // 121:36: -> ^( 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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:39: ^( METHOD[$id] methodArgs ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(METHOD, id), root_1); @@ -2293,15 +2237,15 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:4: property + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:122:4: property { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_property_in_methodOrProperty791); - property72=property(); + pushFollow(FOLLOW_property_in_methodOrProperty751); + property70=property(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, property72.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, property70.getTree()); } break; @@ -2331,52 +2275,52 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start methodArgs - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136: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:128:1: methodArgs : LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN ; public final methodArgs_return methodArgs() throws RecognitionException { methodArgs_return retval = new methodArgs_return(); retval.start = input.LT(1); Object root_0 = null; - Token LPAREN73=null; + Token LPAREN71=null; + Token COMMA73=null; Token COMMA75=null; - Token COMMA77=null; - Token RPAREN78=null; + Token RPAREN76=null; + argument_return argument72 = null; + argument_return argument74 = null; - argument_return argument76 = null; - - Object LPAREN73_tree=null; + Object LPAREN71_tree=null; + Object COMMA73_tree=null; Object COMMA75_tree=null; - Object COMMA77_tree=null; - Object RPAREN78_tree=null; + Object RPAREN76_tree=null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128: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:128:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN { root_0 = (Object)adaptor.nil(); - LPAREN73=(Token)input.LT(1); - 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 )? )? + LPAREN71=(Token)input.LT(1); + match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs766); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128: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==84) ) { + 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==77) ) { 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:136:24: argument ( COMMA argument )* ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:24: argument ( COMMA argument )* ( COMMA )? { - pushFollow(FOLLOW_argument_in_methodArgs810); - argument74=argument(); + pushFollow(FOLLOW_argument_in_methodArgs770); + argument72=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:136:33: ( COMMA argument )* + if ( backtracking==0 ) adaptor.addChild(root_0, argument72.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:33: ( COMMA argument )* loop18: do { int alt18=2; @@ -2385,7 +2329,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==84) ) { + 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==77) ) { alt18=1; } @@ -2395,15 +2339,15 @@ public class SpringExpressionsParser extends Parser { switch (alt18) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:34: COMMA argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:34: COMMA argument { - COMMA75=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs813); if (failed) return retval; - pushFollow(FOLLOW_argument_in_methodArgs816); - argument76=argument(); + COMMA73=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs773); if (failed) return retval; + pushFollow(FOLLOW_argument_in_methodArgs776); + argument74=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument76.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument74.getTree()); } break; @@ -2413,7 +2357,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:136:52: ( COMMA )? + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:52: ( COMMA )? int alt19=2; int LA19_0 = input.LA(1); @@ -2422,10 +2366,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:136:53: COMMA + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:53: COMMA { - COMMA77=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_methodArgs821); if (failed) return retval; + COMMA75=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_methodArgs781); if (failed) return retval; } break; @@ -2438,8 +2382,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN78=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs828); if (failed) return retval; + RPAREN76=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs788); if (failed) return retval; } @@ -2467,7 +2411,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:141: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:133: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); @@ -2480,11 +2424,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133: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:133:11: id= ID { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_property841); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_property801); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); @@ -2499,9 +2443,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 141:17: -> ^( PROPERTY_OR_FIELD[$id] ) + // 133:17: -> ^( 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] ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:20: ^( PROPERTY_OR_FIELD[$id] ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(PROPERTY_OR_FIELD, id), root_1); @@ -2539,42 +2483,42 @@ 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:145: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:136:1: indexer : LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET -> ^( INDEXER $r1 ( $r2)* ) ; public final indexer_return indexer() throws RecognitionException { indexer_return retval = new indexer_return(); retval.start = input.LT(1); Object root_0 = null; - Token LBRACKET79=null; - Token COMMA80=null; - Token RBRACKET81=null; + Token LBRACKET77=null; + Token COMMA78=null; + Token RBRACKET79=null; argument_return r1 = null; argument_return r2 = null; - Object LBRACKET79_tree=null; - Object COMMA80_tree=null; - Object RBRACKET81_tree=null; + Object LBRACKET77_tree=null; + Object COMMA78_tree=null; + Object RBRACKET79_tree=null; RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleTokenStream stream_LBRACKET=new RewriteRuleTokenStream(adaptor,"token LBRACKET"); RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET"); RewriteRuleSubtreeStream stream_argument=new RewriteRuleSubtreeStream(adaptor,"rule argument"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136: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:136:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET { - LBRACKET79=(Token)input.LT(1); - match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer857); if (failed) return retval; - if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET79); + LBRACKET77=(Token)input.LT(1); + match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer816); if (failed) return retval; + if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET77); - pushFollow(FOLLOW_argument_in_indexer861); + pushFollow(FOLLOW_argument_in_indexer820); 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:145:31: ( COMMA r2= argument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:31: ( COMMA r2= argument )* loop21: do { int alt21=2; @@ -2587,13 +2531,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:145:32: COMMA r2= argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:32: COMMA r2= argument { - COMMA80=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_indexer864); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA80); + COMMA78=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_indexer823); if (failed) return retval; + if ( backtracking==0 ) stream_COMMA.add(COMMA78); - pushFollow(FOLLOW_argument_in_indexer868); + pushFollow(FOLLOW_argument_in_indexer827); r2=argument(); _fsp--; if (failed) return retval; @@ -2607,9 +2551,9 @@ public class SpringExpressionsParser extends Parser { } } while (true); - RBRACKET81=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer872); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET81); + RBRACKET79=(Token)input.LT(1); + match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer831); if (failed) return retval; + if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET79); // AST REWRITE @@ -2625,15 +2569,15 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_r1=new RewriteRuleSubtreeStream(adaptor,"token r1",r1!=null?r1.tree:null); root_0 = (Object)adaptor.nil(); - // 145:61: -> ^( INDEXER $r1 ( $r2)* ) + // 136:61: -> ^( 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)* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136: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:145:78: ( $r2)* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:78: ( $r2)* while ( stream_r2.hasNext() ) { adaptor.addChild(root_1, stream_r2.next()); @@ -2673,40 +2617,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start projection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:150:1: projection : PROJECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:1: projection : PROJECT expression RCURLY ; public final projection_return projection() throws RecognitionException { projection_return retval = new projection_return(); retval.start = input.LT(1); Object root_0 = null; - Token PROJECT82=null; - Token RCURLY84=null; - expression_return expression83 = null; + Token PROJECT80=null; + Token RCURLY82=null; + expression_return expression81 = null; - Object PROJECT82_tree=null; - Object RCURLY84_tree=null; + Object PROJECT80_tree=null; + Object RCURLY82_tree=null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:11: ( PROJECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:13: PROJECT expression RCURLY { root_0 = (Object)adaptor.nil(); - PROJECT82=(Token)input.LT(1); - match(input,PROJECT,FOLLOW_PROJECT_in_projection899); if (failed) return retval; + PROJECT80=(Token)input.LT(1); + match(input,PROJECT,FOLLOW_PROJECT_in_projection857); if (failed) return retval; if ( backtracking==0 ) { - PROJECT82_tree = (Object)adaptor.create(PROJECT82); - root_0 = (Object)adaptor.becomeRoot(PROJECT82_tree, root_0); + PROJECT80_tree = (Object)adaptor.create(PROJECT80); + root_0 = (Object)adaptor.becomeRoot(PROJECT80_tree, root_0); } - pushFollow(FOLLOW_expression_in_projection902); - expression83=expression(); + pushFollow(FOLLOW_expression_in_projection860); + expression81=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_projection904); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression81.getTree()); + RCURLY82=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_projection862); if (failed) return retval; } @@ -2734,40 +2678,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start selection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:1: selection : SELECT expression RCURLY ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:1: selection : SELECT expression RCURLY ; public final selection_return selection() throws RecognitionException { selection_return retval = new selection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT85=null; - Token RCURLY87=null; - expression_return expression86 = null; + Token SELECT83=null; + Token RCURLY85=null; + expression_return expression84 = null; - Object SELECT85_tree=null; - Object RCURLY87_tree=null; + Object SELECT83_tree=null; + Object RCURLY85_tree=null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:10: ( SELECT expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:12: SELECT expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT85=(Token)input.LT(1); - match(input,SELECT,FOLLOW_SELECT_in_selection912); if (failed) return retval; + SELECT83=(Token)input.LT(1); + match(input,SELECT,FOLLOW_SELECT_in_selection870); if (failed) return retval; if ( backtracking==0 ) { - SELECT85_tree = (Object)adaptor.create(SELECT85); - root_0 = (Object)adaptor.becomeRoot(SELECT85_tree, root_0); + SELECT83_tree = (Object)adaptor.create(SELECT83); + root_0 = (Object)adaptor.becomeRoot(SELECT83_tree, root_0); } - pushFollow(FOLLOW_expression_in_selection915); - expression86=expression(); + pushFollow(FOLLOW_expression_in_selection873); + expression84=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_selection917); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression84.getTree()); + RCURLY85=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_selection875); if (failed) return retval; } @@ -2795,40 +2739,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start firstSelection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154: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:144:1: firstSelection : SELECT_FIRST expression RCURLY ; public final firstSelection_return firstSelection() throws RecognitionException { firstSelection_return retval = new firstSelection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT_FIRST88=null; - Token RCURLY90=null; - expression_return expression89 = null; + Token SELECT_FIRST86=null; + Token RCURLY88=null; + expression_return expression87 = null; - Object SELECT_FIRST88_tree=null; - Object RCURLY90_tree=null; + Object SELECT_FIRST86_tree=null; + Object RCURLY88_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:144:15: ( SELECT_FIRST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:144:17: SELECT_FIRST expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT_FIRST88=(Token)input.LT(1); - match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection925); if (failed) return retval; + SELECT_FIRST86=(Token)input.LT(1); + match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection883); 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); + SELECT_FIRST86_tree = (Object)adaptor.create(SELECT_FIRST86); + root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST86_tree, root_0); } - pushFollow(FOLLOW_expression_in_firstSelection928); - expression89=expression(); + pushFollow(FOLLOW_expression_in_firstSelection886); + expression87=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_firstSelection930); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression87.getTree()); + RCURLY88=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection888); if (failed) return retval; } @@ -2856,40 +2800,40 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start lastSelection - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:156: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:146:1: lastSelection : SELECT_LAST expression RCURLY ; public final lastSelection_return lastSelection() throws RecognitionException { lastSelection_return retval = new lastSelection_return(); retval.start = input.LT(1); Object root_0 = null; - Token SELECT_LAST91=null; - Token RCURLY93=null; - expression_return expression92 = null; + Token SELECT_LAST89=null; + Token RCURLY91=null; + expression_return expression90 = null; - Object SELECT_LAST91_tree=null; - Object RCURLY93_tree=null; + Object SELECT_LAST89_tree=null; + Object RCURLY91_tree=null; try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:14: ( SELECT_LAST expression RCURLY ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:16: SELECT_LAST expression RCURLY { root_0 = (Object)adaptor.nil(); - SELECT_LAST91=(Token)input.LT(1); - match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection938); if (failed) return retval; + SELECT_LAST89=(Token)input.LT(1); + match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection896); 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); + SELECT_LAST89_tree = (Object)adaptor.create(SELECT_LAST89); + root_0 = (Object)adaptor.becomeRoot(SELECT_LAST89_tree, root_0); } - pushFollow(FOLLOW_expression_in_lastSelection941); - expression92=expression(); + pushFollow(FOLLOW_expression_in_lastSelection899); + expression90=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_lastSelection943); if (failed) return retval; + if ( backtracking==0 ) adaptor.addChild(root_0, expression90.getTree()); + RCURLY91=(Token)input.LT(1); + match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection901); if (failed) return retval; } @@ -2917,39 +2861,39 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start type - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:159: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:149:1: type : TYPE qualifiedId RPAREN -> ^( TYPEREF qualifiedId ) ; public final type_return type() throws RecognitionException { type_return retval = new type_return(); retval.start = input.LT(1); Object root_0 = null; - Token TYPE94=null; - Token RPAREN96=null; - qualifiedId_return qualifiedId95 = null; + Token TYPE92=null; + Token RPAREN94=null; + qualifiedId_return qualifiedId93 = null; - Object TYPE94_tree=null; - Object RPAREN96_tree=null; + Object TYPE92_tree=null; + Object RPAREN94_tree=null; RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN"); RewriteRuleTokenStream stream_TYPE=new RewriteRuleTokenStream(adaptor,"token TYPE"); RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149: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:149:7: TYPE qualifiedId RPAREN { - TYPE94=(Token)input.LT(1); - match(input,TYPE,FOLLOW_TYPE_in_type952); if (failed) return retval; - if ( backtracking==0 ) stream_TYPE.add(TYPE94); + TYPE92=(Token)input.LT(1); + match(input,TYPE,FOLLOW_TYPE_in_type910); if (failed) return retval; + if ( backtracking==0 ) stream_TYPE.add(TYPE92); - pushFollow(FOLLOW_qualifiedId_in_type954); - qualifiedId95=qualifiedId(); + pushFollow(FOLLOW_qualifiedId_in_type912); + qualifiedId93=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_type956); if (failed) return retval; - if ( backtracking==0 ) stream_RPAREN.add(RPAREN96); + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId93.getTree()); + RPAREN94=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_type914); if (failed) return retval; + if ( backtracking==0 ) stream_RPAREN.add(RPAREN94); // AST REWRITE @@ -2963,9 +2907,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 159:31: -> ^( TYPEREF qualifiedId ) + // 149:31: -> ^( 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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149:34: ^( TYPEREF qualifiedId ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(TYPEREF, "TYPEREF"), root_1); @@ -3005,129 +2949,72 @@ 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:163: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:153:1: constructor : ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) ; public final constructor_return constructor() throws RecognitionException { constructor_return retval = new constructor_return(); retval.start = input.LT(1); Object root_0 = null; - Token string_literal97=null; - qualifiedId_return qualifiedId98 = null; + Token string_literal95=null; + qualifiedId_return qualifiedId96 = null; - ctorArgs_return ctorArgs99 = null; - - arrayConstructor_return arrayConstructor100 = null; + ctorArgs_return ctorArgs97 = null; - Object string_literal97_tree=null; - RewriteRuleTokenStream stream_84=new RewriteRuleTokenStream(adaptor,"token 84"); + Object string_literal95_tree=null; + RewriteRuleTokenStream stream_77=new RewriteRuleTokenStream(adaptor,"token 77"); 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:164:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor ) - int alt22=2; - int LA22_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs + { + string_literal95=(Token)input.LT(1); + match(input,77,FOLLOW_77_in_constructor945); if (failed) return retval; + if ( backtracking==0 ) stream_77.add(string_literal95); - if ( (LA22_0==84) ) { - int LA22_1 = input.LA(2); + pushFollow(FOLLOW_qualifiedId_in_constructor947); + qualifiedId96=qualifiedId(); + _fsp--; + if (failed) return retval; + if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId96.getTree()); + pushFollow(FOLLOW_ctorArgs_in_constructor949); + ctorArgs97=ctorArgs(); + _fsp--; + if (failed) return retval; + if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs97.getTree()); - if ( (LA22_1==ID) ) { - int LA22_2 = input.LA(3); + // AST REWRITE + // elements: ctorArgs, qualifiedId + // token labels: + // rule labels: retval + // token list labels: + // rule list labels: + if ( backtracking==0 ) { + retval.tree = root_0; + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - if ( (synpred3()) ) { - alt22=1; - } - else if ( (true) ) { - alt22=2; - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("163:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 2, input); + root_0 = (Object)adaptor.nil(); + // 154:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs ) + { + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:154:64: ^( CONSTRUCTOR qualifiedId ctorArgs ) + { + Object root_1 = (Object)adaptor.nil(); + root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR, "CONSTRUCTOR"), root_1); - throw nvae; - } + adaptor.addChild(root_1, stream_qualifiedId.next()); + adaptor.addChild(root_1, stream_ctorArgs.next()); + + adaptor.addChild(root_0, root_1); } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - new NoViableAltException("163:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 22, 1, input); - - throw nvae; - } - } - else { - if (backtracking>0) {failed=true; return retval;} - NoViableAltException nvae = - 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:164:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs - { - string_literal97=(Token)input.LT(1); - match(input,84,FOLLOW_84_in_constructor987); if (failed) return retval; - if ( backtracking==0 ) stream_84.add(string_literal97); - - pushFollow(FOLLOW_qualifiedId_in_constructor989); - qualifiedId98=qualifiedId(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId98.getTree()); - pushFollow(FOLLOW_ctorArgs_in_constructor991); - ctorArgs99=ctorArgs(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs99.getTree()); - - // AST REWRITE - // elements: ctorArgs, qualifiedId - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 164:61: -> ^( 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); - - adaptor.addChild(root_1, stream_qualifiedId.next()); - adaptor.addChild(root_1, stream_ctorArgs.next()); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - break; - case 2 : - // /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_constructor1008); - arrayConstructor100=arrayConstructor(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, arrayConstructor100.getTree()); - - } - break; } + + } + + } + retval.stop = input.LT(-1); if ( backtracking==0 ) { @@ -3146,714 +3033,83 @@ public class SpringExpressionsParser extends Parser { } // $ANTLR end constructor - public static class arrayConstructor_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start arrayConstructor - // /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); - - Object root_0 = null; - - Token string_literal101=null; - qualifiedId_return qualifiedId102 = null; - - arrayRank_return arrayRank103 = null; - - listInitializer_return listInitializer104 = null; - - - Object string_literal101_tree=null; - 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: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,84,FOLLOW_84_in_arrayConstructor1019); if (failed) return retval; - if ( backtracking==0 ) stream_84.add(string_literal101); - - pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1021); - qualifiedId102=qualifiedId(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId102.getTree()); - 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:169:32: ( listInitializer )? - int alt23=2; - int LA23_0 = input.LA(1); - - if ( (LA23_0==LCURLY) ) { - alt23=1; - } - switch (alt23) { - case 1 : - // /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_arrayConstructor1026); - listInitializer104=listInitializer(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_listInitializer.add(listInitializer104.getTree()); - - } - break; - - } - - - // AST REWRITE - // elements: listInitializer, qualifiedId, arrayRank - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 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: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:170:49: ( listInitializer )? - if ( stream_listInitializer.hasNext() ) { - adaptor.addChild(root_1, stream_listInitializer.next()); - - } - stream_listInitializer.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end arrayConstructor - - public static class arrayRank_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start arrayRank - // /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); - - Object root_0 = null; - - Token LBRACKET105=null; - Token COMMA107=null; - Token RBRACKET109=null; - expression_return expression106 = null; - - expression_return expression108 = null; - - - Object LBRACKET105_tree=null; - Object COMMA107_tree=null; - Object RBRACKET109_tree=null; - RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); - RewriteRuleTokenStream stream_LBRACKET=new RewriteRuleTokenStream(adaptor,"token LBRACKET"); - RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET"); - RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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_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: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==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:174:17: expression ( COMMA expression )* - { - 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:174:28: ( COMMA expression )* - loop24: - do { - int alt24=2; - int LA24_0 = input.LA(1); - - if ( (LA24_0==COMMA) ) { - alt24=1; - } - - - switch (alt24) { - case 1 : - // /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_arrayRank1067); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA107); - - pushFollow(FOLLOW_expression_in_arrayRank1069); - expression108=expression(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression108.getTree()); - - } - break; - - default : - break loop24; - } - } while (true); - - - } - break; - - } - - RBRACKET109=(Token)input.LT(1); - match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1075); if (failed) return retval; - if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET109); - - - // AST REWRITE - // elements: expression - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 174:59: -> ^( 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:174:79: ( expression )* - while ( stream_expression.hasNext() ) { - adaptor.addChild(root_1, stream_expression.next()); - - } - stream_expression.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end arrayRank - - public static class listInitializer_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start listInitializer - // /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); - - Object root_0 = null; - - Token LCURLY110=null; - Token COMMA112=null; - Token RCURLY114=null; - expression_return expression111 = null; - - expression_return expression113 = null; - - - Object LCURLY110_tree=null; - Object COMMA112_tree=null; - Object RCURLY114_tree=null; - RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); - RewriteRuleTokenStream stream_RCURLY=new RewriteRuleTokenStream(adaptor,"token RCURLY"); - RewriteRuleTokenStream stream_LCURLY=new RewriteRuleTokenStream(adaptor,"token LCURLY"); - RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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_listInitializer1100); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY110); - - 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:177:25: ( COMMA expression )* - loop26: - do { - int alt26=2; - int LA26_0 = input.LA(1); - - if ( (LA26_0==COMMA) ) { - alt26=1; - } - - - switch (alt26) { - case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177:26: COMMA expression - { - COMMA112=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_listInitializer1105); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA112); - - pushFollow(FOLLOW_expression_in_listInitializer1107); - expression113=expression(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression113.getTree()); - - } - break; - - default : - break loop26; - } - } while (true); - - RCURLY114=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1111); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY114); - - - // AST REWRITE - // elements: expression - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 177:52: -> ^( 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:177:74: ( expression )* - while ( stream_expression.hasNext() ) { - adaptor.addChild(root_1, stream_expression.next()); - - } - stream_expression.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end listInitializer - - public static class mapInitializer_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start mapInitializer - // /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); - - Object root_0 = null; - - Token POUND115=null; - Token LCURLY116=null; - Token COMMA118=null; - Token RCURLY120=null; - mapEntry_return mapEntry117 = null; - - mapEntry_return mapEntry119 = null; - - - Object POUND115_tree=null; - Object LCURLY116_tree=null; - Object COMMA118_tree=null; - Object RCURLY120_tree=null; - RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); - RewriteRuleTokenStream stream_RCURLY=new RewriteRuleTokenStream(adaptor,"token RCURLY"); - RewriteRuleTokenStream stream_LCURLY=new RewriteRuleTokenStream(adaptor,"token LCURLY"); - RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND"); - RewriteRuleSubtreeStream stream_mapEntry=new RewriteRuleSubtreeStream(adaptor,"rule mapEntry"); - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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_mapInitializer1139); if (failed) return retval; - if ( backtracking==0 ) stream_POUND.add(POUND115); - - LCURLY116=(Token)input.LT(1); - match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1141); if (failed) return retval; - if ( backtracking==0 ) stream_LCURLY.add(LCURLY116); - - 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:183:29: ( COMMA mapEntry )* - loop27: - do { - int alt27=2; - int LA27_0 = input.LA(1); - - if ( (LA27_0==COMMA) ) { - alt27=1; - } - - - switch (alt27) { - case 1 : - // /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_mapInitializer1146); if (failed) return retval; - if ( backtracking==0 ) stream_COMMA.add(COMMA118); - - pushFollow(FOLLOW_mapEntry_in_mapInitializer1148); - mapEntry119=mapEntry(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_mapEntry.add(mapEntry119.getTree()); - - } - break; - - default : - break loop27; - } - } while (true); - - RCURLY120=(Token)input.LT(1); - match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1152); if (failed) return retval; - if ( backtracking==0 ) stream_RCURLY.add(RCURLY120); - - - // AST REWRITE - // elements: mapEntry - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 183:54: -> ^( 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:183:75: ( mapEntry )* - while ( stream_mapEntry.hasNext() ) { - adaptor.addChild(root_1, stream_mapEntry.next()); - - } - stream_mapEntry.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end mapInitializer - - public static class mapEntry_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; - - // $ANTLR start mapEntry - // /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); - - Object root_0 = null; - - Token COLON122=null; - expression_return expression121 = null; - - expression_return expression123 = null; - - - Object COLON122_tree=null; - RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON"); - RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); - try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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_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_mapEntry1175); if (failed) return retval; - if ( backtracking==0 ) stream_COLON.add(COLON122); - - pushFollow(FOLLOW_expression_in_mapEntry1177); - expression123=expression(); - _fsp--; - if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression123.getTree()); - - // AST REWRITE - // elements: expression - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - if ( backtracking==0 ) { - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); - - root_0 = (Object)adaptor.nil(); - // 186:35: -> ^( 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:186:50: ( expression )* - while ( stream_expression.hasNext() ) { - adaptor.addChild(root_1, stream_expression.next()); - - } - stream_expression.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - } - - } - - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } - } - - catch(RecognitionException e) { - reportError(e); - throw e; - } - finally { - } - return retval; - } - // $ANTLR end mapEntry - public static class ctorArgs_return extends ParserRuleReturnScope { Object tree; public Object getTree() { return tree; } }; // $ANTLR start ctorArgs - // /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 ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:157:1: ctorArgs : LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN ; public final ctorArgs_return ctorArgs() throws RecognitionException { ctorArgs_return retval = new ctorArgs_return(); retval.start = input.LT(1); Object root_0 = null; - Token LPAREN124=null; - Token COMMA126=null; - Token RPAREN128=null; - namedArgument_return namedArgument125 = null; + Token LPAREN98=null; + Token COMMA100=null; + Token RPAREN102=null; + namedArgument_return namedArgument99 = null; - namedArgument_return namedArgument127 = null; + namedArgument_return namedArgument101 = null; - Object LPAREN124_tree=null; - Object COMMA126_tree=null; - Object RPAREN128_tree=null; + Object LPAREN98_tree=null; + Object COMMA100_tree=null; + Object RPAREN102_tree=null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158: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:158:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN { root_0 = (Object)adaptor.nil(); - LPAREN124=(Token)input.LT(1); - 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); + LPAREN98=(Token)input.LT(1); + match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs971); if (failed) return retval; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:12: ( namedArgument ( COMMA namedArgument )* )? + int alt23=2; + int LA23_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==84) ) { - alt29=1; + if ( (LA23_0==INTEGER_LITERAL||LA23_0==LPAREN||(LA23_0>=PLUS && LA23_0<=MINUS)||LA23_0==BANG||(LA23_0>=POUND && LA23_0<=ID)||LA23_0==LBRACKET||LA23_0==PROJECT||(LA23_0>=SELECT && LA23_0<=FALSE)||LA23_0==77) ) { + alt23=1; } - switch (alt29) { + switch (alt23) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:13: namedArgument ( COMMA namedArgument )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:13: namedArgument ( COMMA namedArgument )* { - pushFollow(FOLLOW_namedArgument_in_ctorArgs1199); - namedArgument125=namedArgument(); + pushFollow(FOLLOW_namedArgument_in_ctorArgs975); + namedArgument99=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:189:27: ( COMMA namedArgument )* - loop28: + if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument99.getTree()); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:27: ( COMMA namedArgument )* + loop22: do { - int alt28=2; - int LA28_0 = input.LA(1); + int alt22=2; + int LA22_0 = input.LA(1); - if ( (LA28_0==COMMA) ) { - alt28=1; + if ( (LA22_0==COMMA) ) { + alt22=1; } - switch (alt28) { + switch (alt22) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:28: COMMA namedArgument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:28: COMMA namedArgument { - COMMA126=(Token)input.LT(1); - match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1202); if (failed) return retval; - pushFollow(FOLLOW_namedArgument_in_ctorArgs1205); - namedArgument127=namedArgument(); + COMMA100=(Token)input.LT(1); + match(input,COMMA,FOLLOW_COMMA_in_ctorArgs978); if (failed) return retval; + pushFollow(FOLLOW_namedArgument_in_ctorArgs981); + namedArgument101=namedArgument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument127.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument101.getTree()); } break; default : - break loop28; + break loop22; } } while (true); @@ -3863,8 +3119,8 @@ public class SpringExpressionsParser extends Parser { } - RPAREN128=(Token)input.LT(1); - match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1211); if (failed) return retval; + RPAREN102=(Token)input.LT(1); + match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs987); if (failed) return retval; } @@ -3892,28 +3148,28 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start argument - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:1: argument : expression ; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:1: argument : expression ; public final argument_return argument() throws RecognitionException { argument_return retval = new argument_return(); retval.start = input.LT(1); Object root_0 = null; - expression_return expression129 = null; + expression_return expression103 = null; try { - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:10: ( expression ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:160:12: expression { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_expression_in_argument1220); - expression129=expression(); + pushFollow(FOLLOW_expression_in_argument996); + expression103=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, expression129.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, expression103.getTree()); } @@ -3941,7 +3197,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:193: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:162: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); @@ -3949,80 +3205,80 @@ public class SpringExpressionsParser extends Parser { Object root_0 = null; Token id=null; - Token ASSIGN130=null; - expression_return expression131 = null; + Token ASSIGN104=null; + expression_return expression105 = null; - argument_return argument132 = null; + argument_return argument106 = null; Object id_tree=null; - Object ASSIGN130_tree=null; + Object ASSIGN104_tree=null; RewriteRuleTokenStream stream_ASSIGN=new RewriteRuleTokenStream(adaptor,"token ASSIGN"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:194:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) - int alt30=2; - int LA30_0 = input.LA(1); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument ) + int alt24=2; + int LA24_0 = input.LA(1); - if ( (LA30_0==ID) ) { - int LA30_1 = input.LA(2); + if ( (LA24_0==ID) ) { + int LA24_1 = input.LA(2); - if ( (LA30_1==ASSIGN) ) { - int LA30_22 = input.LA(3); + if ( (LA24_1==ASSIGN) ) { + int LA24_21 = input.LA(3); if ( (synpred4()) ) { - alt30=1; + alt24=1; } else if ( (true) ) { - alt30=2; + alt24=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 22, input); + new NoViableAltException("162:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 24, 21, input); throw nvae; } } - else if ( ((LA30_1>=DEFAULT && LA30_1<=QMARK)||(LA30_1>=LPAREN && LA30_1<=POWER)||LA30_1==DOT||(LA30_1>=COMMA && LA30_1<=LBRACKET)||(LA30_1>=EQUAL && LA30_1<=MATCHES)) ) { - alt30=2; + else if ( ((LA24_1>=DEFAULT && LA24_1<=QMARK)||(LA24_1>=LPAREN && LA24_1<=POWER)||LA24_1==DOT||(LA24_1>=COMMA && LA24_1<=LBRACKET)||(LA24_1>=EQUAL && LA24_1<=MATCHES)) ) { + alt24=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 1, input); + new NoViableAltException("162:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 24, 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==84) ) { - alt30=2; + else if ( (LA24_0==INTEGER_LITERAL||LA24_0==LPAREN||(LA24_0>=PLUS && LA24_0<=MINUS)||LA24_0==BANG||LA24_0==POUND||LA24_0==LBRACKET||LA24_0==PROJECT||(LA24_0>=SELECT && LA24_0<=FALSE)||LA24_0==77) ) { + alt24=2; } else { if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("193:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 30, 0, input); + new NoViableAltException("162:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 24, 0, input); throw nvae; } - switch (alt30) { + switch (alt24) { case 1 : - // /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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:7: ( ID ASSIGN )=>id= ID ASSIGN expression { id=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_namedArgument1243); if (failed) return retval; + match(input,ID,FOLLOW_ID_in_namedArgument1019); if (failed) return retval; if ( backtracking==0 ) stream_ID.add(id); - ASSIGN130=(Token)input.LT(1); - match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1245); if (failed) return retval; - if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN130); + ASSIGN104=(Token)input.LT(1); + match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1021); if (failed) return retval; + if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN104); - pushFollow(FOLLOW_expression_in_namedArgument1247); - expression131=expression(); + pushFollow(FOLLOW_expression_in_namedArgument1023); + expression105=expression(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) stream_expression.add(expression131.getTree()); + if ( backtracking==0 ) stream_expression.add(expression105.getTree()); // AST REWRITE // elements: expression @@ -4035,9 +3291,9 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 195:19: -> ^( NAMED_ARGUMENT[$id] expression ) + // 164:19: -> ^( 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 ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:164:22: ^( NAMED_ARGUMENT[$id] expression ) { Object root_1 = (Object)adaptor.nil(); root_1 = (Object)adaptor.becomeRoot(adaptor.create(NAMED_ARGUMENT, id), root_1); @@ -4054,15 +3310,15 @@ public class SpringExpressionsParser extends Parser { } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:7: argument + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:165:7: argument { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_argument_in_namedArgument1283); - argument132=argument(); + pushFollow(FOLLOW_argument_in_namedArgument1059); + argument106=argument(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, argument132.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, argument106.getTree()); } break; @@ -4092,60 +3348,60 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start qualifiedId - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198: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:167:1: qualifiedId : ID ( DOT ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; public final qualifiedId_return qualifiedId() throws RecognitionException { qualifiedId_return retval = new qualifiedId_return(); retval.start = input.LT(1); Object root_0 = null; - Token ID133=null; - Token DOT134=null; - Token ID135=null; + Token ID107=null; + Token DOT108=null; + Token ID109=null; - Object ID133_tree=null; - Object DOT134_tree=null; - Object ID135_tree=null; + Object ID107_tree=null; + Object DOT108_tree=null; + Object ID109_tree=null; RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167: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:167:15: ID ( DOT ID )* { - ID133=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1295); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID133); + ID107=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1071); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID107); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:18: ( DOT ID )* - loop31: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167:18: ( DOT ID )* + loop25: do { - int alt31=2; - int LA31_0 = input.LA(1); + int alt25=2; + int LA25_0 = input.LA(1); - if ( (LA31_0==DOT) ) { - alt31=1; + if ( (LA25_0==DOT) ) { + alt25=1; } - switch (alt31) { + switch (alt25) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:19: DOT ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167:19: DOT ID { - DOT134=(Token)input.LT(1); - match(input,DOT,FOLLOW_DOT_in_qualifiedId1298); if (failed) return retval; - if ( backtracking==0 ) stream_DOT.add(DOT134); + DOT108=(Token)input.LT(1); + match(input,DOT,FOLLOW_DOT_in_qualifiedId1074); if (failed) return retval; + if ( backtracking==0 ) stream_DOT.add(DOT108); - ID135=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_qualifiedId1300); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID135); + ID109=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_qualifiedId1076); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID109); } break; default : - break loop31; + break loop25; } } while (true); @@ -4161,14 +3417,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 198:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 167:28: -> ^( 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 )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167: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:198:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4208,60 +3464,60 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start contextName - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200: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:169:1: contextName : ID ( DIV ID )* -> ^( QUALIFIED_IDENTIFIER ( ID )* ) ; public final contextName_return contextName() throws RecognitionException { contextName_return retval = new contextName_return(); retval.start = input.LT(1); Object root_0 = null; - Token ID136=null; - Token DIV137=null; - Token ID138=null; + Token ID110=null; + Token DIV111=null; + Token ID112=null; - Object ID136_tree=null; - Object DIV137_tree=null; - Object ID138_tree=null; + Object ID110_tree=null; + Object DIV111_tree=null; + Object ID112_tree=null; RewriteRuleTokenStream stream_DIV=new RewriteRuleTokenStream(adaptor,"token DIV"); RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); try { - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g: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 )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169: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:169:15: ID ( DIV ID )* { - ID136=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1319); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID136); + ID110=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1095); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID110); - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:18: ( DIV ID )* - loop32: + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:18: ( DIV ID )* + loop26: do { - int alt32=2; - int LA32_0 = input.LA(1); + int alt26=2; + int LA26_0 = input.LA(1); - if ( (LA32_0==DIV) ) { - alt32=1; + if ( (LA26_0==DIV) ) { + alt26=1; } - switch (alt32) { + switch (alt26) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:19: DIV ID + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:19: DIV ID { - DIV137=(Token)input.LT(1); - match(input,DIV,FOLLOW_DIV_in_contextName1322); if (failed) return retval; - if ( backtracking==0 ) stream_DIV.add(DIV137); + DIV111=(Token)input.LT(1); + match(input,DIV,FOLLOW_DIV_in_contextName1098); if (failed) return retval; + if ( backtracking==0 ) stream_DIV.add(DIV111); - ID138=(Token)input.LT(1); - match(input,ID,FOLLOW_ID_in_contextName1324); if (failed) return retval; - if ( backtracking==0 ) stream_ID.add(ID138); + ID112=(Token)input.LT(1); + match(input,ID,FOLLOW_ID_in_contextName1100); if (failed) return retval; + if ( backtracking==0 ) stream_ID.add(ID112); } break; default : - break loop32; + break loop26; } } while (true); @@ -4277,14 +3533,14 @@ public class SpringExpressionsParser extends Parser { RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null); root_0 = (Object)adaptor.nil(); - // 200:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* ) + // 169:28: -> ^( 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 )* ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169: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:200:54: ( ID )* + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:169:54: ( ID )* while ( stream_ID.hasNext() ) { adaptor.addChild(root_1, stream_ID.next()); @@ -4324,171 +3580,171 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start literal - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202: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:171:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ); public final literal_return literal() throws RecognitionException { literal_return retval = new literal_return(); retval.start = input.LT(1); Object root_0 = null; - Token INTEGER_LITERAL139=null; - Token STRING_LITERAL140=null; - Token DQ_STRING_LITERAL141=null; - Token NULL_LITERAL143=null; - Token HEXADECIMAL_INTEGER_LITERAL144=null; - Token REAL_LITERAL145=null; - boolLiteral_return boolLiteral142 = null; + Token INTEGER_LITERAL113=null; + Token STRING_LITERAL114=null; + Token DQ_STRING_LITERAL115=null; + Token NULL_LITERAL117=null; + Token HEXADECIMAL_INTEGER_LITERAL118=null; + Token REAL_LITERAL119=null; + boolLiteral_return boolLiteral116 = null; - Object INTEGER_LITERAL139_tree=null; - Object STRING_LITERAL140_tree=null; - Object DQ_STRING_LITERAL141_tree=null; - Object NULL_LITERAL143_tree=null; - Object HEXADECIMAL_INTEGER_LITERAL144_tree=null; - Object REAL_LITERAL145_tree=null; + Object INTEGER_LITERAL113_tree=null; + Object STRING_LITERAL114_tree=null; + Object DQ_STRING_LITERAL115_tree=null; + Object NULL_LITERAL117_tree=null; + Object HEXADECIMAL_INTEGER_LITERAL118_tree=null; + Object REAL_LITERAL119_tree=null; try { - // /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; + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:172:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL ) + int alt27=7; switch ( input.LA(1) ) { case INTEGER_LITERAL: { - alt33=1; + alt27=1; } break; case STRING_LITERAL: { - alt33=2; + alt27=2; } break; case DQ_STRING_LITERAL: { - alt33=3; + alt27=3; } break; case TRUE: case FALSE: { - alt33=4; + alt27=4; } break; case NULL_LITERAL: { - alt33=5; + alt27=5; } break; case HEXADECIMAL_INTEGER_LITERAL: { - alt33=6; + alt27=6; } break; case REAL_LITERAL: { - alt33=7; + alt27=7; } break; default: if (backtracking>0) {failed=true; return retval;} NoViableAltException nvae = - new NoViableAltException("202:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 33, 0, input); + new NoViableAltException("171:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL );", 27, 0, input); throw nvae; } - switch (alt33) { + switch (alt27) { case 1 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:203:4: INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:172:4: INTEGER_LITERAL { root_0 = (Object)adaptor.nil(); - INTEGER_LITERAL139=(Token)input.LT(1); - match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1345); if (failed) return retval; + INTEGER_LITERAL113=(Token)input.LT(1); + match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1121); if (failed) return retval; if ( backtracking==0 ) { - INTEGER_LITERAL139_tree = (Object)adaptor.create(INTEGER_LITERAL139); - adaptor.addChild(root_0, INTEGER_LITERAL139_tree); + INTEGER_LITERAL113_tree = (Object)adaptor.create(INTEGER_LITERAL113); + adaptor.addChild(root_0, INTEGER_LITERAL113_tree); } } break; case 2 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:4: STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:4: STRING_LITERAL { root_0 = (Object)adaptor.nil(); - STRING_LITERAL140=(Token)input.LT(1); - match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1351); if (failed) return retval; + STRING_LITERAL114=(Token)input.LT(1); + match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1127); if (failed) return retval; if ( backtracking==0 ) { - STRING_LITERAL140_tree = (Object)adaptor.create(STRING_LITERAL140); - adaptor.addChild(root_0, STRING_LITERAL140_tree); + STRING_LITERAL114_tree = (Object)adaptor.create(STRING_LITERAL114); + adaptor.addChild(root_0, STRING_LITERAL114_tree); } } break; case 3 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:4: DQ_STRING_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174: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_literal1356); if (failed) return retval; + DQ_STRING_LITERAL115=(Token)input.LT(1); + match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1132); 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); + DQ_STRING_LITERAL115_tree = (Object)adaptor.create(DQ_STRING_LITERAL115); + adaptor.addChild(root_0, DQ_STRING_LITERAL115_tree); } } break; case 4 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:206:4: boolLiteral + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:4: boolLiteral { root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_boolLiteral_in_literal1361); - boolLiteral142=boolLiteral(); + pushFollow(FOLLOW_boolLiteral_in_literal1137); + boolLiteral116=boolLiteral(); _fsp--; if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral142.getTree()); + if ( backtracking==0 ) adaptor.addChild(root_0, boolLiteral116.getTree()); } break; case 5 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:4: NULL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:176:4: NULL_LITERAL { root_0 = (Object)adaptor.nil(); - NULL_LITERAL143=(Token)input.LT(1); - match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1366); if (failed) return retval; + NULL_LITERAL117=(Token)input.LT(1); + match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1142); if (failed) return retval; if ( backtracking==0 ) { - NULL_LITERAL143_tree = (Object)adaptor.create(NULL_LITERAL143); - adaptor.addChild(root_0, NULL_LITERAL143_tree); + NULL_LITERAL117_tree = (Object)adaptor.create(NULL_LITERAL117); + adaptor.addChild(root_0, NULL_LITERAL117_tree); } } break; case 6 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:208:4: HEXADECIMAL_INTEGER_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:177: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_literal1371); if (failed) return retval; + HEXADECIMAL_INTEGER_LITERAL118=(Token)input.LT(1); + match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1147); 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); + HEXADECIMAL_INTEGER_LITERAL118_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL118); + adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL118_tree); } } break; case 7 : - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:209:4: REAL_LITERAL + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:178:4: REAL_LITERAL { root_0 = (Object)adaptor.nil(); - REAL_LITERAL145=(Token)input.LT(1); - match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1377); if (failed) return retval; + REAL_LITERAL119=(Token)input.LT(1); + match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1153); if (failed) return retval; if ( backtracking==0 ) { - REAL_LITERAL145_tree = (Object)adaptor.create(REAL_LITERAL145); - adaptor.addChild(root_0, REAL_LITERAL145_tree); + REAL_LITERAL119_tree = (Object)adaptor.create(REAL_LITERAL119); + adaptor.addChild(root_0, REAL_LITERAL119_tree); } } @@ -4519,27 +3775,27 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start boolLiteral - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:212:1: boolLiteral : ( TRUE | FALSE ); + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:181:1: boolLiteral : ( TRUE | FALSE ); public final boolLiteral_return boolLiteral() throws RecognitionException { boolLiteral_return retval = new boolLiteral_return(); retval.start = input.LT(1); Object root_0 = null; - Token set146=null; + Token set120=null; - Object set146_tree=null; + Object set120_tree=null; try { - // /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:181: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(); - set146=(Token)input.LT(1); + set120=(Token)input.LT(1); if ( (input.LA(1)>=TRUE && input.LA(1)<=FALSE) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set146)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set120)); errorRecovery=false;failed=false; } else { @@ -4576,27 +3832,27 @@ public class SpringExpressionsParser extends Parser { }; // $ANTLR start relationalOperator - // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219:1: relationalOperator : ( 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:188:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | INSTANCEOF | BETWEEN | MATCHES ); public final relationalOperator_return relationalOperator() throws RecognitionException { relationalOperator_return retval = new relationalOperator_return(); retval.start = input.LT(1); Object root_0 = null; - Token set147=null; + Token set121=null; - Object set147_tree=null; + Object set121_tree=null; try { - // /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:189:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | 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(); - set147=(Token)input.LT(1); + set121=(Token)input.LT(1); if ( (input.LA(1)>=EQUAL && input.LA(1)<=MATCHES) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set147)); + if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set121)); errorRecovery=false;failed=false; } else { @@ -4629,12 +3885,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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: ( POUND ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:8: POUND ID LPAREN { - 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 ; + match(input,POUND,FOLLOW_POUND_in_synpred1642); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred1644); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred1646); if (failed) return ; } } @@ -4642,39 +3898,23 @@ 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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:4: ( ID LPAREN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:121:5: ID LPAREN { - match(input,ID,FOLLOW_ID_in_synpred2766); if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred2768); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred2726); if (failed) return ; + match(input,LPAREN,FOLLOW_LPAREN_in_synpred2728); if (failed) return ; } } // $ANTLR end synpred2 - // $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: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,84,FOLLOW_84_in_synpred3978); if (failed) return ; - pushFollow(FOLLOW_qualifiedId_in_synpred3980); - qualifiedId(); - _fsp--; - if (failed) return ; - match(input,LPAREN,FOLLOW_LPAREN_in_synpred3982); if (failed) return ; - - } - } - // $ANTLR end synpred3 - // $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: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 + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:7: ( ID ASSIGN ) + // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:8: ID ASSIGN { - match(input,ID,FOLLOW_ID_in_synpred41234); if (failed) return ; - match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41236); if (failed) return ; + match(input,ID,FOLLOW_ID_in_synpred41010); if (failed) return ; + match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred41012); if (failed) return ; } } @@ -4708,20 +3948,6 @@ public class SpringExpressionsParser extends Parser { failed=false; return success; } - public final boolean synpred3() { - backtracking++; - int start = input.mark(); - try { - synpred3_fragment(); // can never throw exception - } catch (RecognitionException re) { - System.err.println("impossible: "+re); - } - boolean success = !failed; - input.rewind(start); - backtracking--; - failed=false; - return success; - } public final boolean synpred1() { backtracking++; int start = input.mark(); @@ -4740,169 +3966,140 @@ public class SpringExpressionsParser extends Parser { - 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_expression_in_expr130 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_expr132 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression152 = new BitSet(new long[]{0x0000000000380002L}); + public static final BitSet FOLLOW_ASSIGN_in_expression161 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression164 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DEFAULT_in_expression174 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_logicalOrExpression_in_expression177 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_QMARK_in_expression187 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_expression190 = new BitSet(new long[]{0x0000000000400000L}); + public static final BitSet FOLLOW_COLON_in_expression192 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_expression195 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_parenExpr206 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_parenExpr209 = new BitSet(new long[]{0x0000000001000000L}); + public static final BitSet FOLLOW_RPAREN_in_parenExpr211 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression222 = new BitSet(new long[]{0x0000000002000002L}); + public static final BitSet FOLLOW_OR_in_logicalOrExpression225 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression228 = new BitSet(new long[]{0x0000000002000002L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression263 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_AND_in_logicalAndExpression266 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression269 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression280 = new BitSet(new long[]{0xFF00000000000002L,0x0000000000000001L}); + public static final BitSet FOLLOW_relationalOperator_in_relationalExpression283 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_sumExpression_in_relationalExpression286 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression297 = new BitSet(new long[]{0x0000000018000002L}); + public static final BitSet FOLLOW_PLUS_in_sumExpression302 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_MINUS_in_sumExpression307 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_productExpression_in_sumExpression311 = new BitSet(new long[]{0x0000000018000002L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression322 = new BitSet(new long[]{0x00000000E0000002L}); + public static final BitSet FOLLOW_STAR_in_productExpression326 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_DIV_in_productExpression331 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_MOD_in_productExpression335 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_powerExpr_in_productExpression339 = new BitSet(new long[]{0x00000000E0000002L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr351 = new BitSet(new long[]{0x0000000100000002L}); + public static final BitSet FOLLOW_POWER_in_powerExpr354 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_unaryExpression_in_powerExpr357 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PLUS_in_unaryExpression371 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_MINUS_in_unaryExpression376 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_BANG_in_unaryExpression381 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_unaryExpression_in_unaryExpression385 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_primaryExpression_in_unaryExpression391 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_startNode_in_primaryExpression405 = new BitSet(new long[]{0x0000004400000002L}); + public static final BitSet FOLLOW_node_in_primaryExpression408 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_parenExpr_in_startNode441 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_startNode449 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_startNode458 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_indexer_in_startNode466 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_literal_in_startNode474 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_type_in_startNode482 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_constructor_in_startNode490 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_startNode498 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_startNode507 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_startNode516 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_startNode524 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DOT_in_node544 = new BitSet(new long[]{0x00001D1800000000L}); + public static final BitSet FOLLOW_dottedNode_in_node546 = new BitSet(new long[]{0x0000004400000002L}); + public static final BitSet FOLLOW_nonDottedNode_in_node551 = new BitSet(new long[]{0x0000004400000002L}); + public static final BitSet FOLLOW_indexer_in_nonDottedNode563 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_methodOrProperty_in_dottedNode576 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_functionOrVar_in_dottedNode582 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_projection_in_dottedNode590 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_selection_in_dottedNode599 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_firstSelection_in_dottedNode608 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_lastSelection_in_dottedNode617 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_function_in_functionOrVar651 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_var_in_functionOrVar659 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_function676 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_ID_in_function680 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_methodArgs_in_function682 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_POUND_in_var703 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_ID_in_var707 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_methodOrProperty735 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_methodArgs_in_methodOrProperty737 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_property_in_methodOrProperty751 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_methodArgs766 = new BitSet(new long[]{0x001FFD5A19800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_argument_in_methodArgs770 = new BitSet(new long[]{0x0000002001000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs773 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_argument_in_methodArgs776 = new BitSet(new long[]{0x0000002001000000L}); + public static final BitSet FOLLOW_COMMA_in_methodArgs781 = new BitSet(new long[]{0x0000000001000000L}); + public static final BitSet FOLLOW_RPAREN_in_methodArgs788 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_property801 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LBRACKET_in_indexer816 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_argument_in_indexer820 = new BitSet(new long[]{0x000000A000000000L}); + public static final BitSet FOLLOW_COMMA_in_indexer823 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_argument_in_indexer827 = new BitSet(new long[]{0x000000A000000000L}); + public static final BitSet FOLLOW_RBRACKET_in_indexer831 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_PROJECT_in_projection857 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_projection860 = new BitSet(new long[]{0x0000020000000000L}); + public static final BitSet FOLLOW_RCURLY_in_projection862 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_in_selection870 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_selection873 = new BitSet(new long[]{0x0000020000000000L}); + public static final BitSet FOLLOW_RCURLY_in_selection875 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection883 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_firstSelection886 = new BitSet(new long[]{0x0000020000000000L}); + public static final BitSet FOLLOW_RCURLY_in_firstSelection888 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection896 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_lastSelection899 = new BitSet(new long[]{0x0000020000000000L}); + public static final BitSet FOLLOW_RCURLY_in_lastSelection901 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_TYPE_in_type910 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_type912 = new BitSet(new long[]{0x0000000001000000L}); + public static final BitSet FOLLOW_RPAREN_in_type914 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_77_in_constructor945 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_qualifiedId_in_constructor947 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_ctorArgs_in_constructor949 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_LPAREN_in_ctorArgs971 = new BitSet(new long[]{0x001FFD5A19800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs975 = new BitSet(new long[]{0x0000002001000000L}); + public static final BitSet FOLLOW_COMMA_in_ctorArgs978 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_namedArgument_in_ctorArgs981 = new BitSet(new long[]{0x0000002001000000L}); + public static final BitSet FOLLOW_RPAREN_in_ctorArgs987 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_expression_in_argument996 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_namedArgument1019 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_ASSIGN_in_namedArgument1021 = new BitSet(new long[]{0x001FFD5A18800010L,0x0000000000002000L}); + public static final BitSet FOLLOW_expression_in_namedArgument1023 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_argument_in_namedArgument1059 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1071 = new BitSet(new long[]{0x0000000400000002L}); + public static final BitSet FOLLOW_DOT_in_qualifiedId1074 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_ID_in_qualifiedId1076 = new BitSet(new long[]{0x0000000400000002L}); + public static final BitSet FOLLOW_ID_in_contextName1095 = new BitSet(new long[]{0x0000000040000002L}); + public static final BitSet FOLLOW_DIV_in_contextName1098 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_ID_in_contextName1100 = new BitSet(new long[]{0x0000000040000002L}); + public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1121 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_STRING_LITERAL_in_literal1127 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1132 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_boolLiteral_in_literal1137 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_NULL_LITERAL_in_literal1142 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1147 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_REAL_LITERAL_in_literal1153 = 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_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}); + public static final BitSet FOLLOW_POUND_in_synpred1642 = new BitSet(new long[]{0x0000001000000000L}); + public static final BitSet FOLLOW_ID_in_synpred1644 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred1646 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred2726 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_LPAREN_in_synpred2728 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ID_in_synpred41010 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_ASSIGN_in_synpred41012 = 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 4758af6e6c9..0237fac7ea9 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,140 +5,138 @@ options { } @header {package org.springframework.expression.spel.generated;} -T84 : 'new' ; +T77 : 'new' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 214 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 183 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" 217 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 186 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" 232 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 200 ASSIGN: '='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 233 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 201 EQUAL: '=='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 234 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 202 NOT_EQUAL: '!='; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 235 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 203 LESS_THAN: '<'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 236 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 204 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" 237 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 205 GREATER_THAN: '>'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 238 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 206 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" 239 -IN: 'in'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 240 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 207 INSTANCEOF: 'instanceof'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 241 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 208 BETWEEN:'between'; -// $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" 209 MATCHES:'matches'; -// $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" 210 NULL_LITERAL: 'null'; -// $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" 212 SEMI: ';'; -// $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" 213 DOT: '.'; -// $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" 214 COMMA: ','; -// $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" 215 LPAREN: '('; -// $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" 216 RPAREN: ')'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 250 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 217 LCURLY: '{'; -// $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" 218 RCURLY: '}'; -// $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" 219 LBRACKET: '['; -// $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" 220 RBRACKET: ']'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 254 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 221 PIPE: '|'; -// $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" 223 AND: 'and'; -// $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" 224 OR: 'or'; -// $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" 225 FALSE: 'false'; -// $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" 226 TRUE: 'true'; -// $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" 228 PLUS: '+'; -// $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" 229 MINUS: '-'; -// $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" 230 DIV: '/'; -// $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" 231 STAR: '*'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 265 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 232 MOD: '%'; -// $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" 233 POWER: '^'; -// $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" 234 BANG: '!'; -// $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" 235 POUND: '#'; -// $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" 236 QMARK: '?'; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 270 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 237 DEFAULT: '??'; -// $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" 238 PROJECT: '!{'; -// $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" 239 SELECT: '?{'; -// $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" 240 SELECT_FIRST: '^{'; -// $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" 241 SELECT_LAST: '${'; -// $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" 242 TYPE: 'T('; -// $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" 244 STRING_LITERAL: '\''! (APOS|~'\'')* '\''!; -// $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" 245 DQ_STRING_LITERAL: '"'! (~'"')* '"'!; -// $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" 246 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" 280 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 247 DOT_ESCAPED: '\\.'; -// $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" 248 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" 282 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 249 DOLLAR: '$'; -// $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" 250 AT: '@'; -// $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" 251 UPTO: '..'; -// $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" 252 COLON: ':'; -// $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" 255 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" 294 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 261 fragment APOS : '\''! '\''; -// $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" 262 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" 296 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263 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" 297 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 264 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" 299 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 266 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" 300 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 267 fragment SIGN : '+' | '-' ; -// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 301 +// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 268 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 91271311359..e14f89ca835 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 @@ -22,14 +22,10 @@ import org.springframework.expression.spel.ast.BooleanLiteral; import org.springframework.expression.spel.ast.CompoundExpression; import org.springframework.expression.spel.ast.ConstructorReference; import org.springframework.expression.spel.ast.Dot; -import org.springframework.expression.spel.ast.ExpressionListNode; import org.springframework.expression.spel.ast.FunctionReference; import org.springframework.expression.spel.ast.Identifier; import org.springframework.expression.spel.ast.Indexer; -import org.springframework.expression.spel.ast.ListInitializer; import org.springframework.expression.spel.ast.Literal; -import org.springframework.expression.spel.ast.MapEntry; -import org.springframework.expression.spel.ast.MapInitializer; import org.springframework.expression.spel.ast.MethodReference; import org.springframework.expression.spel.ast.NullLiteral; import org.springframework.expression.spel.ast.OperatorAnd; @@ -38,7 +34,6 @@ import org.springframework.expression.spel.ast.OperatorDivide; import org.springframework.expression.spel.ast.OperatorEquality; 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.OperatorInstanceof; import org.springframework.expression.spel.ast.OperatorLessThan; @@ -67,8 +62,6 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { public Object create(Token payload) { if (payload != null) { switch (payload.getType()) { - case SpringExpressionsLexer.EXPRESSIONLIST: - return new ExpressionListNode(payload); case SpringExpressionsLexer.TRUE: return new BooleanLiteral(payload, true); @@ -132,17 +125,8 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { case SpringExpressionsLexer.EXPRESSION: return new CompoundExpression(payload); - case SpringExpressionsLexer.LIST_INITIALIZER: - return new ListInitializer(payload); - case SpringExpressionsLexer.MAP_ENTRY: - return new MapEntry(payload); - case SpringExpressionsLexer.MAP_INITIALIZER: - return new MapInitializer(payload); - case SpringExpressionsLexer.CONSTRUCTOR: return new ConstructorReference(payload, false); - case SpringExpressionsLexer.CONSTRUCTOR_ARRAY: - return new ConstructorReference(payload, true); case SpringExpressionsLexer.VARIABLEREF: return new VariableReference(payload); case SpringExpressionsLexer.FUNCTIONREF: @@ -162,10 +146,7 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { return new Ternary(payload); case SpringExpressionsLexer.INDEXER: return new Indexer(payload); - // case SpringExpressionsLexer.UPTO: return new Range(payload); - case SpringExpressionsLexer.IN: - return new OperatorIn(payload); case SpringExpressionsLexer.BETWEEN: return new OperatorBetween(payload); case SpringExpressionsLexer.MATCHES: @@ -178,7 +159,6 @@ public class SpelTreeAdaptor extends CommonTreeAdaptor { case SpringExpressionsLexer.COLON: return new Placeholder(payload); - // case SpringExpressionsLexer.EOF: return new ErrorNode(payload); case SpringExpressionsLexer.DOT: return new Dot(payload); diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/AverageProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/AverageProcessor.java deleted file mode 100644 index 176d0a5d9ce..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/AverageProcessor.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.Collection; - -import org.springframework.expression.spel.ExpressionState; -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; - -// TODO does it return an element consistent with input? (an int if input is ints, even though the average may be -// X.Y?) yes, for now -/** - * The AverageProcessor operates upon an input collection and computes the average value of the elements within it. It - * will currently only operate upon Numbers and its return value type is an Integer if the input values were integers, - * otherwise it is a double. - * - * @author Andy Clement - */ -public class AverageProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws SpelException { - // TODO could support average of other types if delegated to OperatorOverloader for addition and division - boolean allIntegerObjects = true; - int total = 0; - int numberOfElements = 0; - for (Object element : input) { - if (element != null) { - if (element instanceof Number) { - allIntegerObjects = allIntegerObjects - && (element.getClass() == Integer.class || element.getClass() == Integer.TYPE); - total = total + ((Number) element).intValue(); - numberOfElements++; - } else { - throw new SpelException(SpelMessages.TYPE_NOT_SUPPORTED_BY_PROCESSOR, "average", element.getClass()); - } - } - } - int result = total / numberOfElements; - // if (allIntegerObjects) { - // return new Integer(((Number) result).intValue()); - // } else { - return result; - // } - } -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CountProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CountProcessor.java deleted file mode 100644 index c8cf2b39ab3..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CountProcessor.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.Collection; - -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -/** - * The count processor returns an Integer value representing the number of elements in the collection. - * - * @author Andy Clement - * - */ -public class CountProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws SpelException { - return input.size(); - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CutProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CutProcessor.java deleted file mode 100644 index 9fb96373f78..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/CutProcessor.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.SpelMessages; -import org.springframework.expression.spel.ExpressionState; - -public class CutProcessor implements DataProcessor { - - /** Cut a piece out of a collection - the arguments are from (inclusive) to (exclusive) */ - public Object process(Collection input, Object[] arguments, ExpressionState state) throws SpelException { - if (!(arguments[0] instanceof Integer && arguments[1] instanceof Integer)) { - throw new SpelException(SpelMessages.CUT_ARGUMENTS_MUST_BE_INTS, arguments[0].getClass().getName(), - arguments[1].getClass().getName()); - } - int first = ((Integer) arguments[0]).intValue(); - int last = ((Integer) arguments[1]).intValue(); - List result = new ArrayList(); - int pos = 0; - if (first < last) { - for (Object o : input) { - if (pos >= first && pos <= last) - result.add(o); - pos++; - } - } else { - for (Object o : input) { - if (pos >= last && pos <= first) - result.add(0, o); - pos++; - } - } - return result; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DataProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DataProcessor.java deleted file mode 100644 index e4380cdfa87..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DataProcessor.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.Collection; - -import org.springframework.expression.EvaluationException; -import org.springframework.expression.spel.ExpressionState; - -/** - * A Data processor takes as input: a collection, an optional set of arguments that configure its behaviour, an - * evaluation context. It returns the result of processing the collection which might be as simple as adding up its - * elements or returning a subset of the non null elements. - * - * @author Andy Clement - * - */ -public interface DataProcessor { - - Object process(Collection input, Object[] arguments, ExpressionState state) throws EvaluationException; - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DistinctProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DistinctProcessor.java deleted file mode 100644 index 46a961f6a72..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/DistinctProcessor.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -/** - * The DistinctProcessor returns a new collection containing that is similar to the input collection but with all - * duplicate entries removed. - * - * @author Andy Clement - * - */ -public class DistinctProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws SpelException { - List result = new ArrayList(); - for (Object o : input) { - if (!result.contains(o)) - result.add(o); - } - return result; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MaxProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MaxProcessor.java deleted file mode 100644 index 7ef8e040361..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MaxProcessor.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.Collection; - -import org.springframework.expression.EvaluationException; -import org.springframework.expression.TypeComparator; -import org.springframework.expression.spel.ExpressionState; - -/** - * The Max Processor returns the maximum element in the input collection, the maximum is determined using the comparator - * accessible in the evaluation context. - * - * @author Andy Clement - * - */ -public class MaxProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws EvaluationException { - Object max = null; - TypeComparator comparator = state.getTypeComparator(); - for (Object element : input) { - if (max == null) { - max = element; - } else { - if (comparator.compare(element, max) > 0) - max = element; - } - } - return max; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MinProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MinProcessor.java deleted file mode 100644 index a95319d4d79..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/MinProcessor.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.Collection; - -import org.springframework.expression.EvaluationException; -import org.springframework.expression.TypeComparator; -import org.springframework.expression.spel.ExpressionState; - -/** - * The Min Processor returns the minimum element in the input collection, the minimum is determined using the comparator - * accessible in the evaluation context. - * - * @author Andy Clement - * - */ -public class MinProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws EvaluationException { - Object minimum = null; - TypeComparator elementComparator = state.getTypeComparator(); - for (Object element : input) { - if (minimum == null) { - minimum = element; - } else { - if (elementComparator.compare(element, minimum) < 0) - minimum = element; - } - } - return minimum; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/NonNullProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/NonNullProcessor.java deleted file mode 100644 index c3a1c951d0b..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/NonNullProcessor.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.springframework.expression.spel.SpelException; -import org.springframework.expression.spel.ExpressionState; - -/** - * The NonNull Processor returns a new collection containing all non-null entries from the input collection. - * - * @author Andy Clement - * - */ -public class NonNullProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws SpelException { - List l = new ArrayList(); - for (Object o : input) { - if (o != null) - l.add(o); - } - return l; - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/SortProcessor.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/SortProcessor.java deleted file mode 100644 index e572de1470e..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/SortProcessor.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.expression.spel.processors; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import org.springframework.expression.EvaluationException; -import org.springframework.expression.TypeComparator; -import org.springframework.expression.spel.ExpressionState; - -/** - * The Sort Processor will sort an input collection, comparing elements using the comparator accessible in the - * evaluation context. - * - * @author Andy Clement - * - */ -@SuppressWarnings("unchecked") -public class SortProcessor implements DataProcessor { - - public Object process(Collection input, Object[] arguments, ExpressionState state) throws EvaluationException { - List sortedCollection = new ArrayList(); - sortedCollection.addAll(input); - LocalComparator comparator = new LocalComparator(state.getTypeComparator()); - Collections.sort(sortedCollection, comparator); - if (comparator.exceptionOccurred != null) - throw comparator.exceptionOccurred; - return sortedCollection; - } - - private static class LocalComparator implements java.util.Comparator { - TypeComparator comparator; - EvaluationException exceptionOccurred; - - public LocalComparator(TypeComparator comparator) { - this.comparator = comparator; - } - - public int compare(Object o1, Object o2) { - try { - return comparator.compare(o1, o2); - } catch (EvaluationException e) { - exceptionOccurred = e; - return 0; - } - } - - } - -} diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/package.html b/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/package.html deleted file mode 100644 index 4a5cdfae083..00000000000 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/processors/package.html +++ /dev/null @@ -1,14 +0,0 @@ - - -

-Contains the registered collection processors available 'out of the box' with Spring -Expression Language. They are:

    -
  • sort() - sorts a collection -
  • nonnull() - returns a new collection containing the non-null elements from the input collection -
  • count() - returns the number of elements in the collection -
  • min() - returns the minimum element from the input collection -
  • max() - returns the maximum element from the input collection -
  • distinct() - returns a new collection where duplicates from the input collection have been removed -

    - - \ No newline at end of file diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index c9824f58942..4290678d299 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -24,50 +24,56 @@ import org.springframework.expression.spel.standard.StandardEvaluationContext; */ public class ConstructorInvocationTests extends ExpressionTestCase { - public void testPrimitiveTypeArrayConstructors() { - evaluate("new int[]{1,2,3,4}.count()", 4, Integer.class); - evaluate("new boolean[]{true,false,true}.count()", 3, Integer.class); - evaluate("new char[]{'a','b','c'}.count()", 3, Integer.class); - evaluate("new long[]{1,2,3,4,5}.count()", 5, Integer.class); - evaluate("new short[]{2,3,4,5,6}.count()", 5, Integer.class); - evaluate("new double[]{1d,2d,3d,4d}.count()", 4, Integer.class); - evaluate("new float[]{1f,2f,3f,4f}.count()", 4, Integer.class); - evaluate("new byte[]{1,2,3,4}.count()", 4, Integer.class); - } + // public void testPrimitiveTypeArrayConstructors() { + // evaluate("new int[]{1,2,3,4}.count()", 4, Integer.class); + // evaluate("new boolean[]{true,false,true}.count()", 3, Integer.class); + // evaluate("new char[]{'a','b','c'}.count()", 3, Integer.class); + // evaluate("new long[]{1,2,3,4,5}.count()", 5, Integer.class); + // evaluate("new short[]{2,3,4,5,6}.count()", 5, Integer.class); + // evaluate("new double[]{1d,2d,3d,4d}.count()", 4, Integer.class); + // evaluate("new float[]{1f,2f,3f,4f}.count()", 4, Integer.class); + // evaluate("new byte[]{1,2,3,4}.count()", 4, Integer.class); + // } - public void testPrimitiveTypeArrayConstructorsElements() { - evaluate("new int[]{1,2,3,4}[0]", 1, Integer.class); - evaluate("new boolean[]{true,false,true}[0]", true, Boolean.class); - evaluate("new char[]{'a','b','c'}[0]", 'a', Character.class); - evaluate("new long[]{1,2,3,4,5}[0]", 1L, Long.class); - evaluate("new short[]{2,3,4,5,6}[0]", (short) 2, Short.class); - evaluate("new double[]{1d,2d,3d,4d}[0]", (double) 1, Double.class); - evaluate("new float[]{1f,2f,3f,4f}[0]", (float) 1, Float.class); - evaluate("new byte[]{1,2,3,4}[0]", (byte) 1, Byte.class); - } + // public void testPrimitiveTypeArrayConstructorsElements() { + // evaluate("new int[]{1,2,3,4}[0]", 1, Integer.class); + // evaluate("new boolean[]{true,false,true}[0]", true, Boolean.class); + // evaluate("new char[]{'a','b','c'}[0]", 'a', Character.class); + // evaluate("new long[]{1,2,3,4,5}[0]", 1L, Long.class); + // evaluate("new short[]{2,3,4,5,6}[0]", (short) 2, Short.class); + // evaluate("new double[]{1d,2d,3d,4d}[0]", (double) 1, Double.class); + // evaluate("new float[]{1f,2f,3f,4f}[0]", (float) 1, Float.class); + // evaluate("new byte[]{1,2,3,4}[0]", (byte) 1, Byte.class); + // } public void testTypeConstructors() { evaluate("new String('hello world')", "hello world", String.class); - evaluate("new String(new char[]{'h','e','l','l','o'})", "hello", String.class); + // evaluate("new String(new char[]{'h','e','l','l','o'})", "hello", String.class); } - public void testErrorCases() { - evaluateAndCheckError("new char[7]{'a','c','d','e'}", SpelMessages.INITIALIZER_LENGTH_INCORRECT); - evaluateAndCheckError("new char[3]{'a','c','d','e'}", SpelMessages.INITIALIZER_LENGTH_INCORRECT); - evaluateAndCheckError("new char[2]{'hello','world'}", SpelMessages.TYPE_CONVERSION_ERROR); - evaluateAndCheckError("new String('a','c','d')", SpelMessages.CONSTRUCTOR_NOT_FOUND); - } + // public void testErrorCases() { + // evaluateAndCheckError("new char[7]{'a','c','d','e'}", SpelMessages.INITIALIZER_LENGTH_INCORRECT); + // evaluateAndCheckError("new char[3]{'a','c','d','e'}", SpelMessages.INITIALIZER_LENGTH_INCORRECT); + // evaluateAndCheckError("new char[2]{'hello','world'}", SpelMessages.TYPE_CONVERSION_ERROR); + // evaluateAndCheckError("new String('a','c','d')", SpelMessages.CONSTRUCTOR_NOT_FOUND); + // } - public void testTypeArrayConstructors() { - evaluate("new String[]{'a','b','c','d'}[1]", "b", String.class); - evaluateAndCheckError("new String[]{'a','b','c','d'}.size()", SpelMessages.METHOD_NOT_FOUND, 30, "size()", "java.lang.String[]"); - evaluateAndCheckError("new String[]{'a','b','c','d'}.juggernaut", SpelMessages.PROPERTY_OR_FIELD_NOT_FOUND, 30, "juggernaut", "java.lang.String[]"); - evaluate("new String[]{'a','b','c','d'}.length", 4, Integer.class); - } - - public void testMultiDimensionalArrays() { - evaluate("new String[3,4]","[Ljava.lang.String;[3]{java.lang.String[4]{null,null,null,null},java.lang.String[4]{null,null,null,null},java.lang.String[4]{null,null,null,null}}",new String[3][4].getClass()); - } + // public void testTypeArrayConstructors() { + // evaluate("new String[]{'a','b','c','d'}[1]", "b", String.class); + // evaluateAndCheckError("new String[]{'a','b','c','d'}.size()", SpelMessages.METHOD_NOT_FOUND, 30, "size()", + // "java.lang.String[]"); + // evaluateAndCheckError("new String[]{'a','b','c','d'}.juggernaut", SpelMessages.PROPERTY_OR_FIELD_NOT_FOUND, 30, + // "juggernaut", "java.lang.String[]"); + // evaluate("new String[]{'a','b','c','d'}.length", 4, Integer.class); + // } + + // public void testMultiDimensionalArrays() { + // evaluate( + // "new String[3,4]", + // "[Ljava.lang.String;[3]{java.lang.String[4]{null,null,null,null},java.lang.String[4]{null,null,null,null},java.lang.String[4]{null,null,null,null}}" + // , + // new String[3][4].getClass()); + // } /* * These tests are attempting to call constructors where we need to widen or convert the argument in order to @@ -84,7 +90,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { // Closest ctor will be new String(String) and converter supports Double>String evaluate("new String(3.0d)", "3.0", String.class); } - + public void testVarargsInvocation01() throws Exception { // Calling 'public TestCode(String... strings)' SpelExpressionParser parser = new SpelExpressionParser(); @@ -98,7 +104,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { v = parser.parseExpression("new TestType(1,2,3)").getValue(ctx); v = parser.parseExpression("new TestType(1)").getValue(ctx); v = parser.parseExpression("new TestType(1,'a',3.0d)").getValue(ctx); - v = parser.parseExpression("new TestType(new String[]{'a','b','c'})").getValue(ctx); + // v = parser.parseExpression("new TestType(new String[]{'a','b','c'})").getValue(ctx); } } 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 99372256cbd..4960b562bd5 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 @@ -15,8 +15,6 @@ */ package org.springframework.expression.spel; -import java.util.ArrayList; -import java.util.HashMap; /** * Tests the evaluation of real expressions in a real context. @@ -46,42 +44,42 @@ public class EvaluationTests extends ExpressionTestCase { evaluate("3 >= 3", "true", Boolean.class); } - public void testRelOperatorsIn01() { - evaluate("3 in {1,2,3,4,5}", "true", Boolean.class); - } + // public void testRelOperatorsIn01() { + // evaluate("3 in {1,2,3,4,5}", "true", Boolean.class); + // } - public void testRelOperatorsIn02() { - evaluate("name in {null, \"Nikola Tesla\"}", "true", Boolean.class); - evaluate("name in {null, \"Anonymous\"}", "false", Boolean.class); - } - - public void testRelOperatorsBetween01() { - evaluate("1 between {1, 5}", "true", Boolean.class); - } - - public void testRelOperatorsBetween02() { - evaluate("'efg' between {'abc', 'xyz'}", "true", Boolean.class); - } - - public void testRelOperatorsBetweenErrors01() { - evaluateAndCheckError("1 between T(String)", SpelMessages.BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST, 12); - } - - public void testRelOperatorsBetweenErrors02() { - evaluateAndCheckError("'abc' between {5,7}", SpelMessages.NOT_COMPARABLE, 6); - } + // public void testRelOperatorsIn02() { + // evaluate("name in {null, \"Nikola Tesla\"}", "true", Boolean.class); + // evaluate("name in {null, \"Anonymous\"}", "false", Boolean.class); + // } + // + // public void testRelOperatorsBetween01() { + // evaluate("1 between {1, 5}", "true", Boolean.class); + // } + // + // public void testRelOperatorsBetween02() { + // evaluate("'efg' between {'abc', 'xyz'}", "true", Boolean.class); + // } + // + // public void testRelOperatorsBetweenErrors01() { + // evaluateAndCheckError("1 between T(String)", SpelMessages.BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST, 12); + // } + // + // public void testRelOperatorsBetweenErrors02() { + // evaluateAndCheckError("'abc' between {5,7}", SpelMessages.NOT_COMPARABLE, 6); + // } public void testRelOperatorsIs01() { evaluate("'xyz' instanceof T(int)", "false", Boolean.class); } - public void testRelOperatorsIs02() { - evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); - } - - public void testRelOperatorsIs03() { - evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); - } + // public void testRelOperatorsIs02() { + // evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); + // } + // + // public void testRelOperatorsIs03() { + // evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class); + // } public void testRelOperatorsIs04() { evaluate("null instanceof T(String)", "false", Boolean.class); @@ -148,70 +146,70 @@ public class EvaluationTests extends ExpressionTestCase { } // inline list creation - public void testInlineListCreation01() { - evaluate("{1, 2, 3, 4, 5}", "[1, 2, 3, 4, 5]", ArrayList.class); - } - - public void testInlineListCreation02() { - evaluate("{'abc', 'xyz'}", "[abc, xyz]", ArrayList.class); - } - - // inline map creation - public void testInlineMapCreation01() { - evaluate("#{'key1':'Value 1', 'today':'Monday'}", "{key1=Value 1, today=Monday}", HashMap.class); - } - - public void testInlineMapCreation02() { - evaluate("#{1:'January', 2:'February', 3:'March'}.size()", 3, Integer.class);// "{2=February, 1=January, - // 3=March}", HashMap.class); - } - - public void testInlineMapCreation03() { - evaluate("#{'key1':'Value 1', 'today':'Monday'}['key1']", "Value 1", String.class); - } - - public void testInlineMapCreation04() { - evaluate("#{1:'January', 2:'February', 3:'March'}[3]", "March", String.class); - } - - public void testInlineMapCreation05() { - evaluate("#{1:'January', 2:'February', 3:'March'}.get(2)", "February", String.class); - } - - // set construction - public void testSetConstruction01() { - evaluate("new HashSet().addAll({'a','b','c'})", "true", Boolean.class); - } + // public void testInlineListCreation01() { + // evaluate("{1, 2, 3, 4, 5}", "[1, 2, 3, 4, 5]", ArrayList.class); + // } + // + // public void testInlineListCreation02() { + // evaluate("{'abc', 'xyz'}", "[abc, xyz]", ArrayList.class); + // } + // + // // inline map creation + // public void testInlineMapCreation01() { + // evaluate("#{'key1':'Value 1', 'today':'Monday'}", "{key1=Value 1, today=Monday}", HashMap.class); + // } + // + // public void testInlineMapCreation02() { + // evaluate("#{1:'January', 2:'February', 3:'March'}.size()", 3, Integer.class);// "{2=February, 1=January, + // // 3=March}", HashMap.class); + // } + // + // public void testInlineMapCreation03() { + // evaluate("#{'key1':'Value 1', 'today':'Monday'}['key1']", "Value 1", String.class); + // } + // + // public void testInlineMapCreation04() { + // evaluate("#{1:'January', 2:'February', 3:'March'}[3]", "March", String.class); + // } + // + // public void testInlineMapCreation05() { + // evaluate("#{1:'January', 2:'February', 3:'March'}.get(2)", "February", String.class); + // } + // + // // set construction + // public void testSetConstruction01() { + // evaluate("new HashSet().addAll({'a','b','c'})", "true", Boolean.class); + // } // constructors public void testConstructorInvocation01() { evaluate("new String('hello')", "hello", String.class); } - public void testConstructorInvocation02() { - evaluate("new String[3]", "java.lang.String[3]{null,null,null}", String[].class); - } + // public void testConstructorInvocation02() { + // evaluate("new String[3]", "java.lang.String[3]{null,null,null}", String[].class); + // } - public void testConstructorInvocation03() { - evaluateAndCheckError("new String[]", SpelMessages.NO_SIZE_OR_INITIALIZER_FOR_ARRAY_CONSTRUCTION, 4); - } + // public void testConstructorInvocation03() { + // evaluateAndCheckError("new String[]", SpelMessages.NO_SIZE_OR_INITIALIZER_FOR_ARRAY_CONSTRUCTION, 4); + // } - public void testConstructorInvocation04() { - evaluateAndCheckError("new String[3]{'abc',3,'def'}", SpelMessages.INCORRECT_ELEMENT_TYPE_FOR_ARRAY, 4); - } + // public void testConstructorInvocation04() { + // evaluateAndCheckError("new String[3]{'abc',3,'def'}", SpelMessages.INCORRECT_ELEMENT_TYPE_FOR_ARRAY, 4); + // } public void testConstructorInvocation05() { evaluate("new java.lang.String('foobar')", "foobar", String.class); } // array construction - public void testArrayConstruction01() { - evaluate("new int[] {1, 2, 3, 4, 5}", "int[5]{1,2,3,4,5}", int[].class); - } + // public void testArrayConstruction01() { + // evaluate("new int[] {1, 2, 3, 4, 5}", "int[5]{1,2,3,4,5}", int[].class); + // } - public void testArrayConstruction02() { - evaluate("new String[] {'abc', 'xyz'}", "java.lang.String[2]{abc,xyz}", String[].class); - } + // public void testArrayConstruction02() { + // evaluate("new String[] {'abc', 'xyz'}", "java.lang.String[2]{abc,xyz}", String[].class); + // } // unary expressions public void testUnaryMinus01() { @@ -228,85 +226,85 @@ public class EvaluationTests extends ExpressionTestCase { // collection processors // from spring.net: count,sum,max,min,average,sort,orderBy,distinct,nonNull - public void testProcessorsCount01() { - evaluate("new String[] {'abc','def','xyz'}.count()", "3", Integer.class); - } - - public void testProcessorsCount02() { - evaluate("new int[] {1,2,3}.count()", "3", Integer.class); - } - - public void testProcessorsMax01() { - evaluate("new int[] {1,2,3}.max()", "3", Integer.class); - } - - public void testProcessorsMin01() { - evaluate("new int[] {1,2,3}.min()", "1", Integer.class); - } - - public void testProcessorsKeys01() { - evaluate("#{1:'January', 2:'February', 3:'March'}.keySet().sort()", "[1, 2, 3]", ArrayList.class); - } - - public void testProcessorsValues01() { - evaluate("#{1:'January', 2:'February', 3:'March'}.values().sort()", "[February, January, March]", - ArrayList.class); - } - - public void testProcessorsAverage01() { - evaluate("new int[] {1,2,3}.average()", "2", Integer.class); - } - - public void testProcessorsSort01() { - evaluate("new int[] {3,2,1}.sort()", "int[3]{1,2,3}", int[].class); - } - - public void testCollectionProcessorsNonNull01() { - evaluate("{'a','b',null,'d',null}.nonnull()", "[a, b, d]", ArrayList.class); - } - - public void testCollectionProcessorsDistinct01() { - evaluate("{'a','b','a','d','e'}.distinct()", "[a, b, d, e]", ArrayList.class); - } + // public void testProcessorsCount01() { + // evaluate("new String[] {'abc','def','xyz'}.count()", "3", Integer.class); + // } + // + // public void testProcessorsCount02() { + // evaluate("new int[] {1,2,3}.count()", "3", Integer.class); + // } + // + // public void testProcessorsMax01() { + // evaluate("new int[] {1,2,3}.max()", "3", Integer.class); + // } + // + // public void testProcessorsMin01() { + // evaluate("new int[] {1,2,3}.min()", "1", Integer.class); + // } + // + // public void testProcessorsKeys01() { + // evaluate("#{1:'January', 2:'February', 3:'March'}.keySet().sort()", "[1, 2, 3]", ArrayList.class); + // } + // + // public void testProcessorsValues01() { + // evaluate("#{1:'January', 2:'February', 3:'March'}.values().sort()", "[February, January, March]", + // ArrayList.class); + // } + // + // public void testProcessorsAverage01() { + // evaluate("new int[] {1,2,3}.average()", "2", Integer.class); + // } + // + // public void testProcessorsSort01() { + // evaluate("new int[] {3,2,1}.sort()", "int[3]{1,2,3}", int[].class); + // } + // + // public void testCollectionProcessorsNonNull01() { + // evaluate("{'a','b',null,'d',null}.nonnull()", "[a, b, d]", ArrayList.class); + // } + // + // public void testCollectionProcessorsDistinct01() { + // evaluate("{'a','b','a','d','e'}.distinct()", "[a, b, d, e]", ArrayList.class); + // } // projection and selection - public void testProjection01() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.!{#isEven(#this)}", "[n, y, n, y, n, y, n, y, n, y]", ArrayList.class); - } - - public void testProjection02() { - evaluate("#{'a':'y','b':'n','c':'y'}.!{value=='y'?key:null}.nonnull().sort()", "[a, c]", ArrayList.class); - } - - public void testProjection03() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.!{#this>5}", - "[false, false, false, false, false, true, true, true, true, true]", ArrayList.class); - } + // public void testProjection01() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.!{#isEven(#this)}", "[n, y, n, y, n, y, n, y, n, y]", ArrayList.class); + // } + // + // public void testProjection02() { + // evaluate("#{'a':'y','b':'n','c':'y'}.!{value=='y'?key:null}.nonnull().sort()", "[a, c]", ArrayList.class); + // } + // + // public void testProjection03() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.!{#this>5}", + // "[false, false, false, false, false, true, true, true, true, true]", ArrayList.class); + // } // public void testProjection04() { // evaluate("{1,2,3,4,5,6,7,8,9,10}.!{$index>5?'y':'n'}", "[n, n, n, n, n, n, y, y, y, y]", ArrayList.class); // } - public void testSelection01() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", "[2, 4, 6, 8, 10]", ArrayList.class); - } + // public void testSelection01() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", "[2, 4, 6, 8, 10]", ArrayList.class); + // } - public void testSelectionError_NonBooleanSelectionCriteria() { - evaluateAndCheckError("{1,2,3,4,5,6,7,8,9,10}.?{'nonboolean'}", - SpelMessages.RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN); - } + // public void testSelectionError_NonBooleanSelectionCriteria() { + // evaluateAndCheckError("{1,2,3,4,5,6,7,8,9,10}.?{'nonboolean'}", + // SpelMessages.RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN); + // } // public void testSelectionUsingIndex() { // evaluate("{1,2,3,4,5,6,7,8,9,10}.?{$index > 5 }", "[7, 8, 9, 10]", ArrayList.class); // } - public void testSelectionFirst01() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", "2", Integer.class); - } - - public void testSelectionLast01() { - evaluate("{1,2,3,4,5,6,7,8,9,10}.${#isEven(#this) == 'y'}", "10", Integer.class); - } + // public void testSelectionFirst01() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", "2", Integer.class); + // } + // + // public void testSelectionLast01() { + // evaluate("{1,2,3,4,5,6,7,8,9,10}.${#isEven(#this) == 'y'}", "10", Integer.class); + // } // assignment public void testAssignmentToVariables01() { @@ -314,13 +312,13 @@ public class EvaluationTests extends ExpressionTestCase { } // Ternary operator - public void testTernaryOperator01() { - evaluate("{1}.#isEven(#this[0]) == 'y'?'it is even':'it is odd'", "it is odd", String.class); - } - - public void testTernaryOperator02() { - evaluate("{2}.#isEven(#this[0]) == 'y'?'it is even':'it is odd'", "it is even", String.class); - } + // public void testTernaryOperator01() { + // evaluate("{1}.#isEven(#this[0]) == 'y'?'it is even':'it is odd'", "it is odd", String.class); + // } + // + // public void testTernaryOperator02() { + // evaluate("{2}.#isEven(#this[0]) == 'y'?'it is even':'it is odd'", "it is even", String.class); + // } public void testTernaryOperator03() { evaluateAndCheckError("'hello'?1:2", SpelMessages.TYPE_CONVERSION_ERROR); // cannot convert String to boolean @@ -333,13 +331,13 @@ public class EvaluationTests extends ExpressionTestCase { } // Indexer - public void testCutProcessor01() { - evaluate("{1,2,3,4,5}.cut(1,3)", "[2, 3, 4]", ArrayList.class); - } - - public void testCutProcessor02() { - evaluate("{1,2,3,4,5}.cut(3,1)", "[4, 3, 2]", ArrayList.class); - } + // public void testCutProcessor01() { + // evaluate("{1,2,3,4,5}.cut(1,3)", "[2, 3, 4]", ArrayList.class); + // } + // + // public void testCutProcessor02() { + // evaluate("{1,2,3,4,5}.cut(3,1)", "[4, 3, 2]", ArrayList.class); + // } public void testIndexer03() { evaluate("'christian'[8]", "n", String.class); diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 2fc6e94a6e2..98ec9a696aa 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -30,16 +30,16 @@ public class MethodInvocationTests extends ExpressionTestCase { evaluate("getPlaceOfBirth().getCity()", "SmilJan", String.class); } - public void testBuiltInProcessors() { - evaluate("new int[]{1,2,3,4}.count()", 4, Integer.class); - evaluate("new int[]{4,3,2,1}.sort()[3]", 4, Integer.class); - evaluate("new int[]{4,3,2,1}.average()", 2, Integer.class); - evaluate("new int[]{4,3,2,1}.max()", 4, Integer.class); - evaluate("new int[]{4,3,2,1}.min()", 1, Integer.class); - evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class); - evaluate("{1,2,3,null}.nonnull().count()", 3, Integer.class); - evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class); - } + // public void testBuiltInProcessors() { + // evaluate("new int[]{1,2,3,4}.count()", 4, Integer.class); + // evaluate("new int[]{4,3,2,1}.sort()[3]", 4, Integer.class); + // evaluate("new int[]{4,3,2,1}.average()", 2, Integer.class); + // evaluate("new int[]{4,3,2,1}.max()", 4, Integer.class); + // evaluate("new int[]{4,3,2,1}.min()", 1, Integer.class); + // evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class); + // evaluate("{1,2,3,null}.nonnull().count()", 3, Integer.class); + // evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class); + // } public void testStringClass() { evaluate("new java.lang.String('hello').charAt(2)", 'l', Character.class); @@ -74,7 +74,7 @@ public class MethodInvocationTests extends ExpressionTestCase { evaluate("aVarargsMethod(1,2,3)", 3, Integer.class); // all need converting to strings evaluate("aVarargsMethod(1)", 1, Integer.class); // needs string conversion evaluate("aVarargsMethod(1,'a',3.0d)", 3, Integer.class); // first and last need conversion - evaluate("aVarargsMethod(new String[]{'a','b','c'})", 3, Integer.class); + // evaluate("aVarargsMethod(new String[]{'a','b','c'})", 3, Integer.class); } public void testVarargsInvocation02() { @@ -85,7 +85,7 @@ public class MethodInvocationTests extends ExpressionTestCase { evaluate("aVarargsMethod2(8,2,3)", 10, Integer.class); evaluate("aVarargsMethod2(9)", 9, Integer.class); evaluate("aVarargsMethod2(2,'a',3.0d)", 4, Integer.class); - evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", 11, Integer.class); + // evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", 11, Integer.class); } // Due to conversion there are two possible methods to call ... 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 6b497b20f4b..572619fe40f 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 @@ -133,25 +133,25 @@ public class ParsingTests extends TestCase { parseCheck("3>=3", "(3 >= 3)"); } - public void testRelOperatorsIn01() { - parseCheck("3 in {1,2,3,4,5}", "(3 in {1,2,3,4,5})"); - } + // public void testRelOperatorsIn01() { + // parseCheck("3 in {1,2,3,4,5}", "(3 in {1,2,3,4,5})"); + // } + // + // public void testRelOperatorsBetween01() { + // parseCheck("1 between {1, 5}", "(1 between {1,5})"); + // } - public void testRelOperatorsBetween01() { - parseCheck("1 between {1, 5}", "(1 between {1,5})"); - } - - public void testRelOperatorsBetween02() { - parseCheck("'efg' between {'abc', 'xyz'}", "('efg' between {'abc','xyz'})"); - }// true + // public void testRelOperatorsBetween02() { + // parseCheck("'efg' between {'abc', 'xyz'}", "('efg' between {'abc','xyz'})"); + // }// true public void testRelOperatorsIs01() { parseCheck("'xyz' instanceof int", "('xyz' instanceof int)"); }// false - public void testRelOperatorsIs02() { - parseCheck("{1, 2, 3, 4, 5} instanceof List", "({1,2,3,4,5} instanceof List)"); - }// true + // public void testRelOperatorsIs02() { + // parseCheck("{1, 2, 3, 4, 5} instanceof List", "({1,2,3,4,5} instanceof List)"); + // }// true public void testRelOperatorsMatches01() { parseCheck("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'", "('5.0067' matches '^-?\\d+(\\.\\d{2})?$')"); @@ -196,37 +196,37 @@ public class ParsingTests extends TestCase { } // collection processors - public void testCollectionProcessorsCount01() { - parseCheck("new String[] {'abc','def','xyz'}.count()"); - } + // public void testCollectionProcessorsCount01() { + // parseCheck("new String[] {'abc','def','xyz'}.count()"); + // } - public void testCollectionProcessorsCount02() { - parseCheck("new int[] {1,2,3}.count()"); - } - - public void testCollectionProcessorsMax01() { - parseCheck("new int[] {1,2,3}.max()"); - } - - public void testCollectionProcessorsMin01() { - parseCheck("new int[] {1,2,3}.min()"); - } - - public void testCollectionProcessorsAverage01() { - parseCheck("new int[] {1,2,3}.average()"); - } - - public void testCollectionProcessorsSort01() { - parseCheck("new int[] {3,2,1}.sort()"); - } - - public void testCollectionProcessorsNonNull01() { - parseCheck("{'a','b',null,'d',null}.nonNull()"); - } - - public void testCollectionProcessorsDistinct01() { - parseCheck("{'a','b','a','d','e'}.distinct()"); - } + // public void testCollectionProcessorsCount02() { + // parseCheck("new int[] {1,2,3}.count()"); + // } + // + // public void testCollectionProcessorsMax01() { + // parseCheck("new int[] {1,2,3}.max()"); + // } + // + // public void testCollectionProcessorsMin01() { + // parseCheck("new int[] {1,2,3}.min()"); + // } + // + // public void testCollectionProcessorsAverage01() { + // parseCheck("new int[] {1,2,3}.average()"); + // } + // + // public void testCollectionProcessorsSort01() { + // parseCheck("new int[] {3,2,1}.sort()"); + // } + // + // public void testCollectionProcessorsNonNull01() { + // parseCheck("{'a','b',null,'d',null}.nonNull()"); + // } + // + // public void testCollectionProcessorsDistinct01() { + // parseCheck("{'a','b','a','d','e'}.distinct()"); + // } // // references // public void testReferences01() { @@ -255,30 +255,30 @@ public class ParsingTests extends TestCase { } // inline list creation - public void testInlineListCreation01() { - parseCheck("{1, 2, 3, 4, 5}", "{1,2,3,4,5}"); - } + // public void testInlineListCreation01() { + // parseCheck("{1, 2, 3, 4, 5}", "{1,2,3,4,5}"); + // } + // + // public void testInlineListCreation02() { + // parseCheck("{'abc','xyz'}", "{'abc','xyz'}"); + // } - public void testInlineListCreation02() { - parseCheck("{'abc','xyz'}", "{'abc','xyz'}"); - } - - // inline map creation - public void testInlineMapCreation01() { - parseCheck("#{'key1':'Value 1', 'today':DateTime.Today}"); - } - - public void testInlineMapCreation02() { - parseCheck("#{1:'January', 2:'February', 3:'March'}"); - } - - public void testInlineMapCreation03() { - parseCheck("#{'key1':'Value 1', 'today':'Monday'}['key1']"); - } - - public void testInlineMapCreation04() { - parseCheck("#{1:'January', 2:'February', 3:'March'}[3]"); - } + // // inline map creation + // public void testInlineMapCreation01() { + // parseCheck("#{'key1':'Value 1', 'today':DateTime.Today}"); + // } + // + // public void testInlineMapCreation02() { + // parseCheck("#{1:'January', 2:'February', 3:'March'}"); + // } + // + // public void testInlineMapCreation03() { + // parseCheck("#{'key1':'Value 1', 'today':'Monday'}['key1']"); + // } + // + // public void testInlineMapCreation04() { + // parseCheck("#{1:'January', 2:'February', 3:'March'}[3]"); + // } // methods public void testMethods01() { @@ -298,18 +298,18 @@ public class ParsingTests extends TestCase { parseCheck("new String('hello')"); } - public void testConstructors02() { - parseCheck("new String[3]"); - } + // public void testConstructors02() { + // parseCheck("new String[3]"); + // } // array construction - public void testArrayConstruction01() { - parseCheck("new int[] {1, 2, 3, 4, 5}", "new int[] {1,2,3,4,5}"); - } - - public void testArrayConstruction02() { - parseCheck("new String[] {'abc','xyz'}", "new String[] {'abc','xyz'}"); - } + // public void testArrayConstruction01() { + // parseCheck("new int[] {1, 2, 3, 4, 5}", "new int[] {1,2,3,4,5}"); + // } + // + // public void testArrayConstruction02() { + // parseCheck("new String[] {'abc','xyz'}", "new String[] {'abc','xyz'}"); + // } // variables and functions public void testVariables01() { @@ -325,24 +325,24 @@ public class ParsingTests extends TestCase { } // projections and selections - public void testProjections01() { - parseCheck("{1,2,3,4,5,6,7,8,9,10}.!{#isEven()}"); - } + // public void testProjections01() { + // parseCheck("{1,2,3,4,5,6,7,8,9,10}.!{#isEven()}"); + // } - public void testSelections01() { - parseCheck("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", - "{1,2,3,4,5,6,7,8,9,10}.?{(#isEven(#this) == 'y')}"); - } + // public void testSelections01() { + // parseCheck("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", + // "{1,2,3,4,5,6,7,8,9,10}.?{(#isEven(#this) == 'y')}"); + // } - public void testSelectionsFirst01() { - parseCheck("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", - "{1,2,3,4,5,6,7,8,9,10}.^{(#isEven(#this) == 'y')}"); - } + // public void testSelectionsFirst01() { + // parseCheck("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", + // "{1,2,3,4,5,6,7,8,9,10}.^{(#isEven(#this) == 'y')}"); + // } - public void testSelectionsLast01() { - parseCheck("{1,2,3,4,5,6,7,8,9,10}.${#isEven(#this) == 'y'}", - "{1,2,3,4,5,6,7,8,9,10}.${(#isEven(#this) == 'y')}"); - } + // public void testSelectionsLast01() { + // parseCheck("{1,2,3,4,5,6,7,8,9,10}.${#isEven(#this) == 'y'}", + // "{1,2,3,4,5,6,7,8,9,10}.${(#isEven(#this) == 'y')}"); + // } // assignment public void testAssignmentToVariables01() { @@ -350,10 +350,10 @@ public class ParsingTests extends TestCase { } // ternary operator - public void testTernaryOperator01() { - parseCheck("{1}.#isEven(#this) == 'y'?'it is even':'it is odd'", - "({1}.#isEven(#this) == 'y') ? 'it is even' : 'it is odd'"); - } + // public void testTernaryOperator01() { + // parseCheck("{1}.#isEven(#this) == 'y'?'it is even':'it is odd'", + // "({1}.#isEven(#this) == 'y') ? 'it is even' : 'it is odd'"); + // } // // public void testLambdaMax() {