tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r675739 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParserConstants.java ELParserTokenManager.java
Date Thu, 10 Jul 2008 21:05:35 GMT
Author: markt
Date: Thu Jul 10 14:05:35 2008
New Revision: 675739

URL: http://svn.apache.org/viewvc?rev=675739&view=rev
Log:
Auto-generated changes as a result of http://svn.apache.org/viewvc?rev=675726&view=rev

Modified:
    tomcat/trunk/java/org/apache/el/parser/ELParser.java
    tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java
    tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=675739&r1=675738&r2=675739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Thu Jul 10 14:05:35 2008
@@ -963,7 +963,7 @@
     case NULL:
     case LPAREN:
     case IDENTIFIER:
-    case NAMESPACE:
+    case FUNCTION_CALL:
       Value();
       break;
     default:
@@ -1033,7 +1033,7 @@
       break;
     case LPAREN:
     case IDENTIFIER:
-    case NAMESPACE:
+    case FUNCTION_CALL:
       NonLiteral();
       break;
     default:
@@ -1176,25 +1176,9 @@
  /*@bgen(jjtree) Function */
         AstFunction jjtn000 = new AstFunction(JJTFUNCTION);
         boolean jjtc000 = true;
-        jjtree.openNodeScope(jjtn000);Token t0 = null;
-        Token t1 = null;
+        jjtree.openNodeScope(jjtn000);Token tx = null;
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case NAMESPACE:
-        t0 = jj_consume_token(NAMESPACE);
-        break;
-      default:
-        jj_la1[30] = jj_gen;
-        ;
-      }
-      t1 = jj_consume_token(IDENTIFIER);
-                if (t0 != null) {
-                        jjtn000.setPrefix(t0.image.substring(0, t0.image.length() - 1));
-                        jjtn000.setLocalName(t1.image);
-                } else {
-                        jjtn000.setLocalName(t1.image);
-                }
-      jj_consume_token(LPAREN);
+      tx = jj_consume_token(FUNCTION_CALL);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case INTEGER_LITERAL:
       case FLOATING_POINT_LITERAL:
@@ -1208,7 +1192,7 @@
       case EMPTY:
       case MINUS:
       case IDENTIFIER:
-      case NAMESPACE:
+      case FUNCTION_CALL:
         Expression();
         label_10:
         while (true) {
@@ -1217,7 +1201,7 @@
             ;
             break;
           default:
-            jj_la1[31] = jj_gen;
+            jj_la1[30] = jj_gen;
             break label_10;
           }
           jj_consume_token(COMMA);
