[fix] Fixing warnings in unicode script data

2015-08-02 21:30:54 -06:00
parent 770ce4256f
commit 1d39916aaa
2 changed files with 178 additions and 178 deletions
--- a/scripts/geodata/i18n/unicode_properties.py
+++ b/scripts/geodata/i18n/unicode_properties.py
@@ -90,7 +90,7 @@ script_code_t script_codes[] = {{
    {script_codes}
 }};

-script_language_t script_languages[] = {{
+script_languages_t script_languages[] = {{
    {script_languages}
 }};
 '''
@@ -391,7 +391,7 @@ def main(out_dir):

    script_language_data = u''',
    '''.join([script_language_template.format(num_langs=len(langs),
-              languages='{{{}}}'.format(', '.join(['"{}"'.format(l) for l in langs])) if langs else 'NULL')
+              languages='{{{}}}'.format(', '.join(['"{}"'.format(l) for l in langs]) if langs else 'NULL'))
              for langs in sorted_lang_scripts])

    out_file.write(scripts_c_data_template.format(header_name=SCRIPTS_HEADER,
--- a/src/unicode_scripts_data.c
+++ b/src/unicode_scripts_data.c
@@ -1632,16 +1632,16 @@ script_t char_scripts[] = {
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
-    SCRIPT_COMMON,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
@@ -2227,6 +2227,8 @@ script_t char_scripts[] = {
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
+    SCRIPT_ARABIC,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -2273,9 +2275,7 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
    SCRIPT_ARABIC,
@@ -2809,7 +2809,7 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_GUJARATI,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -3162,7 +3162,7 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_TELUGU,
    SCRIPT_TELUGU,
-    SCRIPT_UNKNOWN,
+    SCRIPT_TELUGU,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -3423,7 +3423,7 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_MALAYALAM,
    SCRIPT_MALAYALAM,
    SCRIPT_MALAYALAM,
    SCRIPT_MALAYALAM,
@@ -5109,15 +5109,15 @@ script_t char_scripts[] = {
    SCRIPT_CHEROKEE,
    SCRIPT_CHEROKEE,
    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_CANADIAN_ABORIGINAL,
@@ -8382,7 +8382,7 @@ script_t char_scripts[] = {
    SCRIPT_COMMON,
    SCRIPT_COMMON,
    SCRIPT_COMMON,
-    SCRIPT_UNKNOWN,
+    SCRIPT_COMMON,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -8586,8 +8586,8 @@ script_t char_scripts[] = {
    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_COMMON,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_COMMON,
+    SCRIPT_COMMON,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -11244,10 +11244,10 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_COMMON,
+    SCRIPT_COMMON,
+    SCRIPT_COMMON,
+    SCRIPT_COMMON,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -40909,15 +40909,15 @@ script_t char_scripts[] = {
    SCRIPT_HAN,
    SCRIPT_HAN,
    SCRIPT_HAN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
+    SCRIPT_HAN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -42654,7 +42654,7 @@ script_t char_scripts[] = {
    SCRIPT_CYRILLIC,
    SCRIPT_CYRILLIC,
    SCRIPT_CYRILLIC,
-    SCRIPT_UNKNOWN,
+    SCRIPT_CYRILLIC,
    SCRIPT_CYRILLIC,
    SCRIPT_BAMUM,
    SCRIPT_BAMUM,
@@ -42895,7 +42895,7 @@ script_t char_scripts[] = {
    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_LATIN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_LATIN,
@@ -42930,12 +42930,12 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_LATIN,
    SCRIPT_LATIN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
@@ -43260,8 +43260,8 @@ script_t char_scripts[] = {
    SCRIPT_DEVANAGARI,
    SCRIPT_DEVANAGARI,
    SCRIPT_DEVANAGARI,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_DEVANAGARI,
+    SCRIPT_DEVANAGARI,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_KAYAH_LI,
@@ -43872,10 +43872,10 @@ script_t char_scripts[] = {
    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_LATIN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
+    SCRIPT_LATIN,
    SCRIPT_LATIN,
    SCRIPT_GREEK,
    SCRIPT_UNKNOWN,
@@ -43888,86 +43888,86 @@ script_t char_scripts[] = {
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
+    SCRIPT_CHEROKEE,
    SCRIPT_MEETEI_MAYEK,
    SCRIPT_MEETEI_MAYEK,
    SCRIPT_MEETEI_MAYEK,
@@ -65070,8 +65070,8 @@ script_t char_scripts[] = {
    SCRIPT_INHERITED,
    SCRIPT_INHERITED,
    SCRIPT_INHERITED,
-    SCRIPT_UNKNOWN,
-    SCRIPT_UNKNOWN,
+    SCRIPT_CYRILLIC,
+    SCRIPT_CYRILLIC,
    SCRIPT_COMMON,
    SCRIPT_COMMON,
    SCRIPT_COMMON,
@@ -65600,22 +65600,22 @@ script_code_t script_codes[] = {
 };

 script_languages_t script_languages[] = {
-    {0, NULL},
-    {0, NULL},
+    {0, {NULL}},
+    {0, {NULL}},
    {122, {"gv", "gd", "ga", "gn", "gl", "tr", "ts", "to", "tk", "tg", "mg", "rm", "za", "zu", "tet", "ms", "ty", "quc", "ve", "tn", "mi", "mh", "mt", "csb", "fr", "fy", "fi", "fj", "fo", "ss", "sr", "sq", "sw", "sv", "st", "sk", "so", "sn", "sm", "sg", "se", "lb", "lt", "fil", "ceb", "yo", "qu", "en", "ee", "eu", "et", "es", "rn", "ro", "ast", "xh", "udm", "mdh", "sat", "sl", "kg", "kl", "ky", "tkl", "de", "da", "hif", "hil", "bal", "lua", "ikt", "wo", "ilo", "ln", "tsg", "ch", "ca", "cy", "cs", "lv", "pt", "pl", "gaa", "vi", "is", "iu", "it", "tzm", "id", "pap", "pag", "niu", "gsw", "nd", "haw", "tvl", "bi", "bs", "nso", "gil", "war", "hr", "ht", "hu", "ho", "uz", "ug", "af", "ak", "inh", "tpi", "ay", "kha", "az", "nl", "nn", "na", "nb", "ny", "nr", "pau", "rw"}},
    {1, {"zh"}},
-    {0, NULL},
+    {0, {NULL}},
    {1, {"el"}},
-    {0, NULL},
+    {0, {NULL}},
    {37, {"tt", "tk", "tg", "lez", "mn", "mk", "sah", "sr", "se", "kbd", "mdf", "ru", "ro", "koi", "udm", "tyv", "kk", "kv", "ky", "kum", "ce", "lbe", "ady", "be", "bg", "myv", "ba", "bs", "krc", "os", "uz", "uk", "ug", "ab", "inh", "av", "az"}},
    {1, {"hy"}},
    {1, {"he"}},
    {23, {"tr", "tk", "tg", "ms", "fa", "so", "sd", "zdj", "ckb", "kk", "ks", "ky", "bal", "wo", "id", "ps", "pa", "uz", "ur", "ug", "ar", "inh", "az"}},
    {1, {"ar"}},
    {1, {"dv"}},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
    {10, {"mr", "mai", "sa", "sd", "kok", "sat", "ks", "hif", "ne", "hi"}},
    {4, {"sat", "bn", "as", "kha"}},
    {1, {"pa"}},
@@ -65631,45 +65631,45 @@ script_languages_t script_languages[] = {
    {2, {"dz", "bo"}},
    {1, {"my"}},
    {1, {"ka"}},
-    {0, NULL},
+    {0, {NULL}},
    {2, {"ti", "am"}},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
    {1, {"de"}},
    {1, {"fil"}},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
    {1, {"km"}},
    {1, {"mn"}},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
    {1, {"tzm"}},
    {1, {"vi"}},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL},
-    {0, NULL}
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}},
+    {0, {NULL}}
 };