This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 37830e8d66c727163f4ed2d3c77593e7d5056014
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 17 15:23:40 2025 +0000
Fix BZ 69521 - allow Korean (and other) characters in EL identifiers
Regenerate the parser from the JJTree file to pick up the improved
definition of Identifier. It is now identical to Java Language
Identifier except for also allowing identifiers to start with '#'.
Note that while the parser allows identifiers to start with '#', such
identifiers will still be rejected during the validation process.
https://bz.apache.org/bugzilla/show_bug.cgi?id=69521
---
java/org/apache/el/parser/ELParserConstants.java | 6 +-
.../org/apache/el/parser/ELParserTokenManager.java | 376 +++++++++++++++++++--
test/org/apache/el/parser/TestAstIdentifier.java | 47 +++
webapps/docs/changelog.xml | 5 +
4 files changed, 397 insertions(+), 37 deletions(-)
diff --git a/java/org/apache/el/parser/ELParserConstants.java
b/java/org/apache/el/parser/ELParserConstants.java
index 9eb57a6cc8..abec2c050a 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -118,9 +118,9 @@ public interface ELParserConstants {
/** RegularExpression Id. */
int IMPL_OBJ_START = 58;
/** RegularExpression Id. */
- int LETTER = 59;
+ int JAVALETTER = 59;
/** RegularExpression Id. */
- int DIGIT = 60;
+ int JAVADIGIT = 60;
/** RegularExpression Id. */
int ILLEGAL_CHARACTER = 61;
@@ -138,7 +138,7 @@ public interface ELParserConstants {
"\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"",
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
"\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"",
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
"\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"",
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
- "\"+=\"", "\"=\"", "\"->\"", "<IDENTIFIER>", "<FUNCTIONSUFFIX>",
"\"#\"", "<LETTER>", "<DIGIT>",
+ "\"+=\"", "\"=\"", "\"->\"", "<IDENTIFIER>", "<FUNCTIONSUFFIX>",
"\"#\"", "<JAVALETTER>", "<JAVADIGIT>",
"<ILLEGAL_CHARACTER>", };
}
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java
b/java/org/apache/el/parser/ELParserTokenManager.java
index cc51f5a573..8ff69f918c 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -753,12 +753,120 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjMoveNfa_2(state, pos + 1);
}
- static final long[] jjbitVec3 = { 0x1ff00000fffffffeL,
0xffffffffffffc000L, 0xffffffffL, 0x600000000000000L };
- static final long[] jjbitVec4 = { 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL };
- static final long[] jjbitVec5 = { 0x0L, 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffffffffffffffL };
- static final long[] jjbitVec6 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffL, 0x0L };
- static final long[] jjbitVec7 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0x0L, 0x0L };
- static final long[] jjbitVec8 = { 0x3fffffffffffL, 0x0L, 0x0L, 0x0L };
+ static final long[] jjbitVec3 =
+ { 0xfff0000040220002L, 0xffffffffffffdfffL, 0xfffff02f7fffffffL,
0x12000000007fffffL };
+ static final long[] jjbitVec4 = { 0x0L, 0x0L, 0x420043c00000000L,
0xff7fffffff7fffffL };
+ static final long[] jjbitVec5 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffffffffffffffL, 0x501f0003ffc3L };
+ static final long[] jjbitVec6 = { 0x0L, 0x3cdf000000000000L,
0xfffffffbffffd740L, 0xffbfffffffffffffL };
+ static final long[] jjbitVec7 =
+ { 0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc03L,
0xffffffffffffffffL };
+ static final long[] jjbitVec8 = { 0xfffe00ffffffffffL,
0xfffffffe027fffffL, 0x80ffL, 0x707ffffff0000L };
+ static final long[] jjbitVec9 =
+ { 0xffffffff00000800L, 0xfffec000000007ffL, 0xffffffffffffffffL,
0x9c00c060002fffffL };
+ static final long[] jjbitVec10 = { 0xfffffffd0000L, 0xffffffffffffe000L,
0x2003fffffffffL, 0x43007fffffffc00L };
+ static final long[] jjbitVec11 = { 0x110043fffffL, 0x1ffffffL,
0x1ffd00000000L, 0x0L };
+ static final long[] jjbitVec12 =
+ { 0x23fffffffffffff0L, 0xfefe0003ff010000L, 0x23c5fdfffff99fe0L,
0x80f0003b0004000L };
+ static final long[] jjbitVec13 = { 0x36dfdfffff987e0L, 0x1c00005e000000L,
0x23edfdfffffbbfe0L, 0x2000300010000L };
+ static final long[] jjbitVec14 = { 0x23edfdfffff99fe0L, 0x20003b0000000L,
0x3ffc718d63dc7e8L, 0x200000000010000L };
+ static final long[] jjbitVec15 = { 0x23effdfffffddfe0L, 0x303000000L,
0x23effdfffffddfe0L, 0x6000340000000L };
+ static final long[] jjbitVec16 = { 0x27fffffffffddfe0L,
0xfc00000300004000L, 0x2ffbfffffc7fffe0L, 0x7fL };
+ static final long[] jjbitVec17 = { 0x800dfffffffffffeL, 0x7fL,
0x200decaefef02596L, 0xf000005fL };
+ static final long[] jjbitVec18 = { 0x1L, 0x1ffffffffeffL, 0x1f00L, 0x0L };
+ static final long[] jjbitVec19 =
+ { 0x800007ffffffffffL, 0xffe1c0623c3f0000L, 0xffffffff00004003L,
0xf7ffffffffff20bfL };
+ static final long[] jjbitVec20 =
+ { 0xffffffffffffffffL, 0xffffffff3d7f3dffL, 0x7f3dffffffff3dffL,
0xffffffffff7fff3dL };
+ static final long[] jjbitVec21 = { 0xffffffffff3dffffL, 0x7ffffffL,
0xffffffff0000ffffL, 0x1fffffffffffffL };
+ static final long[] jjbitVec22 =
+ { 0xffffffffffffffffL, 0xffff9fffffffffffL, 0xffffffff07fffffeL,
0x1c7ffffffffffL };
+ static final long[] jjbitVec23 = { 0x3ffff0003dfffL, 0x1dfff0003ffffL,
0xfffffffffffffL, 0x18800000L };
+ static final long[] jjbitVec24 = { 0xffffffff00000000L, 0xffffffffffffffL,
0xffff05ffffffffffL, 0x3fffffffffffffL };
+ static final long[] jjbitVec25 = { 0x1fffffffL, 0x1f3fffffff0000L,
0xfffffffffffL, 0xfeL };
+ static final long[] jjbitVec26 = { 0xffffffff007fffffL, 0x1fffffL,
0x8000000000L, 0x0L };
+ static final long[] jjbitVec27 = { 0xfffffffffffe0L, 0xfe0L,
0xfc00c001fffffff8L, 0x3fffffffffL };
+ static final long[] jjbitVec28 = { 0xfffffffffL, 0x3ffffffffc00e000L,
0x0L, 0x63de0000000000L };
+ static final long[] jjbitVec29 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffffffffffffffL, 0x0L };
+ static final long[] jjbitVec30 =
+ { 0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL,
0x1fdc1fff0fcf1fdcL };
+ static final long[] jjbitVec31 = { 0x8000000000000000L,
0x8002000000100001L, 0x7ffffff1fff0000L, 0x0L };
+ static final long[] jjbitVec32 = { 0xf3ffbd503e2ffc84L,
0xffffffff000043e0L, 0x1ffL, 0x0L };
+ static final long[] jjbitVec33 =
+ { 0xffff7fffffffffffL, 0xffffffff7fffffffL, 0xffffffffffffffffL,
0xc781fffffffffL };
+ static final long[] jjbitVec34 = { 0xffff20bfffffffffL, 0x80ffffffffffL,
0x7f7f7f7f007fffffL, 0x7f7f7f7fL };
+ static final long[] jjbitVec35 = { 0x800000000000L, 0x0L, 0x0L, 0x0L };
+ static final long[] jjbitVec36 =
+ { 0x1f3e03fe000000e0L, 0xfffffffffffffffeL, 0xfffffffee07fffffL,
0xf7ffffffffffffffL };
+ static final long[] jjbitVec37 =
+ { 0xfffe3fffffffffe0L, 0xffffffffffffffffL, 0x7ffffff00007fffL,
0xffff000000000000L };
+ static final long[] jjbitVec38 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0x3fffffffffffffL, 0x0L };
+ static final long[] jjbitVec39 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffffffffffffffL, 0x1fffL };
+ static final long[] jjbitVec40 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0x1fffL, 0x3fffffffffff0000L };
+ static final long[] jjbitVec41 = { 0xc00ffff1fffL, 0x80007fffffffffffL,
0xffffffff00ffffffL, 0xffffffffffffL };
+ static final long[] jjbitVec42 = { 0xfffffffcff800000L,
0xffffffffffffffffL, 0x7ff000f79ffL, 0xff00000000000000L };
+ static final long[] jjbitVec43 = { 0x1000007fffff7bbL, 0xfffffffffffffL,
0xffffffffffffcL, 0x8fc000000000000L };
+ static final long[] jjbitVec44 = { 0xffff003ffffffc00L,
0x1fffffff0000007fL, 0x7fffffffffff0L, 0x8000L };
+ static final long[] jjbitVec45 = { 0x1ffffffffffL, 0x47fffff00000ff7L,
0x3e62ffffffffffffL, 0x1c07ff38000005L };
+ static final long[] jjbitVec46 = { 0x7f7f007e7e7eL, 0x0L, 0x0L,
0x7ffffffffL };
+ static final long[] jjbitVec47 =
+ { 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffff000fffffffffL,
0xffffffffffff87fL };
+ static final long[] jjbitVec48 = { 0xffffffffffffffffL,
0xffff3fffffffffffL, 0xffffffffffffffffL, 0x3ffffffL };
+ static final long[] jjbitVec49 =
+ { 0x5f7ffdffa0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL,
0xfffffffffff80000L };
+ static final long[] jjbitVec50 =
+ { 0x3fffffffffffffffL, 0xffffffffffff0000L, 0xfffffffffffcffffL,
0x1fff0000000000ffL };
+ static final long[] jjbitVec51 =
+ { 0x18000000000000L, 0xffdf02000000e000L, 0xffffffffffffffffL,
0x1fffffffffffffffL };
+ static final long[] jjbitVec52 = { 0x87fffffe00000010L,
0xffffffc007fffffeL, 0x7fffffffffffffffL, 0x631cfcfcfcL };
+ static final long[] jjbitVec53 = { 0x0L, 0x0L, 0x420243cffffffffL,
0xff7fffffff7fffffL };
+ static final long[] jjbitVec54 =
+ { 0xffffffffffffffffL, 0x3cdfffffffffffffL, 0xfffffffbffffd740L,
0xffbfffffffffffffL };
+ static final long[] jjbitVec55 =
+ { 0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffcfbL,
0xffffffffffffffffL };
+ static final long[] jjbitVec56 =
+ { 0xfffe00ffffffffffL, 0xfffffffe027fffffL, 0xbffffffffffe80ffL,
0x707ffffff00b6L };
+ static final long[] jjbitVec57 =
+ { 0xffffffff07ff081fL, 0xffffc3ffffffffffL, 0xffffffffffffffffL,
0x9ffffdffbfefffffL };
+ static final long[] jjbitVec58 = { 0xffffffffffff8000L,
0xffffffffffffe7ffL, 0x3ffffffffffffL, 0x43fffffffffffffL };
+ static final long[] jjbitVec59 = { 0x3fffffffffffL, 0xfffffffL,
0x1ffd00000000L, 0x7ffffff000000000L };
+ static final long[] jjbitVec60 =
+ { 0xffffffffffffffffL, 0xfefeffcfffffffffL, 0xf3c5fdfffff99feeL,
0x80fffcfb080799fL };
+ static final long[] jjbitVec61 = { 0xd36dfdfffff987eeL, 0x3fffc05e023987L,
0xf3edfdfffffbbfeeL, 0x2ffcf00013bbfL };
+ static final long[] jjbitVec62 = { 0xf3edfdfffff99feeL, 0x2ffcfb0c0399fL,
0xc3ffc718d63dc7ecL, 0x200ffc000813dc7L };
+ static final long[] jjbitVec63 = { 0xe3effdfffffddfeeL, 0xffcf03603ddfL,
0xf3effdfffffddfecL, 0x6ffcf40603ddfL };
+ static final long[] jjbitVec64 =
+ { 0xe7fffffffffddfecL, 0xfc00ffcf00807ddfL, 0x2ffbfffffc7fffecL,
0xc0000ff5f847fL };
+ static final long[] jjbitVec65 = { 0x87fffffffffffffeL, 0x3ff7fffL,
0x3bffecaefef02596L, 0xf3ff3f5fL };
+ static final long[] jjbitVec66 = { 0xc2a003ff03000001L,
0xfffe1ffffffffeffL, 0x1ffffffffeffffdfL, 0x40L };
+ static final long[] jjbitVec67 =
+ { 0xffffffffffffffffL, 0xffffffffffff03ffL, 0xffffffff3fffffffL,
0xf7ffffffffff20bfL };
+ static final long[] jjbitVec68 = { 0xffffffffff3dffffL, 0xe7ffffffL,
0xffffffff0000ffffL, 0x1fffffffffffffL };
+ static final long[] jjbitVec69 = { 0x1fffff001fdfffL, 0xddfff000fffffL,
0xffffffffffffffffL, 0x3ff388fffffL };
+ static final long[] jjbitVec70 = { 0xffffffff03ff3800L, 0xffffffffffffffL,
0xffff07ffffffffffL, 0x3fffffffffffffL };
+ static final long[] jjbitVec71 = { 0xfff0fff1fffffffL, 0x1f3fffffffffc0L,
0xffff0fffffffffffL, 0x3ff03ffL };
+ static final long[] jjbitVec72 = { 0xffffffff0fffffffL,
0x9fffffff7fffffffL, 0x8003ff03ffL, 0x0L };
+ static final long[] jjbitVec73 = { 0xffffffffffffffffL, 0xff80003ff0fffL,
0xffffffffffffffffL, 0xfffffffffffffL };
+ static final long[] jjbitVec74 = { 0xffffffffffffffL, 0x3fffffffffffe3ffL,
0x0L, 0x7ffffffff70000L };
+ static final long[] jjbitVec75 =
+ { 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL,
0xf000007fffffffffL };
+ static final long[] jjbitVec76 = { 0x80007c000000f800L,
0x8002fc1f00100001L, 0x7ffffff1fff0000L, 0x1ffe21fff0000L };
+ static final long[] jjbitVec77 =
+ { 0xffff7fffffffffffL, 0xffffffff7fffffffL, 0xffffffffffffffffL,
0xff81fffffffffL };
+ static final long[] jjbitVec78 =
+ { 0xffff20bfffffffffL, 0x800080ffffffffffL, 0x7f7f7f7f007fffffL,
0xffffffff7f7f7f7fL };
+ static final long[] jjbitVec79 =
+ { 0x1f3efffe000000e0L, 0xfffffffffffffffeL, 0xfffffffee67fffffL,
0xf7ffffffffffffffL };
+ static final long[] jjbitVec80 = { 0xfffffff1fffL, 0xbff0ffffffffffffL,
0xffffffff80ffffffL, 0x3ffffffffffffL };
+ static final long[] jjbitVec81 = { 0x10000ffffffffffL, 0xfffffffffffffL,
0xffffffffffffffffL, 0x8ffffff03ff001fL };
+ static final long[] jjbitVec82 = { 0xffff3fffffffffffL,
0x1fffffff000fffffL, 0xffffffffffffffffL, 0x3ff8001L };
+ static final long[] jjbitVec83 = { 0x7fffffffffffffL, 0xc7fffff03ff3fffL,
0xffffffffffffffffL, 0x7cffff38000007L };
+ static final long[] jjbitVec84 = { 0x7f7f007e7e7eL, 0x0L, 0x0L,
0x3ff37ffffffffffL };
+ static final long[] jjbitVec85 =
+ { 0x5f7ffdffe0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL,
0xfffffffffff80000L };
+ static final long[] jjbitVec86 =
+ { 0x18007f0000ffffL, 0xffdf02000000e000L, 0xffffffffffffffffL,
0x9fffffffffffffffL };
+ static final long[] jjbitVec87 =
+ { 0x87fffffe03ff0010L, 0xffffffc007fffffeL, 0x7fffffffffffffffL,
0xe0000631cfcfcfcL };
private int jjMoveNfa_2(int startState, int curPos) {
int startsAt = 0;
@@ -798,7 +906,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if ((0x3ff001000000000L & l) != 0L) {
+ if ((0x3ff00100fffc1ffL & l) != 0L) {
if (kind > 57) {
kind = 57;
}
@@ -806,7 +914,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(29);
}
}
- if ((0x3ff001000000000L & l) != 0L) {
+ if ((0x3ff00100fffc1ffL & l) != 0L) {
if (kind > 56) {
kind = 56;
}
@@ -971,7 +1079,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
break;
}
if (kind > 56) {
@@ -981,7 +1089,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
break;
}
if (kind > 57) {
@@ -1009,7 +1117,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if ((0x7fffffe87fffffeL & l) != 0L) {
+ if ((0x87fffffe87fffffeL & l) != 0L) {
if (kind > 57) {
kind = 57;
}
@@ -1017,7 +1125,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(29);
}
}
- if ((0x7fffffe87fffffeL & l) != 0L) {
+ if ((0x87fffffe87fffffeL & l) != 0L) {
if (kind > 56) {
kind = 56;
}
@@ -1072,7 +1180,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
if (kind > 56) {
@@ -1082,7 +1190,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
if (kind > 57) {
@@ -1114,7 +1222,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
if (kind > 56) {
kind = 56;
}
@@ -1122,7 +1230,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(28);
}
}
- if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
if (kind > 57) {
kind = 57;
}
@@ -1142,7 +1250,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
if (kind > 56) {
@@ -1152,7 +1260,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
if (kind > 57) {
@@ -1683,7 +1791,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if ((0x3ff001000000000L & l) != 0L) {
+ if ((0x3ff00100fffc1ffL & l) != 0L) {
if (kind > 57) {
kind = 57;
}
@@ -1691,7 +1799,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(29);
}
}
- if ((0x3ff001000000000L & l) != 0L) {
+ if ((0x3ff00100fffc1ffL & l) != 0L) {
if (kind > 56) {
kind = 56;
}
@@ -1856,7 +1964,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
break;
}
if (kind > 56) {
@@ -1866,7 +1974,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
break;
}
if (kind > 57) {
@@ -1894,7 +2002,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if ((0x7fffffe87fffffeL & l) != 0L) {
+ if ((0x87fffffe87fffffeL & l) != 0L) {
if (kind > 57) {
kind = 57;
}
@@ -1902,7 +2010,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(29);
}
}
- if ((0x7fffffe87fffffeL & l) != 0L) {
+ if ((0x87fffffe87fffffeL & l) != 0L) {
if (kind > 56) {
kind = 56;
}
@@ -1957,7 +2065,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
if (kind > 56) {
@@ -1967,7 +2075,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
if (kind > 57) {
@@ -1999,7 +2107,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 30:
- if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
if (kind > 56) {
kind = 56;
}
@@ -2007,7 +2115,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(28);
}
}
- if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
if (kind > 57) {
kind = 57;
}
@@ -2027,7 +2135,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
if (kind > 56) {
@@ -2037,7 +2145,7 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 29:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
if (kind > 57) {
@@ -2123,14 +2231,214 @@ public class ELParserTokenManager implements
ELParserConstants {
switch (hiByte) {
case 0:
return ((jjbitVec4[i2] & l2) != 0L);
- case 48:
+ case 2:
return ((jjbitVec5[i2] & l2) != 0L);
- case 49:
+ case 3:
return ((jjbitVec6[i2] & l2) != 0L);
- case 51:
+ case 4:
return ((jjbitVec7[i2] & l2) != 0L);
- case 61:
+ case 5:
return ((jjbitVec8[i2] & l2) != 0L);
+ case 6:
+ return ((jjbitVec9[i2] & l2) != 0L);
+ case 7:
+ return ((jjbitVec10[i2] & l2) != 0L);
+ case 8:
+ return ((jjbitVec11[i2] & l2) != 0L);
+ case 9:
+ return ((jjbitVec12[i2] & l2) != 0L);
+ case 10:
+ return ((jjbitVec13[i2] & l2) != 0L);
+ case 11:
+ return ((jjbitVec14[i2] & l2) != 0L);
+ case 12:
+ return ((jjbitVec15[i2] & l2) != 0L);
+ case 13:
+ return ((jjbitVec16[i2] & l2) != 0L);
+ case 14:
+ return ((jjbitVec17[i2] & l2) != 0L);
+ case 15:
+ return ((jjbitVec18[i2] & l2) != 0L);
+ case 16:
+ return ((jjbitVec19[i2] & l2) != 0L);
+ case 18:
+ return ((jjbitVec20[i2] & l2) != 0L);
+ case 19:
+ return ((jjbitVec21[i2] & l2) != 0L);
+ case 20:
+ return ((jjbitVec0[i2] & l2) != 0L);
+ case 22:
+ return ((jjbitVec22[i2] & l2) != 0L);
+ case 23:
+ return ((jjbitVec23[i2] & l2) != 0L);
+ case 24:
+ return ((jjbitVec24[i2] & l2) != 0L);
+ case 25:
+ return ((jjbitVec25[i2] & l2) != 0L);
+ case 26:
+ return ((jjbitVec26[i2] & l2) != 0L);
+ case 27:
+ return ((jjbitVec27[i2] & l2) != 0L);
+ case 28:
+ return ((jjbitVec28[i2] & l2) != 0L);
+ case 29:
+ return ((jjbitVec29[i2] & l2) != 0L);
+ case 31:
+ return ((jjbitVec30[i2] & l2) != 0L);
+ case 32:
+ return ((jjbitVec31[i2] & l2) != 0L);
+ case 33:
+ return ((jjbitVec32[i2] & l2) != 0L);
+ case 44:
+ return ((jjbitVec33[i2] & l2) != 0L);
+ case 45:
+ return ((jjbitVec34[i2] & l2) != 0L);
+ case 46:
+ return ((jjbitVec35[i2] & l2) != 0L);
+ case 48:
+ return ((jjbitVec36[i2] & l2) != 0L);
+ case 49:
+ return ((jjbitVec37[i2] & l2) != 0L);
+ case 77:
+ return ((jjbitVec38[i2] & l2) != 0L);
+ case 159:
+ return ((jjbitVec39[i2] & l2) != 0L);
+ case 164:
+ return ((jjbitVec40[i2] & l2) != 0L);
+ case 166:
+ return ((jjbitVec41[i2] & l2) != 0L);
+ case 167:
+ return ((jjbitVec42[i2] & l2) != 0L);
+ case 168:
+ return ((jjbitVec43[i2] & l2) != 0L);
+ case 169:
+ return ((jjbitVec44[i2] & l2) != 0L);
+ case 170:
+ return ((jjbitVec45[i2] & l2) != 0L);
+ case 171:
+ return ((jjbitVec46[i2] & l2) != 0L);
+ case 215:
+ return ((jjbitVec47[i2] & l2) != 0L);
+ case 250:
+ return ((jjbitVec48[i2] & l2) != 0L);
+ case 251:
+ return ((jjbitVec49[i2] & l2) != 0L);
+ case 253:
+ return ((jjbitVec50[i2] & l2) != 0L);
+ case 254:
+ return ((jjbitVec51[i2] & l2) != 0L);
+ case 255:
+ return ((jjbitVec52[i2] & l2) != 0L);
+ default:
+ if ((jjbitVec3[i1] & l1) != 0L) {
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long
l1, long l2) {
+ switch (hiByte) {
+ case 0:
+ return ((jjbitVec53[i2] & l2) != 0L);
+ case 2:
+ return ((jjbitVec5[i2] & l2) != 0L);
+ case 3:
+ return ((jjbitVec54[i2] & l2) != 0L);
+ case 4:
+ return ((jjbitVec55[i2] & l2) != 0L);
+ case 5:
+ return ((jjbitVec56[i2] & l2) != 0L);
+ case 6:
+ return ((jjbitVec57[i2] & l2) != 0L);
+ case 7:
+ return ((jjbitVec58[i2] & l2) != 0L);
+ case 8:
+ return ((jjbitVec59[i2] & l2) != 0L);
+ case 9:
+ return ((jjbitVec60[i2] & l2) != 0L);
+ case 10:
+ return ((jjbitVec61[i2] & l2) != 0L);
+ case 11:
+ return ((jjbitVec62[i2] & l2) != 0L);
+ case 12:
+ return ((jjbitVec63[i2] & l2) != 0L);
+ case 13:
+ return ((jjbitVec64[i2] & l2) != 0L);
+ case 14:
+ return ((jjbitVec65[i2] & l2) != 0L);
+ case 15:
+ return ((jjbitVec66[i2] & l2) != 0L);
+ case 16:
+ return ((jjbitVec67[i2] & l2) != 0L);
+ case 18:
+ return ((jjbitVec20[i2] & l2) != 0L);
+ case 19:
+ return ((jjbitVec68[i2] & l2) != 0L);
+ case 20:
+ return ((jjbitVec0[i2] & l2) != 0L);
+ case 22:
+ return ((jjbitVec22[i2] & l2) != 0L);
+ case 23:
+ return ((jjbitVec69[i2] & l2) != 0L);
+ case 24:
+ return ((jjbitVec70[i2] & l2) != 0L);
+ case 25:
+ return ((jjbitVec71[i2] & l2) != 0L);
+ case 26:
+ return ((jjbitVec72[i2] & l2) != 0L);
+ case 27:
+ return ((jjbitVec73[i2] & l2) != 0L);
+ case 28:
+ return ((jjbitVec74[i2] & l2) != 0L);
+ case 29:
+ return ((jjbitVec75[i2] & l2) != 0L);
+ case 31:
+ return ((jjbitVec30[i2] & l2) != 0L);
+ case 32:
+ return ((jjbitVec76[i2] & l2) != 0L);
+ case 33:
+ return ((jjbitVec32[i2] & l2) != 0L);
+ case 44:
+ return ((jjbitVec77[i2] & l2) != 0L);
+ case 45:
+ return ((jjbitVec78[i2] & l2) != 0L);
+ case 46:
+ return ((jjbitVec35[i2] & l2) != 0L);
+ case 48:
+ return ((jjbitVec79[i2] & l2) != 0L);
+ case 49:
+ return ((jjbitVec37[i2] & l2) != 0L);
+ case 77:
+ return ((jjbitVec38[i2] & l2) != 0L);
+ case 159:
+ return ((jjbitVec39[i2] & l2) != 0L);
+ case 164:
+ return ((jjbitVec40[i2] & l2) != 0L);
+ case 166:
+ return ((jjbitVec80[i2] & l2) != 0L);
+ case 167:
+ return ((jjbitVec42[i2] & l2) != 0L);
+ case 168:
+ return ((jjbitVec81[i2] & l2) != 0L);
+ case 169:
+ return ((jjbitVec82[i2] & l2) != 0L);
+ case 170:
+ return ((jjbitVec83[i2] & l2) != 0L);
+ case 171:
+ return ((jjbitVec84[i2] & l2) != 0L);
+ case 215:
+ return ((jjbitVec47[i2] & l2) != 0L);
+ case 250:
+ return ((jjbitVec48[i2] & l2) != 0L);
+ case 251:
+ return ((jjbitVec85[i2] & l2) != 0L);
+ case 253:
+ return ((jjbitVec50[i2] & l2) != 0L);
+ case 254:
+ return ((jjbitVec86[i2] & l2) != 0L);
+ case 255:
+ return ((jjbitVec87[i2] & l2) != 0L);
default:
if ((jjbitVec3[i1] & l1) != 0L) {
return true;
diff --git a/test/org/apache/el/parser/TestAstIdentifier.java
b/test/org/apache/el/parser/TestAstIdentifier.java
index 25d4016385..c42cc66100 100644
--- a/test/org/apache/el/parser/TestAstIdentifier.java
+++ b/test/org/apache/el/parser/TestAstIdentifier.java
@@ -16,11 +16,16 @@
*/
package org.apache.el.parser;
+import javax.el.ELContext;
import javax.el.ELProcessor;
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.jasper.el.ELContextImpl;
+
public class TestAstIdentifier {
@Test
@@ -43,4 +48,46 @@ public class TestAstIdentifier {
Integer.class);
Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), result);
}
+
+
+ @Test
+ public void testIdentifierStart() {
+ for (int i = 0; i < 0xFFFF; i++) {
+ if (Character.isJavaIdentifierStart(i)) {
+ testIdentifier((char) i, 'b');
+ }
+ }
+ }
+
+
+ @Test
+ public void testIdentifierPart() {
+ for (int i = 0; i < 0xFFFF; i++) {
+ if (Character.isJavaIdentifierPart(i)) {
+ testIdentifier('b', (char) i);
+ }
+ }
+ }
+
+
+ private void testIdentifier(char one, char two) {
+ ExpressionFactory factory = ExpressionFactory.newInstance();
+ ELContext context = new ELContextImpl(factory);
+
+ String s = "OK";
+ ValueExpression var = factory.createValueExpression(s, String.class);
+
+ String identifier = new String(new char[] { one , two });
+ context.getVariableMapper().setVariable(identifier, var);
+
+ ValueExpression ve = null;
+ try {
+ ve = factory.createValueExpression(context, "${" + identifier +
"}", String.class);
+ } catch (Exception e) {
+ System.out.println("" + (int) one + " " + (int) two);
+ throw e;
+ }
+
+ Assert.assertEquals(s, ve.getValue(context));
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 12397928bf..b757d2b441 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,11 @@
contained parameters. Pull request <pr>803</pr> provided by Chenjp.
(markt)
</fix>
+ <fix>
+ <bug>69521</bug>: Update the EL Parser to allow the full range of valid
+ characters in an EL identifier as defined by the Java Language
+ Specification. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
