Author: markt
Date: Sun Jan 10 23:04:41 2010
New Revision: 897729
URL: http://svn.apache.org/viewvc?rev=897729&view=rev
Log:
Update generated code after r897728
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=897729&r1=897728&r2=897729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Sun Jan 10 23:04:41
2010
@@ -1486,9 +1486,9 @@
private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(28)) {
+ if (jj_scan_token(27)) {
jj_scanpos = xsp;
- if (jj_scan_token(29)) return true;
+ if (jj_scan_token(28)) return true;
}
return false;
}
@@ -1501,9 +1501,9 @@
private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(30)) {
+ if (jj_scan_token(29)) {
jj_scanpos = xsp;
- if (jj_scan_token(31)) return true;
+ if (jj_scan_token(30)) return true;
}
return false;
}
@@ -1511,9 +1511,9 @@
private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(24)) {
+ if (jj_scan_token(23)) {
jj_scanpos = xsp;
- if (jj_scan_token(25)) return true;
+ if (jj_scan_token(24)) return true;
}
return false;
}
@@ -1537,9 +1537,9 @@
private boolean jj_3R_26() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(26)) {
+ if (jj_scan_token(25)) {
jj_scanpos = xsp;
- if (jj_scan_token(27)) return true;
+ if (jj_scan_token(26)) return true;
}
return false;
}
@@ -1577,9 +1577,9 @@
private boolean jj_3R_23() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(34)) {
+ if (jj_scan_token(33)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) return true;
+ if (jj_scan_token(34)) return true;
}
return false;
}
@@ -1592,9 +1592,9 @@
private boolean jj_3R_22() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(32)) {
+ if (jj_scan_token(31)) {
jj_scanpos = xsp;
- if (jj_scan_token(33)) return true;
+ if (jj_scan_token(32)) return true;
}
return false;
}
@@ -1612,9 +1612,9 @@
private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(38)) {
+ if (jj_scan_token(37)) {
jj_scanpos = xsp;
- if (jj_scan_token(39)) return true;
+ if (jj_scan_token(38)) return true;
}
return false;
}
@@ -1692,9 +1692,9 @@
private boolean jj_3R_15() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(40)) {
+ if (jj_scan_token(39)) {
jj_scanpos = xsp;
- if (jj_scan_token(41)) return true;
+ if (jj_scan_token(40)) return true;
}
return false;
}
@@ -1809,9 +1809,9 @@
private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(36)) {
+ if (jj_scan_token(35)) {
jj_scanpos = xsp;
- if (jj_scan_token(37)) return true;
+ if (jj_scan_token(36)) return true;
}
if (jj_3R_30()) return true;
return false;
@@ -1847,9 +1847,9 @@
private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(50)) {
+ if (jj_scan_token(49)) {
jj_scanpos = xsp;
- if (jj_scan_token(51)) return true;
+ if (jj_scan_token(50)) return true;
}
return false;
}
@@ -1857,9 +1857,9 @@
private boolean jj_3R_39() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(48)) {
+ if (jj_scan_token(47)) {
jj_scanpos = xsp;
- if (jj_scan_token(49)) return true;
+ if (jj_scan_token(48)) return true;
}
return false;
}
@@ -1916,10 +1916,10 @@
jj_la1_init_1();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff000000,0xc000000,0x3000000,0xc0000000,0x30000000,0xff000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4eb00,0x120000,0x4eb00,0x120000,0x40000,0x0,0x800000,0x4eb00,0xeb00,0x6000,};
+ jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x80000000,0x7f800000,0x6000000,0x1800000,0x60000000,0x18000000,0x7f800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27b00,0x90000,0x27b00,0x90000,0x20000,0x0,0x400000,0x27b00,0x7b00,0x3000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[]
{0x0,0x0,0x300,0x300,0xc0,0xc0,0xf,0x3,0xc,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0xf1000,0x30000,0xc0000,0xf1000,0x30,0x104430,0x0,0x100000,0x0,0x0,0x100000,0x0,0x104430,0x0,0x0,};
+ jj_la1_1 = new int[]
{0x0,0x0,0x180,0x180,0x60,0x60,0x7,0x1,0x6,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x3000,0x3000,0x78800,0x18000,0x60000,0x78800,0x18,0x82218,0x0,0x80000,0x0,0x0,0x80000,0x0,0x82218,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[3];
private boolean jj_rescan = false;
@@ -2108,7 +2108,7 @@
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[58];
+ boolean[] la1tokens = new boolean[57];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -2125,7 +2125,7 @@
}
}
}
- for (int i = 0; i < 58; i++) {
+ for (int i = 0; i < 57; 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=897729&r1=897728&r2=897729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java Sun Jan 10
23:04:41 2010
@@ -25,97 +25,95 @@
/** RegularExpression Id. */
int STRING_LITERAL = 11;
/** RegularExpression Id. */
- int BADLY_ESCAPED_STRING_LITERAL = 12;
+ int TRUE = 12;
/** RegularExpression Id. */
- int TRUE = 13;
+ int FALSE = 13;
/** RegularExpression Id. */
- int FALSE = 14;
+ int NULL = 14;
/** RegularExpression Id. */
- int NULL = 15;
+ int END_EXPRESSION = 15;
/** RegularExpression Id. */
- int END_EXPRESSION = 16;
+ int DOT = 16;
/** RegularExpression Id. */
- int DOT = 17;
+ int LPAREN = 17;
/** RegularExpression Id. */
- int LPAREN = 18;
+ int RPAREN = 18;
/** RegularExpression Id. */
- int RPAREN = 19;
+ int LBRACK = 19;
/** RegularExpression Id. */
- int LBRACK = 20;
+ int RBRACK = 20;
/** RegularExpression Id. */
- int RBRACK = 21;
+ int COLON = 21;
/** RegularExpression Id. */
- int COLON = 22;
+ int COMMA = 22;
/** RegularExpression Id. */
- int COMMA = 23;
+ int GT0 = 23;
/** RegularExpression Id. */
- int GT0 = 24;
+ int GT1 = 24;
/** RegularExpression Id. */
- int GT1 = 25;
+ int LT0 = 25;
/** RegularExpression Id. */
- int LT0 = 26;
+ int LT1 = 26;
/** RegularExpression Id. */
- int LT1 = 27;
+ int GE0 = 27;
/** RegularExpression Id. */
- int GE0 = 28;
+ int GE1 = 28;
/** RegularExpression Id. */
- int GE1 = 29;
+ int LE0 = 29;
/** RegularExpression Id. */
- int LE0 = 30;
+ int LE1 = 30;
/** RegularExpression Id. */
- int LE1 = 31;
+ int EQ0 = 31;
/** RegularExpression Id. */
- int EQ0 = 32;
+ int EQ1 = 32;
/** RegularExpression Id. */
- int EQ1 = 33;
+ int NE0 = 33;
/** RegularExpression Id. */
- int NE0 = 34;
+ int NE1 = 34;
/** RegularExpression Id. */
- int NE1 = 35;
+ int NOT0 = 35;
/** RegularExpression Id. */
- int NOT0 = 36;
+ int NOT1 = 36;
/** RegularExpression Id. */
- int NOT1 = 37;
+ int AND0 = 37;
/** RegularExpression Id. */
- int AND0 = 38;
+ int AND1 = 38;
/** RegularExpression Id. */
- int AND1 = 39;
+ int OR0 = 39;
/** RegularExpression Id. */
- int OR0 = 40;
+ int OR1 = 40;
/** RegularExpression Id. */
- int OR1 = 41;
+ int EMPTY = 41;
/** RegularExpression Id. */
- int EMPTY = 42;
+ int INSTANCEOF = 42;
/** RegularExpression Id. */
- int INSTANCEOF = 43;
+ int MULT = 43;
/** RegularExpression Id. */
- int MULT = 44;
+ int PLUS = 44;
/** RegularExpression Id. */
- int PLUS = 45;
+ int MINUS = 45;
/** RegularExpression Id. */
- int MINUS = 46;
+ int QUESTIONMARK = 46;
/** RegularExpression Id. */
- int QUESTIONMARK = 47;
+ int DIV0 = 47;
/** RegularExpression Id. */
- int DIV0 = 48;
+ int DIV1 = 48;
/** RegularExpression Id. */
- int DIV1 = 49;
+ int MOD0 = 49;
/** RegularExpression Id. */
- int MOD0 = 50;
+ int MOD1 = 50;
/** RegularExpression Id. */
- int MOD1 = 51;
+ int IDENTIFIER = 51;
/** RegularExpression Id. */
- int IDENTIFIER = 52;
+ int FUNCTIONSUFFIX = 52;
/** RegularExpression Id. */
- int FUNCTIONSUFFIX = 53;
+ int IMPL_OBJ_START = 53;
/** RegularExpression Id. */
- int IMPL_OBJ_START = 54;
+ int LETTER = 54;
/** RegularExpression Id. */
- int LETTER = 55;
+ int DIGIT = 55;
/** RegularExpression Id. */
- int DIGIT = 56;
- /** RegularExpression Id. */
- int ILLEGAL_CHARACTER = 57;
+ int ILLEGAL_CHARACTER = 56;
/** Lexical state. */
int DEFAULT = 0;
@@ -136,7 +134,6 @@
"<FLOATING_POINT_LITERAL>",
"<EXPONENT>",
"<STRING_LITERAL>",
- "<BADLY_ESCAPED_STRING_LITERAL>",
"\"true\"",
"\"false\"",
"\"null\"",
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=897729&r1=897728&r2=897729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sun Jan 10
23:04:41 2010
@@ -258,84 +258,84 @@
switch (pos)
{
case 0:
- if ((active0 & 0x20000L) != 0L)
+ if ((active0 & 0x10000L) != 0L)
return 1;
- if ((active0 & 0xa0eaaaa00e000L) != 0L)
+ if ((active0 & 0x5075555007000L) != 0L)
{
- jjmatchedKind = 52;
- return 36;
+ jjmatchedKind = 51;
+ return 30;
}
return -1;
case 1:
- if ((active0 & 0x20aaa000000L) != 0L)
- return 36;
- if ((active0 & 0xa0ca00000e000L) != 0L)
+ if ((active0 & 0x5065000007000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 1;
- return 36;
+ return 30;
}
+ if ((active0 & 0x10555000000L) != 0L)
+ return 30;
return -1;
case 2:
- if ((active0 & 0xc000000e000L) != 0L)
+ if ((active0 & 0x5005000000000L) != 0L)
+ return 30;
+ if ((active0 & 0x60000007000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 2;
- return 36;
+ return 30;
}
- if ((active0 & 0xa00a000000000L) != 0L)
- return 36;
return -1;
case 3:
- if ((active0 & 0xa000L) != 0L)
- return 36;
- if ((active0 & 0xc0000004000L) != 0L)
+ if ((active0 & 0x5000L) != 0L)
+ return 30;
+ if ((active0 & 0x60000002000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 3;
- return 36;
+ return 30;
}
return -1;
case 4:
- if ((active0 & 0x40000004000L) != 0L)
- return 36;
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 4;
- return 36;
+ return 30;
}
+ if ((active0 & 0x20000002000L) != 0L)
+ return 30;
return -1;
case 5:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 5;
- return 36;
+ return 30;
}
return -1;
case 6:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 6;
- return 36;
+ return 30;
}
return -1;
case 7:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 7;
- return 36;
+ return 30;
}
return -1;
case 8:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 52;
+ jjmatchedKind = 51;
jjmatchedPos = 8;
- return 36;
+ return 30;
}
return -1;
default :
@@ -351,70 +351,70 @@
switch(curChar)
{
case 33:
- jjmatchedKind = 36;
- return jjMoveStringLiteralDfa1_1(0x400000000L);
+ jjmatchedKind = 35;
+ return jjMoveStringLiteralDfa1_1(0x200000000L);
case 37:
- return jjStopAtPos(0, 50);
+ return jjStopAtPos(0, 49);
case 38:
- return jjMoveStringLiteralDfa1_1(0x4000000000L);
+ return jjMoveStringLiteralDfa1_1(0x2000000000L);
case 40:
- return jjStopAtPos(0, 18);
+ return jjStopAtPos(0, 17);
case 41:
- return jjStopAtPos(0, 19);
+ return jjStopAtPos(0, 18);
case 42:
- return jjStopAtPos(0, 44);
+ return jjStopAtPos(0, 43);
case 43:
- return jjStopAtPos(0, 45);
+ return jjStopAtPos(0, 44);
case 44:
- return jjStopAtPos(0, 23);
+ return jjStopAtPos(0, 22);
case 45:
- return jjStopAtPos(0, 46);
+ return jjStopAtPos(0, 45);
case 46:
- return jjStartNfaWithStates_1(0, 17, 1);
+ return jjStartNfaWithStates_1(0, 16, 1);
case 47:
- return jjStopAtPos(0, 48);
+ return jjStopAtPos(0, 47);
case 58:
- return jjStopAtPos(0, 22);
+ return jjStopAtPos(0, 21);
case 60:
- jjmatchedKind = 26;
- return jjMoveStringLiteralDfa1_1(0x40000000L);
+ jjmatchedKind = 25;
+ return jjMoveStringLiteralDfa1_1(0x20000000L);
case 61:
- return jjMoveStringLiteralDfa1_1(0x100000000L);
+ return jjMoveStringLiteralDfa1_1(0x80000000L);
case 62:
- jjmatchedKind = 24;
- return jjMoveStringLiteralDfa1_1(0x10000000L);
+ jjmatchedKind = 23;
+ return jjMoveStringLiteralDfa1_1(0x8000000L);
case 63:
- return jjStopAtPos(0, 47);
+ return jjStopAtPos(0, 46);
case 91:
- return jjStopAtPos(0, 20);
+ return jjStopAtPos(0, 19);
case 93:
- return jjStopAtPos(0, 21);
+ return jjStopAtPos(0, 20);
case 97:
- return jjMoveStringLiteralDfa1_1(0x8000000000L);
+ return jjMoveStringLiteralDfa1_1(0x4000000000L);
case 100:
- return jjMoveStringLiteralDfa1_1(0x2000000000000L);
+ return jjMoveStringLiteralDfa1_1(0x1000000000000L);
case 101:
- return jjMoveStringLiteralDfa1_1(0x40200000000L);
+ return jjMoveStringLiteralDfa1_1(0x20100000000L);
case 102:
- return jjMoveStringLiteralDfa1_1(0x4000L);
+ return jjMoveStringLiteralDfa1_1(0x2000L);
case 103:
- return jjMoveStringLiteralDfa1_1(0x22000000L);
+ return jjMoveStringLiteralDfa1_1(0x11000000L);
case 105:
- return jjMoveStringLiteralDfa1_1(0x80000000000L);
+ return jjMoveStringLiteralDfa1_1(0x40000000000L);
case 108:
- return jjMoveStringLiteralDfa1_1(0x88000000L);
+ return jjMoveStringLiteralDfa1_1(0x44000000L);
case 109:
- return jjMoveStringLiteralDfa1_1(0x8000000000000L);
+ return jjMoveStringLiteralDfa1_1(0x4000000000000L);
case 110:
- return jjMoveStringLiteralDfa1_1(0x2800008000L);
+ return jjMoveStringLiteralDfa1_1(0x1400004000L);
case 111:
- return jjMoveStringLiteralDfa1_1(0x20000000000L);
+ return jjMoveStringLiteralDfa1_1(0x10000000000L);
case 116:
- return jjMoveStringLiteralDfa1_1(0x2000L);
+ return jjMoveStringLiteralDfa1_1(0x1000L);
case 124:
- return jjMoveStringLiteralDfa1_1(0x10000000000L);
+ return jjMoveStringLiteralDfa1_1(0x8000000000L);
case 125:
- return jjStopAtPos(0, 16);
+ return jjStopAtPos(0, 15);
default :
return jjMoveNfa_1(0, 0);
}
@@ -429,56 +429,56 @@
switch(curChar)
{
case 38:
- if ((active0 & 0x4000000000L) != 0L)
- return jjStopAtPos(1, 38);
+ if ((active0 & 0x2000000000L) != 0L)
+ return jjStopAtPos(1, 37);
break;
case 61:
- if ((active0 & 0x10000000L) != 0L)
- return jjStopAtPos(1, 28);
- else if ((active0 & 0x40000000L) != 0L)
- return jjStopAtPos(1, 30);
- else if ((active0 & 0x100000000L) != 0L)
- return jjStopAtPos(1, 32);
- else if ((active0 & 0x400000000L) != 0L)
- return jjStopAtPos(1, 34);
+ if ((active0 & 0x8000000L) != 0L)
+ return jjStopAtPos(1, 27);
+ else if ((active0 & 0x20000000L) != 0L)
+ return jjStopAtPos(1, 29);
+ else if ((active0 & 0x80000000L) != 0L)
+ return jjStopAtPos(1, 31);
+ else if ((active0 & 0x200000000L) != 0L)
+ return jjStopAtPos(1, 33);
break;
case 97:
- return jjMoveStringLiteralDfa2_1(active0, 0x4000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x2000L);
case 101:
- if ((active0 & 0x20000000L) != 0L)
- return jjStartNfaWithStates_1(1, 29, 36);
- else if ((active0 & 0x80000000L) != 0L)
- return jjStartNfaWithStates_1(1, 31, 36);
- else if ((active0 & 0x800000000L) != 0L)
- return jjStartNfaWithStates_1(1, 35, 36);
+ if ((active0 & 0x10000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 28, 30);
+ else if ((active0 & 0x40000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 30, 30);
+ else if ((active0 & 0x400000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 34, 30);
break;
case 105:
- return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000L);
case 109:
- return jjMoveStringLiteralDfa2_1(active0, 0x40000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L);
case 110:
- return jjMoveStringLiteralDfa2_1(active0, 0x88000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x44000000000L);
case 111:
- return jjMoveStringLiteralDfa2_1(active0, 0x8002000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x4001000000000L);
case 113:
- if ((active0 & 0x200000000L) != 0L)
- return jjStartNfaWithStates_1(1, 33, 36);
+ if ((active0 & 0x100000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 32, 30);
break;
case 114:
- if ((active0 & 0x20000000000L) != 0L)
- return jjStartNfaWithStates_1(1, 41, 36);
- return jjMoveStringLiteralDfa2_1(active0, 0x2000L);
+ if ((active0 & 0x10000000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 40, 30);
+ return jjMoveStringLiteralDfa2_1(active0, 0x1000L);
case 116:
- if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_1(1, 25, 36);
- else if ((active0 & 0x8000000L) != 0L)
- return jjStartNfaWithStates_1(1, 27, 36);
+ if ((active0 & 0x1000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 24, 30);
+ else if ((active0 & 0x4000000L) != 0L)
+ return jjStartNfaWithStates_1(1, 26, 30);
break;
case 117:
- return jjMoveStringLiteralDfa2_1(active0, 0x8000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x4000L);
case 124:
- if ((active0 & 0x10000000000L) != 0L)
- return jjStopAtPos(1, 40);
+ if ((active0 & 0x8000000000L) != 0L)
+ return jjStopAtPos(1, 39);
break;
default :
break;
@@ -497,26 +497,26 @@
switch(curChar)
{
case 100:
- if ((active0 & 0x8000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 39, 36);
- else if ((active0 & 0x8000000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 51, 36);
+ if ((active0 & 0x4000000000L) != 0L)
+ return jjStartNfaWithStates_1(2, 38, 30);
+ else if ((active0 & 0x4000000000000L) != 0L)
+ return jjStartNfaWithStates_1(2, 50, 30);
break;
case 108:
- return jjMoveStringLiteralDfa3_1(active0, 0xc000L);
+ return jjMoveStringLiteralDfa3_1(active0, 0x6000L);
case 112:
- return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L);
+ return jjMoveStringLiteralDfa3_1(active0, 0x20000000000L);
case 115:
- return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L);
case 116:
- if ((active0 & 0x2000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 37, 36);
+ if ((active0 & 0x1000000000L) != 0L)
+ return jjStartNfaWithStates_1(2, 36, 30);
break;
case 117:
- return jjMoveStringLiteralDfa3_1(active0, 0x2000L);
+ return jjMoveStringLiteralDfa3_1(active0, 0x1000L);
case 118:
- if ((active0 & 0x2000000000000L) != 0L)
- return jjStartNfaWithStates_1(2, 49, 36);
+ if ((active0 & 0x1000000000000L) != 0L)
+ return jjStartNfaWithStates_1(2, 48, 30);
break;
default :
break;
@@ -535,17 +535,17 @@
switch(curChar)
{
case 101:
- if ((active0 & 0x2000L) != 0L)
- return jjStartNfaWithStates_1(3, 13, 36);
+ if ((active0 & 0x1000L) != 0L)
+ return jjStartNfaWithStates_1(3, 12, 30);
break;
case 108:
- if ((active0 & 0x8000L) != 0L)
- return jjStartNfaWithStates_1(3, 15, 36);
+ if ((active0 & 0x4000L) != 0L)
+ return jjStartNfaWithStates_1(3, 14, 30);
break;
case 115:
- return jjMoveStringLiteralDfa4_1(active0, 0x4000L);
+ return jjMoveStringLiteralDfa4_1(active0, 0x2000L);
case 116:
- return jjMoveStringLiteralDfa4_1(active0, 0xc0000000000L);
+ return jjMoveStringLiteralDfa4_1(active0, 0x60000000000L);
default :
break;
}
@@ -563,14 +563,14 @@
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa5_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa5_1(active0, 0x40000000000L);
case 101:
- if ((active0 & 0x4000L) != 0L)
- return jjStartNfaWithStates_1(4, 14, 36);
+ if ((active0 & 0x2000L) != 0L)
+ return jjStartNfaWithStates_1(4, 13, 30);
break;
case 121:
- if ((active0 & 0x40000000000L) != 0L)
- return jjStartNfaWithStates_1(4, 42, 36);
+ if ((active0 & 0x20000000000L) != 0L)
+ return jjStartNfaWithStates_1(4, 41, 30);
break;
default :
break;
@@ -589,7 +589,7 @@
switch(curChar)
{
case 110:
- return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L);
default :
break;
}
@@ -607,7 +607,7 @@
switch(curChar)
{
case 99:
- return jjMoveStringLiteralDfa7_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L);
default :
break;
}
@@ -625,7 +625,7 @@
switch(curChar)
{
case 101:
- return jjMoveStringLiteralDfa8_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa8_1(active0, 0x40000000000L);
default :
break;
}
@@ -643,7 +643,7 @@
switch(curChar)
{
case 111:
- return jjMoveStringLiteralDfa9_1(active0, 0x80000000000L);
+ return jjMoveStringLiteralDfa9_1(active0, 0x40000000000L);
default :
break;
}
@@ -661,8 +661,8 @@
switch(curChar)
{
case 102:
- if ((active0 & 0x80000000000L) != 0L)
- return jjStartNfaWithStates_1(9, 43, 36);
+ if ((active0 & 0x40000000000L) != 0L)
+ return jjStartNfaWithStates_1(9, 42, 30);
break;
default :
break;
@@ -698,7 +698,7 @@
private int jjMoveNfa_1(int startState, int curPos)
{
int startsAt = 0;
- jjnewStateCnt = 36;
+ jjnewStateCnt = 30;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -722,29 +722,29 @@
}
else if ((0x1800000000L & l) != 0L)
{
- if (kind > 52)
- kind = 52;
- jjCheckNAddTwoStates(34, 35);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAddTwoStates(28, 29);
}
else if (curChar == 39)
- jjCheckNAddStates(23, 27);
+ jjCheckNAddStates(23, 25);
else if (curChar == 34)
- jjCheckNAddStates(28, 32);
+ jjCheckNAddStates(26, 28);
else if (curChar == 46)
jjCheckNAdd(1);
break;
- case 36:
+ case 30:
if ((0x3ff001000000000L & l) != 0L)
{
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
}
if ((0x3ff001000000000L & l) != 0L)
{
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
}
break;
case 1:
@@ -766,131 +766,115 @@
jjCheckNAdd(4);
break;
case 5:
+ if (curChar == 34)
+ jjCheckNAddStates(26, 28);
+ break;
+ case 6:
+ if ((0xfffffffbffffffffL & l) != 0L)
+ jjCheckNAddStates(26, 28);
+ break;
+ case 8:
+ if ((0x8400000000L & l) != 0L)
+ jjCheckNAddStates(26, 28);
+ break;
+ case 9:
+ if (curChar == 34 && kind > 11)
+ kind = 11;
+ break;
+ case 10:
+ if (curChar == 39)
+ jjCheckNAddStates(23, 25);
+ break;
+ case 11:
+ if ((0xffffff7fffffffffL & l) != 0L)
+ jjCheckNAddStates(23, 25);
+ break;
+ case 13:
+ if ((0x8400000000L & l) != 0L)
+ jjCheckNAddStates(23, 25);
+ break;
+ case 14:
+ if (curChar == 39 && kind > 11)
+ kind = 11;
+ break;
+ case 15:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 8)
kind = 8;
jjCheckNAddStates(18, 22);
break;
- case 6:
+ case 16:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 8)
kind = 8;
- jjCheckNAdd(6);
+ jjCheckNAdd(16);
break;
- case 7:
+ case 17:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(7, 8);
+ jjCheckNAddTwoStates(17, 18);
break;
- case 8:
+ case 18:
if (curChar != 46)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(9, 10);
+ jjCheckNAddTwoStates(19, 20);
break;
- case 9:
+ case 19:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(9, 10);
+ jjCheckNAddTwoStates(19, 20);
break;
- case 11:
+ case 21:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(12);
+ jjCheckNAdd(22);
break;
- case 12:
+ case 22:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 9)
kind = 9;
- jjCheckNAdd(12);
+ jjCheckNAdd(22);
break;
- case 13:
+ case 23:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(13, 14);
+ jjCheckNAddTwoStates(23, 24);
break;
- case 15:
+ case 25:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(16);
+ jjCheckNAdd(26);
break;
- case 16:
+ case 26:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 9)
kind = 9;
- jjCheckNAdd(16);
+ jjCheckNAdd(26);
break;
- case 17:
- if (curChar == 34)
- jjCheckNAddStates(28, 32);
- break;
- case 18:
- if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(33, 35);
- break;
- case 20:
- if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(33, 35);
- break;
- case 21:
- if (curChar == 34 && kind > 11)
- kind = 11;
- break;
- case 22:
- if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddTwoStates(22, 23);
- break;
- case 24:
- if ((0xfffffffbffffffffL & l) != 0L && kind > 12)
- kind = 12;
- break;
- case 25:
- if (curChar == 39)
- jjCheckNAddStates(23, 27);
- break;
- case 26:
- if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(36, 38);
- break;
- case 28:
- if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(36, 38);
- break;
- case 29:
- if (curChar == 39 && kind > 11)
- kind = 11;
- break;
- case 30:
- if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddTwoStates(30, 31);
- break;
- case 32:
- if ((0xffffff7fffffffffL & l) != 0L && kind > 12)
- kind = 12;
- break;
- case 33:
+ case 27:
if ((0x1800000000L & l) == 0L)
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAddTwoStates(34, 35);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAddTwoStates(28, 29);
break;
- case 34:
+ case 28:
if ((0x3ff001000000000L & l) == 0L)
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
break;
- case 35:
+ case 29:
if ((0x3ff001000000000L & l) == 0L)
break;
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
break;
default : break;
}
@@ -906,94 +890,73 @@
case 0:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAddTwoStates(34, 35);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAddTwoStates(28, 29);
break;
- case 36:
+ case 30:
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
}
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
}
break;
case 2:
if ((0x2000000020L & l) != 0L)
- jjAddStates(39, 40);
+ jjAddStates(29, 30);
break;
- case 10:
- if ((0x2000000020L & l) != 0L)
- jjAddStates(41, 42);
- break;
- case 14:
- if ((0x2000000020L & l) != 0L)
- jjAddStates(43, 44);
- break;
- case 18:
+ case 6:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(33, 35);
- break;
- case 19:
- if (curChar == 92)
- jjstateSet[jjnewStateCnt++] = 20;
+ jjCheckNAddStates(26, 28);
break;
- case 20:
+ case 7:
if (curChar == 92)
- jjCheckNAddStates(33, 35);
+ jjstateSet[jjnewStateCnt++] = 8;
break;
- case 22:
- if ((0xffffffffefffffffL & l) != 0L)
- jjAddStates(45, 46);
- break;
- case 23:
+ case 8:
if (curChar == 92)
- jjstateSet[jjnewStateCnt++] = 24;
+ jjCheckNAddStates(26, 28);
break;
- case 24:
- case 32:
- if ((0xffffffffefffffffL & l) != 0L && kind > 12)
- kind = 12;
- break;
- case 26:
+ case 11:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(23, 25);
break;
- case 27:
+ case 12:
if (curChar == 92)
- jjstateSet[jjnewStateCnt++] = 28;
+ jjstateSet[jjnewStateCnt++] = 13;
break;
- case 28:
+ case 13:
if (curChar == 92)
- jjCheckNAddStates(36, 38);
+ jjCheckNAddStates(23, 25);
break;
- case 30:
- if ((0xffffffffefffffffL & l) != 0L)
- jjAddStates(47, 48);
+ case 20:
+ if ((0x2000000020L & l) != 0L)
+ jjAddStates(31, 32);
break;
- case 31:
- if (curChar == 92)
- jjstateSet[jjnewStateCnt++] = 32;
+ case 24:
+ if ((0x2000000020L & l) != 0L)
+ jjAddStates(33, 34);
break;
- case 34:
+ case 28:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
break;
- case 35:
+ case 29:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
break;
default : break;
}
@@ -1013,58 +976,45 @@
case 0:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAddTwoStates(34, 35);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAddTwoStates(28, 29);
break;
- case 36:
+ case 30:
if (jjCanMove_1(hiByte, i1, i2, l1, l2))
{
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
}
if (jjCanMove_1(hiByte, i1, i2, l1, l2))
{
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
}
break;
- case 18:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(33, 35);
- break;
- case 22:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(45, 46);
- break;
- case 24:
- case 32:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 12)
- kind = 12;
- break;
- case 26:
+ case 6:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(36, 38);
+ jjAddStates(26, 28);
break;
- case 30:
+ case 11:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(47, 48);
+ jjAddStates(23, 25);
break;
- case 34:
+ case 28:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- if (kind > 52)
- kind = 52;
- jjCheckNAdd(34);
+ if (kind > 51)
+ kind = 51;
+ jjCheckNAdd(28);
break;
- case 35:
+ case 29:
if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- if (kind > 53)
- kind = 53;
- jjCheckNAdd(35);
+ if (kind > 52)
+ kind = 52;
+ jjCheckNAdd(29);
break;
default : break;
}
@@ -1077,7 +1027,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 36 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -1085,9 +1035,8 @@
}
static final int[] jjnextStates = {
0, 1, 3, 4, 2, 0, 1, 4, 2, 0, 1, 4, 5, 2, 0, 1,
- 2, 6, 6, 7, 8, 13, 14, 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,
+ 2, 6, 16, 17, 18, 23, 24, 11, 12, 14, 6, 7, 9, 3, 4, 21,
+ 22, 25, 26,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1,
long l2)
{
@@ -1125,12 +1074,12 @@
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
"", null, "\44\173", "\43\173", null, null, null, null, null, null, null,
null,
-null, "\164\162\165\145", "\146\141\154\163\145", "\156\165\154\154", "\175",
"\56",
-"\50", "\51", "\133", "\135", "\72", "\54", "\76", "\147\164", "\74",
"\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, };
+"\164\162\165\145", "\146\141\154\163\145", "\156\165\154\154", "\175", "\56",
"\50", "\51",
+"\133", "\135", "\72", "\54", "\76", "\147\164", "\74", "\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, };
/** Lexer state names. */
public static final String[] lexStateNames = {
@@ -1140,19 +1089,19 @@
/** Lex State array. */
public static final int[] jjnewLexState = {
- -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, 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,
};
static final long[] jjtoToken = {
- 0x23ffffffffffb0fL,
+ 0x11ffffffffffb0fL,
};
static final long[] jjtoSkip = {
0xf0L,
};
protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[36];
-private final int[] jjstateSet = new int[72];
+private final int[] jjrounds = new int[30];
+private final int[] jjstateSet = new int[60];
protected char curChar;
/** Constructor. */
public ELParserTokenManager(SimpleCharStream stream){
@@ -1179,7 +1128,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 36; i-- > 0;)
+ for (i = 30; i-- > 0;)
jjrounds[i] = 0x80000000;
}
@@ -1266,9 +1215,9 @@
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_1();
- if (jjmatchedPos == 0 && jjmatchedKind > 57)
+ if (jjmatchedPos == 0 && jjmatchedKind > 56)
{
- jjmatchedKind = 57;
+ jjmatchedKind = 56;
}
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
