This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 58e8a2aa13b903ec326361e21c7aa4722b8fce78 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Jan 17 17:51:26 2025 +0000 Update grammar to use Java 17 definition of Java identifier --- java/org/apache/el/parser/ELParser.jjt | 50 ++++++++++++++++------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt index 981a693ff3..fb6260d5ab 100644 --- a/java/org/apache/el/parser/ELParser.jjt +++ b/java/org/apache/el/parser/ELParser.jjt @@ -606,9 +606,8 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0828", "\u0840"-"\u0858", "\u0860"-"\u086a", - "\u0870"-"\u0887", - "\u0889"-"\u088e", - "\u08a0"-"\u08c9", + "\u08a0"-"\u08b4", + "\u08b6"-"\u08c7", "\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,7 +682,7 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0caa"-"\u0cb3", "\u0cb5"-"\u0cb9", "\u0cbd", - "\u0cdd"-"\u0cde", + "\u0cde", "\u0ce0"-"\u0ce1", "\u0cf1"-"\u0cf2", "\u0d04"-"\u0d0c", @@ -755,8 +753,9 @@ 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", @@ -777,7 +776,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", @@ -816,7 +815,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 +830,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", @@ -862,7 +863,8 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u31a0"-"\u31bf", "\u31f0"-"\u31ff", "\u3400"-"\u4dbf", - "\u4e00"-"\ua48c", + "\u4e00"-"\u9ffc", + "\ua000"-"\ua48c", "\ua4d0"-"\ua4fd", "\ua500"-"\ua60c", "\ua610"-"\ua61f", @@ -872,11 +874,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"-"\ua7bf", + "\ua7c2"-"\ua7ca", + "\ua7f5"-"\ua801", "\ua803"-"\ua805", "\ua807"-"\ua80a", "\ua80c"-"\ua822", @@ -989,9 +989,7 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0825"-"\u0827", "\u0829"-"\u082d", "\u0859"-"\u085b", - "\u0890"-"\u0891", - "\u0898"-"\u089f", - "\u08ca"-"\u0903", + "\u08d3"-"\u0903", "\u093a"-"\u093c", "\u093e"-"\u094f", "\u0951"-"\u0957", @@ -1037,7 +1035,6 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0bd7", "\u0be6"-"\u0bef", "\u0c00"-"\u0c04", - "\u0c3c", "\u0c3e"-"\u0c44", "\u0c46"-"\u0c48", "\u0c4a"-"\u0c4d", @@ -1052,7 +1049,6 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0cd5"-"\u0cd6", "\u0ce2"-"\u0ce3", "\u0ce6"-"\u0cef", - "\u0cf3", "\u0d00"-"\u0d03", "\u0d3b"-"\u0d3c", "\u0d3e"-"\u0d44", @@ -1074,7 +1070,7 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u0e50"-"\u0e59", "\u0eb1", "\u0eb4"-"\u0ebc", - "\u0ec8"-"\u0ece", + "\u0ec8"-"\u0ecd", "\u0ed0"-"\u0ed9", "\u0f18"-"\u0f19", "\u0f20"-"\u0f29", @@ -1097,14 +1093,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 +1114,7 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u1a7f"-"\u1a89", "\u1a90"-"\u1a99", "\u1ab0"-"\u1abd", - "\u1abf"-"\u1ace", + "\u1abf"-"\u1ac0", "\u1b00"-"\u1b04", "\u1b34"-"\u1b44", "\u1b50"-"\u1b59", @@ -1134,7 +1131,8 @@ java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>(); "\u1ced", "\u1cf4", "\u1cf7"-"\u1cf9", - "\u1dc0"-"\u1dff", + "\u1dc0"-"\u1df9", + "\u1dfb"-"\u1dff", "\u200b"-"\u200f", "\u202a"-"\u202e", "\u2060"-"\u2064", --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org