* unicode.c (onigenc_unicode_property_name_to_ctype):

ignore case of properties. * tool/enc-unicode.rb: downcase properties list. * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src: follow above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
author: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 2009-09-10 22:54:01 +0000
committer: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 2009-09-10 22:54:01 +0000
commit: ee4b59a4191ecabc1a9d396e234f20be5e5e9f8c ()
tree: c365ce9fa86e8f507df68c5c616066e7fdea8d02
parent: e519c9d960549163c17571689cc977f7ca45073e (diff)
7 files changed, 1306 insertions, 1217 deletions
@@ -1,3 +1,14 @@
 Fri Sep 11 05:00:19 2009 Koichi Sasada <[email protected]>
 * include/ruby/ruby.h (rb_data_type_t): Add comments.
@@ -2093,16 +2093,16 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
 p = name;
 len = 0;
- while (p < end) {
 code = ONIGENC_MBC_TO_CODE(enc, p, end);
 if (code >= 0x80)
 return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
- buf[len++] = (UChar )code;
 if (len >= PROPERTY_NAME_MAX_SIZE)
 return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-
- p += enclen(enc, p, end);
 }
 buf[len] = 0;
@@ -9371,16 +9371,16 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 #define TOTAL_KEYWORDS 15
 #define MIN_WORD_LENGTH 4
 #define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 20
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
 #define TOTAL_KEYWORDS 131
 #define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 19
 #define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 167
-/* maximum key range = 166, duplicates = 0 */
 #endif /* USE_UNICODE_PROPERTIES */
 #ifdef __GNUC__
