From d83205227e4ff7a428602e84321001de65b59cc0 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@vmware.com>
Date: Thu, 14 Aug 2008 20:27:35 +0000
Subject: [PATCH] tweaked grammar to handle 0X as a hex prefix and removed
 'u'/'U' from int suffixes for now

---
 .../generated/SpringExpressionsLexer.java     |  398 ++--
 .../generated/SpringExpressionsParser.java    | 1687 ++++++++---------
 .../spel/generated/SpringExpressions__.g      |  130 +-
 3 files changed, 1106 insertions(+), 1109 deletions(-)

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 7256dd5338..16bd2a6885 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-08-14 12:42:54
+// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-08-14 13:26:41
 package org.springframework.expression.spel.generated;
 
 import org.antlr.runtime.*;
@@ -149,8 +149,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mSEMIRPAREN() throws RecognitionException {
         try {
             int _type = SEMIRPAREN;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:12: ( ';)' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:14: ';)'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:12: ( ';)' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:14: ';)'
             {
             match(";)"); 
 
@@ -168,10 +168,10 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mINTEGER_LITERAL() throws RecognitionException {
         try {
             int _type = INTEGER_LITERAL;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:275: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:275: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:264: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:264: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:275:4: ( DECIMAL_DIGIT )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:4: ( DECIMAL_DIGIT )+
             int cnt1=0;
             loop1:
             do {
@@ -185,7 +185,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:275:5: DECIMAL_DIGIT
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:5: DECIMAL_DIGIT
             	    {
             	    mDECIMAL_DIGIT(); 
 
@@ -201,7 +201,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:275:21: ( INTEGER_TYPE_SUFFIX )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:21: ( INTEGER_TYPE_SUFFIX )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -210,7 +210,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:275:22: INTEGER_TYPE_SUFFIX
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:22: INTEGER_TYPE_SUFFIX
                     {
                     mINTEGER_TYPE_SUFFIX(); 
 
@@ -233,10 +233,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:277: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:277: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:266: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:266: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:277:31: ( '0x' | '0X' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:31: ( '0x' | '0X' )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -251,20 +251,20 @@ public class SpringExpressionsLexer extends Lexer {
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("277:31: ( '0x' | '0X' )", 3, 1, input);
+                        new NoViableAltException("266:31: ( '0x' | '0X' )", 3, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("277:31: ( '0x' | '0X' )", 3, 0, input);
+                    new NoViableAltException("266: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:277:32: '0x'
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:32: '0x'
                     {
                     match("0x"); 
 
@@ -272,7 +272,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:277:39: '0X'
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:39: '0X'
                     {
                     match("0X"); 
 
@@ -282,7 +282,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:277:45: ( HEX_DIGIT )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:45: ( HEX_DIGIT )+
             int cnt4=0;
             loop4:
             do {
@@ -296,7 +296,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:277:46: HEX_DIGIT
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:46: HEX_DIGIT
             	    {
             	    mHEX_DIGIT(); 
 
@@ -312,7 +312,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:277:58: ( INTEGER_TYPE_SUFFIX )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:58: ( INTEGER_TYPE_SUFFIX )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -321,7 +321,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:277:59: INTEGER_TYPE_SUFFIX
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:59: INTEGER_TYPE_SUFFIX
                     {
                     mINTEGER_TYPE_SUFFIX(); 
 
@@ -344,8 +344,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:295:7: ( '=' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:9: '='
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:7: ( '=' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:284:9: '='
             {
             match('='); 
 
@@ -362,8 +362,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:296:6: ( '==' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:8: '=='
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:6: ( '==' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:285:8: '=='
             {
             match("=="); 
 
@@ -381,8 +381,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:297:10: ( '!=' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:12: '!='
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:286:10: ( '!=' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:286:12: '!='
             {
             match("!="); 
 
@@ -400,8 +400,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:298:10: ( '<' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:12: '<'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:10: ( '<' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:287:12: '<'
             {
             match('<'); 
 
@@ -418,8 +418,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:299:19: ( '<=' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:21: '<='
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:19: ( '<=' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:288:21: '<='
             {
             match("<="); 
 
@@ -437,8 +437,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:300:13: ( '>' )
-            // /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:289:13: ( '>' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:289:15: '>'
             {
             match('>'); 
 
@@ -455,8 +455,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:301:22: ( '>=' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:301:24: '>='
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:22: ( '>=' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:290:24: '>='
             {
             match(">="); 
 
@@ -474,8 +474,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mSOUNDSLIKE() throws RecognitionException {
         try {
             int _type = SOUNDSLIKE;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:2: ( 'soundslike' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:4: 'soundslike'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:2: ( 'soundslike' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:292:4: 'soundslike'
             {
             match("soundslike"); 
 
@@ -493,8 +493,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mDISTANCETO() throws RecognitionException {
         try {
             int _type = DISTANCETO;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:2: ( 'distanceto' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:4: 'distanceto'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:2: ( 'distanceto' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:294:4: 'distanceto'
             {
             match("distanceto"); 
 
@@ -512,8 +512,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:3: ( 'in' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:9: 'in'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:3: ( 'in' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:295:9: 'in'
             {
             match("in"); 
 
@@ -531,8 +531,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mIS() throws RecognitionException {
         try {
             int _type = IS;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:3: ( 'is' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:9: 'is'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:3: ( 'is' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:296:9: 'is'
             {
             match("is"); 
 
@@ -550,8 +550,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:308:8: ( 'between' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:9: 'between'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:8: ( 'between' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:297:9: 'between'
             {
             match("between"); 
 
@@ -569,8 +569,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mLIKE() throws RecognitionException {
         try {
             int _type = LIKE;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:5: ( 'like' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:9: 'like'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:5: ( 'like' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:298:9: 'like'
             {
             match("like"); 
 
@@ -588,8 +588,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:310:8: ( 'matches' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:310:9: 'matches'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:8: ( 'matches' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:299:9: 'matches'
             {
             match("matches"); 
 
@@ -607,8 +607,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:311:13: ( 'null' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:15: 'null'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:13: ( 'null' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:300:15: 'null'
             {
             match("null"); 
 
@@ -626,8 +626,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:313:5: ( ';' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:7: ';'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:5: ( ';' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:302:7: ';'
             {
             match(';'); 
 
@@ -644,8 +644,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:314:4: ( '.' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:9: '.'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:4: ( '.' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:303:9: '.'
             {
             match('.'); 
 
@@ -662,8 +662,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:315:6: ( ',' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:8: ','
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:6: ( ',' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:304:8: ','
             {
             match(','); 
 
@@ -680,8 +680,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:316:7: ( '(' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:316:9: '('
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:7: ( '(' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:305:9: '('
             {
             match('('); 
 
@@ -698,8 +698,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:317:7: ( ')' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:317:9: ')'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:7: ( ')' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:306:9: ')'
             {
             match(')'); 
 
@@ -716,8 +716,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:318:7: ( '{' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:9: '{'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:7: ( '{' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:307:9: '{'
             {
             match('{'); 
 
@@ -734,8 +734,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:319:7: ( '}' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:9: '}'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:7: ( '}' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:308:9: '}'
             {
             match('}'); 
 
@@ -752,8 +752,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:320:9: ( '[' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:320:11: '['
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:9: ( '[' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:309:11: '['
             {
             match('['); 
 
@@ -770,8 +770,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:321:9: ( ']' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:321:11: ']'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:310:9: ( ']' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:310:11: ']'
             {
             match(']'); 
 
@@ -788,8 +788,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:322:5: ( '|' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:7: '|'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:5: ( '|' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:311:7: '|'
             {
             match('|'); 
 
@@ -806,8 +806,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:324:4: ( 'and' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:324:9: 'and'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:4: ( 'and' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:313:9: 'and'
             {
             match("and"); 
 
@@ -825,8 +825,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:325:3: ( 'or' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:325:9: 'or'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:3: ( 'or' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:314:9: 'or'
             {
             match("or"); 
 
@@ -844,8 +844,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:326:6: ( 'false' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:326:9: 'false'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:6: ( 'false' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:315:9: 'false'
             {
             match("false"); 
 
@@ -863,8 +863,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:327:5: ( 'true' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:327:9: 'true'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:316:5: ( 'true' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:316:9: 'true'
             {
             match("true"); 
 
@@ -882,8 +882,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:329:5: ( '+' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:329:7: '+'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:5: ( '+' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:318:7: '+'
             {
             match('+'); 
 
@@ -900,8 +900,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:330:6: ( '-' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:330:8: '-'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:6: ( '-' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:319:8: '-'
             {
             match('-'); 
 
@@ -918,8 +918,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:331:4: ( '/' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:331:6: '/'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:320:4: ( '/' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:320:6: '/'
             {
             match('/'); 
 
@@ -936,8 +936,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:332:5: ( '*' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:332:7: '*'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:321:5: ( '*' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:321:7: '*'
             {
             match('*'); 
 
@@ -954,8 +954,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:333:4: ( '%' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:333:6: '%'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:4: ( '%' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:322:6: '%'
             {
             match('%'); 
 
@@ -972,8 +972,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:334:6: ( '^' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:334:8: '^'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:323:6: ( '^' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:323:8: '^'
             {
             match('^'); 
 
@@ -990,8 +990,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:335:5: ( '!' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335:7: '!'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:324:5: ( '!' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:324:7: '!'
             {
             match('!'); 
 
@@ -1008,8 +1008,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:336:6: ( '#' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:8: '#'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:325:6: ( '#' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:325:8: '#'
             {
             match('#'); 
 
@@ -1026,8 +1026,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:337:6: ( '?' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337:8: '?'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:326:6: ( '?' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:326:8: '?'
             {
             match('?'); 
 
@@ -1044,8 +1044,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:338:8: ( '??' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:338:10: '??'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:327:8: ( '??' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:327:10: '??'
             {
             match("??"); 
 
@@ -1063,8 +1063,8 @@ public class SpringExpressionsLexer extends Lexer {
     public final void mLAMBDA() throws RecognitionException {
         try {
             int _type = LAMBDA;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:339:7: ( '{|' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:339:9: '{|'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:328:7: ( '{|' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:328:9: '{|'
             {
             match("{|"); 
 
@@ -1082,8 +1082,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:340:8: ( '!{' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:340:10: '!{'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:329:8: ( '!{' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:329:10: '!{'
             {
             match("!{"); 
 
@@ -1101,8 +1101,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:341:7: ( '?{' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:341:9: '?{'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:330:7: ( '?{' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:330:9: '?{'
             {
             match("?{"); 
 
@@ -1120,8 +1120,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:342:13: ( '^{' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:342:15: '^{'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:331:13: ( '^{' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:331:15: '^{'
             {
             match("^{"); 
 
@@ -1139,8 +1139,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:343:12: ( '${' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:343:14: '${'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:332:12: ( '${' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:332:14: '${'
             {
             match("${"); 
 
@@ -1158,8 +1158,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:344:5: ( 'T(' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:344:7: 'T('
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:333:5: ( 'T(' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:333:7: 'T('
             {
             match("T("); 
 
@@ -1177,11 +1177,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:346:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:346:17: '\\'' ( APOS | ~ '\\'' )* '\\''
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335:15: ( '\\'' ( APOS | ~ '\\'' )* '\\'' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335:17: '\\'' ( APOS | ~ '\\'' )* '\\''
             {
             match('\''); 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:346:23: ( APOS | ~ '\\'' )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335:23: ( APOS | ~ '\\'' )*
             loop6:
             do {
                 int alt6=3;
@@ -1203,14 +1203,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:346:24: APOS
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335: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:346:29: ~ '\\''
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:335:29: ~ '\\''
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) {
             	        input.consume();
@@ -1246,11 +1246,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:347:18: ( '\"' (~ '\"' )* '\"' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:347:20: '\"' (~ '\"' )* '\"'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:18: ( '\"' (~ '\"' )* '\"' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:20: '\"' (~ '\"' )* '\"'
             {
             match('\"'); 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:347:25: (~ '\"' )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:25: (~ '\"' )*
             loop7:
             do {
                 int alt7=2;
@@ -1263,7 +1263,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:347:26: ~ '\"'
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:336:26: ~ '\"'
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) {
             	        input.consume();
@@ -1299,8 +1299,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:348: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:348: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:337: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:337: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();
@@ -1312,7 +1312,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:348: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:337:29: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | DOT_ESCAPED )*
             loop8:
             do {
                 int alt8=6;
@@ -1406,35 +1406,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:348:30: 'a' .. 'z'
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337: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:348:39: 'A' .. 'Z'
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337: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:348:48: '_'
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337:48: '_'
             	    {
             	    match('_'); 
 
             	    }
             	    break;
             	case 4 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:348:52: '0' .. '9'
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337: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:348:61: DOT_ESCAPED
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:337:61: DOT_ESCAPED
             	    {
             	    mDOT_ESCAPED(); 
 
@@ -1460,8 +1460,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:349:12: ( '\\\\.' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:349:14: '\\\\.'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:338:12: ( '\\\\.' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:338:14: '\\\\.'
             {
             match("\\."); 
 
@@ -1479,10 +1479,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:351:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:351:5: ( ' ' | '\\t' | '\\n' | '\\r' )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:340:3: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:340:5: ( ' ' | '\\t' | '\\n' | '\\r' )+
             {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:351:5: ( ' ' | '\\t' | '\\n' | '\\r' )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:340:5: ( ' ' | '\\t' | '\\n' | '\\r' )+
             int cnt9=0;
             loop9:
             do {
@@ -1536,8 +1536,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:352:7: ( '$' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:352:9: '$'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:341:7: ( '$' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:341:9: '$'
             {
             match('$'); 
 
@@ -1554,8 +1554,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:353:3: ( '@' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:353:5: '@'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:342:3: ( '@' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:342:5: '@'
             {
             match('@'); 
 
@@ -1572,8 +1572,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:354:5: ( '..' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:354:7: '..'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:343:5: ( '..' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:343:7: '..'
             {
             match(".."); 
 
@@ -1591,8 +1591,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:355:6: ( ':' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:355:8: ':'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:344:6: ( ':' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:344:8: ':'
             {
             match(':'); 
 
@@ -1609,18 +1609,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:372: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:361: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:373: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:362: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:373: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:373: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:362: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:362: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:373:8: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:8: ( DECIMAL_DIGIT )+
                     int cnt10=0;
                     loop10:
                     do {
@@ -1634,7 +1634,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:373:9: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:9: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -1650,7 +1650,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:373:25: ( EXPONENT_PART )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:25: ( EXPONENT_PART )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1659,7 +1659,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:373:26: EXPONENT_PART
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:26: EXPONENT_PART
                             {
                             mEXPONENT_PART(); 
 
@@ -1668,7 +1668,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:373:42: ( REAL_TYPE_SUFFIX )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:42: ( REAL_TYPE_SUFFIX )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -1677,7 +1677,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:373:43: REAL_TYPE_SUFFIX
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:362:43: REAL_TYPE_SUFFIX
                             {
                             mREAL_TYPE_SUFFIX(); 
 
@@ -1693,12 +1693,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:374: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:363: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:374: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:374: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:363: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:363: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:374:3: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:3: ( DECIMAL_DIGIT )+
                     int cnt13=0;
                     loop13:
                     do {
@@ -1712,7 +1712,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:374:4: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:4: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -1729,7 +1729,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:374:24: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:24: ( DECIMAL_DIGIT )+
                     int cnt14=0;
                     loop14:
                     do {
@@ -1743,7 +1743,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:374:25: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:25: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -1759,7 +1759,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:374:41: ( EXPONENT_PART )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:41: ( EXPONENT_PART )?
                     int alt15=2;
                     int LA15_0 = input.LA(1);
 
@@ -1768,7 +1768,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:374:42: EXPONENT_PART
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:42: EXPONENT_PART
                             {
                             mEXPONENT_PART(); 
 
@@ -1777,7 +1777,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:374:58: ( REAL_TYPE_SUFFIX )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:58: ( REAL_TYPE_SUFFIX )?
                     int alt16=2;
                     int LA16_0 = input.LA(1);
 
@@ -1786,7 +1786,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:374:59: REAL_TYPE_SUFFIX
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:363:59: REAL_TYPE_SUFFIX
                             {
                             mREAL_TYPE_SUFFIX(); 
 
@@ -1802,12 +1802,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:375: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:364: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:375: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:375: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:364: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:364: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:375:3: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:3: ( DECIMAL_DIGIT )+
                     int cnt17=0;
                     loop17:
                     do {
@@ -1821,7 +1821,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:375:4: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:4: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -1837,14 +1837,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:375:20: ( EXPONENT_PART )
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:375:21: EXPONENT_PART
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:20: ( EXPONENT_PART )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:21: EXPONENT_PART
                     {
                     mEXPONENT_PART(); 
 
                     }
 
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:375:36: ( REAL_TYPE_SUFFIX )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:36: ( REAL_TYPE_SUFFIX )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -1853,7 +1853,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:375:37: REAL_TYPE_SUFFIX
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:364:37: REAL_TYPE_SUFFIX
                             {
                             mREAL_TYPE_SUFFIX(); 
 
@@ -1869,12 +1869,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:376: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:365: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:376: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:376: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:365: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:365: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:376:3: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:365:3: ( DECIMAL_DIGIT )+
                     int cnt19=0;
                     loop19:
                     do {
@@ -1888,7 +1888,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:376:4: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:365:4: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -1904,8 +1904,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:376:20: ( REAL_TYPE_SUFFIX )
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:376:21: REAL_TYPE_SUFFIX
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:365:20: ( REAL_TYPE_SUFFIX )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:365:21: REAL_TYPE_SUFFIX
                     {
                     mREAL_TYPE_SUFFIX(); 
 
@@ -1929,8 +1929,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:378:15: ( '\\'' '\\'' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:378:17: '\\'' '\\''
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:367:15: ( '\\'' '\\'' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:367:17: '\\'' '\\''
             {
             match('\''); 
             match('\''); 
@@ -1946,8 +1946,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:379:24: ( '0' .. '9' )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:379:26: '0' .. '9'
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:368:24: ( '0' .. '9' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:368:26: '0' .. '9'
             {
             matchRange('0','9'); 
 
@@ -1962,8 +1962,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:380:30: ( ( 'L' | 'l' ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:380:32: ( 'L' | 'l' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:369:30: ( ( 'L' | 'l' ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:369:32: ( 'L' | 'l' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -1987,7 +1987,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:381: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:370: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') ) {
@@ -2012,7 +2012,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:383: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:372:24: ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -2024,16 +2024,16 @@ public class SpringExpressionsLexer extends Lexer {
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("383:10: fragment EXPONENT_PART : ( 'e' ( SIGN )* ( DECIMAL_DIGIT )+ | 'E' ( SIGN )* ( DECIMAL_DIGIT )+ );", 25, 0, input);
+                    new NoViableAltException("372: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:383:26: 'e' ( SIGN )* ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372: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:383:31: ( SIGN )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:31: ( SIGN )*
                     loop21:
                     do {
                         int alt21=2;
@@ -2046,7 +2046,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:383:32: SIGN
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:32: SIGN
                     	    {
                     	    mSIGN(); 
 
@@ -2058,7 +2058,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:383:40: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:40: ( DECIMAL_DIGIT )+
                     int cnt22=0;
                     loop22:
                     do {
@@ -2072,7 +2072,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:383:41: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:41: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -2092,10 +2092,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:383:59: 'E' ( SIGN )* ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372: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:383:64: ( SIGN )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:64: ( SIGN )*
                     loop23:
                     do {
                         int alt23=2;
@@ -2108,7 +2108,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:383:65: SIGN
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:65: SIGN
                     	    {
                     	    mSIGN(); 
 
@@ -2120,7 +2120,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:383:73: ( DECIMAL_DIGIT )+
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:73: ( DECIMAL_DIGIT )+
                     int cnt24=0;
                     loop24:
                     do {
@@ -2134,7 +2134,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:383:74: DECIMAL_DIGIT
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:372:74: DECIMAL_DIGIT
                     	    {
                     	    mDECIMAL_DIGIT(); 
 
@@ -2164,7 +2164,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:384:15: ( '+' | '-' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:373: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)=='-' ) {
@@ -2189,7 +2189,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:386:27: ( 'F' | 'f' | 'D' | 'd' | 'M' | 'm' )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:375:27: ( 'F' | 'f' | 'D' | 'd' | 'M' | 'm' )
             // /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)=='M'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='m' ) {
@@ -2696,7 +2696,7 @@ public class SpringExpressionsLexer extends Lexer {
             this.transition = DFA20_transition;
         }
         public String getDescription() {
-            return "372: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 "361: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 =
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 254846bc56..9a86889e92 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-08-14 12:42:53
+// $ANTLR 3.0.1 /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g 2008-08-14 13:26:40
 package org.springframework.expression.spel.generated;
 
 import org.antlr.runtime.*;
@@ -124,16 +124,13 @@ public class SpringExpressionsParser extends Parser {
     public String getGrammarFileName() { return "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g"; }
 
 
-      protected Stack<String> paraphrase = new Stack<String>();
-
-
     public static class expr_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
     // $ANTLR start expr
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:1: expr : expression EOF ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:1: expr : expression EOF ;
     public final expr_return expr() throws RecognitionException {
         expr_return retval = new expr_return();
         retval.start = input.LT(1);
@@ -147,18 +144,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:59:5: ( expression EOF )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:7: expression EOF
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:5: ( expression EOF )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:56:7: expression EOF
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_expression_in_expr178);
+            pushFollow(FOLLOW_expression_in_expr173);
             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_expr180); if (failed) return retval;
+            match(input,EOF,FOLLOW_EOF_in_expr175); if (failed) return retval;
 
             }
 
@@ -173,7 +170,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -186,7 +183,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start exprList
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:61:1: exprList : LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN ) -> ^( EXPRESSIONLIST ( expression )+ ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:58:1: exprList : LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN ) -> ^( EXPRESSIONLIST ( expression )+ ) ;
     public final exprList_return exprList() throws RecognitionException {
         exprList_return retval = new exprList_return();
         retval.start = input.LT(1);
@@ -212,19 +209,19 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_SEMIRPAREN=new RewriteRuleTokenStream(adaptor,"token SEMIRPAREN");
         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:62:5: ( LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN ) -> ^( EXPRESSIONLIST ( expression )+ ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:7: LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:5: ( LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN ) -> ^( EXPRESSIONLIST ( expression )+ ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:7: LPAREN expression ( SEMI expression )+ ( SEMIRPAREN | RPAREN )
             {
             LPAREN3=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_exprList193); if (failed) return retval;
+            match(input,LPAREN,FOLLOW_LPAREN_in_exprList188); if (failed) return retval;
             if ( backtracking==0 ) stream_LPAREN.add(LPAREN3);
 
-            pushFollow(FOLLOW_expression_in_exprList195);
+            pushFollow(FOLLOW_expression_in_exprList190);
             expression4=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_expression.add(expression4.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:25: ( SEMI expression )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:25: ( SEMI expression )+
             int cnt1=0;
             loop1:
             do {
@@ -238,13 +235,13 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt1) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:26: SEMI expression
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:26: SEMI expression
             	    {
             	    SEMI5=(Token)input.LT(1);
-            	    match(input,SEMI,FOLLOW_SEMI_in_exprList198); if (failed) return retval;
+            	    match(input,SEMI,FOLLOW_SEMI_in_exprList193); if (failed) return retval;
             	    if ( backtracking==0 ) stream_SEMI.add(SEMI5);
 
-            	    pushFollow(FOLLOW_expression_in_exprList200);
+            	    pushFollow(FOLLOW_expression_in_exprList195);
             	    expression6=expression();
             	    _fsp--;
             	    if (failed) return retval;
@@ -263,7 +260,7 @@ public class SpringExpressionsParser extends Parser {
                 cnt1++;
             } while (true);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:44: ( SEMIRPAREN | RPAREN )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:44: ( SEMIRPAREN | RPAREN )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -276,26 +273,26 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("62:44: ( SEMIRPAREN | RPAREN )", 2, 0, input);
+                    new NoViableAltException("59:44: ( SEMIRPAREN | RPAREN )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:45: SEMIRPAREN
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:45: SEMIRPAREN
                     {
                     SEMIRPAREN7=(Token)input.LT(1);
-                    match(input,SEMIRPAREN,FOLLOW_SEMIRPAREN_in_exprList205); if (failed) return retval;
+                    match(input,SEMIRPAREN,FOLLOW_SEMIRPAREN_in_exprList200); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMIRPAREN.add(SEMIRPAREN7);
 
 
                     }
                     break;
                 case 2 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:62:58: RPAREN
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:59:58: RPAREN
                     {
                     RPAREN8=(Token)input.LT(1);
-                    match(input,RPAREN,FOLLOW_RPAREN_in_exprList209); if (failed) return retval;
+                    match(input,RPAREN,FOLLOW_RPAREN_in_exprList204); if (failed) return retval;
                     if ( backtracking==0 ) stream_RPAREN.add(RPAREN8);
 
 
@@ -316,9 +313,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 63:7: -> ^( EXPRESSIONLIST ( expression )+ )
+            // 60:7: -> ^( EXPRESSIONLIST ( expression )+ )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:63:10: ^( EXPRESSIONLIST ( expression )+ )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:60:10: ^( EXPRESSIONLIST ( expression )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(EXPRESSIONLIST, "EXPRESSIONLIST"), root_1);
@@ -352,7 +349,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -365,7 +362,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:67: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:64: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);
@@ -393,17 +390,17 @@ public class SpringExpressionsParser extends Parser {
         Object COLON16_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67: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:68: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:64:12: ( logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )? )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:65:5: logicalOrExpression ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_logicalOrExpression_in_expression253);
+            pushFollow(FOLLOW_logicalOrExpression_in_expression248);
             logicalOrExpression9=logicalOrExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, logicalOrExpression9.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69: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:66:5: ( ( ASSIGN logicalOrExpression ) | ( DEFAULT logicalOrExpression ) | ( QMARK expression COLON expression ) )?
             int alt3=4;
             switch ( input.LA(1) ) {
                 case ASSIGN:
@@ -425,18 +422,18 @@ 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:69:7: ( ASSIGN logicalOrExpression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:7: ( ASSIGN logicalOrExpression )
                     {
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:7: ( ASSIGN logicalOrExpression )
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:69:8: ASSIGN logicalOrExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:7: ( ASSIGN logicalOrExpression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:66:8: ASSIGN logicalOrExpression
                     {
                     ASSIGN10=(Token)input.LT(1);
-                    match(input,ASSIGN,FOLLOW_ASSIGN_in_expression262); if (failed) return retval;
+                    match(input,ASSIGN,FOLLOW_ASSIGN_in_expression257); if (failed) return retval;
                     if ( backtracking==0 ) {
                     ASSIGN10_tree = (Object)adaptor.create(ASSIGN10);
                     root_0 = (Object)adaptor.becomeRoot(ASSIGN10_tree, root_0);
                     }
-                    pushFollow(FOLLOW_logicalOrExpression_in_expression265);
+                    pushFollow(FOLLOW_logicalOrExpression_in_expression260);
                     logicalOrExpression11=logicalOrExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -448,18 +445,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:70:6: ( DEFAULT logicalOrExpression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:6: ( DEFAULT logicalOrExpression )
                     {
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:6: ( DEFAULT logicalOrExpression )
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:7: DEFAULT logicalOrExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:6: ( DEFAULT logicalOrExpression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:67:7: DEFAULT logicalOrExpression
                     {
                     DEFAULT12=(Token)input.LT(1);
-                    match(input,DEFAULT,FOLLOW_DEFAULT_in_expression275); if (failed) return retval;
+                    match(input,DEFAULT,FOLLOW_DEFAULT_in_expression270); if (failed) return retval;
                     if ( backtracking==0 ) {
                     DEFAULT12_tree = (Object)adaptor.create(DEFAULT12);
                     root_0 = (Object)adaptor.becomeRoot(DEFAULT12_tree, root_0);
                     }
-                    pushFollow(FOLLOW_logicalOrExpression_in_expression278);
+                    pushFollow(FOLLOW_logicalOrExpression_in_expression273);
                     logicalOrExpression13=logicalOrExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -471,25 +468,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:71:6: ( QMARK expression COLON expression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:68:6: ( QMARK expression COLON expression )
                     {
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:6: ( QMARK expression COLON expression )
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:71:7: QMARK expression COLON expression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:68:6: ( QMARK expression COLON expression )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:68:7: QMARK expression COLON expression
                     {
                     QMARK14=(Token)input.LT(1);
-                    match(input,QMARK,FOLLOW_QMARK_in_expression288); if (failed) return retval;
+                    match(input,QMARK,FOLLOW_QMARK_in_expression283); if (failed) return retval;
                     if ( backtracking==0 ) {
                     QMARK14_tree = (Object)adaptor.create(QMARK14);
                     root_0 = (Object)adaptor.becomeRoot(QMARK14_tree, root_0);
                     }
-                    pushFollow(FOLLOW_expression_in_expression291);
+                    pushFollow(FOLLOW_expression_in_expression286);
                     expression15=expression();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) adaptor.addChild(root_0, expression15.getTree());
                     COLON16=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_expression293); if (failed) return retval;
-                    pushFollow(FOLLOW_expression_in_expression296);
+                    match(input,COLON,FOLLOW_COLON_in_expression288); if (failed) return retval;
+                    pushFollow(FOLLOW_expression_in_expression291);
                     expression17=expression();
                     _fsp--;
                     if (failed) return retval;
@@ -517,7 +514,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -530,7 +527,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:73:1: parenExpr : LPAREN expression RPAREN ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:1: parenExpr : LPAREN expression RPAREN ;
     public final parenExpr_return parenExpr() throws RecognitionException {
         parenExpr_return retval = new parenExpr_return();
         retval.start = input.LT(1);
@@ -546,20 +543,20 @@ public class SpringExpressionsParser extends Parser {
         Object RPAREN20_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:11: ( LPAREN expression RPAREN )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:13: LPAREN expression RPAREN
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:11: ( LPAREN expression RPAREN )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:70:13: LPAREN expression RPAREN
             {
             root_0 = (Object)adaptor.nil();
 
             LPAREN18=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr307); if (failed) return retval;
-            pushFollow(FOLLOW_expression_in_parenExpr310);
+            match(input,LPAREN,FOLLOW_LPAREN_in_parenExpr302); if (failed) return retval;
+            pushFollow(FOLLOW_expression_in_parenExpr305);
             expression19=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, expression19.getTree());
             RPAREN20=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr312); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_parenExpr307); if (failed) return retval;
 
             }
 
@@ -574,7 +571,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -587,7 +584,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:76:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:1: logicalOrExpression : logicalAndExpression ( OR logicalAndExpression )* ;
     public final logicalOrExpression_return logicalOrExpression() throws RecognitionException {
         logicalOrExpression_return retval = new logicalOrExpression_return();
         retval.start = input.LT(1);
@@ -603,17 +600,17 @@ public class SpringExpressionsParser extends Parser {
         Object OR22_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:1: ( logicalAndExpression ( OR logicalAndExpression )* )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:3: logicalAndExpression ( OR logicalAndExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:21: ( logicalAndExpression ( OR logicalAndExpression )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:23: logicalAndExpression ( OR logicalAndExpression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression326);
+            pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression318);
             logicalAndExpression21=logicalAndExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, logicalAndExpression21.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:24: ( OR logicalAndExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:44: ( OR logicalAndExpression )*
             loop4:
             do {
                 int alt4=2;
@@ -626,15 +623,15 @@ 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:79:25: OR logicalAndExpression
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:73:45: OR logicalAndExpression
             	    {
             	    OR22=(Token)input.LT(1);
-            	    match(input,OR,FOLLOW_OR_in_logicalOrExpression329); if (failed) return retval;
+            	    match(input,OR,FOLLOW_OR_in_logicalOrExpression321); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    OR22_tree = (Object)adaptor.create(OR22);
             	    root_0 = (Object)adaptor.becomeRoot(OR22_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression332);
+            	    pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression324);
             	    logicalAndExpression23=logicalAndExpression();
             	    _fsp--;
             	    if (failed) return retval;
@@ -662,7 +659,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -675,7 +672,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:81:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:1: logicalAndExpression : relationalExpression ( AND relationalExpression )* ;
     public final logicalAndExpression_return logicalAndExpression() throws RecognitionException {
         logicalAndExpression_return retval = new logicalAndExpression_return();
         retval.start = input.LT(1);
@@ -691,17 +688,17 @@ public class SpringExpressionsParser extends Parser {
         Object AND25_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:81:22: ( relationalExpression ( AND relationalExpression )* )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:81:24: relationalExpression ( AND relationalExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:22: ( relationalExpression ( AND relationalExpression )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:24: relationalExpression ( AND relationalExpression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression366);
+            pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression358);
             relationalExpression24=relationalExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, relationalExpression24.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:81:45: ( AND relationalExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:45: ( AND relationalExpression )*
             loop5:
             do {
                 int alt5=2;
@@ -714,15 +711,15 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt5) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:81:46: AND relationalExpression
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:75:46: AND relationalExpression
             	    {
             	    AND25=(Token)input.LT(1);
-            	    match(input,AND,FOLLOW_AND_in_logicalAndExpression369); if (failed) return retval;
+            	    match(input,AND,FOLLOW_AND_in_logicalAndExpression361); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    AND25_tree = (Object)adaptor.create(AND25);
             	    root_0 = (Object)adaptor.becomeRoot(AND25_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression372);
+            	    pushFollow(FOLLOW_relationalExpression_in_logicalAndExpression364);
             	    relationalExpression26=relationalExpression();
             	    _fsp--;
             	    if (failed) return retval;
@@ -750,7 +747,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -763,7 +760,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:83:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:1: relationalExpression : sumExpression ( relationalOperator sumExpression )? ;
     public final relationalExpression_return relationalExpression() throws RecognitionException {
         relationalExpression_return retval = new relationalExpression_return();
         retval.start = input.LT(1);
@@ -779,17 +776,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:83:22: ( sumExpression ( relationalOperator sumExpression )? )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:24: sumExpression ( relationalOperator sumExpression )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:22: ( sumExpression ( relationalOperator sumExpression )? )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:24: sumExpression ( relationalOperator sumExpression )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_sumExpression_in_relationalExpression383);
+            pushFollow(FOLLOW_sumExpression_in_relationalExpression375);
             sumExpression27=sumExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, sumExpression27.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:38: ( relationalOperator sumExpression )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:38: ( relationalOperator sumExpression )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -798,14 +795,14 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt6) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:83:39: relationalOperator sumExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:77:39: relationalOperator sumExpression
                     {
-                    pushFollow(FOLLOW_relationalOperator_in_relationalExpression386);
+                    pushFollow(FOLLOW_relationalOperator_in_relationalExpression378);
                     relationalOperator28=relationalOperator();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(relationalOperator28.getTree(), root_0);
-                    pushFollow(FOLLOW_sumExpression_in_relationalExpression389);
+                    pushFollow(FOLLOW_sumExpression_in_relationalExpression381);
                     sumExpression29=sumExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -830,7 +827,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -843,7 +840,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:85:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:79:1: sumExpression : productExpression ( ( PLUS | MINUS ) productExpression )* ;
     public final sumExpression_return sumExpression() throws RecognitionException {
         sumExpression_return retval = new sumExpression_return();
         retval.start = input.LT(1);
@@ -861,17 +858,17 @@ public class SpringExpressionsParser extends Parser {
         Object MINUS32_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:4: productExpression ( ( PLUS | MINUS ) productExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:2: ( productExpression ( ( PLUS | MINUS ) productExpression )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:4: productExpression ( ( PLUS | MINUS ) productExpression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_productExpression_in_sumExpression400);
+            pushFollow(FOLLOW_productExpression_in_sumExpression392);
             productExpression30=productExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, productExpression30.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:22: ( ( PLUS | MINUS ) productExpression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:22: ( ( PLUS | MINUS ) productExpression )*
             loop8:
             do {
                 int alt8=2;
@@ -884,9 +881,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:86:24: ( PLUS | MINUS ) productExpression
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: ( PLUS | MINUS ) productExpression
             	    {
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:86:24: ( PLUS | MINUS )
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:24: ( PLUS | MINUS )
             	    int alt7=2;
             	    int LA7_0 = input.LA(1);
 
@@ -899,16 +896,16 @@ public class SpringExpressionsParser extends Parser {
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("86:24: ( PLUS | MINUS )", 7, 0, input);
+            	            new NoViableAltException("80:24: ( PLUS | MINUS )", 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:86:25: PLUS
+            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:25: PLUS
             	            {
             	            PLUS31=(Token)input.LT(1);
-            	            match(input,PLUS,FOLLOW_PLUS_in_sumExpression405); if (failed) return retval;
+            	            match(input,PLUS,FOLLOW_PLUS_in_sumExpression397); if (failed) return retval;
             	            if ( backtracking==0 ) {
             	            PLUS31_tree = (Object)adaptor.create(PLUS31);
             	            root_0 = (Object)adaptor.becomeRoot(PLUS31_tree, root_0);
@@ -917,10 +914,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:86:33: MINUS
+            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:80:33: MINUS
             	            {
             	            MINUS32=(Token)input.LT(1);
-            	            match(input,MINUS,FOLLOW_MINUS_in_sumExpression410); if (failed) return retval;
+            	            match(input,MINUS,FOLLOW_MINUS_in_sumExpression402); if (failed) return retval;
             	            if ( backtracking==0 ) {
             	            MINUS32_tree = (Object)adaptor.create(MINUS32);
             	            root_0 = (Object)adaptor.becomeRoot(MINUS32_tree, root_0);
@@ -931,7 +928,7 @@ public class SpringExpressionsParser extends Parser {
 
             	    }
 
-            	    pushFollow(FOLLOW_productExpression_in_sumExpression414);
+            	    pushFollow(FOLLOW_productExpression_in_sumExpression406);
             	    productExpression33=productExpression();
             	    _fsp--;
             	    if (failed) return retval;
@@ -959,7 +956,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -972,7 +969,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:92: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:86: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);
@@ -992,17 +989,17 @@ public class SpringExpressionsParser extends Parser {
         Object MOD37_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93: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:93: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:87:2: ( powerExpr ( ( STAR | DIV | MOD ) powerExpr )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:4: powerExpr ( ( STAR | DIV | MOD ) powerExpr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_powerExpr_in_productExpression429);
+            pushFollow(FOLLOW_powerExpr_in_productExpression421);
             powerExpr34=powerExpr();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, powerExpr34.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:14: ( ( STAR | DIV | MOD ) powerExpr )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:14: ( ( STAR | DIV | MOD ) powerExpr )*
             loop10:
             do {
                 int alt10=2;
@@ -1015,9 +1012,9 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt10) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:15: ( STAR | DIV | MOD ) powerExpr
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:15: ( STAR | DIV | MOD ) powerExpr
             	    {
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:15: ( STAR | DIV | MOD )
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:15: ( STAR | DIV | MOD )
             	    int alt9=3;
             	    switch ( input.LA(1) ) {
             	    case STAR:
@@ -1038,17 +1035,17 @@ public class SpringExpressionsParser extends Parser {
             	    default:
             	        if (backtracking>0) {failed=true; return retval;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("93:15: ( STAR | DIV | MOD )", 9, 0, input);
+            	            new NoViableAltException("87:15: ( STAR | DIV | MOD )", 9, 0, input);
 
             	        throw nvae;
             	    }
 
             	    switch (alt9) {
             	        case 1 :
-            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:16: STAR
+            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:16: STAR
             	            {
             	            STAR35=(Token)input.LT(1);
-            	            match(input,STAR,FOLLOW_STAR_in_productExpression433); if (failed) return retval;
+            	            match(input,STAR,FOLLOW_STAR_in_productExpression425); if (failed) return retval;
             	            if ( backtracking==0 ) {
             	            STAR35_tree = (Object)adaptor.create(STAR35);
             	            root_0 = (Object)adaptor.becomeRoot(STAR35_tree, root_0);
@@ -1057,10 +1054,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:93:24: DIV
+            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:24: DIV
             	            {
             	            DIV36=(Token)input.LT(1);
-            	            match(input,DIV,FOLLOW_DIV_in_productExpression438); if (failed) return retval;
+            	            match(input,DIV,FOLLOW_DIV_in_productExpression430); if (failed) return retval;
             	            if ( backtracking==0 ) {
             	            DIV36_tree = (Object)adaptor.create(DIV36);
             	            root_0 = (Object)adaptor.becomeRoot(DIV36_tree, root_0);
@@ -1069,10 +1066,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:93:30: MOD
+            	            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:87:30: MOD
             	            {
             	            MOD37=(Token)input.LT(1);
-            	            match(input,MOD,FOLLOW_MOD_in_productExpression442); if (failed) return retval;
+            	            match(input,MOD,FOLLOW_MOD_in_productExpression434); if (failed) return retval;
             	            if ( backtracking==0 ) {
             	            MOD37_tree = (Object)adaptor.create(MOD37);
             	            root_0 = (Object)adaptor.becomeRoot(MOD37_tree, root_0);
@@ -1083,7 +1080,7 @@ public class SpringExpressionsParser extends Parser {
 
             	    }
 
-            	    pushFollow(FOLLOW_powerExpr_in_productExpression446);
+            	    pushFollow(FOLLOW_powerExpr_in_productExpression438);
             	    powerExpr38=powerExpr();
             	    _fsp--;
             	    if (failed) return retval;
@@ -1111,7 +1108,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -1124,7 +1121,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:99:1: powerExpr : unaryExpression ( POWER unaryExpression )? ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:1: powerExpr : unaryExpression ( POWER unaryExpression )? ;
     public final powerExpr_return powerExpr() throws RecognitionException {
         powerExpr_return retval = new powerExpr_return();
         retval.start = input.LT(1);
@@ -1140,17 +1137,17 @@ public class SpringExpressionsParser extends Parser {
         Object POWER40_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:12: ( unaryExpression ( POWER unaryExpression )? )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:14: unaryExpression ( POWER unaryExpression )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:12: ( unaryExpression ( POWER unaryExpression )? )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:14: unaryExpression ( POWER unaryExpression )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_unaryExpression_in_powerExpr462);
+            pushFollow(FOLLOW_unaryExpression_in_powerExpr454);
             unaryExpression39=unaryExpression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, unaryExpression39.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:30: ( POWER unaryExpression )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:30: ( POWER unaryExpression )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1159,15 +1156,15 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt11) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:99:31: POWER unaryExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:93:31: POWER unaryExpression
                     {
                     POWER40=(Token)input.LT(1);
-                    match(input,POWER,FOLLOW_POWER_in_powerExpr465); if (failed) return retval;
+                    match(input,POWER,FOLLOW_POWER_in_powerExpr457); if (failed) return retval;
                     if ( backtracking==0 ) {
                     POWER40_tree = (Object)adaptor.create(POWER40);
                     root_0 = (Object)adaptor.becomeRoot(POWER40_tree, root_0);
                     }
-                    pushFollow(FOLLOW_unaryExpression_in_powerExpr468);
+                    pushFollow(FOLLOW_unaryExpression_in_powerExpr460);
                     unaryExpression41=unaryExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -1192,7 +1189,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -1205,7 +1202,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:101: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:95: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);
@@ -1225,7 +1222,7 @@ public class SpringExpressionsParser extends Parser {
         Object BANG44_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:3: ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:2: ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1238,17 +1235,17 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("101:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 13, 0, input);
+                    new NoViableAltException("95:1: unaryExpression : ( ( PLUS | MINUS | BANG ) unaryExpression | primaryExpression );", 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:107:5: ( PLUS | MINUS | BANG ) unaryExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96: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:107:5: ( PLUS | MINUS | BANG )
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:4: ( PLUS | MINUS | BANG )
                     int alt12=3;
                     switch ( input.LA(1) ) {
                     case PLUS:
@@ -1269,17 +1266,17 @@ public class SpringExpressionsParser extends Parser {
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("107:5: ( PLUS | MINUS | BANG )", 12, 0, input);
+                            new NoViableAltException("96:4: ( PLUS | MINUS | BANG )", 12, 0, input);
 
                         throw nvae;
                     }
 
                     switch (alt12) {
                         case 1 :
-                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:6: PLUS
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:5: PLUS
                             {
                             PLUS42=(Token)input.LT(1);
-                            match(input,PLUS,FOLLOW_PLUS_in_unaryExpression488); if (failed) return retval;
+                            match(input,PLUS,FOLLOW_PLUS_in_unaryExpression474); if (failed) return retval;
                             if ( backtracking==0 ) {
                             PLUS42_tree = (Object)adaptor.create(PLUS42);
                             root_0 = (Object)adaptor.becomeRoot(PLUS42_tree, root_0);
@@ -1288,10 +1285,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:107:14: MINUS
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:13: MINUS
                             {
                             MINUS43=(Token)input.LT(1);
-                            match(input,MINUS,FOLLOW_MINUS_in_unaryExpression493); if (failed) return retval;
+                            match(input,MINUS,FOLLOW_MINUS_in_unaryExpression479); if (failed) return retval;
                             if ( backtracking==0 ) {
                             MINUS43_tree = (Object)adaptor.create(MINUS43);
                             root_0 = (Object)adaptor.becomeRoot(MINUS43_tree, root_0);
@@ -1300,10 +1297,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:107:23: BANG
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:96:22: BANG
                             {
                             BANG44=(Token)input.LT(1);
-                            match(input,BANG,FOLLOW_BANG_in_unaryExpression498); if (failed) return retval;
+                            match(input,BANG,FOLLOW_BANG_in_unaryExpression484); if (failed) return retval;
                             if ( backtracking==0 ) {
                             BANG44_tree = (Object)adaptor.create(BANG44);
                             root_0 = (Object)adaptor.becomeRoot(BANG44_tree, root_0);
@@ -1314,7 +1311,7 @@ public class SpringExpressionsParser extends Parser {
 
                     }
 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression502);
+                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression488);
                     unaryExpression45=unaryExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -1323,11 +1320,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:108:4: primaryExpression
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:97:4: primaryExpression
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_primaryExpression_in_unaryExpression508);
+                    pushFollow(FOLLOW_primaryExpression_in_unaryExpression494);
                     primaryExpression46=primaryExpression();
                     _fsp--;
                     if (failed) return retval;
@@ -1348,7 +1345,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -1361,7 +1358,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:110: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:99: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);
@@ -1376,15 +1373,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:111: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:111:7: startNode ( node )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100: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:100:7: startNode ( node )?
             {
-            pushFollow(FOLLOW_startNode_in_primaryExpression522);
+            pushFollow(FOLLOW_startNode_in_primaryExpression508);
             startNode47=startNode();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_startNode.add(startNode47.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:17: ( node )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:17: ( node )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -1393,9 +1390,9 @@ 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:111:18: node
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:18: node
                     {
-                    pushFollow(FOLLOW_node_in_primaryExpression525);
+                    pushFollow(FOLLOW_node_in_primaryExpression511);
                     node48=node();
                     _fsp--;
                     if (failed) return retval;
@@ -1418,15 +1415,15 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 111:25: -> ^( EXPRESSION startNode ( node )? )
+            // 100:25: -> ^( EXPRESSION startNode ( node )? )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:28: ^( EXPRESSION startNode ( node )? )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100: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:111:51: ( node )?
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:100:51: ( node )?
                 if ( stream_node.hasNext() ) {
                     adaptor.addChild(root_1, stream_node.next());
 
@@ -1453,7 +1450,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -1466,7 +1463,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:113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );
     public final startNode_return startNode() throws RecognitionException {
         startNode_return retval = new startNode_return();
         retval.start = input.LT(1);
@@ -1510,7 +1507,7 @@ public class SpringExpressionsParser extends Parser {
 
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:5: ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:103:5: ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda )
             int alt15=17;
             switch ( input.LA(1) ) {
             case LPAREN:
@@ -1529,7 +1526,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 23, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 23, input);
 
                         throw nvae;
                     }
@@ -1548,7 +1545,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 24, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 24, input);
 
                         throw nvae;
                     }
@@ -1567,7 +1564,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 25, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 25, input);
 
                         throw nvae;
                     }
@@ -1586,7 +1583,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 26, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 26, input);
 
                         throw nvae;
                     }
@@ -1605,7 +1602,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 27, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 27, input);
 
                         throw nvae;
                     }
@@ -1624,7 +1621,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 28, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 28, input);
 
                         throw nvae;
                     }
@@ -1643,7 +1640,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 29, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 29, input);
 
                         throw nvae;
                     }
@@ -1662,7 +1659,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 30, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 30, input);
 
                         throw nvae;
                     }
@@ -1681,7 +1678,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 31, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 31, input);
 
                         throw nvae;
                     }
@@ -1700,7 +1697,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 32, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 32, input);
 
                         throw nvae;
                     }
@@ -1719,7 +1716,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 33, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 33, input);
 
                         throw nvae;
                     }
@@ -1738,7 +1735,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 34, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 34, input);
 
                         throw nvae;
                     }
@@ -1758,7 +1755,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 35, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 35, input);
 
                         throw nvae;
                     }
@@ -1777,7 +1774,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 36, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 36, input);
 
                         throw nvae;
                     }
@@ -1796,7 +1793,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 37, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 37, input);
 
                         throw nvae;
                     }
@@ -1815,7 +1812,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 38, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 38, input);
 
                         throw nvae;
                     }
@@ -1834,7 +1831,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 39, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 39, input);
 
                         throw nvae;
                     }
@@ -1853,7 +1850,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 40, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 40, input);
 
                         throw nvae;
                     }
@@ -1872,7 +1869,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 41, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 41, input);
 
                         throw nvae;
                     }
@@ -1891,7 +1888,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 42, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 42, input);
 
                         throw nvae;
                     }
@@ -1910,7 +1907,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 43, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 43, input);
 
                         throw nvae;
                     }
@@ -1929,7 +1926,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 44, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 44, input);
 
                         throw nvae;
                     }
@@ -1948,7 +1945,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 45, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 45, input);
 
                         throw nvae;
                     }
@@ -1967,7 +1964,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 46, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 46, input);
 
                         throw nvae;
                     }
@@ -1986,7 +1983,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 47, input);
+                            new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 47, input);
 
                         throw nvae;
                     }
@@ -1995,7 +1992,7 @@ public class SpringExpressionsParser extends Parser {
                 default:
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 1, input);
+                        new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 1, input);
 
                     throw nvae;
                 }
@@ -2020,7 +2017,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 3, input);
+                        new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 3, input);
 
                     throw nvae;
                 }
@@ -2097,18 +2094,18 @@ public class SpringExpressionsParser extends Parser {
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("113:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 15, 0, input);
+                    new NoViableAltException("102:1: startNode : ( ( LPAREN expression SEMI )=> exprList | parenExpr | methodOrProperty | functionOrVar | localFunctionOrVar | reference | indexer | literal | type | constructor | projection | selection | firstSelection | lastSelection | listInitializer | mapInitializer | lambda );", 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:115:5: ( LPAREN expression SEMI )=> exprList
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:5: ( LPAREN expression SEMI )=> exprList
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_exprList_in_startNode568);
+                    pushFollow(FOLLOW_exprList_in_startNode554);
                     exprList49=exprList();
                     _fsp--;
                     if (failed) return retval;
@@ -2117,11 +2114,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:116:7: parenExpr
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:105:7: parenExpr
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_parenExpr_in_startNode577);
+                    pushFollow(FOLLOW_parenExpr_in_startNode563);
                     parenExpr50=parenExpr();
                     _fsp--;
                     if (failed) return retval;
@@ -2130,11 +2127,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:117:7: methodOrProperty
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:106:7: methodOrProperty
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_methodOrProperty_in_startNode585);
+                    pushFollow(FOLLOW_methodOrProperty_in_startNode571);
                     methodOrProperty51=methodOrProperty();
                     _fsp--;
                     if (failed) return retval;
@@ -2143,11 +2140,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:118:7: functionOrVar
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:107:7: functionOrVar
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_functionOrVar_in_startNode594);
+                    pushFollow(FOLLOW_functionOrVar_in_startNode580);
                     functionOrVar52=functionOrVar();
                     _fsp--;
                     if (failed) return retval;
@@ -2156,11 +2153,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:119:7: localFunctionOrVar
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:108:7: localFunctionOrVar
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_localFunctionOrVar_in_startNode602);
+                    pushFollow(FOLLOW_localFunctionOrVar_in_startNode588);
                     localFunctionOrVar53=localFunctionOrVar();
                     _fsp--;
                     if (failed) return retval;
@@ -2169,11 +2166,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:120:7: reference
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:109:7: reference
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_reference_in_startNode610);
+                    pushFollow(FOLLOW_reference_in_startNode596);
                     reference54=reference();
                     _fsp--;
                     if (failed) return retval;
@@ -2182,11 +2179,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:121:7: indexer
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:110:7: indexer
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_indexer_in_startNode618);
+                    pushFollow(FOLLOW_indexer_in_startNode604);
                     indexer55=indexer();
                     _fsp--;
                     if (failed) return retval;
@@ -2195,11 +2192,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:122:7: literal
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:111:7: literal
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_literal_in_startNode626);
+                    pushFollow(FOLLOW_literal_in_startNode612);
                     literal56=literal();
                     _fsp--;
                     if (failed) return retval;
@@ -2208,11 +2205,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:123:7: type
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:112:7: type
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_type_in_startNode634);
+                    pushFollow(FOLLOW_type_in_startNode620);
                     type57=type();
                     _fsp--;
                     if (failed) return retval;
@@ -2221,11 +2218,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:124:7: constructor
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:113:7: constructor
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_constructor_in_startNode642);
+                    pushFollow(FOLLOW_constructor_in_startNode628);
                     constructor58=constructor();
                     _fsp--;
                     if (failed) return retval;
@@ -2234,11 +2231,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 11 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:7: projection
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:114:7: projection
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_projection_in_startNode650);
+                    pushFollow(FOLLOW_projection_in_startNode636);
                     projection59=projection();
                     _fsp--;
                     if (failed) return retval;
@@ -2247,11 +2244,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 12 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:126:7: selection
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:7: selection
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_selection_in_startNode659);
+                    pushFollow(FOLLOW_selection_in_startNode645);
                     selection60=selection();
                     _fsp--;
                     if (failed) return retval;
@@ -2260,11 +2257,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 13 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:127:7: firstSelection
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:116:7: firstSelection
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_firstSelection_in_startNode668);
+                    pushFollow(FOLLOW_firstSelection_in_startNode654);
                     firstSelection61=firstSelection();
                     _fsp--;
                     if (failed) return retval;
@@ -2273,11 +2270,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 14 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:7: lastSelection
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:117:7: lastSelection
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_lastSelection_in_startNode676);
+                    pushFollow(FOLLOW_lastSelection_in_startNode662);
                     lastSelection62=lastSelection();
                     _fsp--;
                     if (failed) return retval;
@@ -2286,11 +2283,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 15 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:7: listInitializer
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:118:7: listInitializer
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_listInitializer_in_startNode684);
+                    pushFollow(FOLLOW_listInitializer_in_startNode670);
                     listInitializer63=listInitializer();
                     _fsp--;
                     if (failed) return retval;
@@ -2299,11 +2296,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 16 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:7: mapInitializer
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:119:7: mapInitializer
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_mapInitializer_in_startNode692);
+                    pushFollow(FOLLOW_mapInitializer_in_startNode678);
                     mapInitializer64=mapInitializer();
                     _fsp--;
                     if (failed) return retval;
@@ -2312,11 +2309,11 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 17 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:7: lambda
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:120:7: lambda
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_lambda_in_startNode700);
+                    pushFollow(FOLLOW_lambda_in_startNode686);
                     lambda65=lambda();
                     _fsp--;
                     if (failed) return retval;
@@ -2337,7 +2334,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2350,7 +2347,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start node
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:1: node : ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+ ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:1: node : ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+ ;
     public final node_return node() throws RecognitionException {
         node_return retval = new node_return();
         retval.start = input.LT(1);
@@ -2378,12 +2375,12 @@ public class SpringExpressionsParser extends Parser {
         Object DOT74_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:135:5: ( ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+ )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:2: ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:124:5: ( ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+ )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:2: ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+
             {
             root_0 = (Object)adaptor.nil();
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:2: ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:2: ( methodOrProperty | functionOrVar | indexer | projection | selection | firstSelection | lastSelection | exprList | DOT )+
             int cnt16=0;
             loop16:
             do {
@@ -2439,9 +2436,9 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt16) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:136:4: methodOrProperty
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:125:4: methodOrProperty
             	    {
-            	    pushFollow(FOLLOW_methodOrProperty_in_node721);
+            	    pushFollow(FOLLOW_methodOrProperty_in_node707);
             	    methodOrProperty66=methodOrProperty();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2450,9 +2447,9 @@ public class SpringExpressionsParser extends Parser {
             	    }
             	    break;
             	case 2 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:137:4: functionOrVar
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:126:4: functionOrVar
             	    {
-            	    pushFollow(FOLLOW_functionOrVar_in_node727);
+            	    pushFollow(FOLLOW_functionOrVar_in_node713);
             	    functionOrVar67=functionOrVar();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2461,9 +2458,9 @@ public class SpringExpressionsParser extends Parser {
             	    }
             	    break;
             	case 3 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138:7: indexer
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:127:7: indexer
             	    {
-            	    pushFollow(FOLLOW_indexer_in_node735);
+            	    pushFollow(FOLLOW_indexer_in_node721);
             	    indexer68=indexer();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2472,9 +2469,9 @@ public class SpringExpressionsParser extends Parser {
             	    }
             	    break;
             	case 4 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:7: projection
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:128:7: projection
             	    {
-            	    pushFollow(FOLLOW_projection_in_node743);
+            	    pushFollow(FOLLOW_projection_in_node729);
             	    projection69=projection();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2483,9 +2480,9 @@ public class SpringExpressionsParser extends Parser {
             	    }
             	    break;
             	case 5 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:140:7: selection
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:129:7: selection
             	    {
-            	    pushFollow(FOLLOW_selection_in_node752);
+            	    pushFollow(FOLLOW_selection_in_node738);
             	    selection70=selection();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2494,9 +2491,9 @@ public class SpringExpressionsParser extends Parser {
             	    }
             	    break;
             	case 6 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:141:7: firstSelection
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:130:7: firstSelection
             	    {
-            	    pushFollow(FOLLOW_firstSelection_in_node761);
+            	    pushFollow(FOLLOW_firstSelection_in_node747);
             	    firstSelection71=firstSelection();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2505,9 +2502,9 @@ 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:142:7: lastSelection
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:131:7: lastSelection
             	    {
-            	    pushFollow(FOLLOW_lastSelection_in_node770);
+            	    pushFollow(FOLLOW_lastSelection_in_node756);
             	    lastSelection72=lastSelection();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2516,9 +2513,9 @@ 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:143:7: exprList
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:132:7: exprList
             	    {
-            	    pushFollow(FOLLOW_exprList_in_node779);
+            	    pushFollow(FOLLOW_exprList_in_node765);
             	    exprList73=exprList();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2527,10 +2524,10 @@ 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:144:7: DOT
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:133:7: DOT
             	    {
             	    DOT74=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_node787); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_node773); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    DOT74_tree = (Object)adaptor.create(DOT74);
             	    adaptor.addChild(root_0, DOT74_tree);
@@ -2563,7 +2560,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2576,7 +2573,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start functionOrVar
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148: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:137: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);
@@ -2590,7 +2587,7 @@ public class SpringExpressionsParser extends Parser {
 
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149: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:138:5: ( ( POUND ID LPAREN )=> function | var )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2609,7 +2606,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("148:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 17, 2, input);
+                            new NoViableAltException("137:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 17, 2, input);
 
                         throw nvae;
                     }
@@ -2617,7 +2614,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("148:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 17, 1, input);
+                        new NoViableAltException("137:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 17, 1, input);
 
                     throw nvae;
                 }
@@ -2625,17 +2622,17 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("148:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 17, 0, input);
+                    new NoViableAltException("137:1: functionOrVar : ( ( POUND ID LPAREN )=> function | var );", 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:149:7: ( POUND ID LPAREN )=> function
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138:7: ( POUND ID LPAREN )=> function
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_function_in_functionOrVar820);
+                    pushFollow(FOLLOW_function_in_functionOrVar806);
                     function75=function();
                     _fsp--;
                     if (failed) return retval;
@@ -2644,11 +2641,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:150:7: var
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:139:7: var
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_var_in_functionOrVar828);
+                    pushFollow(FOLLOW_var_in_functionOrVar814);
                     var76=var();
                     _fsp--;
                     if (failed) return retval;
@@ -2669,7 +2666,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2682,7 +2679,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:153: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:142: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);
@@ -2700,18 +2697,18 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153: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:153:12: POUND id= ID methodArgs
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142: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:142:12: POUND id= ID methodArgs
             {
             POUND77=(Token)input.LT(1);
-            match(input,POUND,FOLLOW_POUND_in_function845); if (failed) return retval;
+            match(input,POUND,FOLLOW_POUND_in_function831); if (failed) return retval;
             if ( backtracking==0 ) stream_POUND.add(POUND77);
 
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_function849); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function835); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
-            pushFollow(FOLLOW_methodArgs_in_function851);
+            pushFollow(FOLLOW_methodArgs_in_function837);
             methodArgs78=methodArgs();
             _fsp--;
             if (failed) return retval;
@@ -2728,9 +2725,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 153:35: -> ^( FUNCTIONREF[$id] methodArgs )
+            // 142:35: -> ^( FUNCTIONREF[$id] methodArgs )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:153:38: ^( FUNCTIONREF[$id] methodArgs )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:142:38: ^( FUNCTIONREF[$id] methodArgs )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(FUNCTIONREF, id), root_1);
@@ -2757,7 +2754,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2770,7 +2767,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:155: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:144: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);
@@ -2786,15 +2783,15 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155: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:155:7: POUND id= ID
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:144: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:144:7: POUND id= ID
             {
             POUND79=(Token)input.LT(1);
-            match(input,POUND,FOLLOW_POUND_in_var872); if (failed) return retval;
+            match(input,POUND,FOLLOW_POUND_in_var858); if (failed) return retval;
             if ( backtracking==0 ) stream_POUND.add(POUND79);
 
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_var876); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_var862); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
 
@@ -2809,9 +2806,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 155:19: -> ^( VARIABLEREF[$id] )
+            // 144:19: -> ^( VARIABLEREF[$id] )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:22: ^( VARIABLEREF[$id] )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:144:22: ^( VARIABLEREF[$id] )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VARIABLEREF, id), root_1);
@@ -2836,7 +2833,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2849,7 +2846,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start localFunctionOrVar
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:157:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:146:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );
     public final localFunctionOrVar_return localFunctionOrVar() throws RecognitionException {
         localFunctionOrVar_return retval = new localFunctionOrVar_return();
         retval.start = input.LT(1);
@@ -2863,7 +2860,7 @@ public class SpringExpressionsParser extends Parser {
 
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:2: ( ( DOLLAR ID LPAREN )=> localFunction | localVar )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:147:2: ( ( DOLLAR ID LPAREN )=> localFunction | localVar )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2882,7 +2879,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("157:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 2, input);
+                            new NoViableAltException("146:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 2, input);
 
                         throw nvae;
                     }
@@ -2890,7 +2887,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("157:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 1, input);
+                        new NoViableAltException("146:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 1, input);
 
                     throw nvae;
                 }
@@ -2898,17 +2895,17 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("157:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 0, input);
+                    new NoViableAltException("146:1: localFunctionOrVar : ( ( DOLLAR ID LPAREN )=> localFunction | localVar );", 18, 0, input);
 
                 throw nvae;
             }
             switch (alt18) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:4: ( DOLLAR ID LPAREN )=> localFunction
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:147:4: ( DOLLAR ID LPAREN )=> localFunction
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_localFunction_in_localFunctionOrVar903);
+                    pushFollow(FOLLOW_localFunction_in_localFunctionOrVar889);
                     localFunction80=localFunction();
                     _fsp--;
                     if (failed) return retval;
@@ -2917,11 +2914,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:159:4: localVar
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:148:4: localVar
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_localVar_in_localFunctionOrVar908);
+                    pushFollow(FOLLOW_localVar_in_localFunctionOrVar894);
                     localVar81=localVar();
                     _fsp--;
                     if (failed) return retval;
@@ -2942,7 +2939,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -2955,7 +2952,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start localFunction
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:1: localFunction : DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:1: localFunction : DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) ;
     public final localFunction_return localFunction() throws RecognitionException {
         localFunction_return retval = new localFunction_return();
         retval.start = input.LT(1);
@@ -2973,18 +2970,18 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:15: ( DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:17: DOLLAR id= ID methodArgs
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:15: ( DOLLAR id= ID methodArgs -> ^( LOCALFUNC[$id] methodArgs ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:17: DOLLAR id= ID methodArgs
             {
             DOLLAR82=(Token)input.LT(1);
-            match(input,DOLLAR,FOLLOW_DOLLAR_in_localFunction918); if (failed) return retval;
+            match(input,DOLLAR,FOLLOW_DOLLAR_in_localFunction904); if (failed) return retval;
             if ( backtracking==0 ) stream_DOLLAR.add(DOLLAR82);
 
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_localFunction922); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_localFunction908); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
-            pushFollow(FOLLOW_methodArgs_in_localFunction924);
+            pushFollow(FOLLOW_methodArgs_in_localFunction910);
             methodArgs83=methodArgs();
             _fsp--;
             if (failed) return retval;
@@ -3001,9 +2998,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 162:41: -> ^( LOCALFUNC[$id] methodArgs )
+            // 151:41: -> ^( LOCALFUNC[$id] methodArgs )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:44: ^( LOCALFUNC[$id] methodArgs )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:151:44: ^( LOCALFUNC[$id] methodArgs )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(LOCALFUNC, id), root_1);
@@ -3030,7 +3027,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3043,7 +3040,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start localVar
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:1: localVar : DOLLAR id= ID -> ^( LOCALVAR[$id] ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:1: localVar : DOLLAR id= ID -> ^( LOCALVAR[$id] ) ;
     public final localVar_return localVar() throws RecognitionException {
         localVar_return retval = new localVar_return();
         retval.start = input.LT(1);
@@ -3059,15 +3056,15 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:9: ( DOLLAR id= ID -> ^( LOCALVAR[$id] ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:11: DOLLAR id= ID
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:9: ( DOLLAR id= ID -> ^( LOCALVAR[$id] ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:11: DOLLAR id= ID
             {
             DOLLAR84=(Token)input.LT(1);
-            match(input,DOLLAR,FOLLOW_DOLLAR_in_localVar939); if (failed) return retval;
+            match(input,DOLLAR,FOLLOW_DOLLAR_in_localVar925); if (failed) return retval;
             if ( backtracking==0 ) stream_DOLLAR.add(DOLLAR84);
 
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_localVar943); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_localVar929); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
 
@@ -3082,9 +3079,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 163:24: -> ^( LOCALVAR[$id] )
+            // 152:24: -> ^( LOCALVAR[$id] )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:163:27: ^( LOCALVAR[$id] )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:152:27: ^( LOCALVAR[$id] )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(LOCALVAR, id), root_1);
@@ -3109,7 +3106,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3122,7 +3119,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:165: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:154: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);
@@ -3139,7 +3136,7 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_methodArgs=new RewriteRuleSubtreeStream(adaptor,"rule methodArgs");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166: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:155:2: ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -3158,7 +3155,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("165:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 2, input);
+                            new NoViableAltException("154:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 2, input);
 
                         throw nvae;
                     }
@@ -3169,7 +3166,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("165:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 1, input);
+                        new NoViableAltException("154:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 1, input);
 
                     throw nvae;
                 }
@@ -3177,19 +3174,19 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("165:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 0, input);
+                    new NoViableAltException("154:1: methodOrProperty : ( ( ID LPAREN )=>id= ID methodArgs -> ^( METHOD[$id] methodArgs ) | property );", 19, 0, input);
 
                 throw nvae;
             }
             switch (alt19) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166: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:155:4: ( ID LPAREN )=>id= ID methodArgs
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_methodOrProperty969); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_methodOrProperty955); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
-                    pushFollow(FOLLOW_methodArgs_in_methodOrProperty971);
+                    pushFollow(FOLLOW_methodArgs_in_methodOrProperty957);
                     methodArgs85=methodArgs();
                     _fsp--;
                     if (failed) return retval;
@@ -3206,9 +3203,9 @@ public class SpringExpressionsParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 166:36: -> ^( METHOD[$id] methodArgs )
+                    // 155:36: -> ^( METHOD[$id] methodArgs )
                     {
-                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:39: ^( METHOD[$id] methodArgs )
+                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:39: ^( METHOD[$id] methodArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(METHOD, id), root_1);
@@ -3225,11 +3222,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:167:4: property
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:156:4: property
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_property_in_methodOrProperty985);
+                    pushFollow(FOLLOW_property_in_methodOrProperty971);
                     property86=property();
                     _fsp--;
                     if (failed) return retval;
@@ -3250,7 +3247,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3263,7 +3260,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start methodArgs
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173: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:162: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);
@@ -3285,14 +3282,14 @@ public class SpringExpressionsParser extends Parser {
         Object RPAREN92_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173: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:173: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:162: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:162:15: LPAREN ( argument ( COMMA argument )* ( COMMA )? )? RPAREN
             {
             root_0 = (Object)adaptor.nil();
 
             LPAREN87=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs1000); if (failed) return retval;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:23: ( argument ( COMMA argument )* ( COMMA )? )?
+            match(input,LPAREN,FOLLOW_LPAREN_in_methodArgs986); if (failed) return retval;
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:23: ( argument ( COMMA argument )* ( COMMA )? )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -3301,14 +3298,14 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt22) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:24: argument ( COMMA argument )* ( COMMA )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:24: argument ( COMMA argument )* ( COMMA )?
                     {
-                    pushFollow(FOLLOW_argument_in_methodArgs1004);
+                    pushFollow(FOLLOW_argument_in_methodArgs990);
                     argument88=argument();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) adaptor.addChild(root_0, argument88.getTree());
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:33: ( COMMA argument )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:33: ( COMMA argument )*
                     loop20:
                     do {
                         int alt20=2;
@@ -3327,11 +3324,11 @@ public class SpringExpressionsParser extends Parser {
 
                         switch (alt20) {
                     	case 1 :
-                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:173:34: COMMA argument
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:34: COMMA argument
                     	    {
                     	    COMMA89=(Token)input.LT(1);
-                    	    match(input,COMMA,FOLLOW_COMMA_in_methodArgs1007); if (failed) return retval;
-                    	    pushFollow(FOLLOW_argument_in_methodArgs1010);
+                    	    match(input,COMMA,FOLLOW_COMMA_in_methodArgs993); if (failed) return retval;
+                    	    pushFollow(FOLLOW_argument_in_methodArgs996);
                     	    argument90=argument();
                     	    _fsp--;
                     	    if (failed) return retval;
@@ -3345,7 +3342,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:173:52: ( COMMA )?
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:52: ( COMMA )?
                     int alt21=2;
                     int LA21_0 = input.LA(1);
 
@@ -3354,10 +3351,10 @@ 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:173:53: COMMA
+                            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:162:53: COMMA
                             {
                             COMMA91=(Token)input.LT(1);
-                            match(input,COMMA,FOLLOW_COMMA_in_methodArgs1015); if (failed) return retval;
+                            match(input,COMMA,FOLLOW_COMMA_in_methodArgs1001); if (failed) return retval;
 
                             }
                             break;
@@ -3371,7 +3368,7 @@ public class SpringExpressionsParser extends Parser {
             }
 
             RPAREN92=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs1022); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_methodArgs1008); if (failed) return retval;
 
             }
 
@@ -3386,7 +3383,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3399,7 +3396,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:178: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:167: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);
@@ -3412,11 +3409,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:178: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:178:11: id= ID
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167: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:167:11: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_property1035); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_property1021); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
 
@@ -3431,9 +3428,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 178:17: -> ^( PROPERTY_OR_FIELD[$id] )
+            // 167:17: -> ^( PROPERTY_OR_FIELD[$id] )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:178:20: ^( PROPERTY_OR_FIELD[$id] )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:167:20: ^( PROPERTY_OR_FIELD[$id] )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(PROPERTY_OR_FIELD, id), root_1);
@@ -3458,7 +3455,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3471,7 +3468,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start reference
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:185:1: reference : AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:174:1: reference : AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) ;
     public final reference_return reference() throws RecognitionException {
         reference_return retval = new reference_return();
         retval.start = input.LT(1);
@@ -3498,18 +3495,18 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleSubtreeStream stream_contextName=new RewriteRuleSubtreeStream(adaptor,"rule contextName");
         RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:2: ( AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:5: AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:2: ( AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:5: AT pos= LPAREN (cn= contextName COLON )? (q= qualifiedId )? RPAREN
             {
             AT93=(Token)input.LT(1);
-            match(input,AT,FOLLOW_AT_in_reference1057); if (failed) return retval;
+            match(input,AT,FOLLOW_AT_in_reference1043); if (failed) return retval;
             if ( backtracking==0 ) stream_AT.add(AT93);
 
             pos=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_reference1061); if (failed) return retval;
+            match(input,LPAREN,FOLLOW_LPAREN_in_reference1047); if (failed) return retval;
             if ( backtracking==0 ) stream_LPAREN.add(pos);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:19: (cn= contextName COLON )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:19: (cn= contextName COLON )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3522,15 +3519,15 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt23) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:20: cn= contextName COLON
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:20: cn= contextName COLON
                     {
-                    pushFollow(FOLLOW_contextName_in_reference1066);
+                    pushFollow(FOLLOW_contextName_in_reference1052);
                     cn=contextName();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_contextName.add(cn.getTree());
                     COLON94=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_reference1068); if (failed) return retval;
+                    match(input,COLON,FOLLOW_COLON_in_reference1054); if (failed) return retval;
                     if ( backtracking==0 ) stream_COLON.add(COLON94);
 
 
@@ -3539,7 +3536,7 @@ public class SpringExpressionsParser extends Parser {
 
             }
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:43: (q= qualifiedId )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:43: (q= qualifiedId )?
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -3548,9 +3545,9 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt24) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:186:44: q= qualifiedId
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:175:44: q= qualifiedId
                     {
-                    pushFollow(FOLLOW_qualifiedId_in_reference1075);
+                    pushFollow(FOLLOW_qualifiedId_in_reference1061);
                     q=qualifiedId();
                     _fsp--;
                     if (failed) return retval;
@@ -3562,12 +3559,12 @@ public class SpringExpressionsParser extends Parser {
             }
 
             RPAREN95=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_reference1079); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_reference1065); if (failed) return retval;
             if ( backtracking==0 ) stream_RPAREN.add(RPAREN95);
 
 
             // AST REWRITE
-            // elements: RPAREN, q, COLON, cn
+            // elements: q, cn, COLON, RPAREN
             // token labels: 
             // rule labels: cn, retval, q
             // token list labels: 
@@ -3579,22 +3576,22 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_q=new RewriteRuleSubtreeStream(adaptor,"token q",q!=null?q.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 187:4: -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN )
+            // 176:4: -> ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:7: ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:176:7: ^( REFERENCE[$pos] ( $cn COLON )? ( $q)? RPAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(REFERENCE, pos), root_1);
 
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:25: ( $cn COLON )?
-                if ( stream_COLON.hasNext()||stream_cn.hasNext() ) {
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:176:25: ( $cn COLON )?
+                if ( stream_cn.hasNext()||stream_COLON.hasNext() ) {
                     adaptor.addChild(root_1, stream_cn.next());
                     adaptor.addChild(root_1, stream_COLON.next());
 
                 }
-                stream_COLON.reset();
                 stream_cn.reset();
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:38: ( $q)?
+                stream_COLON.reset();
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:176:38: ( $q)?
                 if ( stream_q.hasNext() ) {
                     adaptor.addChild(root_1, stream_q.next());
 
@@ -3622,7 +3619,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3635,7 +3632,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start indexer
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193: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:182: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);
@@ -3658,19 +3655,19 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET");
         RewriteRuleSubtreeStream stream_argument=new RewriteRuleSubtreeStream(adaptor,"rule argument");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193: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:193: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:182: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:182:10: LBRACKET r1= argument ( COMMA r2= argument )* RBRACKET
             {
             LBRACKET96=(Token)input.LT(1);
-            match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer1114); if (failed) return retval;
+            match(input,LBRACKET,FOLLOW_LBRACKET_in_indexer1100); if (failed) return retval;
             if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET96);
 
-            pushFollow(FOLLOW_argument_in_indexer1118);
+            pushFollow(FOLLOW_argument_in_indexer1104);
             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:193:31: ( COMMA r2= argument )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:31: ( COMMA r2= argument )*
             loop25:
             do {
                 int alt25=2;
@@ -3683,13 +3680,13 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt25) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:32: COMMA r2= argument
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:32: COMMA r2= argument
             	    {
             	    COMMA97=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_indexer1121); if (failed) return retval;
+            	    match(input,COMMA,FOLLOW_COMMA_in_indexer1107); if (failed) return retval;
             	    if ( backtracking==0 ) stream_COMMA.add(COMMA97);
 
-            	    pushFollow(FOLLOW_argument_in_indexer1125);
+            	    pushFollow(FOLLOW_argument_in_indexer1111);
             	    r2=argument();
             	    _fsp--;
             	    if (failed) return retval;
@@ -3704,12 +3701,12 @@ public class SpringExpressionsParser extends Parser {
             } while (true);
 
             RBRACKET98=(Token)input.LT(1);
-            match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer1129); if (failed) return retval;
+            match(input,RBRACKET,FOLLOW_RBRACKET_in_indexer1115); if (failed) return retval;
             if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET98);
 
 
             // AST REWRITE
-            // elements: r2, r1
+            // elements: r1, r2
             // token labels: 
             // rule labels: r2, retval, r1
             // token list labels: 
@@ -3721,15 +3718,15 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_r1=new RewriteRuleSubtreeStream(adaptor,"token r1",r1!=null?r1.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 193:61: -> ^( INDEXER $r1 ( $r2)* )
+            // 182:61: -> ^( INDEXER $r1 ( $r2)* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:64: ^( INDEXER $r1 ( $r2)* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182: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:193:78: ( $r2)*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:182:78: ( $r2)*
                 while ( stream_r2.hasNext() ) {
                     adaptor.addChild(root_1, stream_r2.next());
 
@@ -3756,7 +3753,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3769,7 +3766,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start projection
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:1: projection : PROJECT expression RCURLY ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:1: projection : PROJECT expression RCURLY ;
     public final projection_return projection() throws RecognitionException {
         projection_return retval = new projection_return();
         retval.start = input.LT(1);
@@ -3785,24 +3782,24 @@ public class SpringExpressionsParser extends Parser {
         Object RCURLY101_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:11: ( PROJECT expression RCURLY )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:198:13: PROJECT expression RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:11: ( PROJECT expression RCURLY )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:187:13: PROJECT expression RCURLY
             {
             root_0 = (Object)adaptor.nil();
 
             PROJECT99=(Token)input.LT(1);
-            match(input,PROJECT,FOLLOW_PROJECT_in_projection1156); if (failed) return retval;
+            match(input,PROJECT,FOLLOW_PROJECT_in_projection1142); if (failed) return retval;
             if ( backtracking==0 ) {
             PROJECT99_tree = (Object)adaptor.create(PROJECT99);
             root_0 = (Object)adaptor.becomeRoot(PROJECT99_tree, root_0);
             }
-            pushFollow(FOLLOW_expression_in_projection1159);
+            pushFollow(FOLLOW_expression_in_projection1145);
             expression100=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, expression100.getTree());
             RCURLY101=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_projection1161); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_projection1147); if (failed) return retval;
 
             }
 
@@ -3817,7 +3814,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3830,7 +3827,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start selection
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:1: selection : SELECT expression RCURLY ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:1: selection : SELECT expression RCURLY ;
     public final selection_return selection() throws RecognitionException {
         selection_return retval = new selection_return();
         retval.start = input.LT(1);
@@ -3846,24 +3843,24 @@ public class SpringExpressionsParser extends Parser {
         Object RCURLY104_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:10: ( SELECT expression RCURLY )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:200:12: SELECT expression RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:10: ( SELECT expression RCURLY )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:189:12: SELECT expression RCURLY
             {
             root_0 = (Object)adaptor.nil();
 
             SELECT102=(Token)input.LT(1);
-            match(input,SELECT,FOLLOW_SELECT_in_selection1169); if (failed) return retval;
+            match(input,SELECT,FOLLOW_SELECT_in_selection1155); if (failed) return retval;
             if ( backtracking==0 ) {
             SELECT102_tree = (Object)adaptor.create(SELECT102);
             root_0 = (Object)adaptor.becomeRoot(SELECT102_tree, root_0);
             }
-            pushFollow(FOLLOW_expression_in_selection1172);
+            pushFollow(FOLLOW_expression_in_selection1158);
             expression103=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, expression103.getTree());
             RCURLY104=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_selection1174); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_selection1160); if (failed) return retval;
 
             }
 
@@ -3878,7 +3875,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3891,7 +3888,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start firstSelection
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202: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:191:1: firstSelection : SELECT_FIRST expression RCURLY ;
     public final firstSelection_return firstSelection() throws RecognitionException {
         firstSelection_return retval = new firstSelection_return();
         retval.start = input.LT(1);
@@ -3907,24 +3904,24 @@ public class SpringExpressionsParser extends Parser {
         Object RCURLY107_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202:15: ( SELECT_FIRST expression RCURLY )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:202:17: SELECT_FIRST expression RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:15: ( SELECT_FIRST expression RCURLY )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:191:17: SELECT_FIRST expression RCURLY
             {
             root_0 = (Object)adaptor.nil();
 
             SELECT_FIRST105=(Token)input.LT(1);
-            match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection1182); if (failed) return retval;
+            match(input,SELECT_FIRST,FOLLOW_SELECT_FIRST_in_firstSelection1168); if (failed) return retval;
             if ( backtracking==0 ) {
             SELECT_FIRST105_tree = (Object)adaptor.create(SELECT_FIRST105);
             root_0 = (Object)adaptor.becomeRoot(SELECT_FIRST105_tree, root_0);
             }
-            pushFollow(FOLLOW_expression_in_firstSelection1185);
+            pushFollow(FOLLOW_expression_in_firstSelection1171);
             expression106=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, expression106.getTree());
             RCURLY107=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection1187); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_firstSelection1173); if (failed) return retval;
 
             }
 
@@ -3939,7 +3936,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -3952,7 +3949,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start lastSelection
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204: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:193:1: lastSelection : SELECT_LAST expression RCURLY ;
     public final lastSelection_return lastSelection() throws RecognitionException {
         lastSelection_return retval = new lastSelection_return();
         retval.start = input.LT(1);
@@ -3968,24 +3965,24 @@ public class SpringExpressionsParser extends Parser {
         Object RCURLY110_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:14: ( SELECT_LAST expression RCURLY )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:16: SELECT_LAST expression RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:14: ( SELECT_LAST expression RCURLY )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:193:16: SELECT_LAST expression RCURLY
             {
             root_0 = (Object)adaptor.nil();
 
             SELECT_LAST108=(Token)input.LT(1);
-            match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection1195); if (failed) return retval;
+            match(input,SELECT_LAST,FOLLOW_SELECT_LAST_in_lastSelection1181); if (failed) return retval;
             if ( backtracking==0 ) {
             SELECT_LAST108_tree = (Object)adaptor.create(SELECT_LAST108);
             root_0 = (Object)adaptor.becomeRoot(SELECT_LAST108_tree, root_0);
             }
-            pushFollow(FOLLOW_expression_in_lastSelection1198);
+            pushFollow(FOLLOW_expression_in_lastSelection1184);
             expression109=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) adaptor.addChild(root_0, expression109.getTree());
             RCURLY110=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection1200); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_lastSelection1186); if (failed) return retval;
 
             }
 
@@ -4000,7 +3997,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4013,7 +4010,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start type
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207: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:196: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);
@@ -4031,20 +4028,20 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_TYPE=new RewriteRuleTokenStream(adaptor,"token TYPE");
         RewriteRuleSubtreeStream stream_qualifiedId=new RewriteRuleSubtreeStream(adaptor,"rule qualifiedId");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207: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:207:7: TYPE qualifiedId RPAREN
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196: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:196:7: TYPE qualifiedId RPAREN
             {
             TYPE111=(Token)input.LT(1);
-            match(input,TYPE,FOLLOW_TYPE_in_type1209); if (failed) return retval;
+            match(input,TYPE,FOLLOW_TYPE_in_type1195); if (failed) return retval;
             if ( backtracking==0 ) stream_TYPE.add(TYPE111);
 
-            pushFollow(FOLLOW_qualifiedId_in_type1211);
+            pushFollow(FOLLOW_qualifiedId_in_type1197);
             qualifiedId112=qualifiedId();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId112.getTree());
             RPAREN113=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_type1213); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_type1199); if (failed) return retval;
             if ( backtracking==0 ) stream_RPAREN.add(RPAREN113);
 
 
@@ -4059,9 +4056,9 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 207:31: -> ^( TYPEREF qualifiedId )
+            // 196:31: -> ^( TYPEREF qualifiedId )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:34: ^( TYPEREF qualifiedId )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:196:34: ^( TYPEREF qualifiedId )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(TYPEREF, "TYPEREF"), root_1);
@@ -4088,7 +4085,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4101,7 +4098,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start lambda
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:1: lambda : LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:204:1: lambda : LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) ;
     public final lambda_return lambda() throws RecognitionException {
         lambda_return retval = new lambda_return();
         retval.start = input.LT(1);
@@ -4125,14 +4122,14 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleSubtreeStream stream_argList=new RewriteRuleSubtreeStream(adaptor,"rule argList");
         RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:4: ( LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:8: LAMBDA ( argList )? PIPE expression RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:4: ( LAMBDA ( argList )? PIPE expression RCURLY -> ^( LAMBDA ( argList )? expression ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:8: LAMBDA ( argList )? PIPE expression RCURLY
             {
             LAMBDA114=(Token)input.LT(1);
-            match(input,LAMBDA,FOLLOW_LAMBDA_in_lambda1240); if (failed) return retval;
+            match(input,LAMBDA,FOLLOW_LAMBDA_in_lambda1226); if (failed) return retval;
             if ( backtracking==0 ) stream_LAMBDA.add(LAMBDA114);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:15: ( argList )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:15: ( argList )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -4141,9 +4138,9 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt26) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:16: argList
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:16: argList
                     {
-                    pushFollow(FOLLOW_argList_in_lambda1243);
+                    pushFollow(FOLLOW_argList_in_lambda1229);
                     argList115=argList();
                     _fsp--;
                     if (failed) return retval;
@@ -4155,21 +4152,21 @@ public class SpringExpressionsParser extends Parser {
             }
 
             PIPE116=(Token)input.LT(1);
-            match(input,PIPE,FOLLOW_PIPE_in_lambda1247); if (failed) return retval;
+            match(input,PIPE,FOLLOW_PIPE_in_lambda1233); if (failed) return retval;
             if ( backtracking==0 ) stream_PIPE.add(PIPE116);
 
-            pushFollow(FOLLOW_expression_in_lambda1249);
+            pushFollow(FOLLOW_expression_in_lambda1235);
             expression117=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_expression.add(expression117.getTree());
             RCURLY118=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_lambda1251); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_lambda1237); if (failed) return retval;
             if ( backtracking==0 ) stream_RCURLY.add(RCURLY118);
 
 
             // AST REWRITE
-            // elements: argList, expression, LAMBDA
+            // elements: LAMBDA, argList, expression
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4179,14 +4176,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 216:49: -> ^( LAMBDA ( argList )? expression )
+            // 205:49: -> ^( LAMBDA ( argList )? expression )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:52: ^( LAMBDA ( argList )? expression )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:52: ^( LAMBDA ( argList )? expression )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_LAMBDA.next(), root_1);
 
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:61: ( argList )?
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:205:61: ( argList )?
                 if ( stream_argList.hasNext() ) {
                     adaptor.addChild(root_1, stream_argList.next());
 
@@ -4214,7 +4211,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4227,7 +4224,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start argList
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:1: argList : (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:1: argList : (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) ;
     public final argList_return argList() throws RecognitionException {
         argList_return retval = new argList_return();
         retval.start = input.LT(1);
@@ -4244,20 +4241,20 @@ 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:218:9: ( (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:11: (id+= ID ( COMMA id+= ID )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:9: ( (id+= ID ( COMMA id+= ID )* ) -> ^( ARGLIST ( $id)* ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:11: (id+= ID ( COMMA id+= ID )* )
             {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:11: (id+= ID ( COMMA id+= ID )* )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:12: id+= ID ( COMMA id+= ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:11: (id+= ID ( COMMA id+= ID )* )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:12: id+= ID ( COMMA id+= ID )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_argList1275); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_argList1261); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:19: ( COMMA id+= ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:19: ( COMMA id+= ID )*
             loop27:
             do {
                 int alt27=2;
@@ -4270,14 +4267,14 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt27) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:20: COMMA id+= ID
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:20: COMMA id+= ID
             	    {
             	    COMMA119=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_argList1278); if (failed) return retval;
+            	    match(input,COMMA,FOLLOW_COMMA_in_argList1264); if (failed) return retval;
             	    if ( backtracking==0 ) stream_COMMA.add(COMMA119);
 
             	    id=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_argList1282); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_argList1268); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -4308,14 +4305,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 218:36: -> ^( ARGLIST ( $id)* )
+            // 207:36: -> ^( ARGLIST ( $id)* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:39: ^( ARGLIST ( $id)* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:39: ^( ARGLIST ( $id)* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(ARGLIST, "ARGLIST"), root_1);
 
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:218:49: ( $id)*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:207:49: ( $id)*
                 while ( stream_id.hasNext() ) {
                     adaptor.addChild(root_1, stream_id.next());
 
@@ -4342,7 +4339,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4355,7 +4352,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start constructor
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220: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:209:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );
     public final constructor_return constructor() throws RecognitionException {
         constructor_return retval = new constructor_return();
         retval.start = input.LT(1);
@@ -4375,7 +4372,7 @@ public class SpringExpressionsParser extends Parser {
         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:221:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:2: ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -4394,7 +4391,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("220:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 2, input);
+                            new NoViableAltException("209:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 2, input);
 
                         throw nvae;
                     }
@@ -4402,7 +4399,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("220:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 1, input);
+                        new NoViableAltException("209:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 1, input);
 
                     throw nvae;
                 }
@@ -4410,31 +4407,31 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("220:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 0, input);
+                    new NoViableAltException("209:1: constructor : ( ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs -> ^( CONSTRUCTOR qualifiedId ctorArgs ) | arrayConstructor );", 28, 0, input);
 
                 throw nvae;
             }
             switch (alt28) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:4: ( 'new' qualifiedId LPAREN )=> 'new' qualifiedId ctorArgs
                     {
                     string_literal120=(Token)input.LT(1);
-                    match(input,94,FOLLOW_94_in_constructor1318); if (failed) return retval;
+                    match(input,94,FOLLOW_94_in_constructor1304); if (failed) return retval;
                     if ( backtracking==0 ) stream_94.add(string_literal120);
 
-                    pushFollow(FOLLOW_qualifiedId_in_constructor1320);
+                    pushFollow(FOLLOW_qualifiedId_in_constructor1306);
                     qualifiedId121=qualifiedId();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId121.getTree());
-                    pushFollow(FOLLOW_ctorArgs_in_constructor1322);
+                    pushFollow(FOLLOW_ctorArgs_in_constructor1308);
                     ctorArgs122=ctorArgs();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_ctorArgs.add(ctorArgs122.getTree());
 
                     // AST REWRITE
-                    // elements: ctorArgs, qualifiedId
+                    // elements: qualifiedId, ctorArgs
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -4444,9 +4441,9 @@ public class SpringExpressionsParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 221:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs )
+                    // 210:61: -> ^( CONSTRUCTOR qualifiedId ctorArgs )
                     {
-                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:64: ^( CONSTRUCTOR qualifiedId ctorArgs )
+                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:64: ^( CONSTRUCTOR qualifiedId ctorArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(CONSTRUCTOR, "CONSTRUCTOR"), root_1);
@@ -4464,11 +4461,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:222:6: arrayConstructor
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:211:6: arrayConstructor
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_arrayConstructor_in_constructor1339);
+                    pushFollow(FOLLOW_arrayConstructor_in_constructor1325);
                     arrayConstructor123=arrayConstructor();
                     _fsp--;
                     if (failed) return retval;
@@ -4489,7 +4486,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4502,7 +4499,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start arrayConstructor
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:225:1: arrayConstructor : 'new' qualifiedId arrayRank ( listInitializer )? -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:214: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);
@@ -4523,24 +4520,24 @@ public class SpringExpressionsParser extends Parser {
         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:226: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:226:4: 'new' qualifiedId arrayRank ( listInitializer )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215: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:215:4: 'new' qualifiedId arrayRank ( listInitializer )?
             {
             string_literal124=(Token)input.LT(1);
-            match(input,94,FOLLOW_94_in_arrayConstructor1350); if (failed) return retval;
+            match(input,94,FOLLOW_94_in_arrayConstructor1336); if (failed) return retval;
             if ( backtracking==0 ) stream_94.add(string_literal124);
 
-            pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1352);
+            pushFollow(FOLLOW_qualifiedId_in_arrayConstructor1338);
             qualifiedId125=qualifiedId();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_qualifiedId.add(qualifiedId125.getTree());
-            pushFollow(FOLLOW_arrayRank_in_arrayConstructor1354);
+            pushFollow(FOLLOW_arrayRank_in_arrayConstructor1340);
             arrayRank126=arrayRank();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_arrayRank.add(arrayRank126.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:32: ( listInitializer )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:32: ( listInitializer )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -4549,9 +4546,9 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt29) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:226:33: listInitializer
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:215:33: listInitializer
                     {
-                    pushFollow(FOLLOW_listInitializer_in_arrayConstructor1357);
+                    pushFollow(FOLLOW_listInitializer_in_arrayConstructor1343);
                     listInitializer127=listInitializer();
                     _fsp--;
                     if (failed) return retval;
@@ -4564,7 +4561,7 @@ public class SpringExpressionsParser extends Parser {
 
 
             // AST REWRITE
-            // elements: qualifiedId, listInitializer, arrayRank
+            // elements: arrayRank, listInitializer, qualifiedId
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4574,16 +4571,16 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 227:4: -> ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? )
+            // 216: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:227:7: ^( CONSTRUCTOR_ARRAY qualifiedId arrayRank ( listInitializer )? )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216: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:227:49: ( listInitializer )?
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:216:49: ( listInitializer )?
                 if ( stream_listInitializer.hasNext() ) {
                     adaptor.addChild(root_1, stream_listInitializer.next());
 
@@ -4610,7 +4607,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4623,7 +4620,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start arrayRank
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:230:1: arrayRank : LBRACKET ( expression ( COMMA expression )* )? RBRACKET -> ^( EXPRESSIONLIST ( expression )* ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:219: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);
@@ -4646,14 +4643,14 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_RBRACKET=new RewriteRuleTokenStream(adaptor,"token RBRACKET");
         RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231: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:231:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220: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:220:7: LBRACKET ( expression ( COMMA expression )* )? RBRACKET
             {
             LBRACKET128=(Token)input.LT(1);
-            match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1392); if (failed) return retval;
+            match(input,LBRACKET,FOLLOW_LBRACKET_in_arrayRank1378); if (failed) return retval;
             if ( backtracking==0 ) stream_LBRACKET.add(LBRACKET128);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:16: ( expression ( COMMA expression )* )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:16: ( expression ( COMMA expression )* )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -4662,14 +4659,14 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt31) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:17: expression ( COMMA expression )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:17: expression ( COMMA expression )*
                     {
-                    pushFollow(FOLLOW_expression_in_arrayRank1395);
+                    pushFollow(FOLLOW_expression_in_arrayRank1381);
                     expression129=expression();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_expression.add(expression129.getTree());
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:28: ( COMMA expression )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:28: ( COMMA expression )*
                     loop30:
                     do {
                         int alt30=2;
@@ -4682,13 +4679,13 @@ public class SpringExpressionsParser extends Parser {
 
                         switch (alt30) {
                     	case 1 :
-                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:29: COMMA expression
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:29: COMMA expression
                     	    {
                     	    COMMA130=(Token)input.LT(1);
-                    	    match(input,COMMA,FOLLOW_COMMA_in_arrayRank1398); if (failed) return retval;
+                    	    match(input,COMMA,FOLLOW_COMMA_in_arrayRank1384); if (failed) return retval;
                     	    if ( backtracking==0 ) stream_COMMA.add(COMMA130);
 
-                    	    pushFollow(FOLLOW_expression_in_arrayRank1400);
+                    	    pushFollow(FOLLOW_expression_in_arrayRank1386);
                     	    expression131=expression();
                     	    _fsp--;
                     	    if (failed) return retval;
@@ -4709,7 +4706,7 @@ public class SpringExpressionsParser extends Parser {
             }
 
             RBRACKET132=(Token)input.LT(1);
-            match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1406); if (failed) return retval;
+            match(input,RBRACKET,FOLLOW_RBRACKET_in_arrayRank1392); if (failed) return retval;
             if ( backtracking==0 ) stream_RBRACKET.add(RBRACKET132);
 
 
@@ -4724,14 +4721,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 231:59: -> ^( EXPRESSIONLIST ( expression )* )
+            // 220:59: -> ^( EXPRESSIONLIST ( expression )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231:62: ^( EXPRESSIONLIST ( expression )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220: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:231:79: ( expression )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:220:79: ( expression )*
                 while ( stream_expression.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression.next());
 
@@ -4758,7 +4755,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4771,7 +4768,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start listInitializer
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:233:1: listInitializer : LCURLY expression ( COMMA expression )* RCURLY -> ^( LIST_INITIALIZER ( expression )* ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:222: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);
@@ -4794,19 +4791,19 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_LCURLY=new RewriteRuleTokenStream(adaptor,"token LCURLY");
         RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234: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:234:7: LCURLY expression ( COMMA expression )* RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223: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:223:7: LCURLY expression ( COMMA expression )* RCURLY
             {
             LCURLY133=(Token)input.LT(1);
-            match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1431); if (failed) return retval;
+            match(input,LCURLY,FOLLOW_LCURLY_in_listInitializer1417); if (failed) return retval;
             if ( backtracking==0 ) stream_LCURLY.add(LCURLY133);
 
-            pushFollow(FOLLOW_expression_in_listInitializer1433);
+            pushFollow(FOLLOW_expression_in_listInitializer1419);
             expression134=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_expression.add(expression134.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:25: ( COMMA expression )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:25: ( COMMA expression )*
             loop32:
             do {
                 int alt32=2;
@@ -4819,13 +4816,13 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt32) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:26: COMMA expression
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:26: COMMA expression
             	    {
             	    COMMA135=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_listInitializer1436); if (failed) return retval;
+            	    match(input,COMMA,FOLLOW_COMMA_in_listInitializer1422); if (failed) return retval;
             	    if ( backtracking==0 ) stream_COMMA.add(COMMA135);
 
-            	    pushFollow(FOLLOW_expression_in_listInitializer1438);
+            	    pushFollow(FOLLOW_expression_in_listInitializer1424);
             	    expression136=expression();
             	    _fsp--;
             	    if (failed) return retval;
@@ -4840,7 +4837,7 @@ public class SpringExpressionsParser extends Parser {
             } while (true);
 
             RCURLY137=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1442); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_listInitializer1428); if (failed) return retval;
             if ( backtracking==0 ) stream_RCURLY.add(RCURLY137);
 
 
@@ -4855,14 +4852,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 234:52: -> ^( LIST_INITIALIZER ( expression )* )
+            // 223:52: -> ^( LIST_INITIALIZER ( expression )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:234:55: ^( LIST_INITIALIZER ( expression )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223: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:234:74: ( expression )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:223:74: ( expression )*
                 while ( stream_expression.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression.next());
 
@@ -4889,7 +4886,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -4902,7 +4899,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start mapInitializer
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:239:1: mapInitializer : POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY -> ^( MAP_INITIALIZER ( mapEntry )* ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:228: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);
@@ -4928,23 +4925,23 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_POUND=new RewriteRuleTokenStream(adaptor,"token POUND");
         RewriteRuleSubtreeStream stream_mapEntry=new RewriteRuleSubtreeStream(adaptor,"rule mapEntry");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240: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:240:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229: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:229:7: POUND LCURLY mapEntry ( COMMA mapEntry )* RCURLY
             {
             POUND138=(Token)input.LT(1);
-            match(input,POUND,FOLLOW_POUND_in_mapInitializer1470); if (failed) return retval;
+            match(input,POUND,FOLLOW_POUND_in_mapInitializer1456); if (failed) return retval;
             if ( backtracking==0 ) stream_POUND.add(POUND138);
 
             LCURLY139=(Token)input.LT(1);
-            match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1472); if (failed) return retval;
+            match(input,LCURLY,FOLLOW_LCURLY_in_mapInitializer1458); if (failed) return retval;
             if ( backtracking==0 ) stream_LCURLY.add(LCURLY139);
 
-            pushFollow(FOLLOW_mapEntry_in_mapInitializer1474);
+            pushFollow(FOLLOW_mapEntry_in_mapInitializer1460);
             mapEntry140=mapEntry();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_mapEntry.add(mapEntry140.getTree());
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:29: ( COMMA mapEntry )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:29: ( COMMA mapEntry )*
             loop33:
             do {
                 int alt33=2;
@@ -4957,13 +4954,13 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt33) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:30: COMMA mapEntry
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:30: COMMA mapEntry
             	    {
             	    COMMA141=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1477); if (failed) return retval;
+            	    match(input,COMMA,FOLLOW_COMMA_in_mapInitializer1463); if (failed) return retval;
             	    if ( backtracking==0 ) stream_COMMA.add(COMMA141);
 
-            	    pushFollow(FOLLOW_mapEntry_in_mapInitializer1479);
+            	    pushFollow(FOLLOW_mapEntry_in_mapInitializer1465);
             	    mapEntry142=mapEntry();
             	    _fsp--;
             	    if (failed) return retval;
@@ -4978,7 +4975,7 @@ public class SpringExpressionsParser extends Parser {
             } while (true);
 
             RCURLY143=(Token)input.LT(1);
-            match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1483); if (failed) return retval;
+            match(input,RCURLY,FOLLOW_RCURLY_in_mapInitializer1469); if (failed) return retval;
             if ( backtracking==0 ) stream_RCURLY.add(RCURLY143);
 
 
@@ -4993,14 +4990,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 240:54: -> ^( MAP_INITIALIZER ( mapEntry )* )
+            // 229:54: -> ^( MAP_INITIALIZER ( mapEntry )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:57: ^( MAP_INITIALIZER ( mapEntry )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229: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:240:75: ( mapEntry )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:229:75: ( mapEntry )*
                 while ( stream_mapEntry.hasNext() ) {
                     adaptor.addChild(root_1, stream_mapEntry.next());
 
@@ -5027,7 +5024,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5040,7 +5037,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start mapEntry
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:1: mapEntry : expression COLON expression -> ^( MAP_ENTRY ( expression )* ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:231: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);
@@ -5057,19 +5054,19 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243: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:243:7: expression COLON expression
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232: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:232:7: expression COLON expression
             {
-            pushFollow(FOLLOW_expression_in_mapEntry1504);
+            pushFollow(FOLLOW_expression_in_mapEntry1490);
             expression144=expression();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_expression.add(expression144.getTree());
             COLON145=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_mapEntry1506); if (failed) return retval;
+            match(input,COLON,FOLLOW_COLON_in_mapEntry1492); if (failed) return retval;
             if ( backtracking==0 ) stream_COLON.add(COLON145);
 
-            pushFollow(FOLLOW_expression_in_mapEntry1508);
+            pushFollow(FOLLOW_expression_in_mapEntry1494);
             expression146=expression();
             _fsp--;
             if (failed) return retval;
@@ -5086,14 +5083,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 243:35: -> ^( MAP_ENTRY ( expression )* )
+            // 232:35: -> ^( MAP_ENTRY ( expression )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:243:38: ^( MAP_ENTRY ( expression )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232: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:243:50: ( expression )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:232:50: ( expression )*
                 while ( stream_expression.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression.next());
 
@@ -5120,7 +5117,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5133,7 +5130,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start ctorArgs
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:245: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:234: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);
@@ -5153,14 +5150,14 @@ public class SpringExpressionsParser extends Parser {
         Object RPAREN151_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:246: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:235: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:235:4: LPAREN ( namedArgument ( COMMA namedArgument )* )? RPAREN
             {
             root_0 = (Object)adaptor.nil();
 
             LPAREN147=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1526); if (failed) return retval;
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:12: ( namedArgument ( COMMA namedArgument )* )?
+            match(input,LPAREN,FOLLOW_LPAREN_in_ctorArgs1512); if (failed) return retval;
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:12: ( namedArgument ( COMMA namedArgument )* )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -5169,14 +5166,14 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt35) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:13: namedArgument ( COMMA namedArgument )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:13: namedArgument ( COMMA namedArgument )*
                     {
-                    pushFollow(FOLLOW_namedArgument_in_ctorArgs1530);
+                    pushFollow(FOLLOW_namedArgument_in_ctorArgs1516);
                     namedArgument148=namedArgument();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) adaptor.addChild(root_0, namedArgument148.getTree());
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:27: ( COMMA namedArgument )*
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:27: ( COMMA namedArgument )*
                     loop34:
                     do {
                         int alt34=2;
@@ -5189,11 +5186,11 @@ public class SpringExpressionsParser extends Parser {
 
                         switch (alt34) {
                     	case 1 :
-                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:28: COMMA namedArgument
+                    	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:235:28: COMMA namedArgument
                     	    {
                     	    COMMA149=(Token)input.LT(1);
-                    	    match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1533); if (failed) return retval;
-                    	    pushFollow(FOLLOW_namedArgument_in_ctorArgs1536);
+                    	    match(input,COMMA,FOLLOW_COMMA_in_ctorArgs1519); if (failed) return retval;
+                    	    pushFollow(FOLLOW_namedArgument_in_ctorArgs1522);
                     	    namedArgument150=namedArgument();
                     	    _fsp--;
                     	    if (failed) return retval;
@@ -5214,7 +5211,7 @@ public class SpringExpressionsParser extends Parser {
             }
 
             RPAREN151=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1542); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_ctorArgs1528); if (failed) return retval;
 
             }
 
@@ -5229,7 +5226,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5242,7 +5239,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start argument
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:1: argument : expression ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:1: argument : expression ;
     public final argument_return argument() throws RecognitionException {
         argument_return retval = new argument_return();
         retval.start = input.LT(1);
@@ -5254,12 +5251,12 @@ public class SpringExpressionsParser extends Parser {
 
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:10: ( expression )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:12: expression
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:10: ( expression )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:237:12: expression
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_expression_in_argument1551);
+            pushFollow(FOLLOW_expression_in_argument1537);
             expression152=expression();
             _fsp--;
             if (failed) return retval;
@@ -5278,7 +5275,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5291,7 +5288,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:250: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:239: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);
@@ -5311,7 +5308,7 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_expression=new RewriteRuleSubtreeStream(adaptor,"rule expression");
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:5: ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -5330,7 +5327,7 @@ public class SpringExpressionsParser extends Parser {
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("250:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 26, input);
+                            new NoViableAltException("239:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 26, input);
 
                         throw nvae;
                     }
@@ -5341,7 +5338,7 @@ public class SpringExpressionsParser extends Parser {
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("250:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 1, input);
+                        new NoViableAltException("239:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 1, input);
 
                     throw nvae;
                 }
@@ -5352,23 +5349,23 @@ public class SpringExpressionsParser extends Parser {
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("250:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 0, input);
+                    new NoViableAltException("239:1: namedArgument : ( ( ID ASSIGN )=>id= ID ASSIGN expression -> ^( NAMED_ARGUMENT[$id] expression ) | argument );", 36, 0, input);
 
                 throw nvae;
             }
             switch (alt36) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251: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:240:7: ( ID ASSIGN )=>id= ID ASSIGN expression
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_namedArgument1574); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_namedArgument1560); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     ASSIGN153=(Token)input.LT(1);
-                    match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1576); if (failed) return retval;
+                    match(input,ASSIGN,FOLLOW_ASSIGN_in_namedArgument1562); if (failed) return retval;
                     if ( backtracking==0 ) stream_ASSIGN.add(ASSIGN153);
 
-                    pushFollow(FOLLOW_expression_in_namedArgument1578);
+                    pushFollow(FOLLOW_expression_in_namedArgument1564);
                     expression154=expression();
                     _fsp--;
                     if (failed) return retval;
@@ -5385,9 +5382,9 @@ public class SpringExpressionsParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 252:19: -> ^( NAMED_ARGUMENT[$id] expression )
+                    // 241:19: -> ^( NAMED_ARGUMENT[$id] expression )
                     {
-                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:22: ^( NAMED_ARGUMENT[$id] expression )
+                        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:241:22: ^( NAMED_ARGUMENT[$id] expression )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(NAMED_ARGUMENT, id), root_1);
@@ -5404,11 +5401,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:253:7: argument
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:242:7: argument
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_argument_in_namedArgument1614);
+                    pushFollow(FOLLOW_argument_in_namedArgument1600);
                     argument155=argument();
                     _fsp--;
                     if (failed) return retval;
@@ -5429,7 +5426,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5442,7 +5439,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start qualifiedId
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255: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:244: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);
@@ -5460,14 +5457,14 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255: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:255:15: ID ( DOT ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244: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:244:15: ID ( DOT ID )*
             {
             ID156=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_qualifiedId1626); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_qualifiedId1612); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID156);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:18: ( DOT ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:18: ( DOT ID )*
             loop37:
             do {
                 int alt37=2;
@@ -5480,14 +5477,14 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt37) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:19: DOT ID
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:19: DOT ID
             	    {
             	    DOT157=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_qualifiedId1629); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_qualifiedId1615); if (failed) return retval;
             	    if ( backtracking==0 ) stream_DOT.add(DOT157);
 
             	    ID158=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_qualifiedId1631); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_qualifiedId1617); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(ID158);
 
 
@@ -5511,14 +5508,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 255:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* )
+            // 244:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:31: ^( QUALIFIED_IDENTIFIER ( ID )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:31: ^( QUALIFIED_IDENTIFIER ( ID )* )
                 {
                 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:255:54: ( ID )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:244:54: ( ID )*
                 while ( stream_ID.hasNext() ) {
                     adaptor.addChild(root_1, stream_ID.next());
 
@@ -5545,7 +5542,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5558,7 +5555,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start contextName
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257: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:246: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);
@@ -5576,14 +5573,14 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257: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:257:15: ID ( DIV ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:246:15: ID ( DIV ID )*
             {
             ID159=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_contextName1650); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_contextName1636); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID159);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:18: ( DIV ID )*
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:18: ( DIV ID )*
             loop38:
             do {
                 int alt38=2;
@@ -5596,14 +5593,14 @@ public class SpringExpressionsParser extends Parser {
 
                 switch (alt38) {
             	case 1 :
-            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:19: DIV ID
+            	    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:19: DIV ID
             	    {
             	    DIV160=(Token)input.LT(1);
-            	    match(input,DIV,FOLLOW_DIV_in_contextName1653); if (failed) return retval;
+            	    match(input,DIV,FOLLOW_DIV_in_contextName1639); if (failed) return retval;
             	    if ( backtracking==0 ) stream_DIV.add(DIV160);
 
             	    ID161=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_contextName1655); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_contextName1641); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(ID161);
 
 
@@ -5627,14 +5624,14 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 257:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* )
+            // 246:28: -> ^( QUALIFIED_IDENTIFIER ( ID )* )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:257:31: ^( QUALIFIED_IDENTIFIER ( ID )* )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246: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:257:54: ( ID )*
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:246:54: ( ID )*
                 while ( stream_ID.hasNext() ) {
                     adaptor.addChild(root_1, stream_ID.next());
 
@@ -5661,7 +5658,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5674,7 +5671,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start literal
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral );
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:248:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral );
     public final literal_return literal() throws RecognitionException {
         literal_return retval = new literal_return();
         retval.start = input.LT(1);
@@ -5700,7 +5697,7 @@ public class SpringExpressionsParser extends Parser {
         Object REAL_LITERAL168_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:2: ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral )
             int alt39=8;
             switch ( input.LA(1) ) {
             case INTEGER_LITERAL:
@@ -5747,19 +5744,19 @@ public class SpringExpressionsParser extends Parser {
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("259:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral );", 39, 0, input);
+                    new NoViableAltException("248:1: literal : ( INTEGER_LITERAL | STRING_LITERAL | DQ_STRING_LITERAL | boolLiteral | NULL_LITERAL | HEXADECIMAL_INTEGER_LITERAL | REAL_LITERAL | dateLiteral );", 39, 0, input);
 
                 throw nvae;
             }
 
             switch (alt39) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:260:4: INTEGER_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:249:4: INTEGER_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     INTEGER_LITERAL162=(Token)input.LT(1);
-                    match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1676); if (failed) return retval;
+                    match(input,INTEGER_LITERAL,FOLLOW_INTEGER_LITERAL_in_literal1662); if (failed) return retval;
                     if ( backtracking==0 ) {
                     INTEGER_LITERAL162_tree = (Object)adaptor.create(INTEGER_LITERAL162);
                     adaptor.addChild(root_0, INTEGER_LITERAL162_tree);
@@ -5768,12 +5765,12 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:4: STRING_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:250:4: STRING_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     STRING_LITERAL163=(Token)input.LT(1);
-                    match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1682); if (failed) return retval;
+                    match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal1668); if (failed) return retval;
                     if ( backtracking==0 ) {
                     STRING_LITERAL163_tree = (Object)adaptor.create(STRING_LITERAL163);
                     adaptor.addChild(root_0, STRING_LITERAL163_tree);
@@ -5782,12 +5779,12 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 3 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:262:4: DQ_STRING_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:4: DQ_STRING_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     DQ_STRING_LITERAL164=(Token)input.LT(1);
-                    match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1687); if (failed) return retval;
+                    match(input,DQ_STRING_LITERAL,FOLLOW_DQ_STRING_LITERAL_in_literal1673); if (failed) return retval;
                     if ( backtracking==0 ) {
                     DQ_STRING_LITERAL164_tree = (Object)adaptor.create(DQ_STRING_LITERAL164);
                     adaptor.addChild(root_0, DQ_STRING_LITERAL164_tree);
@@ -5796,11 +5793,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:263:4: boolLiteral
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:252:4: boolLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_boolLiteral_in_literal1692);
+                    pushFollow(FOLLOW_boolLiteral_in_literal1678);
                     boolLiteral165=boolLiteral();
                     _fsp--;
                     if (failed) return retval;
@@ -5809,12 +5806,12 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 5 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:264:4: NULL_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:253:4: NULL_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     NULL_LITERAL166=(Token)input.LT(1);
-                    match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1697); if (failed) return retval;
+                    match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal1683); if (failed) return retval;
                     if ( backtracking==0 ) {
                     NULL_LITERAL166_tree = (Object)adaptor.create(NULL_LITERAL166);
                     adaptor.addChild(root_0, NULL_LITERAL166_tree);
@@ -5823,12 +5820,12 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 6 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:265:4: HEXADECIMAL_INTEGER_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:254:4: HEXADECIMAL_INTEGER_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     HEXADECIMAL_INTEGER_LITERAL167=(Token)input.LT(1);
-                    match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1702); if (failed) return retval;
+                    match(input,HEXADECIMAL_INTEGER_LITERAL,FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1688); if (failed) return retval;
                     if ( backtracking==0 ) {
                     HEXADECIMAL_INTEGER_LITERAL167_tree = (Object)adaptor.create(HEXADECIMAL_INTEGER_LITERAL167);
                     adaptor.addChild(root_0, HEXADECIMAL_INTEGER_LITERAL167_tree);
@@ -5837,12 +5834,12 @@ public class SpringExpressionsParser extends Parser {
                     }
                     break;
                 case 7 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:266:4: REAL_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:255:4: REAL_LITERAL
                     {
                     root_0 = (Object)adaptor.nil();
 
                     REAL_LITERAL168=(Token)input.LT(1);
-                    match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1708); if (failed) return retval;
+                    match(input,REAL_LITERAL,FOLLOW_REAL_LITERAL_in_literal1694); if (failed) return retval;
                     if ( backtracking==0 ) {
                     REAL_LITERAL168_tree = (Object)adaptor.create(REAL_LITERAL168);
                     adaptor.addChild(root_0, REAL_LITERAL168_tree);
@@ -5851,11 +5848,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:267:4: dateLiteral
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:256:4: dateLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_dateLiteral_in_literal1713);
+                    pushFollow(FOLLOW_dateLiteral_in_literal1699);
                     dateLiteral169=dateLiteral();
                     _fsp--;
                     if (failed) return retval;
@@ -5876,7 +5873,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5889,7 +5886,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start boolLiteral
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:1: boolLiteral : ( TRUE | FALSE );
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259:1: boolLiteral : ( TRUE | FALSE );
     public final boolLiteral_return boolLiteral() throws RecognitionException {
         boolLiteral_return retval = new boolLiteral_return();
         retval.start = input.LT(1);
@@ -5901,7 +5898,7 @@ public class SpringExpressionsParser extends Parser {
         Object set170_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:270:12: ( TRUE | FALSE )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:259: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();
@@ -5933,7 +5930,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -5946,7 +5943,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start dateLiteral
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:1: dateLiteral : 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN -> ^( DATE_LITERAL $d ( $f)? ) ;
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:1: dateLiteral : 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN -> ^( DATE_LITERAL $d ( $f)? ) ;
     public final dateLiteral_return dateLiteral() throws RecognitionException {
         dateLiteral_return retval = new dateLiteral_return();
         retval.start = input.LT(1);
@@ -5973,22 +5970,22 @@ public class SpringExpressionsParser extends Parser {
         RewriteRuleTokenStream stream_STRING_LITERAL=new RewriteRuleTokenStream(adaptor,"token STRING_LITERAL");
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:12: ( 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN -> ^( DATE_LITERAL $d ( $f)? ) )
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:14: 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:12: ( 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN -> ^( DATE_LITERAL $d ( $f)? ) )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:14: 'date' LPAREN d= STRING_LITERAL ( COMMA f= STRING_LITERAL )? RPAREN
             {
             string_literal171=(Token)input.LT(1);
-            match(input,95,FOLLOW_95_in_dateLiteral1734); if (failed) return retval;
+            match(input,95,FOLLOW_95_in_dateLiteral1720); if (failed) return retval;
             if ( backtracking==0 ) stream_95.add(string_literal171);
 
             LPAREN172=(Token)input.LT(1);
-            match(input,LPAREN,FOLLOW_LPAREN_in_dateLiteral1736); if (failed) return retval;
+            match(input,LPAREN,FOLLOW_LPAREN_in_dateLiteral1722); if (failed) return retval;
             if ( backtracking==0 ) stream_LPAREN.add(LPAREN172);
 
             d=(Token)input.LT(1);
-            match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_dateLiteral1740); if (failed) return retval;
+            match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_dateLiteral1726); if (failed) return retval;
             if ( backtracking==0 ) stream_STRING_LITERAL.add(d);
 
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:45: ( COMMA f= STRING_LITERAL )?
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:45: ( COMMA f= STRING_LITERAL )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -5997,14 +5994,14 @@ public class SpringExpressionsParser extends Parser {
             }
             switch (alt40) {
                 case 1 :
-                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:46: COMMA f= STRING_LITERAL
+                    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:46: COMMA f= STRING_LITERAL
                     {
                     COMMA173=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_dateLiteral1743); if (failed) return retval;
+                    match(input,COMMA,FOLLOW_COMMA_in_dateLiteral1729); if (failed) return retval;
                     if ( backtracking==0 ) stream_COMMA.add(COMMA173);
 
                     f=(Token)input.LT(1);
-                    match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_dateLiteral1747); if (failed) return retval;
+                    match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_dateLiteral1733); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING_LITERAL.add(f);
 
 
@@ -6014,7 +6011,7 @@ public class SpringExpressionsParser extends Parser {
             }
 
             RPAREN174=(Token)input.LT(1);
-            match(input,RPAREN,FOLLOW_RPAREN_in_dateLiteral1751); if (failed) return retval;
+            match(input,RPAREN,FOLLOW_RPAREN_in_dateLiteral1737); if (failed) return retval;
             if ( backtracking==0 ) stream_RPAREN.add(RPAREN174);
 
 
@@ -6031,15 +6028,15 @@ public class SpringExpressionsParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 272:78: -> ^( DATE_LITERAL $d ( $f)? )
+            // 261:78: -> ^( DATE_LITERAL $d ( $f)? )
             {
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:81: ^( DATE_LITERAL $d ( $f)? )
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:81: ^( DATE_LITERAL $d ( $f)? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(DATE_LITERAL, "DATE_LITERAL"), root_1);
 
                 adaptor.addChild(root_1, stream_d.next());
-                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:272:99: ( $f)?
+                // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:261:99: ( $f)?
                 if ( stream_f.hasNext() ) {
                     adaptor.addChild(root_1, stream_f.next());
 
@@ -6066,7 +6063,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -6079,7 +6076,7 @@ public class SpringExpressionsParser extends Parser {
     };
 
     // $ANTLR start relationalOperator
-    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:279:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | LIKE | MATCHES | SOUNDSLIKE | DISTANCETO );
+    // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:268:1: relationalOperator : ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | LIKE | MATCHES | SOUNDSLIKE | DISTANCETO );
     public final relationalOperator_return relationalOperator() throws RecognitionException {
         relationalOperator_return retval = new relationalOperator_return();
         retval.start = input.LT(1);
@@ -6091,7 +6088,7 @@ public class SpringExpressionsParser extends Parser {
         Object set175_tree=null;
 
         try {
-            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:280:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | LIKE | MATCHES | SOUNDSLIKE | DISTANCETO )
+            // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:269:5: ( EQUAL | NOT_EQUAL | LESS_THAN | LESS_THAN_OR_EQUAL | GREATER_THAN | GREATER_THAN_OR_EQUAL | IN | IS | BETWEEN | LIKE | MATCHES | SOUNDSLIKE | DISTANCETO )
             // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:
             {
             root_0 = (Object)adaptor.nil();
@@ -6123,7 +6120,7 @@ public class SpringExpressionsParser extends Parser {
                 catch(RecognitionException e) {
                         //reportError(e);
                         throw e;
-               }
+                }
         finally {
         }
         return retval;
@@ -6132,15 +6129,15 @@ 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:115:5: ( LPAREN expression SEMI )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:115:6: LPAREN expression SEMI
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:5: ( LPAREN expression SEMI )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:104:6: LPAREN expression SEMI
         {
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred1559); if (failed) return ;
-        pushFollow(FOLLOW_expression_in_synpred1561);
+        match(input,LPAREN,FOLLOW_LPAREN_in_synpred1545); if (failed) return ;
+        pushFollow(FOLLOW_expression_in_synpred1547);
         expression();
         _fsp--;
         if (failed) return ;
-        match(input,SEMI,FOLLOW_SEMI_in_synpred1563); if (failed) return ;
+        match(input,SEMI,FOLLOW_SEMI_in_synpred1549); if (failed) return ;
 
         }
     }
@@ -6148,12 +6145,12 @@ 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:149:7: ( POUND ID LPAREN )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:149:8: POUND ID LPAREN
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138:7: ( POUND ID LPAREN )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:138:8: POUND ID LPAREN
         {
-        match(input,POUND,FOLLOW_POUND_in_synpred2811); if (failed) return ;
-        match(input,ID,FOLLOW_ID_in_synpred2813); if (failed) return ;
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred2815); if (failed) return ;
+        match(input,POUND,FOLLOW_POUND_in_synpred2797); if (failed) return ;
+        match(input,ID,FOLLOW_ID_in_synpred2799); if (failed) return ;
+        match(input,LPAREN,FOLLOW_LPAREN_in_synpred2801); if (failed) return ;
 
         }
     }
@@ -6161,12 +6158,12 @@ public class SpringExpressionsParser extends Parser {
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:4: ( DOLLAR ID LPAREN )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:158:5: DOLLAR ID LPAREN
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:147:4: ( DOLLAR ID LPAREN )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:147:5: DOLLAR ID LPAREN
         {
-        match(input,DOLLAR,FOLLOW_DOLLAR_in_synpred3894); if (failed) return ;
-        match(input,ID,FOLLOW_ID_in_synpred3896); if (failed) return ;
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred3898); if (failed) return ;
+        match(input,DOLLAR,FOLLOW_DOLLAR_in_synpred3880); if (failed) return ;
+        match(input,ID,FOLLOW_ID_in_synpred3882); if (failed) return ;
+        match(input,LPAREN,FOLLOW_LPAREN_in_synpred3884); if (failed) return ;
 
         }
     }
@@ -6174,11 +6171,11 @@ public class SpringExpressionsParser extends Parser {
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:4: ( ID LPAREN )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:166:5: ID LPAREN
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:4: ( ID LPAREN )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:155:5: ID LPAREN
         {
-        match(input,ID,FOLLOW_ID_in_synpred4960); if (failed) return ;
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred4962); if (failed) return ;
+        match(input,ID,FOLLOW_ID_in_synpred4946); if (failed) return ;
+        match(input,LPAREN,FOLLOW_LPAREN_in_synpred4948); if (failed) return ;
 
         }
     }
@@ -6186,15 +6183,15 @@ public class SpringExpressionsParser extends Parser {
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:4: ( 'new' qualifiedId LPAREN )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:221:5: 'new' qualifiedId LPAREN
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:4: ( 'new' qualifiedId LPAREN )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:210:5: 'new' qualifiedId LPAREN
         {
-        match(input,94,FOLLOW_94_in_synpred51309); if (failed) return ;
-        pushFollow(FOLLOW_qualifiedId_in_synpred51311);
+        match(input,94,FOLLOW_94_in_synpred51295); if (failed) return ;
+        pushFollow(FOLLOW_qualifiedId_in_synpred51297);
         qualifiedId();
         _fsp--;
         if (failed) return ;
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred51313); if (failed) return ;
+        match(input,LPAREN,FOLLOW_LPAREN_in_synpred51299); if (failed) return ;
 
         }
     }
@@ -6202,11 +6199,11 @@ public class SpringExpressionsParser extends Parser {
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:7: ( ID ASSIGN )
-        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:251:8: ID ASSIGN
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:7: ( ID ASSIGN )
+        // /Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g:240:8: ID ASSIGN
         {
-        match(input,ID,FOLLOW_ID_in_synpred61565); if (failed) return ;
-        match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred61567); if (failed) return ;
+        match(input,ID,FOLLOW_ID_in_synpred61551); if (failed) return ;
+        match(input,ASSIGN,FOLLOW_ASSIGN_in_synpred61553); if (failed) return ;
 
         }
     }
@@ -6300,212 +6297,212 @@ public class SpringExpressionsParser extends Parser {
 
  
 
-    public static final BitSet FOLLOW_expression_in_expr178 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_expr180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_exprList193 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_exprList195 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_SEMI_in_exprList198 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_exprList200 = new BitSet(new long[]{0x0000000380000000L});
-    public static final BitSet FOLLOW_SEMIRPAREN_in_exprList205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RPAREN_in_exprList209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_logicalOrExpression_in_expression253 = new BitSet(new long[]{0x0000001C00000002L});
-    public static final BitSet FOLLOW_ASSIGN_in_expression262 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_logicalOrExpression_in_expression265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DEFAULT_in_expression275 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_logicalOrExpression_in_expression278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QMARK_in_expression288 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_expression291 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_COLON_in_expression293 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_expression296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_parenExpr307 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_parenExpr310 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_parenExpr312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression326 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_OR_in_logicalOrExpression329 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression332 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression366 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_AND_in_logicalAndExpression369 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression372 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_sumExpression_in_relationalExpression383 = new BitSet(new long[]{0x0000000000000002L,0x00000000007FFC00L});
-    public static final BitSet FOLLOW_relationalOperator_in_relationalExpression386 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_sumExpression_in_relationalExpression389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_productExpression_in_sumExpression400 = new BitSet(new long[]{0x0000030000000002L});
-    public static final BitSet FOLLOW_PLUS_in_sumExpression405 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_MINUS_in_sumExpression410 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_productExpression_in_sumExpression414 = new BitSet(new long[]{0x0000030000000002L});
-    public static final BitSet FOLLOW_powerExpr_in_productExpression429 = new BitSet(new long[]{0x00001C0000000002L});
-    public static final BitSet FOLLOW_STAR_in_productExpression433 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_DIV_in_productExpression438 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_MOD_in_productExpression442 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_powerExpr_in_productExpression446 = new BitSet(new long[]{0x00001C0000000002L});
-    public static final BitSet FOLLOW_unaryExpression_in_powerExpr462 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_POWER_in_powerExpr465 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_unaryExpression_in_powerExpr468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PLUS_in_unaryExpression488 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_MINUS_in_unaryExpression493 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_BANG_in_unaryExpression498 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_primaryExpression_in_unaryExpression508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_startNode_in_primaryExpression522 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_node_in_primaryExpression525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_exprList_in_startNode568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_parenExpr_in_startNode577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_methodOrProperty_in_startNode585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_functionOrVar_in_startNode594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_localFunctionOrVar_in_startNode602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_reference_in_startNode610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_indexer_in_startNode618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_startNode626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_type_in_startNode634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constructor_in_startNode642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_projection_in_startNode650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_selection_in_startNode659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_firstSelection_in_startNode668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lastSelection_in_startNode676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_listInitializer_in_startNode684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_mapInitializer_in_startNode692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lambda_in_startNode700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_methodOrProperty_in_node721 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_functionOrVar_in_node727 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_indexer_in_node735 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_projection_in_node743 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_selection_in_node752 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_firstSelection_in_node761 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_lastSelection_in_node770 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_exprList_in_node779 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_DOT_in_node787 = new BitSet(new long[]{0x0EA3800040000002L});
-    public static final BitSet FOLLOW_function_in_functionOrVar820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_var_in_functionOrVar828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_POUND_in_function845 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_function849 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_methodArgs_in_function851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_POUND_in_var872 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_var876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_localFunction_in_localFunctionOrVar903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_localVar_in_localFunctionOrVar908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOLLAR_in_localFunction918 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_localFunction922 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_methodArgs_in_localFunction924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOLLAR_in_localVar939 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_localVar943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_methodOrProperty969 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_methodArgs_in_methodOrProperty971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_property_in_methodOrProperty985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_methodArgs1000 = new BitSet(new long[]{0xBEB7430240000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_argument_in_methodArgs1004 = new BitSet(new long[]{0x0008000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_methodArgs1007 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_argument_in_methodArgs1010 = new BitSet(new long[]{0x0008000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_methodArgs1015 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_methodArgs1022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_property1035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AT_in_reference1057 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_reference1061 = new BitSet(new long[]{0x0002000200000000L});
-    public static final BitSet FOLLOW_contextName_in_reference1066 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_COLON_in_reference1068 = new BitSet(new long[]{0x0002000200000000L});
-    public static final BitSet FOLLOW_qualifiedId_in_reference1075 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_reference1079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LBRACKET_in_indexer1114 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_argument_in_indexer1118 = new BitSet(new long[]{0x0048000000000000L});
-    public static final BitSet FOLLOW_COMMA_in_indexer1121 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_argument_in_indexer1125 = new BitSet(new long[]{0x0048000000000000L});
-    public static final BitSet FOLLOW_RBRACKET_in_indexer1129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PROJECT_in_projection1156 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_projection1159 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_projection1161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SELECT_in_selection1169 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_selection1172 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_selection1174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection1182 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_firstSelection1185 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_firstSelection1187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection1195 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_lastSelection1198 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_lastSelection1200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TYPE_in_type1209 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_qualifiedId_in_type1211 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_type1213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LAMBDA_in_lambda1240 = new BitSet(new long[]{0x4002000000000000L});
-    public static final BitSet FOLLOW_argList_in_lambda1243 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_PIPE_in_lambda1247 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_lambda1249 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_lambda1251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_argList1275 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_COMMA_in_argList1278 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_argList1282 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_94_in_constructor1318 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_qualifiedId_in_constructor1320 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_ctorArgs_in_constructor1322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_arrayConstructor_in_constructor1339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_arrayConstructor1350 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1352 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1354 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LBRACKET_in_arrayRank1392 = new BitSet(new long[]{0xBEF7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_arrayRank1395 = new BitSet(new long[]{0x0048000000000000L});
-    public static final BitSet FOLLOW_COMMA_in_arrayRank1398 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_arrayRank1400 = new BitSet(new long[]{0x0048000000000000L});
-    public static final BitSet FOLLOW_RBRACKET_in_arrayRank1406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LCURLY_in_listInitializer1431 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_listInitializer1433 = new BitSet(new long[]{0x0108000000000000L});
-    public static final BitSet FOLLOW_COMMA_in_listInitializer1436 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_listInitializer1438 = new BitSet(new long[]{0x0108000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_listInitializer1442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_POUND_in_mapInitializer1470 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_LCURLY_in_mapInitializer1472 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_mapEntry_in_mapInitializer1474 = new BitSet(new long[]{0x0108000000000000L});
-    public static final BitSet FOLLOW_COMMA_in_mapInitializer1477 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_mapEntry_in_mapInitializer1479 = new BitSet(new long[]{0x0108000000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_mapInitializer1483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_mapEntry1504 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_COLON_in_mapEntry1506 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_mapEntry1508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_ctorArgs1526 = new BitSet(new long[]{0xBEB7430240000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_namedArgument_in_ctorArgs1530 = new BitSet(new long[]{0x0008000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_ctorArgs1533 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_namedArgument_in_ctorArgs1536 = new BitSet(new long[]{0x0008000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_ctorArgs1542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_argument1551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_namedArgument1574 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_ASSIGN_in_namedArgument1576 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_namedArgument1578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_argument_in_namedArgument1614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_qualifiedId1626 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_DOT_in_qualifiedId1629 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_qualifiedId1631 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_ID_in_contextName1650 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_DIV_in_contextName1653 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_contextName1655 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_LITERAL_in_literal1682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_boolLiteral_in_literal1692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_LITERAL_in_literal1697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_REAL_LITERAL_in_literal1708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dateLiteral_in_literal1713 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_expression_in_expr173 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_expr175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_exprList188 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_exprList190 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_SEMI_in_exprList193 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_exprList195 = new BitSet(new long[]{0x0000000380000000L});
+    public static final BitSet FOLLOW_SEMIRPAREN_in_exprList200 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RPAREN_in_exprList204 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_logicalOrExpression_in_expression248 = new BitSet(new long[]{0x0000001C00000002L});
+    public static final BitSet FOLLOW_ASSIGN_in_expression257 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_logicalOrExpression_in_expression260 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DEFAULT_in_expression270 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_logicalOrExpression_in_expression273 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QMARK_in_expression283 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_expression286 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_COLON_in_expression288 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_expression291 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_parenExpr302 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_parenExpr305 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_parenExpr307 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression318 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_OR_in_logicalOrExpression321 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression324 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression358 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_AND_in_logicalAndExpression361 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_relationalExpression_in_logicalAndExpression364 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_sumExpression_in_relationalExpression375 = new BitSet(new long[]{0x0000000000000002L,0x00000000007FFC00L});
+    public static final BitSet FOLLOW_relationalOperator_in_relationalExpression378 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_sumExpression_in_relationalExpression381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_productExpression_in_sumExpression392 = new BitSet(new long[]{0x0000030000000002L});
+    public static final BitSet FOLLOW_PLUS_in_sumExpression397 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_MINUS_in_sumExpression402 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_productExpression_in_sumExpression406 = new BitSet(new long[]{0x0000030000000002L});
+    public static final BitSet FOLLOW_powerExpr_in_productExpression421 = new BitSet(new long[]{0x00001C0000000002L});
+    public static final BitSet FOLLOW_STAR_in_productExpression425 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_DIV_in_productExpression430 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_MOD_in_productExpression434 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_powerExpr_in_productExpression438 = new BitSet(new long[]{0x00001C0000000002L});
+    public static final BitSet FOLLOW_unaryExpression_in_powerExpr454 = new BitSet(new long[]{0x0000200000000002L});
+    public static final BitSet FOLLOW_POWER_in_powerExpr457 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_unaryExpression_in_powerExpr460 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PLUS_in_unaryExpression474 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_MINUS_in_unaryExpression479 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_BANG_in_unaryExpression484 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression488 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_primaryExpression_in_unaryExpression494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_startNode_in_primaryExpression508 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_node_in_primaryExpression511 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_exprList_in_startNode554 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_parenExpr_in_startNode563 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_methodOrProperty_in_startNode571 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_functionOrVar_in_startNode580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_localFunctionOrVar_in_startNode588 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_reference_in_startNode596 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_indexer_in_startNode604 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_startNode612 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_type_in_startNode620 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constructor_in_startNode628 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_projection_in_startNode636 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_selection_in_startNode645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_firstSelection_in_startNode654 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lastSelection_in_startNode662 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_listInitializer_in_startNode670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_mapInitializer_in_startNode678 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lambda_in_startNode686 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_methodOrProperty_in_node707 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_functionOrVar_in_node713 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_indexer_in_node721 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_projection_in_node729 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_selection_in_node738 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_firstSelection_in_node747 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_lastSelection_in_node756 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_exprList_in_node765 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_DOT_in_node773 = new BitSet(new long[]{0x0EA3800040000002L});
+    public static final BitSet FOLLOW_function_in_functionOrVar806 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_var_in_functionOrVar814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_POUND_in_function831 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_function835 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_methodArgs_in_function837 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_POUND_in_var858 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_var862 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_localFunction_in_localFunctionOrVar889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_localVar_in_localFunctionOrVar894 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOLLAR_in_localFunction904 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_localFunction908 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_methodArgs_in_localFunction910 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOLLAR_in_localVar925 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_localVar929 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_methodOrProperty955 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_methodArgs_in_methodOrProperty957 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_property_in_methodOrProperty971 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_methodArgs986 = new BitSet(new long[]{0xBEB7430240000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_argument_in_methodArgs990 = new BitSet(new long[]{0x0008000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_methodArgs993 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_argument_in_methodArgs996 = new BitSet(new long[]{0x0008000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_methodArgs1001 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_methodArgs1008 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_property1021 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AT_in_reference1043 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_reference1047 = new BitSet(new long[]{0x0002000200000000L});
+    public static final BitSet FOLLOW_contextName_in_reference1052 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_COLON_in_reference1054 = new BitSet(new long[]{0x0002000200000000L});
+    public static final BitSet FOLLOW_qualifiedId_in_reference1061 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_reference1065 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LBRACKET_in_indexer1100 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_argument_in_indexer1104 = new BitSet(new long[]{0x0048000000000000L});
+    public static final BitSet FOLLOW_COMMA_in_indexer1107 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_argument_in_indexer1111 = new BitSet(new long[]{0x0048000000000000L});
+    public static final BitSet FOLLOW_RBRACKET_in_indexer1115 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROJECT_in_projection1142 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_projection1145 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_projection1147 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SELECT_in_selection1155 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_selection1158 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_selection1160 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SELECT_FIRST_in_firstSelection1168 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_firstSelection1171 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_firstSelection1173 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SELECT_LAST_in_lastSelection1181 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_lastSelection1184 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_lastSelection1186 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TYPE_in_type1195 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_qualifiedId_in_type1197 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_type1199 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LAMBDA_in_lambda1226 = new BitSet(new long[]{0x4002000000000000L});
+    public static final BitSet FOLLOW_argList_in_lambda1229 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_PIPE_in_lambda1233 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_lambda1235 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_lambda1237 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_argList1261 = new BitSet(new long[]{0x0008000000000002L});
+    public static final BitSet FOLLOW_COMMA_in_argList1264 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_argList1268 = new BitSet(new long[]{0x0008000000000002L});
+    public static final BitSet FOLLOW_94_in_constructor1304 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_qualifiedId_in_constructor1306 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_ctorArgs_in_constructor1308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_arrayConstructor_in_constructor1325 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_94_in_arrayConstructor1336 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_qualifiedId_in_arrayConstructor1338 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_arrayRank_in_arrayConstructor1340 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_listInitializer_in_arrayConstructor1343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LBRACKET_in_arrayRank1378 = new BitSet(new long[]{0xBEF7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_arrayRank1381 = new BitSet(new long[]{0x0048000000000000L});
+    public static final BitSet FOLLOW_COMMA_in_arrayRank1384 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_arrayRank1386 = new BitSet(new long[]{0x0048000000000000L});
+    public static final BitSet FOLLOW_RBRACKET_in_arrayRank1392 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LCURLY_in_listInitializer1417 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_listInitializer1419 = new BitSet(new long[]{0x0108000000000000L});
+    public static final BitSet FOLLOW_COMMA_in_listInitializer1422 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_listInitializer1424 = new BitSet(new long[]{0x0108000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_listInitializer1428 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_POUND_in_mapInitializer1456 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_LCURLY_in_mapInitializer1458 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_mapEntry_in_mapInitializer1460 = new BitSet(new long[]{0x0108000000000000L});
+    public static final BitSet FOLLOW_COMMA_in_mapInitializer1463 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_mapEntry_in_mapInitializer1465 = new BitSet(new long[]{0x0108000000000000L});
+    public static final BitSet FOLLOW_RCURLY_in_mapInitializer1469 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_expression_in_mapEntry1490 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_COLON_in_mapEntry1492 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_mapEntry1494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_ctorArgs1512 = new BitSet(new long[]{0xBEB7430240000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_namedArgument_in_ctorArgs1516 = new BitSet(new long[]{0x0008000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_ctorArgs1519 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_namedArgument_in_ctorArgs1522 = new BitSet(new long[]{0x0008000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_ctorArgs1528 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_expression_in_argument1537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_namedArgument1560 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_ASSIGN_in_namedArgument1562 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_namedArgument1564 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_argument_in_namedArgument1600 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_qualifiedId1612 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_DOT_in_qualifiedId1615 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_qualifiedId1617 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_ID_in_contextName1636 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_DIV_in_contextName1639 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_contextName1641 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_INTEGER_LITERAL_in_literal1662 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_LITERAL_in_literal1668 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DQ_STRING_LITERAL_in_literal1673 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_boolLiteral_in_literal1678 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_LITERAL_in_literal1683 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_HEXADECIMAL_INTEGER_LITERAL_in_literal1688 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_REAL_LITERAL_in_literal1694 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dateLiteral_in_literal1699 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_set_in_boolLiteral0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_dateLiteral1734 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_dateLiteral1736 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_STRING_LITERAL_in_dateLiteral1740 = new BitSet(new long[]{0x0008000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_dateLiteral1743 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_STRING_LITERAL_in_dateLiteral1747 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_RPAREN_in_dateLiteral1751 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_95_in_dateLiteral1720 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_dateLiteral1722 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_STRING_LITERAL_in_dateLiteral1726 = new BitSet(new long[]{0x0008000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_dateLiteral1729 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_STRING_LITERAL_in_dateLiteral1733 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_RPAREN_in_dateLiteral1737 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_set_in_relationalOperator0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred1559 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
-    public static final BitSet FOLLOW_expression_in_synpred1561 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_SEMI_in_synpred1563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_POUND_in_synpred2811 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_synpred2813 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred2815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOLLAR_in_synpred3894 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_ID_in_synpred3896 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred3898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_synpred4960 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred4962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_synpred51309 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_qualifiedId_in_synpred51311 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred51313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_synpred61565 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_ASSIGN_in_synpred61567 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_synpred1545 = new BitSet(new long[]{0xBEB7430040000020L,0x00000000C000007FL});
+    public static final BitSet FOLLOW_expression_in_synpred1547 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_SEMI_in_synpred1549 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_POUND_in_synpred2797 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_synpred2799 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_synpred2801 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOLLAR_in_synpred3880 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ID_in_synpred3882 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_synpred3884 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_synpred4946 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_synpred4948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_94_in_synpred51295 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_qualifiedId_in_synpred51297 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_LPAREN_in_synpred51299 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_synpred61551 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_ASSIGN_in_synpred61553 = 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 968da03ccb..3a59078736 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
@@ -8,130 +8,130 @@ options {
 T94 : 'new' ;
 T95 : 'date' ;
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 65
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 62
 SEMIRPAREN : ';)'; // recoveryrelated: allows us to cope with a rogue superfluous semicolon before the rparen in an expression list
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 274
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 263
 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" 277
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 266
 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" 295
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 284
 ASSIGN: '=';
-// $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" 285
 EQUAL: '==';
-// $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" 286
 NOT_EQUAL: '!=';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 298
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 287
 LESS_THAN: '<';
-// $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" 288
 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" 300
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 289
 GREATER_THAN: '>';
-// $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" 290
 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" 302
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 291
 SOUNDSLIKE
 	:	'soundslike';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 304
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 293
 DISTANCETO
 	:	'distanceto';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 306
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 295
 IN:     'in';	
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 307
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 296
 IS:     'is';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 308
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 297
 BETWEEN:'between';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 309
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 298
 LIKE:   'like';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 310
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 299
 MATCHES:'matches';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 311
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 300
 NULL_LITERAL: 'null';
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 313
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 302
 SEMI: ';';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 314
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 303
 DOT:    '.';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 315
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 304
 COMMA:	',';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 316
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 305
 LPAREN: '(';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 317
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 306
 RPAREN: ')';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 318
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 307
 LCURLY: '{';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 319
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 308
 RCURLY: '}';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 320
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 309
 LBRACKET: '[';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 321
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 310
 RBRACKET: ']';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 322
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 311
 PIPE:	'|';
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 324
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 313
 AND:    'and';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 325
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 314
 OR:     'or';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 326
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 315
 FALSE:  'false';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 327
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 316
 TRUE:   'true';
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 329
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 318
 PLUS: '+';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 330
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 319
 MINUS: '-';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 331
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 320
 DIV: '/';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 332
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 321
 STAR: '*';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 333
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 322
 MOD: '%';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 334
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 323
 POWER: '^';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 335
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 324
 BANG: '!';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 336
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 325
 POUND: '#';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 337
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 326
 QMARK: '?';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 338
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 327
 DEFAULT: '??';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 339
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 328
 LAMBDA: '{|';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 340
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 329
 PROJECT: '!{';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 341
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 330
 SELECT: '?{';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 342
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 331
 SELECT_FIRST: '^{';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 343
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 332
 SELECT_LAST: '${';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 344
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 333
 TYPE: 'T(';
 
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 346
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 335
 STRING_LITERAL:	'\''! (APOS|~'\'')* '\''!;
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 347
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 336
 DQ_STRING_LITERAL:	'"'! (~'"')* '"'!;
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 348
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 337
 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" 349
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 338
 DOT_ESCAPED: '\\.';
 //DOUBLE_DOT: ':';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 351
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 340
 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" 352
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 341
 DOLLAR:	'$';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 353
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 342
 AT: '@';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 354
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 343
 UPTO: '..';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 355
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 344
 COLON: ':';
 
 	/*
@@ -149,26 +149,26 @@ COLON: ':';
 		in= (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" 372
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 361
 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" 378
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 367
 fragment APOS : '\''! '\'';
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 379
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 368
 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" 380
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 369
 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" 381
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 370
 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" 383
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 372
 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" 384
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 373
 fragment SIGN :	'+' | '-' ;
 // TODO what is M or m?
-// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 386
+// $ANTLR src "/Users/aclement/el2/spring-framework/trunk/org.springframework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g" 375
 fragment REAL_TYPE_SUFFIX : 'F' | 'f' | 'D' | 'd' | 'M' | 'm' ;