@@ -1225,10 +1209,19 @@
         }
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[31] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
+          jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+                int split = tx.image.indexOf(":");
+                if (split!=-1) {
+                        jjtn000.setPrefix(tx.image.substring(0, split));
+                        jjtn000.setLocalName(tx.image.substring(split + 1, tx.image.length()
- 1));
+                } else {
+                        jjtn000.setLocalName(tx.image.substring(0, tx.image.length() - 1));
+                }
     } catch (Throwable jjte000) {
           if (jjtc000) {
             jjtree.clearNodeScope(jjtn000);
@@ -1273,7 +1266,7 @@
       Null();
       break;
     default:
-      jj_la1[33] = jj_gen;
+      jj_la1[32] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1310,7 +1303,7 @@
       }
       break;
     default:
-      jj_la1[34] = jj_gen;
+      jj_la1[33] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1405,34 +1398,61 @@
   }
 
   final private boolean jj_3R_11() {
+    if (jj_scan_token(FUNCTION_CALL)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(54)) jj_scanpos = xsp;
-    if (jj_scan_token(IDENTIFIER)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    xsp = jj_scanpos;
     if (jj_3R_12()) jj_scanpos = xsp;
     if (jj_scan_token(RPAREN)) return true;
     return false;
   }
 
-  final private boolean jj_3R_20() {
-    if (jj_3R_21()) return true;
+  final private boolean jj_3R_28() {
+    if (jj_3R_34()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_35()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  final private boolean jj_3R_44() {
+  final private boolean jj_3R_37() {
+    if (jj_scan_token(MINUS)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_29() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_36()) {
+    jj_scanpos = xsp;
+    if (jj_3R_37()) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_36() {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_69() {
     if (jj_scan_token(IDENTIFIER)) return true;
     return false;
   }
 
-  final private boolean jj_3R_19() {
-    if (jj_3R_20()) return true;
+  final private boolean jj_3R_61() {
+    if (jj_3R_69()) return true;
     return false;
   }
 
-  final private boolean jj_3R_38() {
-    if (jj_3R_44()) return true;
+  final private boolean jj_3R_24() {
+    if (jj_3R_28()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_29()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -1441,187 +1461,377 @@
     return false;
   }
 
-  final private boolean jj_3R_31() {
+  final private boolean jj_3R_33() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_37()) {
+    if (jj_scan_token(29)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(30)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_60() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_13()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_52() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_60()) {
     jj_scanpos = xsp;
     if (jj_3_1()) {
     jj_scanpos = xsp;
-    if (jj_3R_38()) return true;
+    if (jj_3R_61()) return true;
     }
     }
     return false;
   }
 
-  final private boolean jj_3R_37() {
-    if (jj_scan_token(LPAREN)) return true;
+  final private boolean jj_3R_32() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(31)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(32)) return true;
+    }
     return false;
   }
 
-  final private boolean jj_3R_43() {
+  final private boolean jj_3R_31() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(25)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(26)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_68() {
     if (jj_scan_token(NULL)) return true;
     return false;
   }
 
-  final private boolean jj_3R_42() {
+  final private boolean jj_3R_25() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_30()) {
+    jj_scanpos = xsp;
+    if (jj_3R_31()) {
+    jj_scanpos = xsp;
+    if (jj_3R_32()) {
+    jj_scanpos = xsp;
+    if (jj_3R_33()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_30() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(27)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(28)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_63() {
+    if (jj_scan_token(LBRACK)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_67() {
     if (jj_scan_token(STRING_LITERAL)) return true;
     return false;
   }
 
-  final private boolean jj_3R_18() {
-    if (jj_3R_19()) return true;
+  final private boolean jj_3R_54() {
+    if (jj_3R_63()) return true;
     return false;
   }
 
-  final private boolean jj_3R_41() {
+  final private boolean jj_3R_22() {
+    if (jj_3R_24()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_25()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_27() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(35)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(36)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_62() {
+    if (jj_scan_token(DOT)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_26() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(33)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(34)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_23() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_26()) {
+    jj_scanpos = xsp;
+    if (jj_3R_27()) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_66() {
     if (jj_scan_token(INTEGER_LITERAL)) return true;
     return false;
   }
 
-  final private boolean jj_3R_17() {
-    if (jj_3R_18()) return true;
+  final private boolean jj_3R_21() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(39)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(40)) return true;
+    }
     return false;
   }
 
-  final private boolean jj_3R_40() {
+  final private boolean jj_3R_53() {
+    if (jj_3R_62()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_50() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_53()) {
+    jj_scanpos = xsp;
+    if (jj_3R_54()) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_20() {
+    if (jj_3R_22()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_23()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_47() {
+    if (jj_3R_50()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_65() {
     if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
     return false;
   }
 
-  final private boolean jj_3R_29() {
-    if (jj_3R_31()) return true;
+  final private boolean jj_3R_49() {
+    if (jj_3R_52()) return true;
     return false;
   }
 
-  final private boolean jj_3R_46() {
+  final private boolean jj_3R_14() {
+    if (jj_scan_token(COMMA)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_71() {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  final private boolean jj_3R_16() {
-    if (jj_3R_17()) return true;
+  final private boolean jj_3R_48() {
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  final private boolean jj_3R_27() {
+  final private boolean jj_3R_46() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_28()) {
+    if (jj_3R_48()) {
     jj_scanpos = xsp;
-    if (jj_3R_29()) return true;
+    if (jj_3R_49()) return true;
     }
     return false;
   }
 
-  final private boolean jj_3R_28() {
-    if (jj_3R_30()) return true;
+  final private boolean jj_3R_18() {
+    if (jj_3R_20()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_21()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  final private boolean jj_3R_45() {
+  final private boolean jj_3R_19() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(41)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(42)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_70() {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  final private boolean jj_3R_39() {
+  final private boolean jj_3R_64() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_45()) {
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_46()) return true;
+    if (jj_3R_71()) return true;
     }
     return false;
   }
 
-  final private boolean jj_3R_15() {
-    if (jj_3R_16()) return true;
+  final private boolean jj_3R_45() {
+    if (jj_3R_46()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_47()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  final private boolean jj_3R_26() {
-    if (jj_3R_27()) return true;
+  final private boolean jj_3R_16() {
+    if (jj_3R_18()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_19()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  final private boolean jj_3R_25() {
-    if (jj_3R_26()) return true;
+  final private boolean jj_3R_41() {
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  final private boolean jj_3R_36() {
-    if (jj_3R_43()) return true;
+  final private boolean jj_3R_59() {
+    if (jj_3R_68()) return true;
     return false;
   }
 
-  final private boolean jj_3R_35() {
-    if (jj_3R_42()) return true;
+  final private boolean jj_3R_58() {
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  final private boolean jj_3R_24() {
-    if (jj_scan_token(EMPTY)) return true;
+  final private boolean jj_3R_17() {
+    if (jj_scan_token(QUESTIONMARK)) return true;
     return false;
   }
 
-  final private boolean jj_3R_34() {
-    if (jj_3R_41()) return true;
+  final private boolean jj_3R_40() {
+    if (jj_scan_token(EMPTY)) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  final private boolean jj_3R_33() {
-    if (jj_3R_40()) return true;
+  final private boolean jj_3R_57() {
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  final private boolean jj_3R_23() {
+  final private boolean jj_3R_12() {
+    if (jj_3R_13()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(37)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(38)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_14()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  final private boolean jj_3R_12() {
-    if (jj_3R_13()) return true;
+  final private boolean jj_3R_56() {
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  final private boolean jj_3R_22() {
-    if (jj_scan_token(MINUS)) return true;
+  final private boolean jj_3R_39() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(37)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(38)) return true;
+    }
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  final private boolean jj_3R_21() {
+  final private boolean jj_3R_34() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_22()) {
+    if (jj_3R_38()) {
     jj_scanpos = xsp;
-    if (jj_3R_23()) {
+    if (jj_3R_39()) {
     jj_scanpos = xsp;
-    if (jj_3R_24()) {
+    if (jj_3R_40()) {
     jj_scanpos = xsp;
-    if (jj_3R_25()) return true;
+    if (jj_3R_41()) return true;
     }
     }
     }
     return false;
   }
 
-  final private boolean jj_3R_30() {
+  final private boolean jj_3R_38() {
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_34()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_55() {
+    if (jj_3R_64()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_51() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_32()) {
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) {
+    if (jj_3R_56()) {
     jj_scanpos = xsp;
-    if (jj_3R_34()) {
+    if (jj_3R_57()) {
     jj_scanpos = xsp;
-    if (jj_3R_35()) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_36()) return true;
+    if (jj_3R_59()) return true;
     }
     }
     }
@@ -1629,18 +1839,56 @@
     return false;
   }
 
-  final private boolean jj_3R_32() {
-    if (jj_3R_39()) return true;
+  final private boolean jj_3R_15() {
+    if (jj_3R_16()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_17()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  final private boolean jj_3R_14() {
-    if (jj_3R_15()) return true;
+  final private boolean jj_3R_44() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(51)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(52)) return true;
+    }
     return false;
   }
 
   final private boolean jj_3R_13() {
-    if (jj_3R_14()) return true;
+    if (jj_3R_15()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_43() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(49)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(50)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_35() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_42()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) {
+    jj_scanpos = xsp;
+    if (jj_3R_44()) return true;
+    }
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_42() {
+    if (jj_scan_token(MULT)) return true;
     return false;
   }
 
@@ -1653,7 +1901,7 @@
   public boolean lookingAhead = false;
   private boolean jj_semLA;
   private int jj_gen;
-  final private int[] jj_la1 = new int[35];
+  final private int[] jj_la1 = new int[34];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static {
@@ -1661,10 +1909,10 @@
       jj_la1_1();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x240000,0x9d600,0x240000,0x80000,0x0,0x0,0x1000000,0x9d600,0x1d600,0xc000,};
+      jj_la1_0 = new int[] {0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x240000,0x9d600,0x240000,0x80000,0x0,0x1000000,0x9d600,0x1d600,0xc000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x10000,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x608860,0x0,0x600000,0x0,0x0,0x200000,0x400000,0x0,0x608860,0x0,0x0,};
+      jj_la1_1 = new int[] {0x0,0x0,0x10000,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x1208860,0x0,0x1200000,0x0,0x0,0x200000,0x0,0x1208860,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -1679,7 +1927,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1693,7 +1941,7 @@
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1703,7 +1951,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1714,7 +1962,7 @@
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1723,7 +1971,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1733,7 +1981,7 @@
     jj_ntk = -1;
     jjtree.reset();
     jj_gen = 0;
-    for (int i = 0; i < 35; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1844,15 +2092,15 @@
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[60];
-    for (int i = 0; i < 60; i++) {
+    boolean[] la1tokens = new boolean[62];
+    for (int i = 0; i < 62; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 35; i++) {
+    for (int i = 0; i < 34; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -1864,7 +2112,7 @@
         }
       }
     }
-    for (int i = 0; i < 60; i++) {
+    for (int i = 0; i < 62; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

Modified: tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java?rev=675739&r1=675738&r2=675739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java Thu Jul 10 14:05:35 2008
@@ -69,11 +69,13 @@
   int MOD1 = 52;
   int IDENTIFIER = 53;
   int NAMESPACE = 54;
-  int FUNCTIONSUFFIX = 55;
-  int IMPL_OBJ_START = 56;
-  int LETTER = 57;
-  int DIGIT = 58;
-  int ILLEGAL_CHARACTER = 59;
+  int NAMESPACE_NAME = 55;
+  int FUNCTION_CALL = 56;
+  int FUNCTIONSUFFIX = 57;
+  int IMPL_OBJ_START = 58;
+  int LETTER = 59;
+  int DIGIT = 60;
+  int ILLEGAL_CHARACTER = 61;
 
   int DEFAULT = 0;
   int IN_EXPRESSION = 1;
@@ -134,6 +136,8 @@
     "\"mod\"",
     "<IDENTIFIER>",
     "<NAMESPACE>",
+    "<NAMESPACE_NAME>",
+    "<FUNCTION_CALL>",
     "<FUNCTIONSUFFIX>",
     "\"#\"",
     "<LETTER>",

Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=675739&r1=675738&r2=675739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Thu Jul 10 14:05:35 2008
@@ -302,7 +302,7 @@
          if ((active0 & 0x141d555401c000L) != 0L)
          {
             jjmatchedKind = 53;
-            return 41;
+            return 42;
          }
          if ((active0 & 0x40000L) != 0L)
             return 1;
@@ -318,24 +318,24 @@
          }
          return -1;
       case 2:
-         if ((active0 & 0x14014000000000L) != 0L)
-            return 42;
          if ((active0 & 0x18000001c000L) != 0L)
          {
             jjmatchedKind = 53;
             jjmatchedPos = 2;
             return 42;
          }
+         if ((active0 & 0x14014000000000L) != 0L)
+            return 42;
          return -1;
       case 3:
-         if ((active0 & 0x14000L) != 0L)
-            return 42;
          if ((active0 & 0x180000008000L) != 0L)
          {
             jjmatchedKind = 53;
             jjmatchedPos = 3;
             return 42;
          }
+         if ((active0 & 0x14000L) != 0L)
+            return 42;
          return -1;
       case 4:
          if ((active0 & 0x80000008000L) != 0L)
@@ -740,7 +740,7 @@
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 41;
+   jjnewStateCnt = 42;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -755,77 +755,52 @@
          {
             switch(jjstateSet[--i])
             {
-               case 41:
-                  if ((0x3ff001000000000L & l) != 0L)
-                  {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
-                  }
-                  else if ((0x600000000000L & l) != 0L)
-                     jjCheckNAddStates(4, 6);
-                  else if (curChar == 58)
-                  {
-                     if (kind > 54)
-                        kind = 54;
-                  }
-                  if ((0x3ff001000000000L & l) != 0L)
-                     jjCheckNAddStates(7, 10);
-                  if ((0x3ff001000000000L & l) != 0L)
-                  {
-                     if (kind > 53)
-                        kind = 53;
-                     jjCheckNAdd(34);
-                  }
-                  if ((0x1800000000L & l) != 0L)
-                     jjCheckNAddStates(11, 14);
-                  break;
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 9)
                         kind = 9;
-                     jjCheckNAddStates(15, 19);
+                     jjCheckNAddStates(4, 8);
                   }
                   else if ((0x1800000000L & l) != 0L)
                   {
                      if (kind > 53)
                         kind = 53;
-                     jjCheckNAddStates(20, 25);
+                     jjCheckNAddStates(9, 15);
                   }
                   else if (curChar == 39)
-                     jjCheckNAddStates(26, 30);
+                     jjCheckNAddStates(16, 20);
                   else if (curChar == 34)
-                     jjCheckNAddStates(31, 35);
+                     jjCheckNAddStates(21, 25);
                   else if (curChar == 46)
                      jjCheckNAdd(1);
                   break;
                case 42:
-                  if ((0x3ff001000000000L & l) != 0L)
+                  if ((0x3ff601000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(36, 37);
+                  else if (curChar == 40)
                   {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
+                     if (kind > 56)
+                        kind = 56;
                   }
-                  else if ((0x600000000000L & l) != 0L)
-                     jjCheckNAddStates(4, 6);
                   else if (curChar == 58)
+                     jjstateSet[jjnewStateCnt++] = 38;
+                  if ((0x3ff001000000000L & l) != 0L)
                   {
-                     if (kind > 54)
-                        kind = 54;
+                     if (kind > 57)
+                        kind = 57;
+                     jjCheckNAdd(41);
                   }
                   if ((0x3ff001000000000L & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(39, 40);
                   if ((0x3ff001000000000L & l) != 0L)
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   if ((0x3ff001000000000L & l) != 0L)
                   {
                      if (kind > 53)
                         kind = 53;
                      jjCheckNAdd(34);
                   }
-                  if ((0x1800000000L & l) != 0L)
-                     jjCheckNAddStates(11, 14);
                   break;
                case 1:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -850,7 +825,7 @@
                      break;
                   if (kind > 9)
                      kind = 9;
-                  jjCheckNAddStates(15, 19);
+                  jjCheckNAddStates(4, 8);
                   break;
                case 6:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -905,15 +880,15 @@
                   break;
                case 17:
                   if (curChar == 34)
-                     jjCheckNAddStates(31, 35);
+                     jjCheckNAddStates(21, 25);
                   break;
                case 18:
                   if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(36, 38);
+                     jjCheckNAddStates(29, 31);
                   break;
                case 20:
                   if (curChar == 34)
-                     jjCheckNAddStates(36, 38);
+                     jjCheckNAddStates(29, 31);
                   break;
                case 21:
                   if (curChar == 34 && kind > 12)
@@ -929,15 +904,15 @@
                   break;
                case 25:
                   if (curChar == 39)
-                     jjCheckNAddStates(26, 30);
+                     jjCheckNAddStates(16, 20);
                   break;
                case 26:
                   if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(39, 41);
+                     jjCheckNAddStates(32, 34);
                   break;
                case 28:
                   if (curChar == 39)
-                     jjCheckNAddStates(39, 41);
+                     jjCheckNAddStates(32, 34);
                   break;
                case 29:
                   if (curChar == 39 && kind > 12)
@@ -956,7 +931,7 @@
                      break;
                   if (kind > 53)
                      kind = 53;
-                  jjCheckNAddStates(20, 25);
+                  jjCheckNAddStates(9, 15);
                   break;
                case 34:
                   if ((0x3ff001000000000L & l) == 0L)
@@ -967,30 +942,34 @@
                   break;
                case 35:
                   if ((0x3ff001000000000L & l) != 0L)
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   break;
                case 36:
-                  if ((0x1800000000L & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                  if ((0x3ff601000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(36, 37);
                   break;
                case 37:
-                  if ((0x3ff001000000000L & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                  if (curChar == 58)
+                     jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 38:
-                  if ((0x600000000000L & l) != 0L)
-                     jjCheckNAddStates(4, 6);
+                  if ((0x1800000000L & l) != 0L)
+                     jjCheckNAddTwoStates(39, 40);
                   break;
                case 39:
-                  if (curChar == 58 && kind > 54)
-                     kind = 54;
+                  if ((0x3ff001000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(39, 40);
                   break;
                case 40:
+                  if (curChar == 40 && kind > 56)
+                     kind = 56;
+                  break;
+               case 41:
                   if ((0x3ff001000000000L & l) == 0L)
                      break;
-                  if (kind > 55)
-                     kind = 55;
-                  jjCheckNAdd(40);
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(41);
                   break;
                default : break;
             }
@@ -1003,44 +982,26 @@
          {
             switch(jjstateSet[--i])
             {
-               case 41:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
-                  }
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(11, 14);
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(7, 10);
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 53)
-                        kind = 53;
-                     jjCheckNAdd(34);
-                  }
-                  break;
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 53)
                      kind = 53;
-                  jjCheckNAddStates(20, 25);
+                  jjCheckNAddStates(9, 15);
                   break;
                case 42:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
+                     if (kind > 57)
+                        kind = 57;
+                     jjCheckNAdd(41);
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(39, 40);
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(36, 37);
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 53)
@@ -1050,19 +1011,19 @@
                   break;
                case 2:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(42, 43);
+                     jjAddStates(35, 36);
                   break;
                case 10:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(44, 45);
+                     jjAddStates(37, 38);
                   break;
                case 14:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(46, 47);
+                     jjAddStates(39, 40);
                   break;
                case 18:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(36, 38);
+                     jjCheckNAddStates(29, 31);
                   break;
                case 19:
                   if (curChar == 92)
@@ -1070,11 +1031,11 @@
                   break;
                case 20:
                   if (curChar == 92)
-                     jjCheckNAddStates(36, 38);
+                     jjCheckNAddStates(29, 31);
                   break;
                case 22:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjAddStates(48, 49);
+                     jjAddStates(41, 42);
                   break;
                case 23:
                   if (curChar == 92)
@@ -1087,7 +1048,7 @@
                   break;
                case 26:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(39, 41);
+                     jjCheckNAddStates(32, 34);
                   break;
                case 27:
                   if (curChar == 92)
@@ -1095,11 +1056,11 @@
                   break;
                case 28:
                   if (curChar == 92)
-                     jjCheckNAddStates(39, 41);
+                     jjCheckNAddStates(32, 34);
                   break;
                case 30:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjAddStates(50, 51);
+                     jjAddStates(43, 44);
                   break;
                case 31:
                   if (curChar == 92)
@@ -1114,22 +1075,26 @@
                   break;
                case 35:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   break;
                case 36:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(36, 37);
                   break;
-               case 37:
+               case 38:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(39, 40);
                   break;
-               case 40:
+               case 39:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(39, 40);
+                  break;
+               case 41:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 55)
-                     kind = 55;
-                  jjCheckNAdd(40);
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(41);
                   break;
                default : break;
             }
@@ -1146,30 +1111,12 @@
          {
             switch(jjstateSet[--i])
             {
-               case 41:
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                  {
-                     if (kind > 53)
-                        kind = 53;
-                     jjCheckNAdd(34);
-                  }
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(7, 10);
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(11, 14);
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                  {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
-                  }
-                  break;
                case 0:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 53)
                      kind = 53;
-                  jjCheckNAddStates(20, 25);
+                  jjCheckNAddStates(9, 15);
                   break;
                case 42:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -1179,25 +1126,25 @@
                      jjCheckNAdd(34);
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(36, 37);
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(39, 40);
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 55)
-                        kind = 55;
-                     jjCheckNAdd(40);
+                     if (kind > 57)
+                        kind = 57;
+                     jjCheckNAdd(41);
                   }
                   break;
                case 18:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(36, 38);
+                     jjAddStates(29, 31);
                   break;
                case 22:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(48, 49);
+                     jjAddStates(41, 42);
                   break;
                case 24:
                case 32:
@@ -1206,11 +1153,11 @@
                   break;
                case 26:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(39, 41);
+                     jjAddStates(32, 34);
                   break;
                case 30:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(50, 51);
+                     jjAddStates(43, 44);
                   break;
                case 34:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -1221,22 +1168,26 @@
                   break;
                case 35:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(7, 10);
+                     jjCheckNAddStates(26, 28);
                   break;
                case 36:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(36, 37);
                   break;
-               case 37:
+               case 38:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddStates(11, 14);
+                     jjCheckNAddTwoStates(39, 40);
                   break;
-               case 40:
+               case 39:
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     jjCheckNAddTwoStates(39, 40);
+                  break;
+               case 41:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 55)
-                     kind = 55;
-                  jjCheckNAdd(40);
+                  if (kind > 57)
+                     kind = 57;
+                  jjCheckNAdd(41);
                   break;
                default : break;
             }
@@ -1249,17 +1200,16 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 41 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 42 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   0, 1, 3, 5, 36, 38, 39, 35, 36, 38, 39, 36, 37, 38, 39, 6, 
-   7, 8, 13, 14, 34, 35, 36, 38, 39, 40, 26, 27, 29, 30, 31, 18, 
-   19, 21, 22, 23, 18, 19, 21, 26, 27, 29, 3, 4, 11, 12, 15, 16, 
-   22, 23, 30, 31, 
+   0, 1, 3, 5, 6, 7, 8, 13, 14, 34, 35, 36, 37, 39, 40, 41, 
+   26, 27, 29, 30, 31, 18, 19, 21, 22, 23, 35, 36, 37, 18, 19, 21, 
+   26, 27, 29, 3, 4, 11, 12, 15, 16, 22, 23, 30, 31, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -1300,7 +1250,7 @@
 "\154\164", "\76\75", "\147\145", "\74\75", "\154\145", "\75\75", "\145\161", "\41\75", 
 "\156\145", "\41", "\156\157\164", "\46\46", "\141\156\144", "\174\174", "\157\162", 
 "\145\155\160\164\171", "\151\156\163\164\141\156\143\145\157\146", "\52", "\53", "\55",
"\77", "\57", 
-"\144\151\166", "\45", "\155\157\144", null, null, null, null, null, null, null, };
+"\144\151\166", "\45", "\155\157\144", null, null, null, null, null, null, null, null, null,
};
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "IN_EXPRESSION", 
@@ -1308,17 +1258,17 @@
 public static final int[] jjnewLexState = {
    -1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1,
-1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0x8fffffffffff60fL, 
+   0x233ffffffffff60fL, 
 };
 static final long[] jjtoSkip = {
    0x1f0L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[41];
-private final int[] jjstateSet = new int[82];
+private final int[] jjrounds = new int[42];
+private final int[] jjstateSet = new int[84];
 protected char curChar;
 public ELParserTokenManager(SimpleCharStream stream){
    if (SimpleCharStream.staticFlag)
@@ -1340,7 +1290,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 41; i-- > 0;)
+   for (i = 42; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 public void ReInit(SimpleCharStream stream, int lexState)
@@ -1413,9 +1363,9 @@
        jjmatchedKind = 0x7fffffff;
        jjmatchedPos = 0;
        curPos = jjMoveStringLiteralDfa0_1();
-       if (jjmatchedPos == 0 && jjmatchedKind > 59)
+       if (jjmatchedPos == 0 && jjmatchedKind > 61)
        {
-          jjmatchedKind = 59;
+          jjmatchedKind = 61;
        }
        break;
    }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message