@@ -9395,36 +9395,40 @@ uniname2ctype_hash (str, len)
 register const char *str;
 register unsigned int len;
 {
 static const unsigned char asso_values[] =
 {
 #ifndef USE_UNICODE_PROPERTIES
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 1, 10, 3, 7, 21,
- 21, 8, 21, 21, 21, 21, 6, 21, 8, 21,
- 4, 21, 21, 5, 21, 8, 21, 1, 4, 21,
- 21, 21, 21, 21, 21, 21, 21, 5, 21, 21,
- 21, 21, 21, 7, 21, 3, 21, 21, 21, 21,
- 2, 21, 1, 21, 1, 21, 2, 21, 21, 6,
- 21, 21, 21, 21, 21, 21, 21, 21
 #else /* USE_UNICODE_PROPERTIES */
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 33, 14, 2, 56, 13,
- 168, 38, 89, 98, 168, 58, 11, 12, 85, 22,
- 1, 168, 78, 3, 38, 24, 62, 12, 7, 64,
- 108, 168, 168, 168, 168, 70, 168, 5, 5, 73,
- 57, 22, 31, 57, 9, 49, 36, 39, 13, 49,
- 4, 2, 18, 168, 20, 6, 60, 1, 24, 14,
- 168, 21, 168, 168, 168, 168, 168, 168
 #endif /* USE_UNICODE_PROPERTIES */
 };
 #ifndef USE_UNICODE_PROPERTIES
@@ -9438,7 +9442,7 @@ uniname2ctype_hash (str, len)
 hval += asso_values[(unsigned char)str[2]];
 /*FALLTHROUGH*/
 case 2:
- hval += asso_values[(unsigned char)str[1]];
 /*FALLTHROUGH*/
 case 1:
 hval += asso_values[(unsigned char)str[0]];
@@ -9451,315 +9455,315 @@ uniname2ctype_hash (str, len)
 struct uniname2ctype_pool_t
 {
 #ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("Word")];
- char uniname2ctype_pool_str7[sizeof("Alpha")];
- char uniname2ctype_pool_str8[sizeof("Alnum")];
- char uniname2ctype_pool_str9[sizeof("ASCII")];
- char uniname2ctype_pool_str10[sizeof("Cntrl")];
 #else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str2[sizeof("P")];
- char uniname2ctype_pool_str3[sizeof("C")];
- char uniname2ctype_pool_str4[sizeof("S")];
- char uniname2ctype_pool_str5[sizeof("Po")];
- char uniname2ctype_pool_str6[sizeof("Co")];
- char uniname2ctype_pool_str7[sizeof("So")];
- char uniname2ctype_pool_str8[sizeof("Cn")];
- char uniname2ctype_pool_str9[sizeof("Ps")];
- char uniname2ctype_pool_str10[sizeof("Cs")];
-#endif /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str11[sizeof("Punct")];
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str12[sizeof("Print")];
- char uniname2ctype_pool_str13[sizeof("XDigit")];
- char uniname2ctype_pool_str14[sizeof("Upper")];
- char uniname2ctype_pool_str15[sizeof("Space")];
- char uniname2ctype_pool_str16[sizeof("NEWLINE")];
- char uniname2ctype_pool_str17[sizeof("Lower")];
- char uniname2ctype_pool_str18[sizeof("Graph")];
- char uniname2ctype_pool_str19[sizeof("Digit")];
- char uniname2ctype_pool_str20[sizeof("Blank")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str12[sizeof("L")];
- char uniname2ctype_pool_str13[sizeof("M")];
- char uniname2ctype_pool_str14[sizeof("Lu")];
- char uniname2ctype_pool_str15[sizeof("Lo")];
- char uniname2ctype_pool_str16[sizeof("Cuneiform")];
- char uniname2ctype_pool_str17[sizeof("Sundanese")];
- char uniname2ctype_pool_str18[sizeof("Mn")];
- char uniname2ctype_pool_str19[sizeof("Saurashtra")];
- char uniname2ctype_pool_str20[sizeof("Cham")];
- char uniname2ctype_pool_str21[sizeof("Lao")];
- char uniname2ctype_pool_str22[sizeof("Phoenician")];
- char uniname2ctype_pool_str23[sizeof("Phags_Pa")];
- char uniname2ctype_pool_str24[sizeof("Shavian")];
- char uniname2ctype_pool_str25[sizeof("Pe")];
- char uniname2ctype_pool_str26[sizeof("Ll")];
- char uniname2ctype_pool_str27[sizeof("Mongolian")];
- char uniname2ctype_pool_str28[sizeof("Coptic")];
- char uniname2ctype_pool_str29[sizeof("Buhid")];
- char uniname2ctype_pool_str30[sizeof("Canadian_Aboriginal")];
- char uniname2ctype_pool_str31[sizeof("Space")];
- char uniname2ctype_pool_str32[sizeof("Lower")];
- char uniname2ctype_pool_str33[sizeof("Carian")];
- char uniname2ctype_pool_str34[sizeof("Pf")];
- char uniname2ctype_pool_str35[sizeof("Cf")];
- char uniname2ctype_pool_str36[sizeof("Me")];
- char uniname2ctype_pool_str37[sizeof("Blank")];
- char uniname2ctype_pool_str38[sizeof("Word")];
- char uniname2ctype_pool_str39[sizeof("Malayalam")];
- char uniname2ctype_pool_str40[sizeof("Balinese")];
- char uniname2ctype_pool_str41[sizeof("Cherokee")];
- char uniname2ctype_pool_str42[sizeof("Bopomofo")];
- char uniname2ctype_pool_str43[sizeof("ASCII")];
- char uniname2ctype_pool_str44[sizeof("Sk")];
- char uniname2ctype_pool_str45[sizeof("Myanmar")];
- char uniname2ctype_pool_str46[sizeof("Braille")];
- char uniname2ctype_pool_str47[sizeof("Bengali")];
- char uniname2ctype_pool_str48[sizeof("Cypriot")];
- char uniname2ctype_pool_str49[sizeof("Syloti_Nagri")];
- char uniname2ctype_pool_str50[sizeof("Syriac")];
- char uniname2ctype_pool_str51[sizeof("Cyrillic")];
- char uniname2ctype_pool_str52[sizeof("Pi")];
- char uniname2ctype_pool_str53[sizeof("Assigned")];
- char uniname2ctype_pool_str54[sizeof("Sm")];
- char uniname2ctype_pool_str55[sizeof("Alnum")];
- char uniname2ctype_pool_str56[sizeof("Thai")];
- char uniname2ctype_pool_str57[sizeof("Lepcha")];
- char uniname2ctype_pool_str58[sizeof("Thaana")];
- char uniname2ctype_pool_str59[sizeof("Common")];
- char uniname2ctype_pool_str60[sizeof("Pd")];
- char uniname2ctype_pool_str61[sizeof("Any")];
- char uniname2ctype_pool_str62[sizeof("Lm")];
- char uniname2ctype_pool_str63[sizeof("Sinhala")];
- char uniname2ctype_pool_str64[sizeof("Arabic")];
- char uniname2ctype_pool_str65[sizeof("Upper")];
- char uniname2ctype_pool_str66[sizeof("Glagolitic")];
- char uniname2ctype_pool_str67[sizeof("Gurmukhi")];
- char uniname2ctype_pool_str68[sizeof("Graph")];
- char uniname2ctype_pool_str69[sizeof("Alpha")];
- char uniname2ctype_pool_str70[sizeof("Georgian")];
- char uniname2ctype_pool_str71[sizeof("Cntrl")];
- char uniname2ctype_pool_str72[sizeof("Linear_B")];
- char uniname2ctype_pool_str73[sizeof("Lt")];
- char uniname2ctype_pool_str74[sizeof("Kannada")];
- char uniname2ctype_pool_str75[sizeof("Print")];
- char uniname2ctype_pool_str76[sizeof("Pc")];
- char uniname2ctype_pool_str77[sizeof("Cc")];
- char uniname2ctype_pool_str78[sizeof("Sc")];
- char uniname2ctype_pool_str79[sizeof("Telugu")];
- char uniname2ctype_pool_str80[sizeof("Buginese")];
- char uniname2ctype_pool_str81[sizeof("Latin")];
- char uniname2ctype_pool_str82[sizeof("Kharoshthi")];
- char uniname2ctype_pool_str83[sizeof("Gujarati")];
- char uniname2ctype_pool_str84[sizeof("Osmanya")];
- char uniname2ctype_pool_str85[sizeof("Greek")];
- char uniname2ctype_pool_str86[sizeof("N")];
- char uniname2ctype_pool_str87[sizeof("Mc")];
- char uniname2ctype_pool_str88[sizeof("Runic")];
- char uniname2ctype_pool_str89[sizeof("No")];
- char uniname2ctype_pool_str90[sizeof("Ethiopic")];
- char uniname2ctype_pool_str91[sizeof("Deseret")];
- char uniname2ctype_pool_str92[sizeof("Kayah_Li")];
- char uniname2ctype_pool_str93[sizeof("Ogham")];
- char uniname2ctype_pool_str94[sizeof("Ugaritic")];
- char uniname2ctype_pool_str95[sizeof("Lydian")];
- char uniname2ctype_pool_str96[sizeof("Oriya")];
- char uniname2ctype_pool_str97[sizeof("Tamil")];
- char uniname2ctype_pool_str98[sizeof("Tai_Le")];
- char uniname2ctype_pool_str99[sizeof("Tibetan")];
- char uniname2ctype_pool_str100[sizeof("Nl")];
- char uniname2ctype_pool_str101[sizeof("Han")];
- char uniname2ctype_pool_str102[sizeof("Old_Italic")];
- char uniname2ctype_pool_str103[sizeof("Old_Persian")];
- char uniname2ctype_pool_str104[sizeof("Hangul")];
- char uniname2ctype_pool_str105[sizeof("Hanunoo")];
- char uniname2ctype_pool_str106[sizeof("Gothic")];
- char uniname2ctype_pool_str107[sizeof("Tagalog")];
- char uniname2ctype_pool_str108[sizeof("Tagbanwa")];
- char uniname2ctype_pool_str109[sizeof("Z")];
- char uniname2ctype_pool_str110[sizeof("Armenian")];
- char uniname2ctype_pool_str111[sizeof("Lycian")];
- char uniname2ctype_pool_str112[sizeof("Devanagari")];
- char uniname2ctype_pool_str113[sizeof("Ol_Chiki")];
- char uniname2ctype_pool_str114[sizeof("Limbu")];
- char uniname2ctype_pool_str115[sizeof("Yi")];
- char uniname2ctype_pool_str116[sizeof("Zs")];
- char uniname2ctype_pool_str117[sizeof("NEWLINE")];
- char uniname2ctype_pool_str118[sizeof("XDigit")];
- char uniname2ctype_pool_str119[sizeof("Vai")];
- char uniname2ctype_pool_str120[sizeof("Inherited")];
- char uniname2ctype_pool_str121[sizeof("Khmer")];
- char uniname2ctype_pool_str122[sizeof("Hebrew")];
- char uniname2ctype_pool_str123[sizeof("Zl")];
- char uniname2ctype_pool_str126[sizeof("Tifinagh")];
- char uniname2ctype_pool_str128[sizeof("Zp")];
- char uniname2ctype_pool_str129[sizeof("Nko")];
- char uniname2ctype_pool_str131[sizeof("Katakana")];
- char uniname2ctype_pool_str132[sizeof("New_Tai_Lue")];
- char uniname2ctype_pool_str142[sizeof("Rejang")];
- char uniname2ctype_pool_str144[sizeof("Nd")];
- char uniname2ctype_pool_str166[sizeof("Hiragana")];
- char uniname2ctype_pool_str167[sizeof("Digit")];
 #endif /* USE_UNICODE_PROPERTIES */
 };
 static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 {
-#ifdef USE_UNICODE_PROPERTIES
- "P",
- "C",
- "S",
- "Po",
- "Co",
- "So",
- "Cn",
- "Ps",
- "Cs",
- "Punct",
- "L",
- "M",
- "Lu",
- "Lo",
- "Cuneiform",
- "Sundanese",
- "Mn",
- "Saurashtra",
- "Cham",
- "Lao",
- "Phoenician",
- "Phags_Pa",
- "Shavian",
- "Pe",
- "Ll",
- "Mongolian",
- "Coptic",
- "Buhid",
- "Canadian_Aboriginal",
- "Space",
- "Lower",
- "Carian",
- "Pf",
- "Cf",
- "Me",
- "Blank",
-#endif /* USE_UNICODE_PROPERTIES */
- "Word",
 #ifndef USE_UNICODE_PROPERTIES
- "Alpha",
- "Alnum",
 #else /* USE_UNICODE_PROPERTIES */
- "Malayalam",
- "Balinese",
- "Cherokee",
- "Bopomofo",
 #endif /* USE_UNICODE_PROPERTIES */
- "ASCII",
 #ifdef USE_UNICODE_PROPERTIES
- "Sk",
- "Myanmar",
- "Braille",
- "Bengali",
- "Cypriot",
- "Syloti_Nagri",
- "Syriac",
- "Cyrillic",
- "Pi",
- "Assigned",
- "Sm",
- "Alnum",
- "Thai",
- "Lepcha",
- "Thaana",
- "Common",
- "Pd",
- "Any",
- "Lm",
- "Sinhala",
- "Arabic",
- "Upper",
- "Glagolitic",
- "Gurmukhi",
- "Graph",
- "Alpha",
- "Georgian",
 #endif /* USE_UNICODE_PROPERTIES */
- "Cntrl",
 #ifndef USE_UNICODE_PROPERTIES
- "Punct",
 #else /* USE_UNICODE_PROPERTIES */
- "Linear_B",
- "Lt",
- "Kannada",
 #endif /* USE_UNICODE_PROPERTIES */
- "Print",
 #ifndef USE_UNICODE_PROPERTIES
- "XDigit",
- "Upper",
- "Space",
 #else /* USE_UNICODE_PROPERTIES */
- "Pc",
- "Cc",
- "Sc",
- "Telugu",
- "Buginese",
- "Latin",
- "Kharoshthi",
- "Gujarati",
- "Osmanya",
- "Greek",
- "N",
- "Mc",
- "Runic",
- "No",
- "Ethiopic",
- "Deseret",
- "Kayah_Li",
- "Ogham",
- "Ugaritic",
- "Lydian",
- "Oriya",
- "Tamil",
- "Tai_Le",
- "Tibetan",
- "Nl",
- "Han",
- "Old_Italic",
- "Old_Persian",
- "Hangul",
- "Hanunoo",
- "Gothic",
- "Tagalog",
- "Tagbanwa",
- "Z",
- "Armenian",
- "Lycian",
- "Devanagari",
- "Ol_Chiki",
- "Limbu",
- "Yi",
- "Zs",
 #endif /* USE_UNICODE_PROPERTIES */
- "NEWLINE",
 #ifndef USE_UNICODE_PROPERTIES
- "Lower",
- "Graph",
- "Digit",
- "Blank"
 #else /* USE_UNICODE_PROPERTIES */
- "XDigit",
- "Vai",
- "Inherited",
- "Khmer",
- "Hebrew",
- "Zl",
- "Tifinagh",
- "Zp",
- "Nko",
- "Katakana",
- "New_Tai_Lue",
- "Rejang",
- "Nd",
- "Hiragana",
- "Digit"
 #endif /* USE_UNICODE_PROPERTIES */
 };
 #define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
@@ -9776,166 +9780,198 @@ uniname2ctype_p (str, len)
 {
 static const struct uniname2ctype_struct wordlist[] =
 {
-#ifndef USE_UNICODE_PROPERTIES
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 3},
-#else /* USE_UNICODE_PROPERTIES */
 {-1}, {-1},
 {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 22},
-#endif /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 8},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 23},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 29},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 26},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 32},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 74},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 117},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 85},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 108},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 81},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 19},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 31},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 2},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str39, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 80},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 47},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 76},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 106},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 61},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 57},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 16},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54, 48},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 73},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str57, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58, 62},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 54},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 39},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 15},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 25},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 72},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 110},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67, 65},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 77},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 27},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78, 46},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 107},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81, 55},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 66},
 {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 56},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 33},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 30},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88, 83},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89, 36},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 79},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 93},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 125},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 102},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 67},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 68},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 100},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 96},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 95},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 98},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 50},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 58},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 127},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 63},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 122},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115, 90},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 53},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121, 84},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122, 59},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 51},
 {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 111},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 52},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 119},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 109},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 126},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 34},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166, 86},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 4}
 #endif /* USE_UNICODE_PROPERTIES */
 };
