summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven R. Loomis <srloomis@us.ibm.com>2019-09-10 14:18:17 -0700
committerSteven R. Loomis <srloomis@us.ibm.com>2019-09-12 15:30:41 -0700
commitfa6839ecaafc6f499106678fc5118cba9ca06df7 (patch)
tree077c9e962c5e6a3af5c76c6c3466851847c95edd /tools
parentf62e7a93881e150efe5ac8c9e771611a128dc61c (diff)
downloadandroid-node-v8-fa6839ecaafc6f499106678fc5118cba9ca06df7.tar.gz
android-node-v8-fa6839ecaafc6f499106678fc5118cba9ca06df7.tar.bz2
android-node-v8-fa6839ecaafc6f499106678fc5118cba9ca06df7.zip
tools: fix iculslocs to support ICU 65.1
The ICU alias table format changed in https://unicode-org.atlassian.net/browse/ICU-20627 Because of this, iculslocs.cc needs to handle URES_TABLE format contents in the res_index.txt file. PR-URL: https://github.com/nodejs/node/pull/29523 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/icu/iculslocs.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc
index 8b1fa527c2..e0de237745 100644
--- a/tools/icu/iculslocs.cc
+++ b/tools/icu/iculslocs.cc
@@ -209,7 +209,8 @@ int dumpAllButInstalledLocales(int lev,
} else {
printIndent(bf, lev);
fprintf(bf, "%s", key);
- switch (ures_getType(t.getAlias())) {
+ const UResType type = ures_getType(t.getAlias());
+ switch (type) {
case URES_STRING: {
int32_t len = 0;
const UChar* s = ures_getString(t.getAlias(), &len, status);
@@ -218,8 +219,16 @@ int dumpAllButInstalledLocales(int lev,
fwrite(s, len, 1, bf);
fprintf(bf, "\"}");
} break;
+ case URES_TABLE: {
+ fprintf(bf, ":table {\n");
+ dumpAllButInstalledLocales(lev+1, &t, bf, status);
+ printIndent(bf, lev);
+ fprintf(bf, "}\n");
+ } break;
default: {
- printf("ERROR: unhandled type in dumpAllButInstalledLocales().\n");
+ printf("ERROR: unhandled type %d for key %s "
+ "in dumpAllButInstalledLocales().\n",
+ static_cast<int>(type), key);
return 1;
} break;
}