This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 81af55ae48f512e7b032314c3e67db505191520e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 17 18:16:15 2025 +0000
Update grammar to use Java 11 definition of Java identifier
---
java/org/apache/el/parser/ELParser.jjt | 102 ++++++++++++++++-----------------
1 file changed, 50 insertions(+), 52 deletions(-)
diff --git a/java/org/apache/el/parser/ELParser.jjt
b/java/org/apache/el/parser/ELParser.jjt
index 981a693ff3..af5bcfab19 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -580,10 +580,10 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u048a"-"\u052f",
"\u0531"-"\u0556",
"\u0559",
- "\u0560"-"\u0588",
+ "\u0561"-"\u0587",
"\u058f",
"\u05d0"-"\u05ea",
- "\u05ef"-"\u05f2",
+ "\u05f0"-"\u05f2",
"\u060b",
"\u0620"-"\u064a",
"\u066e"-"\u066f",
@@ -600,15 +600,14 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u07ca"-"\u07ea",
"\u07f4"-"\u07f5",
"\u07fa",
- "\u07fe"-"\u0815",
+ "\u0800"-"\u0815",
"\u081a",
"\u0824",
"\u0828",
"\u0840"-"\u0858",
"\u0860"-"\u086a",
- "\u0870"-"\u0887",
- "\u0889"-"\u088e",
- "\u08a0"-"\u08c9",
+ "\u08a0"-"\u08b4",
+ "\u08b6"-"\u08bd",
"\u0904"-"\u0939",
"\u093d",
"\u0950",
@@ -675,7 +674,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0c2a"-"\u0c39",
"\u0c3d",
"\u0c58"-"\u0c5a",
- "\u0c5d",
"\u0c60"-"\u0c61",
"\u0c80",
"\u0c85"-"\u0c8c",
@@ -684,10 +682,10 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0caa"-"\u0cb3",
"\u0cb5"-"\u0cb9",
"\u0cbd",
- "\u0cdd"-"\u0cde",
+ "\u0cde",
"\u0ce0"-"\u0ce1",
"\u0cf1"-"\u0cf2",
- "\u0d04"-"\u0d0c",
+ "\u0d05"-"\u0d0c",
"\u0d0e"-"\u0d10",
"\u0d12"-"\u0d3a",
"\u0d3d",
@@ -705,10 +703,16 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0e3f"-"\u0e46",
"\u0e81"-"\u0e82",
"\u0e84",
- "\u0e86"-"\u0e8a",
- "\u0e8c"-"\u0ea3",
+ "\u0e87"-"\u0e88",
+ "\u0e8a",
+ "\u0e8d",
+ "\u0e94"-"\u0e97",
+ "\u0e99"-"\u0e9f",
+ "\u0ea1"-"\u0ea3",
"\u0ea5",
- "\u0ea7"-"\u0eb0",
+ "\u0ea7",
+ "\u0eaa"-"\u0eab",
+ "\u0ead"-"\u0eb0",
"\u0eb2"-"\u0eb3",
"\u0ebd",
"\u0ec0"-"\u0ec4",
@@ -755,15 +759,16 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1681"-"\u169a",
"\u16a0"-"\u16ea",
"\u16ee"-"\u16f8",
- "\u1700"-"\u1711",
- "\u171f"-"\u1731",
+ "\u1700"-"\u170c",
+ "\u170e"-"\u1711",
+ "\u1720"-"\u1731",
"\u1740"-"\u1751",
"\u1760"-"\u176c",
"\u176e"-"\u1770",
"\u1780"-"\u17b3",
"\u17d7",
"\u17db"-"\u17dc",
- "\u1820"-"\u1878",
+ "\u1820"-"\u1877",
"\u1880"-"\u1884",
"\u1887"-"\u18a8",
"\u18aa",
@@ -777,7 +782,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1a20"-"\u1a54",
"\u1aa7",
"\u1b05"-"\u1b33",
- "\u1b45"-"\u1b4c",
+ "\u1b45"-"\u1b4b",
"\u1b83"-"\u1ba0",
"\u1bae"-"\u1baf",
"\u1bba"-"\u1be5",
@@ -785,12 +790,9 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1c4d"-"\u1c4f",
"\u1c5a"-"\u1c7d",
"\u1c80"-"\u1c88",
- "\u1c90"-"\u1cba",
- "\u1cbd"-"\u1cbf",
"\u1ce9"-"\u1cec",
- "\u1cee"-"\u1cf3",
+ "\u1cee"-"\u1cf1",
"\u1cf5"-"\u1cf6",
- "\u1cfa",
"\u1d00"-"\u1dbf",
"\u1e00"-"\u1f15",
"\u1f18"-"\u1f1d",
@@ -816,7 +818,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u2071",
"\u207f",
"\u2090"-"\u209c",
- "\u20a0"-"\u20c0",
+ "\u20a0"-"\u20bf",
"\u2102",
"\u2107",
"\u210a"-"\u2113",
@@ -831,7 +833,9 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u2145"-"\u2149",
"\u214e",
"\u2160"-"\u2188",
- "\u2c00"-"\u2ce4",
+ "\u2c00"-"\u2c2e",
+ "\u2c30"-"\u2c5e",
+ "\u2c60"-"\u2ce4",
"\u2ceb"-"\u2cee",
"\u2cf2"-"\u2cf3",
"\u2d00"-"\u2d25",
@@ -857,12 +861,13 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u309d"-"\u309f",
"\u30a1"-"\u30fa",
"\u30fc"-"\u30ff",
- "\u3105"-"\u312f",
+ "\u3105"-"\u312e",
"\u3131"-"\u318e",
- "\u31a0"-"\u31bf",
+ "\u31a0"-"\u31ba",
"\u31f0"-"\u31ff",
- "\u3400"-"\u4dbf",
- "\u4e00"-"\ua48c",
+ "\u3400"-"\u4db5",
+ "\u4e00"-"\u9fea",
+ "\ua000"-"\ua48c",
"\ua4d0"-"\ua4fd",
"\ua500"-"\ua60c",
"\ua610"-"\ua61f",
@@ -872,11 +877,9 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\ua6a0"-"\ua6ef",
"\ua717"-"\ua71f",
"\ua722"-"\ua788",
- "\ua78b"-"\ua7ca",
- "\ua7d0"-"\ua7d1",
- "\ua7d3",
- "\ua7d5"-"\ua7d9",
- "\ua7f2"-"\ua801",
+ "\ua78b"-"\ua7ae",
+ "\ua7b0"-"\ua7b7",
+ "\ua7f7"-"\ua801",
"\ua803"-"\ua805",
"\ua807"-"\ua80a",
"\ua80c"-"\ua822",
@@ -885,7 +888,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\ua882"-"\ua8b3",
"\ua8f2"-"\ua8f7",
"\ua8fb",
- "\ua8fd"-"\ua8fe",
+ "\ua8fd",
"\ua90a"-"\ua925",
"\ua930"-"\ua946",
"\ua960"-"\ua97c",
@@ -914,7 +917,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\uab20"-"\uab26",
"\uab28"-"\uab2e",
"\uab30"-"\uab5a",
- "\uab5c"-"\uab69",
+ "\uab5c"-"\uab65",
"\uab70"-"\uabe2",
"\uac00"-"\ud7a3",
"\ud7b0"-"\ud7c6",
@@ -983,15 +986,12 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u07a6"-"\u07b0",
"\u07c0"-"\u07c9",
"\u07eb"-"\u07f3",
- "\u07fd",
"\u0816"-"\u0819",
"\u081b"-"\u0823",
"\u0825"-"\u0827",
"\u0829"-"\u082d",
"\u0859"-"\u085b",
- "\u0890"-"\u0891",
- "\u0898"-"\u089f",
- "\u08ca"-"\u0903",
+ "\u08d4"-"\u0903",
"\u093a"-"\u093c",
"\u093e"-"\u094f",
"\u0951"-"\u0957",
@@ -1005,7 +1005,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u09d7",
"\u09e2"-"\u09e3",
"\u09e6"-"\u09ef",
- "\u09fe",
"\u0a01"-"\u0a03",
"\u0a3c",
"\u0a3e"-"\u0a42",
@@ -1027,7 +1026,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0b3e"-"\u0b44",
"\u0b47"-"\u0b48",
"\u0b4b"-"\u0b4d",
- "\u0b55"-"\u0b57",
+ "\u0b56"-"\u0b57",
"\u0b62"-"\u0b63",
"\u0b66"-"\u0b6f",
"\u0b82",
@@ -1036,8 +1035,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0bca"-"\u0bcd",
"\u0bd7",
"\u0be6"-"\u0bef",
- "\u0c00"-"\u0c04",
- "\u0c3c",
+ "\u0c00"-"\u0c03",
"\u0c3e"-"\u0c44",
"\u0c46"-"\u0c48",
"\u0c4a"-"\u0c4d",
@@ -1052,7 +1050,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0cd5"-"\u0cd6",
"\u0ce2"-"\u0ce3",
"\u0ce6"-"\u0cef",
- "\u0cf3",
"\u0d00"-"\u0d03",
"\u0d3b"-"\u0d3c",
"\u0d3e"-"\u0d44",
@@ -1061,7 +1058,7 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0d57",
"\u0d62"-"\u0d63",
"\u0d66"-"\u0d6f",
- "\u0d81"-"\u0d83",
+ "\u0d82"-"\u0d83",
"\u0dca",
"\u0dcf"-"\u0dd4",
"\u0dd6",
@@ -1073,8 +1070,9 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u0e47"-"\u0e4e",
"\u0e50"-"\u0e59",
"\u0eb1",
- "\u0eb4"-"\u0ebc",
- "\u0ec8"-"\u0ece",
+ "\u0eb4"-"\u0eb9",
+ "\u0ebb"-"\u0ebc",
+ "\u0ec8"-"\u0ecd",
"\u0ed0"-"\u0ed9",
"\u0f18"-"\u0f19",
"\u0f20"-"\u0f29",
@@ -1097,14 +1095,15 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1082"-"\u108d",
"\u108f"-"\u109d",
"\u135d"-"\u135f",
- "\u1712"-"\u1715",
+ "\u1712"-"\u1714",
"\u1732"-"\u1734",
"\u1752"-"\u1753",
"\u1772"-"\u1773",
"\u17b4"-"\u17d3",
"\u17dd",
"\u17e0"-"\u17e9",
- "\u180b"-"\u1819",
+ "\u180b"-"\u180e",
+ "\u1810"-"\u1819",
"\u1885"-"\u1886",
"\u18a9",
"\u1920"-"\u192b",
@@ -1117,7 +1116,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1a7f"-"\u1a89",
"\u1a90"-"\u1a99",
"\u1ab0"-"\u1abd",
- "\u1abf"-"\u1ace",
"\u1b00"-"\u1b04",
"\u1b34"-"\u1b44",
"\u1b50"-"\u1b59",
@@ -1132,9 +1130,10 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\u1cd0"-"\u1cd2",
"\u1cd4"-"\u1ce8",
"\u1ced",
- "\u1cf4",
+ "\u1cf2"-"\u1cf4",
"\u1cf7"-"\u1cf9",
- "\u1dc0"-"\u1dff",
+ "\u1dc0"-"\u1df9",
+ "\u1dfb"-"\u1dff",
"\u200b"-"\u200f",
"\u202a"-"\u202e",
"\u2060"-"\u2064",
@@ -1156,12 +1155,11 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
"\ua806",
"\ua80b",
"\ua823"-"\ua827",
- "\ua82c",
"\ua880"-"\ua881",
"\ua8b4"-"\ua8c5",
"\ua8d0"-"\ua8d9",
"\ua8e0"-"\ua8f1",
- "\ua8ff"-"\ua909",
+ "\ua900"-"\ua909",
"\ua926"-"\ua92d",
"\ua947"-"\ua953",
"\ua980"-"\ua983",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