@@ -9371,16 +9371,16 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 #define TOTAL_KEYWORDS 15
 #define MIN_WORD_LENGTH 4
 #define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 20
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
 #define TOTAL_KEYWORDS 131
 #define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 19
 #define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 167
-/* maximum key range = 166, duplicates = 0 */
 #endif /* USE_UNICODE_PROPERTIES */
 #ifdef __GNUC__
@@ -9395,36 +9395,40 @@ uniname2ctype_hash (str, len)
 register const char *str;
 register unsigned int len;
 {
 static const unsigned char asso_values[] =
 {
 #ifndef USE_UNICODE_PROPERTIES
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 1, 10, 3, 7, 21,
- 21, 8, 21, 21, 21, 21, 6, 21, 8, 21,
- 4, 21, 21, 5, 21, 8, 21, 1, 4, 21,
- 21, 21, 21, 21, 21, 21, 21, 5, 21, 21,
- 21, 21, 21, 7, 21, 3, 21, 21, 21, 21,
- 2, 21, 1, 21, 1, 21, 2, 21, 21, 6,
- 21, 21, 21, 21, 21, 21, 21, 21
 #else /* USE_UNICODE_PROPERTIES */
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 33, 14, 2, 56, 13,
- 168, 38, 89, 98, 168, 58, 11, 12, 85, 22,
- 1, 168, 78, 3, 38, 24, 62, 12, 7, 64,
- 108, 168, 168, 168, 168, 70, 168, 5, 5, 73,
- 57, 22, 31, 57, 9, 49, 36, 39, 13, 49,
- 4, 2, 18, 168, 20, 6, 60, 1, 24, 14,
- 168, 21, 168, 168, 168, 168, 168, 168
 #endif /* USE_UNICODE_PROPERTIES */
 };
 #ifndef USE_UNICODE_PROPERTIES
@@ -9438,7 +9442,7 @@ uniname2ctype_hash (str, len)
 hval += asso_values[(unsigned char)str[2]];
 /*FALLTHROUGH*/
 case 2:
- hval += asso_values[(unsigned char)str[1]];
 /*FALLTHROUGH*/
 case 1:
 hval += asso_values[(unsigned char)str[0]];
@@ -9451,315 +9455,315 @@ uniname2ctype_hash (str, len)
 struct uniname2ctype_pool_t
 {
 #ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("Word")];
- char uniname2ctype_pool_str7[sizeof("Alpha")];
- char uniname2ctype_pool_str8[sizeof("Alnum")];
- char uniname2ctype_pool_str9[sizeof("ASCII")];
- char uniname2ctype_pool_str10[sizeof("Cntrl")];
 #else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str2[sizeof("P")];
- char uniname2ctype_pool_str3[sizeof("C")];
- char uniname2ctype_pool_str4[sizeof("S")];
- char uniname2ctype_pool_str5[sizeof("Po")];
- char uniname2ctype_pool_str6[sizeof("Co")];
- char uniname2ctype_pool_str7[sizeof("So")];
- char uniname2ctype_pool_str8[sizeof("Cn")];
- char uniname2ctype_pool_str9[sizeof("Ps")];
- char uniname2ctype_pool_str10[sizeof("Cs")];
-#endif /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str11[sizeof("Punct")];
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str12[sizeof("Print")];
- char uniname2ctype_pool_str13[sizeof("XDigit")];
- char uniname2ctype_pool_str14[sizeof("Upper")];
- char uniname2ctype_pool_str15[sizeof("Space")];
- char uniname2ctype_pool_str16[sizeof("NEWLINE")];
- char uniname2ctype_pool_str17[sizeof("Lower")];
- char uniname2ctype_pool_str18[sizeof("Graph")];
- char uniname2ctype_pool_str19[sizeof("Digit")];
- char uniname2ctype_pool_str20[sizeof("Blank")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str12[sizeof("L")];
- char uniname2ctype_pool_str13[sizeof("M")];
- char uniname2ctype_pool_str14[sizeof("Lu")];
- char uniname2ctype_pool_str15[sizeof("Lo")];
- char uniname2ctype_pool_str16[sizeof("Cuneiform")];
- char uniname2ctype_pool_str17[sizeof("Sundanese")];
- char uniname2ctype_pool_str18[sizeof("Mn")];
- char uniname2ctype_pool_str19[sizeof("Saurashtra")];
- char uniname2ctype_pool_str20[sizeof("Cham")];
- char uniname2ctype_pool_str21[sizeof("Lao")];
- char uniname2ctype_pool_str22[sizeof("Phoenician")];
- char uniname2ctype_pool_str23[sizeof("Phags_Pa")];
- char uniname2ctype_pool_str24[sizeof("Shavian")];
- char uniname2ctype_pool_str25[sizeof("Pe")];
- char uniname2ctype_pool_str26[sizeof("Ll")];
- char uniname2ctype_pool_str27[sizeof("Mongolian")];
- char uniname2ctype_pool_str28[sizeof("Coptic")];
- char uniname2ctype_pool_str29[sizeof("Buhid")];
- char uniname2ctype_pool_str30[sizeof("Canadian_Aboriginal")];
- char uniname2ctype_pool_str31[sizeof("Space")];
- char uniname2ctype_pool_str32[sizeof("Lower")];
- char uniname2ctype_pool_str33[sizeof("Carian")];
- char uniname2ctype_pool_str34[sizeof("Pf")];
- char uniname2ctype_pool_str35[sizeof("Cf")];
- char uniname2ctype_pool_str36[sizeof("Me")];
- char uniname2ctype_pool_str37[sizeof("Blank")];
- char uniname2ctype_pool_str38[sizeof("Word")];
- char uniname2ctype_pool_str39[sizeof("Malayalam")];
- char uniname2ctype_pool_str40[sizeof("Balinese")];
- char uniname2ctype_pool_str41[sizeof("Cherokee")];
- char uniname2ctype_pool_str42[sizeof("Bopomofo")];
- char uniname2ctype_pool_str43[sizeof("ASCII")];
- char uniname2ctype_pool_str44[sizeof("Sk")];
- char uniname2ctype_pool_str45[sizeof("Myanmar")];
- char uniname2ctype_pool_str46[sizeof("Braille")];
- char uniname2ctype_pool_str47[sizeof("Bengali")];
- char uniname2ctype_pool_str48[sizeof("Cypriot")];
- char uniname2ctype_pool_str49[sizeof("Syloti_Nagri")];
- char uniname2ctype_pool_str50[sizeof("Syriac")];
- char uniname2ctype_pool_str51[sizeof("Cyrillic")];
- char uniname2ctype_pool_str52[sizeof("Pi")];
- char uniname2ctype_pool_str53[sizeof("Assigned")];
- char uniname2ctype_pool_str54[sizeof("Sm")];
- char uniname2ctype_pool_str55[sizeof("Alnum")];
- char uniname2ctype_pool_str56[sizeof("Thai")];
- char uniname2ctype_pool_str57[sizeof("Lepcha")];
- char uniname2ctype_pool_str58[sizeof("Thaana")];
- char uniname2ctype_pool_str59[sizeof("Common")];
- char uniname2ctype_pool_str60[sizeof("Pd")];
- char uniname2ctype_pool_str61[sizeof("Any")];
- char uniname2ctype_pool_str62[sizeof("Lm")];
- char uniname2ctype_pool_str63[sizeof("Sinhala")];
- char uniname2ctype_pool_str64[sizeof("Arabic")];
- char uniname2ctype_pool_str65[sizeof("Upper")];
- char uniname2ctype_pool_str66[sizeof("Glagolitic")];
- char uniname2ctype_pool_str67[sizeof("Gurmukhi")];
- char uniname2ctype_pool_str68[sizeof("Graph")];
- char uniname2ctype_pool_str69[sizeof("Alpha")];
- char uniname2ctype_pool_str70[sizeof("Georgian")];
- char uniname2ctype_pool_str71[sizeof("Cntrl")];
- char uniname2ctype_pool_str72[sizeof("Linear_B")];
- char uniname2ctype_pool_str73[sizeof("Lt")];
- char uniname2ctype_pool_str74[sizeof("Kannada")];
- char uniname2ctype_pool_str75[sizeof("Print")];
- char uniname2ctype_pool_str76[sizeof("Pc")];
- char uniname2ctype_pool_str77[sizeof("Cc")];
- char uniname2ctype_pool_str78[sizeof("Sc")];
- char uniname2ctype_pool_str79[sizeof("Telugu")];
- char uniname2ctype_pool_str80[sizeof("Buginese")];
- char uniname2ctype_pool_str81[sizeof("Latin")];
- char uniname2ctype_pool_str82[sizeof("Kharoshthi")];
- char uniname2ctype_pool_str83[sizeof("Gujarati")];
- char uniname2ctype_pool_str84[sizeof("Osmanya")];
- char uniname2ctype_pool_str85[sizeof("Greek")];
- char uniname2ctype_pool_str86[sizeof("N")];
- char uniname2ctype_pool_str87[sizeof("Mc")];
- char uniname2ctype_pool_str88[sizeof("Runic")];
- char uniname2ctype_pool_str89[sizeof("No")];
- char uniname2ctype_pool_str90[sizeof("Ethiopic")];
- char uniname2ctype_pool_str91[sizeof("Deseret")];
- char uniname2ctype_pool_str92[sizeof("Kayah_Li")];
- char uniname2ctype_pool_str93[sizeof("Ogham")];
- char uniname2ctype_pool_str94[sizeof("Ugaritic")];
- char uniname2ctype_pool_str95[sizeof("Lydian")];
- char uniname2ctype_pool_str96[sizeof("Oriya")];
- char uniname2ctype_pool_str97[sizeof("Tamil")];
- char uniname2ctype_pool_str98[sizeof("Tai_Le")];
- char uniname2ctype_pool_str99[sizeof("Tibetan")];
- char uniname2ctype_pool_str100[sizeof("Nl")];
- char uniname2ctype_pool_str101[sizeof("Han")];
- char uniname2ctype_pool_str102[sizeof("Old_Italic")];
- char uniname2ctype_pool_str103[sizeof("Old_Persian")];
- char uniname2ctype_pool_str104[sizeof("Hangul")];
- char uniname2ctype_pool_str105[sizeof("Hanunoo")];
- char uniname2ctype_pool_str106[sizeof("Gothic")];
- char uniname2ctype_pool_str107[sizeof("Tagalog")];
- char uniname2ctype_pool_str108[sizeof("Tagbanwa")];
- char uniname2ctype_pool_str109[sizeof("Z")];
- char uniname2ctype_pool_str110[sizeof("Armenian")];
- char uniname2ctype_pool_str111[sizeof("Lycian")];
- char uniname2ctype_pool_str112[sizeof("Devanagari")];
- char uniname2ctype_pool_str113[sizeof("Ol_Chiki")];
- char uniname2ctype_pool_str114[sizeof("Limbu")];
- char uniname2ctype_pool_str115[sizeof("Yi")];
- char uniname2ctype_pool_str116[sizeof("Zs")];
- char uniname2ctype_pool_str117[sizeof("NEWLINE")];
- char uniname2ctype_pool_str118[sizeof("XDigit")];
- char uniname2ctype_pool_str119[sizeof("Vai")];
- char uniname2ctype_pool_str120[sizeof("Inherited")];
- char uniname2ctype_pool_str121[sizeof("Khmer")];
- char uniname2ctype_pool_str122[sizeof("Hebrew")];
- char uniname2ctype_pool_str123[sizeof("Zl")];
- char uniname2ctype_pool_str126[sizeof("Tifinagh")];
- char uniname2ctype_pool_str128[sizeof("Zp")];
- char uniname2ctype_pool_str129[sizeof("Nko")];
- char uniname2ctype_pool_str131[sizeof("Katakana")];
- char uniname2ctype_pool_str132[sizeof("New_Tai_Lue")];
- char uniname2ctype_pool_str142[sizeof("Rejang")];
- char uniname2ctype_pool_str144[sizeof("Nd")];
- char uniname2ctype_pool_str166[sizeof("Hiragana")];
- char uniname2ctype_pool_str167[sizeof("Digit")];
 #endif /* USE_UNICODE_PROPERTIES */
 };
 static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 {
-#ifdef USE_UNICODE_PROPERTIES
- "P",
- "C",
- "S",
- "Po",
- "Co",
- "So",
- "Cn",
- "Ps",
- "Cs",
- "Punct",
- "L",
- "M",
- "Lu",
- "Lo",
- "Cuneiform",
- "Sundanese",
- "Mn",
- "Saurashtra",
- "Cham",
- "Lao",
- "Phoenician",
- "Phags_Pa",
- "Shavian",
- "Pe",
- "Ll",
- "Mongolian",
- "Coptic",
- "Buhid",
- "Canadian_Aboriginal",
- "Space",
- "Lower",
- "Carian",
- "Pf",
- "Cf",
- "Me",
- "Blank",
-#endif /* USE_UNICODE_PROPERTIES */
- "Word",
 #ifndef USE_UNICODE_PROPERTIES
- "Alpha",
- "Alnum",
 #else /* USE_UNICODE_PROPERTIES */
- "Malayalam",
- "Balinese",
- "Cherokee",
- "Bopomofo",
 #endif /* USE_UNICODE_PROPERTIES */
- "ASCII",
 #ifdef USE_UNICODE_PROPERTIES
- "Sk",
- "Myanmar",
- "Braille",
- "Bengali",
- "Cypriot",
- "Syloti_Nagri",
- "Syriac",
- "Cyrillic",
- "Pi",
- "Assigned",
- "Sm",
- "Alnum",
- "Thai",
- "Lepcha",
- "Thaana",
- "Common",
- "Pd",
- "Any",
- "Lm",
- "Sinhala",
- "Arabic",
- "Upper",
- "Glagolitic",
- "Gurmukhi",
- "Graph",
- "Alpha",
- "Georgian",
 #endif /* USE_UNICODE_PROPERTIES */
- "Cntrl",
 #ifndef USE_UNICODE_PROPERTIES
- "Punct",
 #else /* USE_UNICODE_PROPERTIES */
- "Linear_B",
- "Lt",
- "Kannada",
 #endif /* USE_UNICODE_PROPERTIES */
- "Print",
 #ifndef USE_UNICODE_PROPERTIES
- "XDigit",
- "Upper",
- "Space",
 #else /* USE_UNICODE_PROPERTIES */
- "Pc",
- "Cc",
- "Sc",
- "Telugu",
- "Buginese",
- "Latin",
- "Kharoshthi",
- "Gujarati",
- "Osmanya",
- "Greek",
- "N",
- "Mc",
- "Runic",
- "No",
- "Ethiopic",
- "Deseret",
- "Kayah_Li",
- "Ogham",
- "Ugaritic",
- "Lydian",
- "Oriya",
- "Tamil",
- "Tai_Le",
- "Tibetan",
- "Nl",
- "Han",
- "Old_Italic",
- "Old_Persian",
- "Hangul",
- "Hanunoo",
- "Gothic",
- "Tagalog",
- "Tagbanwa",
- "Z",
- "Armenian",
- "Lycian",
- "Devanagari",
- "Ol_Chiki",
- "Limbu",
- "Yi",
- "Zs",
 #endif /* USE_UNICODE_PROPERTIES */
- "NEWLINE",
 #ifndef USE_UNICODE_PROPERTIES
- "Lower",
- "Graph",
- "Digit",
- "Blank"
 #else /* USE_UNICODE_PROPERTIES */
- "XDigit",
- "Vai",
- "Inherited",
- "Khmer",
- "Hebrew",
- "Zl",
- "Tifinagh",
- "Zp",
- "Nko",
- "Katakana",
- "New_Tai_Lue",
- "Rejang",
- "Nd",
- "Hiragana",
- "Digit"
 #endif /* USE_UNICODE_PROPERTIES */
 };
 #define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
@@ -9776,166 +9780,198 @@ uniname2ctype_p (str, len)
 {
 static const struct uniname2ctype_struct wordlist[] =
 {
-#ifndef USE_UNICODE_PROPERTIES
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 3},
-#else /* USE_UNICODE_PROPERTIES */
 {-1}, {-1},
 {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 22},
-#endif /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 8},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 23},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 29},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 26},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 32},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 74},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 117},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 85},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 108},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 81},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 19},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 31},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 2},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str39, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 80},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 47},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 76},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 106},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 61},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 57},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 16},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54, 48},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 73},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str57, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58, 62},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 54},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 39},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 15},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 25},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 72},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 110},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67, 65},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 77},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 27},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78, 46},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 107},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81, 55},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 66},
 {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 56},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 33},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 30},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88, 83},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89, 36},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 79},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 93},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 125},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 102},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 67},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 68},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 100},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 96},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 95},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 98},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 50},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 58},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 127},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 63},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 122},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115, 90},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 53},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121, 84},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122, 59},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 51},
 {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 111},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 52},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 119},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 109},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 126},
 {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 34},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166, 86},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 4}
 #endif /* USE_UNICODE_PROPERTIES */
 };
