Skip to content

Commit 0ce63ee

Browse files
committed
[GR-59330] Update ICU4J to 76.1 (Unicode 16, CLDR 46).
PullRequest: graal/19140
2 parents c59e941 + a0ea76c commit 0ce63ee

File tree

7 files changed

+422
-42
lines changed

7 files changed

+422
-42
lines changed

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/chardata/UnicodeCharacterAliases.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
public class UnicodeCharacterAliases {
5757

5858
/* GENERATED CODE BEGIN - KEEP THIS MARKER FOR AUTOMATIC UPDATES */
59-
public static final EconomicMap<String, Integer> CHARACTER_ALIASES = EconomicMap.create(473);
59+
public static final EconomicMap<String, Integer> CHARACTER_ALIASES = EconomicMap.create(477);
6060

6161
static {
6262
CHARACTER_ALIASES.put("ACK", 0x0006);
@@ -67,6 +67,7 @@ public class UnicodeCharacterAliases {
6767
CHARACTER_ALIASES.put("APPLICATION PROGRAM COMMAND", 0x009F);
6868
CHARACTER_ALIASES.put("ARABIC SMALL HIGH LIGATURE ALEF WITH YEH BARREE", 0x0616);
6969
CHARACTER_ALIASES.put("BACKSPACE", 0x0008);
70+
CHARACTER_ALIASES.put("BAMUM LETTER PHASE-A MAEMGBIEE", 0x1680B);
7071
CHARACTER_ALIASES.put("BEL", 0x0007);
7172
CHARACTER_ALIASES.put("BOM", 0xFEFF);
7273
CHARACTER_ALIASES.put("BPH", 0x0082);
@@ -86,6 +87,7 @@ public class UnicodeCharacterAliases {
8687
CHARACTER_ALIASES.put("CONTROL SEQUENCE INTRODUCER", 0x009B);
8788
CHARACTER_ALIASES.put("CR", 0x000D);
8889
CHARACTER_ALIASES.put("CSI", 0x009B);
90+
CHARACTER_ALIASES.put("CUNEIFORM SIGN KALAM", 0x12327);
8991
CHARACTER_ALIASES.put("CUNEIFORM SIGN NU11 OVER NU11 BUR OVER BUR", 0x122D5);
9092
CHARACTER_ALIASES.put("CUNEIFORM SIGN NU11 TENU", 0x122D4);
9193
CHARACTER_ALIASES.put("DATA LINK ESCAPE", 0x0010);
@@ -174,6 +176,8 @@ public class UnicodeCharacterAliases {
174176
CHARACTER_ALIASES.put("MEDEFAIDRIN CAPITAL LETTER NG", 0x16E57);
175177
CHARACTER_ALIASES.put("MEDEFAIDRIN SMALL LETTER H", 0x16E76);
176178
CHARACTER_ALIASES.put("MEDEFAIDRIN SMALL LETTER NG", 0x16E77);
179+
CHARACTER_ALIASES.put("MENDE KIKAKUI SYLLABLE M172 MBO", 0x1E899);
180+
CHARACTER_ALIASES.put("MENDE KIKAKUI SYLLABLE M174 MBOO", 0x1E89A);
177181
CHARACTER_ALIASES.put("MESSAGE WAITING", 0x0095);
178182
CHARACTER_ALIASES.put("MICR DASH SYMBOL", 0x2449);
179183
CHARACTER_ALIASES.put("MICR ON US SYMBOL", 0x2448);

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java

Lines changed: 355 additions & 0 deletions
Large diffs are not rendered by default.

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyDataVersion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public final class UnicodePropertyDataVersion {
4646
/* GENERATED CODE BEGIN - KEEP THIS MARKER FOR AUTOMATIC UPDATES */
4747
public static final UnicodePropertyData UNICODE_15_0_0 = UnicodePropertyData.INSTANCE;
4848
public static final UnicodePropertyData UNICODE_15_1_0 = UnicodePropertyData.populateUNICODE_15_1_0(UNICODE_15_0_0);
49+
public static final UnicodePropertyData UNICODE_16_0_0 = UnicodePropertyData.populateUNICODE_16_0_0(UNICODE_15_0_0);
4950

5051
/* GENERATED CODE END - KEEP THIS MARKER FOR AUTOMATIC UPDATES */
5152
}

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldData.java

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ public enum CaseFoldAlgorithm {
8484
private static CaseFoldEquivalenceTable getTable(CaseFoldUnfoldAlgorithm algorithm) {
8585
switch (algorithm) {
8686
case ECMAScriptNonUnicode:
87-
return UNICODE_15_1_0_JS;
87+
return UNICODE_16_0_0_JS;
8888
case ECMAScriptUnicode:
89-
return UNICODE_15_1_0_SIMPLE;
89+
return UNICODE_16_0_0_SIMPLE;
9090
case Ascii:
9191
return ASCII;
9292
case JavaUnicode:
@@ -150,7 +150,7 @@ public static void applyCaseFoldUnfold(CodePointSetAccumulator codePointSet, Cod
150150

151151
public static CodePointSet simpleCaseFold(CodePointSet codePointSet, CodePointSetAccumulator tmp) {
152152
tmp.addSet(codePointSet);
153-
UNICODE_15_1_0_SIMPLE.applyCaseFold(tmp, codePointSet);
153+
UNICODE_16_0_0_SIMPLE.applyCaseFold(tmp, codePointSet);
154154
tmp.intersectWith(FOLDED_CHARACTERS);
155155
return tmp.toCodePointSet();
156156
}
@@ -629,7 +629,7 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
629629
"fo",
630630
};
631631
public static final int MAX_MULTI_CHAR_SEQUENCE_LENGTH = 4;
632-
private static final CaseFoldEquivalenceTable UNICODE_15_1_0_SIMPLE = new CaseFoldEquivalenceTable(null, new CodePointSet[]{
632+
private static final CaseFoldEquivalenceTable UNICODE_16_0_0_SIMPLE = new CaseFoldEquivalenceTable(null, new CodePointSet[]{
633633
rangeSet(0x00004b, 0x00004b, 0x00006b, 0x00006b, 0x00212a, 0x00212a),
634634
rangeSet(0x000053, 0x000053, 0x000073, 0x000073, 0x00017f, 0x00017f),
635635
rangeSet(0x0000b5, 0x0000b5, 0x00039c, 0x00039c, 0x0003bc, 0x0003bc),
@@ -704,6 +704,7 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
704704
0x000197, 0x000197, INTEGER_OFFSET, 209,
705705
0x000198, 0x000199, ALTERNATING_AL, 0,
706706
0x00019a, 0x00019a, INTEGER_OFFSET, 163,
707+
0x00019b, 0x00019b, INTEGER_OFFSET, 42561,
707708
0x00019c, 0x00019c, INTEGER_OFFSET, 211,
708709
0x00019d, 0x00019d, INTEGER_OFFSET, 213,
709710
0x00019e, 0x00019e, INTEGER_OFFSET, 130,
@@ -756,6 +757,7 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
756757
0x000260, 0x000260, INTEGER_OFFSET, -205,
757758
0x000261, 0x000261, INTEGER_OFFSET, 42315,
758759
0x000263, 0x000263, INTEGER_OFFSET, -207,
760+
0x000264, 0x000264, INTEGER_OFFSET, 42343,
759761
0x000265, 0x000265, INTEGER_OFFSET, 42280,
760762
0x000266, 0x000266, INTEGER_OFFSET, 42308,
761763
0x000268, 0x000268, INTEGER_OFFSET, -209,
@@ -901,6 +903,7 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
901903
0x001c86, 0x001c86, DIRECT_MAPPING, 23,
902904
0x001c87, 0x001c87, DIRECT_MAPPING, 24,
903905
0x001c88, 0x001c88, DIRECT_MAPPING, 25,
906+
0x001c89, 0x001c8a, ALTERNATING_UL, 0,
904907
0x001c90, 0x001cba, INTEGER_OFFSET, -3008,
905908
0x001cbd, 0x001cbf, INTEGER_OFFSET, -3008,
906909
0x001d79, 0x001d79, INTEGER_OFFSET, 35332,
@@ -1027,8 +1030,11 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
10271030
0x00a7c5, 0x00a7c5, INTEGER_OFFSET, -42307,
10281031
0x00a7c6, 0x00a7c6, INTEGER_OFFSET, -35384,
10291032
0x00a7c7, 0x00a7ca, ALTERNATING_UL, 0,
1033+
0x00a7cb, 0x00a7cb, INTEGER_OFFSET, -42343,
1034+
0x00a7cc, 0x00a7cd, ALTERNATING_AL, 0,
10301035
0x00a7d0, 0x00a7d1, ALTERNATING_AL, 0,
1031-
0x00a7d6, 0x00a7d9, ALTERNATING_AL, 0,
1036+
0x00a7d6, 0x00a7db, ALTERNATING_AL, 0,
1037+
0x00a7dc, 0x00a7dc, INTEGER_OFFSET, -42561,
10321038
0x00a7f5, 0x00a7f6, ALTERNATING_UL, 0,
10331039
0x00ab53, 0x00ab53, INTEGER_OFFSET, -928,
10341040
0x00ab70, 0x00abbf, INTEGER_OFFSET, -38864,
@@ -1049,14 +1055,16 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
10491055
0x0105bb, 0x0105bc, INTEGER_OFFSET, -39,
10501056
0x010c80, 0x010cb2, INTEGER_OFFSET, 64,
10511057
0x010cc0, 0x010cf2, INTEGER_OFFSET, -64,
1058+
0x010d50, 0x010d65, INTEGER_OFFSET, 32,
1059+
0x010d70, 0x010d85, INTEGER_OFFSET, -32,
10521060
0x0118a0, 0x0118bf, INTEGER_OFFSET, 32,
10531061
0x0118c0, 0x0118df, INTEGER_OFFSET, -32,
10541062
0x016e40, 0x016e5f, INTEGER_OFFSET, 32,
10551063
0x016e60, 0x016e7f, INTEGER_OFFSET, -32,
10561064
0x01e900, 0x01e921, INTEGER_OFFSET, 34,
10571065
0x01e922, 0x01e943, INTEGER_OFFSET, -34,
10581066
});
1059-
private static final CaseFoldEquivalenceTable UNICODE_15_1_0_JS = new CaseFoldEquivalenceTable(UNICODE_15_1_0_SIMPLE, new CodePointSet[]{
1067+
private static final CaseFoldEquivalenceTable UNICODE_16_0_0_JS = new CaseFoldEquivalenceTable(UNICODE_16_0_0_SIMPLE, new CodePointSet[]{
10601068
rangeSet(0x000398, 0x000398, 0x0003b8, 0x0003b8, 0x0003d1, 0x0003d1),
10611069
}, new int[]{
10621070
0x00004b, 0x00005a, INTEGER_OFFSET, 32,
@@ -1106,19 +1114,30 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
11061114
0x0105bb, 0x0105bc, INTEGER_OFFSET, 0,
11071115
0x010c80, 0x010cb2, INTEGER_OFFSET, 0,
11081116
0x010cc0, 0x010cf2, INTEGER_OFFSET, 0,
1117+
0x010d50, 0x010d65, INTEGER_OFFSET, 0,
1118+
0x010d70, 0x010d85, INTEGER_OFFSET, 0,
11091119
0x0118a0, 0x0118bf, INTEGER_OFFSET, 0,
11101120
0x0118c0, 0x0118df, INTEGER_OFFSET, 0,
11111121
0x016e40, 0x016e5f, INTEGER_OFFSET, 0,
11121122
0x016e60, 0x016e7f, INTEGER_OFFSET, 0,
11131123
0x01e900, 0x01e921, INTEGER_OFFSET, 0,
11141124
0x01e922, 0x01e943, INTEGER_OFFSET, 0,
11151125
});
1116-
private static final CaseFoldEquivalenceTable UNICODE_15_1_0_PY = new CaseFoldEquivalenceTable(UNICODE_15_1_0_SIMPLE, new CodePointSet[]{
1126+
private static final CaseFoldEquivalenceTable UNICODE_15_1_0_PY = new CaseFoldEquivalenceTable(UNICODE_16_0_0_SIMPLE, new CodePointSet[]{
11171127
rangeSet(0x000049, 0x000049, 0x000069, 0x000069, 0x000130, 0x000131),
11181128
}, new int[]{
11191129
0x000049, 0x000049, DIRECT_MAPPING, 0,
11201130
0x000069, 0x000069, DIRECT_MAPPING, 0,
11211131
0x000130, 0x000131, DIRECT_MAPPING, 0,
1132+
0x00019b, 0x00019b, INTEGER_OFFSET, 0,
1133+
0x000264, 0x000264, INTEGER_OFFSET, 0,
1134+
0x001c89, 0x001c8a, INTEGER_OFFSET, 0,
1135+
0x00a7cb, 0x00a7cb, INTEGER_OFFSET, 0,
1136+
0x00a7cc, 0x00a7cd, INTEGER_OFFSET, 0,
1137+
0x00a7da, 0x00a7db, INTEGER_OFFSET, 0,
1138+
0x00a7dc, 0x00a7dc, INTEGER_OFFSET, 0,
1139+
0x010d50, 0x010d65, INTEGER_OFFSET, 0,
1140+
0x010d70, 0x010d85, INTEGER_OFFSET, 0,
11221141
});
11231142
private static final CaseFoldEquivalenceTable UNICODE_15_0_0_JAVA = new CaseFoldEquivalenceTable(UNICODE_15_1_0_PY, new CodePointSet[]{
11241143
}, new int[]{
@@ -1965,7 +1984,7 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
19651984
0x0004fc, 0x0004fe, 0x0004fe, 0x000500, 0x000500, 0x000502, 0x000502, 0x000504, 0x000504, 0x000506, 0x000506, 0x000508, 0x000508, 0x00050a, 0x00050a, 0x00050c, 0x00050c, 0x00050e,
19661985
0x00050e, 0x000510, 0x000510, 0x000512, 0x000512, 0x000514, 0x000514, 0x000516, 0x000516, 0x000518, 0x000518, 0x00051a, 0x00051a, 0x00051c, 0x00051c, 0x00051e, 0x00051e, 0x000520,
19671986
0x000520, 0x000522, 0x000522, 0x000524, 0x000524, 0x000526, 0x000526, 0x000528, 0x000528, 0x00052a, 0x00052a, 0x00052c, 0x00052c, 0x00052e, 0x00052e, 0x000531, 0x000556, 0x0010a0,
1968-
0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0013f8, 0x0013fd, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001e00, 0x001e00, 0x001e02, 0x001e02, 0x001e04,
1987+
0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0013f8, 0x0013fd, 0x001c80, 0x001c89, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001e00, 0x001e00, 0x001e02, 0x001e02, 0x001e04,
19691988
0x001e04, 0x001e06, 0x001e06, 0x001e08, 0x001e08, 0x001e0a, 0x001e0a, 0x001e0c, 0x001e0c, 0x001e0e, 0x001e0e, 0x001e10, 0x001e10, 0x001e12, 0x001e12, 0x001e14, 0x001e14, 0x001e16,
19701989
0x001e16, 0x001e18, 0x001e18, 0x001e1a, 0x001e1a, 0x001e1c, 0x001e1c, 0x001e1e, 0x001e1e, 0x001e20, 0x001e20, 0x001e22, 0x001e22, 0x001e24, 0x001e24, 0x001e26, 0x001e26, 0x001e28,
19711990
0x001e28, 0x001e2a, 0x001e2a, 0x001e2c, 0x001e2c, 0x001e2e, 0x001e2e, 0x001e30, 0x001e30, 0x001e32, 0x001e32, 0x001e34, 0x001e34, 0x001e36, 0x001e36, 0x001e38, 0x001e38, 0x001e3a,
@@ -2001,9 +2020,9 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
20012020
0x00a77b, 0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782, 0x00a782, 0x00a784, 0x00a784, 0x00a786, 0x00a786, 0x00a78b, 0x00a78b, 0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792,
20022021
0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798, 0x00a79a, 0x00a79a, 0x00a79c, 0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0, 0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4, 0x00a7a6,
20032022
0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa, 0x00a7ae, 0x00a7b0, 0x00a7b4, 0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c0,
2004-
0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f5, 0x00a7f5, 0x00ab70, 0x00abbf, 0x00fb05,
2005-
0x00fb05, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010c80, 0x010cb2, 0x0118a0,
2006-
0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921);
2023+
0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7cb, 0x00a7cc, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7da, 0x00a7da, 0x00a7dc,
2024+
0x00a7dc, 0x00a7f5, 0x00a7f5, 0x00ab70, 0x00abbf, 0x00fb05, 0x00fb05, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c,
2025+
0x010592, 0x010594, 0x010595, 0x010c80, 0x010cb2, 0x010d50, 0x010d65, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921);
20072026

20082027
/* GENERATED CODE END - KEEP THIS MARKER FOR AUTOMATIC UPDATES */
20092028

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/ECMAScriptFlavor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
public final class ECMAScriptFlavor extends RegexFlavor {
5757

5858
public static final ECMAScriptFlavor INSTANCE = new ECMAScriptFlavor();
59-
public static final UnicodeProperties UNICODE = new UnicodeProperties(UnicodePropertyDataVersion.UNICODE_15_1_0, 0);
59+
public static final UnicodeProperties UNICODE = new UnicodeProperties(UnicodePropertyDataVersion.UNICODE_16_0_0, 0);
6060

6161
private ECMAScriptFlavor() {
6262
super(0);

truffle/mx.truffle/suite.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,22 @@
145145

146146
"ICU4J" : {
147147
"moduleName" : "com.ibm.icu",
148-
"digest" : "sha512:08720318b2d175ad8379306caacea7da181e51ce9e7410318dae11008ab4a8d6d7b1723136a1fd17b02b11efd24ce87cbe24413c1d5f8d7cb0d00c9d32c1b267",
149-
"sourceDigest" : "sha512:0cc7bda1e4396249ff33cb692fe102a20c499fce53c79035a26ed3815760554246e5fd9bd5bf6f154cf2c823c0502fc573ce2987924c263cd371aaf3dadc7a8b",
148+
"digest" : "sha512:5f4126df9bf28c2ea82b63b3c0d0f08a1e371b3fac0c7acab34a37f087927b1876535f4e0b889d28f20fcf42e816af00b3f302d48bc01c8dc13b49e40dd3927d",
149+
"sourceDigest" : "sha512:25a05e8ceb88420e3fd77447fbf3687c6bec5ff17dc1a34a571a3b28aee1d7a2699fa8edce43e09f175ddbf35a58c8fa50a0b04631b47858e711308c55fbdfb2",
150150
"maven" : {
151151
"groupId" : "com.ibm.icu",
152152
"artifactId" : "icu4j",
153-
"version" : "74.1",
153+
"version" : "76.1",
154154
},
155155
},
156156
"ICU4J-CHARSET" : {
157157
"moduleName" : "com.ibm.icu.charset",
158-
"digest" : "sha512:15457b170448676d299b20d6bb26909735645f6e3fe28efb6036ad4b94a91ee58bfbeb427adc9264fe6bfa23972b3dbd2df9c85f8285290ed2b035da6e51326b",
159-
"sourceDigest" : "sha512:0f90efa00cb7c98af87f9fbe6a63f5d465d4cd9da9666d2cd04d7b3e588b1b9c3835403f5c9f2863d5cd93122ad004e888fb06da3bdd2b5f37e830ae699d2576",
158+
"digest" : "sha512:61fa695e522babd5da17f1d4696f7f6b67eb25fa0adfd62704dc00c2f3289f099ace819607f782eae9b7042257c654b36de14278808e3bdfd1c46038141c8066",
159+
"sourceDigest" : "sha512:8e8fc31c1afc42277fd54bd008de408f900589012d8544275250dde93642e123b776c12bc1b7cfa2803c0e11ec714d4758efab3690e65dd2bf052a51ada0f5f5",
160160
"maven" : {
161161
"groupId" : "com.ibm.icu",
162162
"artifactId" : "icu4j-charset",
163-
"version" : "74.1",
163+
"version" : "76.1",
164164
},
165165
},
166166

@@ -1248,6 +1248,7 @@
12481248
},
12491249
"description" : "ICU4J shaded library.",
12501250
"allowsJavadocWarnings": True,
1251+
"forceJavac": True,
12511252
"javac.lint.overrides" : 'none',
12521253
"jacoco" : "exclude",
12531254
"graalCompilerSourceEdition": "ignore",

0 commit comments

Comments
 (0)