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: #29523 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]>
nodejs · Sep 25, 2019 · 0db7ebe · 0db7ebe
1 parent 9abee07
commit 0db7ebe
Showing 1 changed file with 11 additions and 2 deletions.
diff --git 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;
       }