@@ -9330,138 +9330,138 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 %}
 struct uniname2ctype_struct;
 %%
-NEWLINE, 0
-Alpha, 1
-Blank, 2
-Cntrl, 3
-Digit, 4
-Graph, 5
-Lower, 6
-Print, 7
-Punct, 8
-Space, 9
-Upper, 10
-XDigit, 11
-Word, 12
-Alnum, 13
-ASCII, 14
 #ifdef USE_UNICODE_PROPERTIES
-Any, 15
-Assigned, 16
-C, 17
-Cc, 18
-Cf, 19
-Cn, 20
-Co, 21
-Cs, 22
-L, 23
-Ll, 24
-Lm, 25
-Lo, 26
-Lt, 27
-Lu, 28
-M, 29
-Mc, 30
-Me, 31
-Mn, 32
-N, 33
-Nd, 34
-Nl, 35
-No, 36
-P, 37
-Pc, 38
-Pd, 39
-Pe, 40
-Pf, 41
-Pi, 42
-Po, 43
-Ps, 44
-S, 45
-Sc, 46
-Sk, 47
-Sm, 48
-So, 49
-Z, 50
-Zl, 51
-Zp, 52
-Zs, 53
-Common, 54
-Latin, 55
-Greek, 56
-Cyrillic, 57
-Armenian, 58
-Hebrew, 59
-Arabic, 60
-Syriac, 61
-Thaana, 62
-Devanagari, 63
-Bengali, 64
-Gurmukhi, 65
-Gujarati, 66
-Oriya, 67
-Tamil, 68
-Telugu, 69
-Kannada, 70
-Malayalam, 71
-Sinhala, 72
-Thai, 73
-Lao, 74
-Tibetan, 75
-Myanmar, 76
-Georgian, 77
-Hangul, 78
-Ethiopic, 79
-Cherokee, 80
-Canadian_Aboriginal, 81
-Ogham, 82
-Runic, 83
-Khmer, 84
-Mongolian, 85
-Hiragana, 86
-Katakana, 87
-Bopomofo, 88
-Han, 89
-Yi, 90
-Old_Italic, 91
-Gothic, 92
-Deseret, 93
-Inherited, 94
-Tagalog, 95
-Hanunoo, 96
-Buhid, 97
-Tagbanwa, 98
-Limbu, 99
-Tai_Le, 100
-Linear_B, 101
-Ugaritic, 102
-Shavian, 103
-Osmanya, 104
-Cypriot, 105
-Braille, 106
-Buginese, 107
-Coptic, 108
-New_Tai_Lue, 109
-Glagolitic, 110
-Tifinagh, 111
-Syloti_Nagri, 112
-Old_Persian, 113
-Kharoshthi, 114
-Balinese, 115
-Cuneiform, 116
-Phoenician, 117
-Phags_Pa, 118
-Nko, 119
-Sundanese, 120
-Lepcha, 121
-Ol_Chiki, 122
-Vai, 123
-Saurashtra, 124
-Kayah_Li, 125
-Rejang, 126
-Lycian, 127
-Carian, 128
-Lydian, 129
-Cham, 130
 #endif /* USE_UNICODE_PROPERTIES */
 %%
 static int
@@ -9330,138 +9330,138 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
 %}
 struct uniname2ctype_struct;
 %%
-NEWLINE, 0
-Alpha, 1
-Blank, 2
-Cntrl, 3
-Digit, 4
-Graph, 5
-Lower, 6
-Print, 7
-Punct, 8
-Space, 9
-Upper, 10
-XDigit, 11
-Word, 12
-Alnum, 13
-ASCII, 14
 #ifdef USE_UNICODE_PROPERTIES
-Any, 15
-Assigned, 16
-C, 17
-Cc, 18
-Cf, 19
-Cn, 20
-Co, 21
-Cs, 22
-L, 23
-Ll, 24
-Lm, 25
-Lo, 26
-Lt, 27
-Lu, 28
-M, 29
-Mc, 30
-Me, 31
-Mn, 32
-N, 33
-Nd, 34
-Nl, 35
-No, 36
-P, 37
-Pc, 38
-Pd, 39
-Pe, 40
-Pf, 41
-Pi, 42
-Po, 43
-Ps, 44
-S, 45
-Sc, 46
-Sk, 47
-Sm, 48
-So, 49
-Z, 50
-Zl, 51
-Zp, 52
-Zs, 53
-Common, 54
-Latin, 55
-Greek, 56
-Cyrillic, 57
-Armenian, 58
-Hebrew, 59
-Arabic, 60
-Syriac, 61
-Thaana, 62
-Devanagari, 63
-Bengali, 64
-Gurmukhi, 65
-Gujarati, 66
-Oriya, 67
-Tamil, 68
-Telugu, 69
-Kannada, 70
-Malayalam, 71
-Sinhala, 72
-Thai, 73
-Lao, 74
-Tibetan, 75
-Myanmar, 76
-Georgian, 77
-Hangul, 78
-Ethiopic, 79
-Cherokee, 80
-Canadian_Aboriginal, 81
-Ogham, 82
-Runic, 83
-Khmer, 84
-Mongolian, 85
-Hiragana, 86
-Katakana, 87
-Bopomofo, 88
-Han, 89
-Yi, 90
-Old_Italic, 91
-Gothic, 92
-Deseret, 93
-Inherited, 94
-Tagalog, 95
-Hanunoo, 96
-Buhid, 97
-Tagbanwa, 98
-Limbu, 99
-Tai_Le, 100
-Linear_B, 101
-Ugaritic, 102
-Shavian, 103
-Osmanya, 104
-Cypriot, 105
-Braille, 106
-Buginese, 107
-Coptic, 108
-New_Tai_Lue, 109
-Glagolitic, 110
-Tifinagh, 111
-Syloti_Nagri, 112
-Old_Persian, 113
-Kharoshthi, 114
-Balinese, 115
-Cuneiform, 116
-Phoenician, 117
-Phags_Pa, 118
-Nko, 119
-Sundanese, 120
-Lepcha, 121
-Ol_Chiki, 122
-Vai, 123
-Saurashtra, 124
-Kayah_Li, 125
-Rejang, 126
-Lycian, 127
-Carian, 128
-Lydian, 129
-Cham, 130
 #endif /* USE_UNICODE_PROPERTIES */
 %%
 static int
@@ -176,6 +176,12 @@ def make_const(prop, pairs, name)
 puts "}; /* CR_#{prop} */"
 end
 puts '%{'
 gcps, data = parse_unicode_data(ARGV[0])
 POSIX_NAMES.each do |name|
@@ -213,10 +219,10 @@ struct uniname2ctype_struct;
 %%
 __HEREDOC
 i = -1
-POSIX_NAMES.each {|name|puts"%-21s %3d"%[name+',', i+=1]}
 puts "#ifdef USE_UNICODE_PROPERTIES"
-gcps.each{|name|puts"%-21s %3d"%[name+',', i+=1]}
-scripts.each{|name|puts"%-21s %3d"%[name+',', i+=1]}
 puts "#endif /* USE_UNICODE_PROPERTIES */\n"
 puts(<<'__HEREDOC')
 %%
author	naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>	2009-09-10 22:54:01 +0000
committer	naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>	2009-09-10 22:54:01 +0000
commit	ee4b59a4191ecabc1a9d396e234f20be5e5e9f8c ()
tree	c365ce9fa86e8f507df68c5c616066e7fdea8d02
parent	e519c9d960549163c17571689cc977f7ca45073e (diff)