diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-08-18 09:34:18 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-08-18 09:34:18 +0000 |
| commit | ec7956d922c85fc6154062ce5ba58fe40e9d5901 (patch) | |
| tree | 3a990101ac791acb2841899d63594eb3d34e43e3 | |
| parent | a0c9a28b7cc5d8b85d4e65109729ad9a7a9ebe00 (diff) | |
| download | glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.gz glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.xz glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.zip | |
* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.
(TST_DECL_VARS): Don't declare err_flg. (TST_GET_ERRET): Don't set err_flg. (TST_GET_ERRET_SEQ): Likewise. (TST_IF_RETURN): Don't use err_flg, check err_exp directly. * tests-mbwc/dat_swscanf.c: Don't set err_flg. * tests-mbwc/dat_iswalnum.c: Likewise. * tests-mbwc/dat_iswalpha.c: Likewise. * tests-mbwc/dat_iswcntrl.c: Likewise. * tests-mbwc/dat_iswctype.c: Likewise. * tests-mbwc/dat_iswdigit.c: Likewise. * tests-mbwc/dat_iswgraph.c: Likewise. * tests-mbwc/dat_iswlower.c: Likewise. * tests-mbwc/dat_iswprint.c: Likewise. * tests-mbwc/dat_iswpunct.c: Likewise. * tests-mbwc/dat_iswspace.c: Likewise. * tests-mbwc/dat_iswupper.c: Likewise. * tests-mbwc/dat_iswxdigit.c: Likewise. * tests-mbwc/dat_mblen.c: Likewise. * tests-mbwc/dat_mbrlen.c: Likewise. * tests-mbwc/dat_mbrtowc.c: Likewise. * tests-mbwc/dat_mbsrtowcs.c: Likewise. * tests-mbwc/dat_mbstowcs.c: Likewise. * tests-mbwc/dat_mbtowc.c: Likewise. * tests-mbwc/dat_strcoll.c: Likewise. * tests-mbwc/dat_strfmon.c: Likewise. * tests-mbwc/dat_strxfrm.c: Likewise. * tests-mbwc/dat_swscanf.c: Likewise. * tests-mbwc/dat_towctrans.c: Likewise. * tests-mbwc/dat_towlower.c: Likewise. * tests-mbwc/dat_towupper.c: Likewise. * tests-mbwc/dat_wcrtomb.c: Likewise. * tests-mbwc/dat_wcscat.c: Likewise. * tests-mbwc/dat_wcschr.c: Likewise. * tests-mbwc/dat_wcscmp.c: Likewise. * tests-mbwc/dat_wcscoll.c: Likewise. * tests-mbwc/dat_wcscpy.c: Likewise. * tests-mbwc/dat_wcscspn.c: Likewise. * tests-mbwc/dat_wcslen.c: Likewise. * tests-mbwc/dat_wcsncat.c: Likewise. * tests-mbwc/dat_wcsncmp.c: Likewise. * tests-mbwc/dat_wcsncpy.c: Likewise. * tests-mbwc/dat_wcspbrk.c: Likewise. * tests-mbwc/dat_wcsrtombs.c: Likewise. * tests-mbwc/dat_wcsspn.c: Likewise. * tests-mbwc/dat_wcsstr.c: Likewise. * tests-mbwc/dat_wcstod.c: Likewise. * tests-mbwc/dat_wcstok.c: Likewise. * tests-mbwc/dat_wcstombs.c: Likewise. * tests-mbwc/dat_wcswidth.c: Likewise. * tests-mbwc/dat_wcsxfrm.c: Likewise. * tests-mbwc/dat_wctob.c: Likewise. * tests-mbwc/dat_wctomb.c: Likewise. * tests-mbwc/dat_wctrans.c: Likewise. * tests-mbwc/dat_wctype.c: Likewise. * tests-mbwc/dat_wcwidth.c: Likewise. * tests-mbwc/dat_isw-funcs.h: Fix comment. 2000-08-18 Andreas Jaeger <aj@suse.de> * tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg. (TST_DECL_VARS): Don't declare err_flg. (TST_GET_ERRET): Don't set err_flg. (TST_GET_ERRET_SEQ): Likewise. (TST_IF_RETURN): Don't use err_flg, check err_exp directly. * tests-mbwc/dat_swscanf.c: Don't set err_flg. * tests-mbwc/dat_iswalnum.c: Likewise. * tests-mbwc/dat_iswalpha.c: Likewise. * tests-mbwc/dat_iswcntrl.c: Likewise. * tests-mbwc/dat_iswctype.c: Likewise. * tests-mbwc/dat_iswdigit.c: Likewise. * tests-mbwc/dat_iswgraph.c: Likewise. * tests-mbwc/dat_iswlower.c: Likewise. * tests-mbwc/dat_iswprint.c: Likewise. * tests-mbwc/dat_iswpunct.c: Likewise. * tests-mbwc/dat_iswspace.c: Likewise. * tests-mbwc/dat_iswupper.c: Likewise. * tests-mbwc/dat_iswxdigit.c: Likewise. * tests-mbwc/dat_mblen.c: Likewise. * tests-mbwc/dat_mbrlen.c: Likewise. * tests-mbwc/dat_mbrtowc.c: Likewise. * tests-mbwc/dat_mbsrtowcs.c: Likewise. * tests-mbwc/dat_mbstowcs.c: Likewise. * tests-mbwc/dat_mbtowc.c: Likewise. * tests-mbwc/dat_strcoll.c: Likewise. * tests-mbwc/dat_strfmon.c: Likewise. * tests-mbwc/dat_strxfrm.c: Likewise. * tests-mbwc/dat_swscanf.c: Likewise. * tests-mbwc/dat_towctrans.c: Likewise. * tests-mbwc/dat_towlower.c: Likewise. * tests-mbwc/dat_towupper.c: Likewise. * tests-mbwc/dat_wcrtomb.c: Likewise. * tests-mbwc/dat_wcscat.c: Likewise. * tests-mbwc/dat_wcschr.c: Likewise. * tests-mbwc/dat_wcscmp.c: Likewise. * tests-mbwc/dat_wcscoll.c: Likewise. * tests-mbwc/dat_wcscpy.c: Likewise. * tests-mbwc/dat_wcscspn.c: Likewise. * tests-mbwc/dat_wcslen.c: Likewise. * tests-mbwc/dat_wcsncat.c: Likewise. * tests-mbwc/dat_wcsncmp.c: Likewise. * tests-mbwc/dat_wcsncpy.c: Likewise. * tests-mbwc/dat_wcspbrk.c: Likewise. * tests-mbwc/dat_wcsrtombs.c: Likewise. * tests-mbwc/dat_wcsspn.c: Likewise. * tests-mbwc/dat_wcsstr.c: Likewise. * tests-mbwc/dat_wcstod.c: Likewise. * tests-mbwc/dat_wcstok.c: Likewise. * tests-mbwc/dat_wcstombs.c: Likewise. * tests-mbwc/dat_wcswidth.c: Likewise. * tests-mbwc/dat_wcsxfrm.c: Likewise. * tests-mbwc/dat_wctob.c: Likewise. * tests-mbwc/dat_wctomb.c: Likewise. * tests-mbwc/dat_wctrans.c: Likewise. * tests-mbwc/dat_wctype.c: Likewise. * tests-mbwc/dat_wcwidth.c: Likewise. * tests-mbwc/dat_isw-funcs.h: Fix comment.
53 files changed, 2451 insertions, 2393 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 538dd50248..284d9050ba 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,64 @@ +2000-08-18 Andreas Jaeger <aj@suse.de> + + * tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg. + (TST_DECL_VARS): Don't declare err_flg. + (TST_GET_ERRET): Don't set err_flg. + (TST_GET_ERRET_SEQ): Likewise. + (TST_IF_RETURN): Don't use err_flg, check err_exp directly. + + * tests-mbwc/dat_swscanf.c: Don't set err_flg. + * tests-mbwc/dat_iswalnum.c: Likewise. + * tests-mbwc/dat_iswalpha.c: Likewise. + * tests-mbwc/dat_iswcntrl.c: Likewise. + * tests-mbwc/dat_iswctype.c: Likewise. + * tests-mbwc/dat_iswdigit.c: Likewise. + * tests-mbwc/dat_iswgraph.c: Likewise. + * tests-mbwc/dat_iswlower.c: Likewise. + * tests-mbwc/dat_iswprint.c: Likewise. + * tests-mbwc/dat_iswpunct.c: Likewise. + * tests-mbwc/dat_iswspace.c: Likewise. + * tests-mbwc/dat_iswupper.c: Likewise. + * tests-mbwc/dat_iswxdigit.c: Likewise. + * tests-mbwc/dat_mblen.c: Likewise. + * tests-mbwc/dat_mbrlen.c: Likewise. + * tests-mbwc/dat_mbrtowc.c: Likewise. + * tests-mbwc/dat_mbsrtowcs.c: Likewise. + * tests-mbwc/dat_mbstowcs.c: Likewise. + * tests-mbwc/dat_mbtowc.c: Likewise. + * tests-mbwc/dat_strcoll.c: Likewise. + * tests-mbwc/dat_strfmon.c: Likewise. + * tests-mbwc/dat_strxfrm.c: Likewise. + * tests-mbwc/dat_swscanf.c: Likewise. + * tests-mbwc/dat_towctrans.c: Likewise. + * tests-mbwc/dat_towlower.c: Likewise. + * tests-mbwc/dat_towupper.c: Likewise. + * tests-mbwc/dat_wcrtomb.c: Likewise. + * tests-mbwc/dat_wcscat.c: Likewise. + * tests-mbwc/dat_wcschr.c: Likewise. + * tests-mbwc/dat_wcscmp.c: Likewise. + * tests-mbwc/dat_wcscoll.c: Likewise. + * tests-mbwc/dat_wcscpy.c: Likewise. + * tests-mbwc/dat_wcscspn.c: Likewise. + * tests-mbwc/dat_wcslen.c: Likewise. + * tests-mbwc/dat_wcsncat.c: Likewise. + * tests-mbwc/dat_wcsncmp.c: Likewise. + * tests-mbwc/dat_wcsncpy.c: Likewise. + * tests-mbwc/dat_wcspbrk.c: Likewise. + * tests-mbwc/dat_wcsrtombs.c: Likewise. + * tests-mbwc/dat_wcsspn.c: Likewise. + * tests-mbwc/dat_wcsstr.c: Likewise. + * tests-mbwc/dat_wcstod.c: Likewise. + * tests-mbwc/dat_wcstok.c: Likewise. + * tests-mbwc/dat_wcstombs.c: Likewise. + * tests-mbwc/dat_wcswidth.c: Likewise. + * tests-mbwc/dat_wcsxfrm.c: Likewise. + * tests-mbwc/dat_wctob.c: Likewise. + * tests-mbwc/dat_wctomb.c: Likewise. + * tests-mbwc/dat_wctrans.c: Likewise. + * tests-mbwc/dat_wctype.c: Likewise. + * tests-mbwc/dat_wcwidth.c: Likewise. + * tests-mbwc/dat_isw-funcs.h: Fix comment. + 2000-08-17 Andreas Jaeger <aj@suse.de> * tests-mbwc/tst_funcs.h (TST_IF_RETURN): Only test errno if it diff --git a/localedata/tests-mbwc/dat_isw-funcs.h b/localedata/tests-mbwc/dat_isw-funcs.h index 2c86556ddb..70aecb0839 100644 --- a/localedata/tests-mbwc/dat_isw-funcs.h +++ b/localedata/tests-mbwc/dat_isw-funcs.h @@ -28,10 +28,10 @@ * Set the ret_flg=0 for TRUE cases and the tst_isw*() will check * the non-zero value. * - * { { WEOF }, { 0,0,1,0 } }, - * | | - * | ret_val: an expected return value - * ret_flg: if 1, compare an actual return value with the - * ret_val; if 0, the test program - * checks the actual return value. + * { { WEOF }, { 0,1,0 } }, + * | | + * | ret_val: an expected return value + * ret_flg: if 1, compare an actual return value with the + * ret_val; if 0, the test program + * checks the actual return value. */ diff --git a/localedata/tests-mbwc/dat_iswalnum.c b/localedata/tests-mbwc/dat_iswalnum.c index 68573f9f3a..49833b84b1 100644 --- a/localedata/tests-mbwc/dat_iswalnum.c +++ b/localedata/tests-mbwc/dat_iswalnum.c @@ -14,137 +14,137 @@ TST_ISW_LOC (ALNUM, alnum) = { { TST_ISW_REC (de, alnum) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* last element */ } }, { TST_ISW_REC (de_UTF8, alnum) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* last element */ } }, { TST_ISW_REC (enUS, alnum) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,0,0 } }, - { { 0x0039 }, { 0,0,0,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,0,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,0,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,0,0 } }, + { { 0x0039 }, { 0,0,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,0,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,0,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* last element */ } }, { TST_ISW_REC (eucJP, alnum) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,0,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* last element */ } }, diff --git a/localedata/tests-mbwc/dat_iswalpha.c b/localedata/tests-mbwc/dat_iswalpha.c index d219111561..40c4c4275b 100644 --- a/localedata/tests-mbwc/dat_iswalpha.c +++ b/localedata/tests-mbwc/dat_iswalpha.c @@ -14,106 +14,106 @@ TST_ISW_LOC (ALPHA, alpha) = { { TST_ISW_REC (de, alpha) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* last element */ } }, { TST_ISW_REC (enUS, alpha) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,0,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,0,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, /* 20 */ + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,0,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,0,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, /* 20 */ { is_last: 1 } /* last element */ } }, { TST_ISW_REC (eucJP, alpha) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,0,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* last element */ } }, diff --git a/localedata/tests-mbwc/dat_iswcntrl.c b/localedata/tests-mbwc/dat_iswcntrl.c index 89d5021916..18a0e287e5 100644 --- a/localedata/tests-mbwc/dat_iswcntrl.c +++ b/localedata/tests-mbwc/dat_iswcntrl.c @@ -14,106 +14,106 @@ TST_ISW_LOC (CNTRL, cntrl) = { { TST_ISW_REC (de, cntrl) { - { { 0x0080 }, { 0,0,0,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,0,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,0,0 } }, /* CTRL */ + { { 0x009F }, { 0,0,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, cntrl) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,0,0 } }, - { { 0x001F }, { 0,0,0,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,1,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,1,0 } }, - { { 0x007A }, { 0,0,1,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,0,0 } }, - { { 0x0080 }, { 0,0,0,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,0,0 } }, + { { 0x001F }, { 0,0,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,1,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,1,0 } }, + { { 0x007A }, { 0,1,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,0,0 } }, + { { 0x0080 }, { 0,0,0 } }, { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, cntrl) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswctype.c b/localedata/tests-mbwc/dat_iswctype.c index bfabfa4394..86d0835304 100644 --- a/localedata/tests-mbwc/dat_iswctype.c +++ b/localedata/tests-mbwc/dat_iswctype.c @@ -22,523 +22,523 @@ * Set the ret_flg=0 for TRUE cases and the tst_isw*() will check * the non-zero value. * - * { { WEOF }, { 0,0,1,0 } }, - * | | - * | ret_val: an expected return value - * ret_flg: if 1, compare an actual return value with the - * ret_val; if 0, the test program checks - * the actual return value. + * { { WEOF }, { 0,1,0 } }, + * | | + * | ret_val: an expected return value + * ret_flg: if 1, compare an actual return value with the + * ret_val; if 0, the test program checks + * the actual return value. */ TST_ISWCTYPE tst_iswctype_loc [] = { { { Tiswctype, TST_LOC_de }, { - { { 0x009F, "alnum" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "alnum" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "alnum" }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B1, "alnum" }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B3, "alnum" }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4, "alnum" }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00BB, "alnum" }, { 0,0,1,0 } }, /* >> */ - { { 0x00BE, "alnum" }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF, "alnum" }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0, "alnum" }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6, "alnum" }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7, "alnum" }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8, "alnum" }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF, "alnum" }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0, "alnum" }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6, "alnum" }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7, "alnum" }, { 0,0,1,0 } }, /* division */ - { { 0x00F8, "alnum" }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF, "alnum" }, { 0,0,0,0 } }, /* y dia */ - { { 0x0080, "alpha" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "alpha" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "alpha" }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B1, "alpha" }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B4, "alpha" }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8, "alpha" }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9, "alpha" }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB, "alpha" }, { 0,0,1,0 } }, /* >> */ - { { 0x00BE, "alpha" }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF, "alpha" }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0, "alpha" }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6, "alpha" }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7, "alpha" }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8, "alpha" }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF, "alpha" }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0, "alpha" }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6, "alpha" }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7, "alpha" }, { 0,0,1,0 } }, /* division */ - { { 0x00F8, "alpha" }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF, "alpha" }, { 0,0,0,0 } }, /* y dia */ - { { 0x0080, "cntrl" }, { 0,0,0,0 } }, /* CTRL */ - { { 0x009F, "cntrl" }, { 0,0,0,0 } }, /* CTRL */ - { { 0x00A0, "cntrl" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00F6, "cntrl" }, { 0,0,1,0 } }, /* o dia */ - { { 0x00FF, "cntrl" }, { 0,0,1,0 } }, /* y dia */ - { { 0x00B9, "digit" }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BE, "digit" }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x009F, "graph" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "graph" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "graph" }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B1, "graph" }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B3, "graph" }, { 0,0,0,0 } }, /* SUP 3 */ - { { 0x00B4, "graph" }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00BB, "graph" }, { 0,0,0,0 } }, /* >> */ - { { 0x00BE, "graph" }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00C0, "graph" }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6, "graph" }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7, "graph" }, { 0,0,0,0 } }, /* multipl. */ - { { 0x00D8, "graph" }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF, "graph" }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00F7, "graph" }, { 0,0,0,0 } }, /* division */ - { { 0x00F8, "graph" }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF, "graph" }, { 0,0,0,0 } }, /* y dia */ - { { 0x009F, "print" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "print" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "print" }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B1, "print" }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B4, "print" }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00B8, "print" }, { 0,0,0,0 } }, /* CEDILLA */ - { { 0x00B9, "print" }, { 0,0,0,0 } }, /* SUP 1 */ - { { 0x00BB, "print" }, { 0,0,0,0 } }, /* >> */ - { { 0x00BE, "print" }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00C0, "print" }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00DF, "print" }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00F6, "print" }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7, "print" }, { 0,0,0,0 } }, /* division */ - { { 0x00F8, "print" }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF, "print" }, { 0,0,0,0 } }, /* y dia */ - { { 0x009F, "punct" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "punct" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "punct" }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B0, "punct" }, { 0,0,0,0 } }, /* Degree */ - { { 0x00B1, "punct" }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B2, "punct" }, { 0,0,0,0 } }, /* SUP 2 */ - { { 0x00B3, "punct" }, { 0,0,0,0 } }, /* SUP 3 */ - { { 0x00B4, "punct" }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00B8, "punct" }, { 0,0,0,0 } }, /* CEDILLA */ - { { 0x00B9, "punct" }, { 0,0,0,0 } }, /* SUP 1 */ - { { 0x00BB, "punct" }, { 0,0,0,0 } }, /* >> */ - { { 0x00BC, "punct" }, { 0,0,0,0 } }, /* 1/4 */ - { { 0x00BD, "punct" }, { 0,0,0,0 } }, /* 1/2 */ - { { 0x00BE, "punct" }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00BF, "punct" }, { 0,0,0,0 } }, /* UD ? */ - { { 0x00C0, "punct" }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D7, "punct" }, { 0,0,0,0 } }, /* multipl. */ - { { 0x00DF, "punct" }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00F6, "punct" }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7, "punct" }, { 0,0,0,0 } }, /* division */ - { { 0x00FF, "punct" }, { 0,0,1,0 } }, /* y dia */ - { { 0x009F, "space" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "space" }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1, "space" }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B1, "space" }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00F8, "space" }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00B3, "lower" }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B8, "lower" }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00BE, "lower" }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00C0, "lower" }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6, "lower" }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D8, "lower" }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF, "lower" }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0, "lower" }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6, "lower" }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7, "lower" }, { 0,0,1,0 } }, /* division */ - { { 0x00F8, "lower" }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF, "lower" }, { 0,0,0,0 } }, /* y dia */ - { { 0x00B4, "upper" }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8, "upper" }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9, "upper" }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BE, "upper" }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF, "upper" }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0, "upper" }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6, "upper" }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7, "upper" }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8, "upper" }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF, "upper" }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00FF, "upper" }, { 0,0,1,0 } }, /* y dia */ - { { 0x00B9, "xdigit" }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BC, "xdigit" }, { 0,0,1,0 } }, /* 1/4 */ + { { 0x009F, "alnum" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "alnum" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "alnum" }, { 0,1,0 } }, /* UD ! */ + { { 0x00B1, "alnum" }, { 0,1,0 } }, /* +- sign */ + { { 0x00B3, "alnum" }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4, "alnum" }, { 0,1,0 } }, /* ACUTE */ + { { 0x00BB, "alnum" }, { 0,1,0 } }, /* >> */ + { { 0x00BE, "alnum" }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF, "alnum" }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0, "alnum" }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6, "alnum" }, { 0,0,0 } }, /* O dia */ + { { 0x00D7, "alnum" }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8, "alnum" }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF, "alnum" }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0, "alnum" }, { 0,0,0 } }, /* a grave */ + { { 0x00F6, "alnum" }, { 0,0,0 } }, /* o dia */ + { { 0x00F7, "alnum" }, { 0,1,0 } }, /* division */ + { { 0x00F8, "alnum" }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF, "alnum" }, { 0,0,0 } }, /* y dia */ + { { 0x0080, "alpha" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "alpha" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "alpha" }, { 0,1,0 } }, /* UD ! */ + { { 0x00B1, "alpha" }, { 0,1,0 } }, /* +- sign */ + { { 0x00B4, "alpha" }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8, "alpha" }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9, "alpha" }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB, "alpha" }, { 0,1,0 } }, /* >> */ + { { 0x00BE, "alpha" }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF, "alpha" }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0, "alpha" }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6, "alpha" }, { 0,0,0 } }, /* O dia */ + { { 0x00D7, "alpha" }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8, "alpha" }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF, "alpha" }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0, "alpha" }, { 0,0,0 } }, /* a grave */ + { { 0x00F6, "alpha" }, { 0,0,0 } }, /* o dia */ + { { 0x00F7, "alpha" }, { 0,1,0 } }, /* division */ + { { 0x00F8, "alpha" }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF, "alpha" }, { 0,0,0 } }, /* y dia */ + { { 0x0080, "cntrl" }, { 0,0,0 } }, /* CTRL */ + { { 0x009F, "cntrl" }, { 0,0,0 } }, /* CTRL */ + { { 0x00A0, "cntrl" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00F6, "cntrl" }, { 0,1,0 } }, /* o dia */ + { { 0x00FF, "cntrl" }, { 0,1,0 } }, /* y dia */ + { { 0x00B9, "digit" }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BE, "digit" }, { 0,1,0 } }, /* 3/4 */ + { { 0x009F, "graph" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "graph" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "graph" }, { 0,0,0 } }, /* UD ! */ + { { 0x00B1, "graph" }, { 0,0,0 } }, /* +- sign */ + { { 0x00B3, "graph" }, { 0,0,0 } }, /* SUP 3 */ + { { 0x00B4, "graph" }, { 0,0,0 } }, /* ACUTE */ + { { 0x00BB, "graph" }, { 0,0,0 } }, /* >> */ + { { 0x00BE, "graph" }, { 0,0,0 } }, /* 3/4 */ + { { 0x00C0, "graph" }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6, "graph" }, { 0,0,0 } }, /* O dia */ + { { 0x00D7, "graph" }, { 0,0,0 } }, /* multipl. */ + { { 0x00D8, "graph" }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF, "graph" }, { 0,0,0 } }, /* small Sh */ + { { 0x00F7, "graph" }, { 0,0,0 } }, /* division */ + { { 0x00F8, "graph" }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF, "graph" }, { 0,0,0 } }, /* y dia */ + { { 0x009F, "print" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "print" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "print" }, { 0,0,0 } }, /* UD ! */ + { { 0x00B1, "print" }, { 0,0,0 } }, /* +- sign */ + { { 0x00B4, "print" }, { 0,0,0 } }, /* ACUTE */ + { { 0x00B8, "print" }, { 0,0,0 } }, /* CEDILLA */ + { { 0x00B9, "print" }, { 0,0,0 } }, /* SUP 1 */ + { { 0x00BB, "print" }, { 0,0,0 } }, /* >> */ + { { 0x00BE, "print" }, { 0,0,0 } }, /* 3/4 */ + { { 0x00C0, "print" }, { 0,0,0 } }, /* A Grave */ + { { 0x00DF, "print" }, { 0,0,0 } }, /* small Sh */ + { { 0x00F6, "print" }, { 0,0,0 } }, /* o dia */ + { { 0x00F7, "print" }, { 0,0,0 } }, /* division */ + { { 0x00F8, "print" }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF, "print" }, { 0,0,0 } }, /* y dia */ + { { 0x009F, "punct" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "punct" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "punct" }, { 0,0,0 } }, /* UD ! */ + { { 0x00B0, "punct" }, { 0,0,0 } }, /* Degree */ + { { 0x00B1, "punct" }, { 0,0,0 } }, /* +- sign */ + { { 0x00B2, "punct" }, { 0,0,0 } }, /* SUP 2 */ + { { 0x00B3, "punct" }, { 0,0,0 } }, /* SUP 3 */ + { { 0x00B4, "punct" }, { 0,0,0 } }, /* ACUTE */ + { { 0x00B8, "punct" }, { 0,0,0 } }, /* CEDILLA */ + { { 0x00B9, "punct" }, { 0,0,0 } }, /* SUP 1 */ + { { 0x00BB, "punct" }, { 0,0,0 } }, /* >> */ + { { 0x00BC, "punct" }, { 0,0,0 } }, /* 1/4 */ + { { 0x00BD, "punct" }, { 0,0,0 } }, /* 1/2 */ + { { 0x00BE, "punct" }, { 0,0,0 } }, /* 3/4 */ + { { 0x00BF, "punct" }, { 0,0,0 } }, /* UD ? */ + { { 0x00C0, "punct" }, { 0,1,0 } }, /* A Grave */ + { { 0x00D7, "punct" }, { 0,0,0 } }, /* multipl. */ + { { 0x00DF, "punct" }, { 0,1,0 } }, /* small Sh */ + { { 0x00F6, "punct" }, { 0,1,0 } }, /* o dia */ + { { 0x00F7, "punct" }, { 0,0,0 } }, /* division */ + { { 0x00FF, "punct" }, { 0,1,0 } }, /* y dia */ + { { 0x009F, "space" }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0, "space" }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1, "space" }, { 0,1,0 } }, /* UD ! */ + { { 0x00B1, "space" }, { 0,1,0 } }, /* +- sign */ + { { 0x00F8, "space" }, { 0,1,0 } }, /* o stroke */ + { { 0x00B3, "lower" }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B8, "lower" }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00BE, "lower" }, { 0,1,0 } }, /* 3/4 */ + { { 0x00C0, "lower" }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6, "lower" }, { 0,1,0 } }, /* O dia */ + { { 0x00D8, "lower" }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF, "lower" }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0, "lower" }, { 0,0,0 } }, /* a grave */ + { { 0x00F6, "lower" }, { 0,0,0 } }, /* o dia */ + { { 0x00F7, "lower" }, { 0,1,0 } }, /* division */ + { { 0x00F8, "lower" }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF, "lower" }, { 0,0,0 } }, /* y dia */ + { { 0x00B4, "upper" }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8, "upper" }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9, "upper" }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BE, "upper" }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF, "upper" }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0, "upper" }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6, "upper" }, { 0,0,0 } }, /* O dia */ + { { 0x00D7, "upper" }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8, "upper" }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF, "upper" }, { 0,1,0 } }, /* small Sh */ + { { 0x00FF, "upper" }, { 0,1,0 } }, /* y dia */ + { { 0x00B9, "xdigit" }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BC, "xdigit" }, { 0,1,0 } }, /* 1/4 */ { is_last: 1 } } }, { { Tiswctype, TST_LOC_enUS }, { - { { WEOF, "alnum" }, { 0,0,1,0 } }, - { { 0x0000, "alnum" }, { 0,0,1,0 } }, - { { 0x001F, "alnum" }, { 0,0,1,0 } }, - { { 0x0020, "alnum" }, { 0,0,1,0 } }, - { { 0x0021, "alnum" }, { 0,0,1,0 } }, - { { 0x002F, "alnum" }, { 0,0,1,0 } }, - { { 0x0030, "alnum" }, { 0,0,0,0 } }, - { { 0x0039, "alnum" }, { 0,0,0,0 } }, - { { 0x003A, "alnum" }, { 0,0,1,0 } }, - { { 0x0040, "alnum" }, { 0,0,1,0 } }, - { { 0x0041, "alnum" }, { 0,0,0,0 } }, - { { 0x005A, "alnum" }, { 0,0,0,0 } }, - { { 0x005B, "alnum" }, { 0,0,1,0 } }, - { { 0x0060, "alnum" }, { 0,0,1,0 } }, - { { 0x0061, "alnum" }, { 0,0,0,0 } }, - { { 0x007A, "alnum" }, { 0,0,0,0 } }, - { { 0x007B, "alnum" }, { 0,0,1,0 } }, - { { 0x007E, "alnum" }, { 0,0,1,0 } }, - { { 0x007F, "alnum" }, { 0,0,1,0 } }, - { { 0x0080, "alnum" }, { 0,0,1,0 } }, - { { 0x0000, "alpha" }, { 0,0,1,0 } }, - { { 0x001F, "alpha" }, { 0,0,1,0 } }, - { { 0x0020, "alpha" }, { 0,0,1,0 } }, - { { 0x0021, "alpha" }, { 0,0,1,0 } }, - { { 0x002F, "alpha" }, { 0,0,1,0 } }, - { { 0x0030, "alpha" }, { 0,0,1,0 } }, - { { 0x0039, "alpha" }, { 0,0,1,0 } }, - { { 0x003A, "alpha" }, { 0,0,1,0 } }, - { { 0x0040, "alpha" }, { 0,0,1,0 } }, - { { 0x0041, "alpha" }, { 0,0,0,0 } }, - { { 0x005A, "alpha" }, { 0,0,0,0 } }, - { { 0x005B, "alpha" }, { 0,0,1,0 } }, - { { 0x0060, "alpha" }, { 0,0,1,0 } }, - { { 0x0061, "alpha" }, { 0,0,0,0 } }, - { { 0x007A, "alpha" }, { 0,0,0,0 } }, - { { 0x007B, "alpha" }, { 0,0,1,0 } }, - { { 0x007E, "alpha" }, { 0,0,1,0 } }, - { { 0x007F, "alpha" }, { 0,0,1,0 } }, - { { 0x0080, "alpha" }, { 0,0,1,0 } }, - { { 0x0009, "blank" }, { 0,0,0,0 } }, - { { 0x000B, "blank" }, { 0,0,1,0 } }, - { { 0x0020, "blank" }, { 0,0,0,0 } }, - { { 0x0000, "cntrl" }, { 0,0,0,0 } }, - { { 0x001F, "cntrl" }, { 0,0,0,0 } }, - { { 0x0020, "cntrl" }, { 0,0,1,0 } }, - { { 0x0021, "cntrl" }, { 0,0,1,0 } }, - { { 0x002F, "cntrl" }, { 0,0,1,0 } }, - { { 0x0030, "cntrl" }, { 0,0,1,0 } }, - { { 0x0039, "cntrl" }, { 0,0,1,0 } }, - { { 0x003A, "cntrl" }, { 0,0,1,0 } }, - { { 0x0040, "cntrl" }, { 0,0,1,0 } }, - { { 0x0041, "cntrl" }, { 0,0,1,0 } }, - { { 0x005A, "cntrl" }, { 0,0,1,0 } }, - { { 0x005B, "cntrl" }, { 0,0,1,0 } }, - { { 0x0060, "cntrl" }, { 0,0,1,0 } }, - { { 0x0061, "cntrl" }, { 0,0,1,0 } }, - { { 0x007A, "cntrl" }, { 0,0,1,0 } }, - { { 0x007B, "cntrl" }, { 0,0,1,0 } }, - { { 0x007E, "cntrl" }, { 0,0,1,0 } }, - { { 0x007F, "cntrl" }, { 0,0,0,0 } }, - { { 0x0080, "cntrl" }, { 0,0,0,0 } }, - { { 0x0000, "digit" }, { 0,0,1,0 } }, - { { 0x001F, "digit" }, { 0,0,1,0 } }, - { { 0x0020, "digit" }, { 0,0,1,0 } }, - { { 0x0021, "digit" }, { 0,0,1,0 } }, - { { 0x002F, "digit" }, { 0,0,1,0 } }, - { { 0x0030, "digit" }, { 0,0,0,0 } }, - { { 0x0039, "digit" }, { 0,0,0,0 } }, - { { 0x003A, "digit" }, { 0,0,1,0 } }, - { { 0x0040, "digit" }, { 0,0,1,0 } }, - { { 0x0041, "digit" }, { 0,0,1,0 } }, - { { 0x005A, "digit" }, { 0,0,1,0 } }, - { { 0x005B, "digit" }, { 0,0,1,0 } }, - { { 0x0060, "digit" }, { 0,0,1,0 } }, - { { 0x0061, "digit" }, { 0,0,1,0 } }, - { { 0x007A, "digit" }, { 0,0,1,0 } }, - { { 0x007B, "digit" }, { 0,0,1,0 } }, - { { 0x007E, "digit" }, { 0,0,1,0 } }, - { { 0x007F, "digit" }, { 0,0,1,0 } }, - { { 0x0080, "digit" }, { 0,0,1,0 } }, - { { 0x0000, "graph" }, { 0,0,1,0 } }, - { { 0x001F, "graph" }, { 0,0,1,0 } }, - { { 0x0020, "graph" }, { 0,0,1,0 } }, - { { 0x0021, "graph" }, { 0,0,0,0 } }, - { { 0x002F, "graph" }, { 0,0,0,0 } }, - { { 0x0030, "graph" }, { 0,0,0,0 } }, - { { 0x0039, "graph" }, { 0,0,0,0 } }, - { { 0x003A, "graph" }, { 0,0,0,0 } }, - { { 0x0040, "graph" }, { 0,0,0,0 } }, - { { 0x0041, "graph" }, { 0,0,0,0 } }, - { { 0x005A, "graph" }, { 0,0,0,0 } }, - { { 0x005B, "graph" }, { 0,0,0,0 } }, - { { 0x0060, "graph" }, { 0,0,0,0 } }, - { { 0x0061, "graph" }, { 0,0,0,0 } }, - { { 0x007A, "graph" }, { 0,0,0,0 } }, - { { 0x007B, "graph" }, { 0,0,0,0 } }, - { { 0x007E, "graph" }, { 0,0,0,0 } }, - { { 0x007F, "graph" }, { 0,0,1,0 } }, - { { 0x0080, "graph" }, { 0,0,1,0 } }, - { { 0x0000, "print" }, { 0,0,1,0 } }, - { { 0x001F, "print" }, { 0,0,1,0 } }, - { { 0x0020, "print" }, { 0,0,0,0 } }, - { { 0x0021, "print" }, { 0,0,0,0 } }, - { { 0x002F, "print" }, { 0,0,0,0 } }, - { { 0x0030, "print" }, { 0,0,0,0 } }, - { { 0x0039, "print" }, { 0,0,0,0 } }, - { { 0x003A, "print" }, { 0,0,0,0 } }, - { { 0x0040, "print" }, { 0,0,0,0 } }, - { { 0x0041, "print" }, { 0,0,0,0 } }, - { { 0x005A, "print" }, { 0,0,0,0 } }, - { { 0x005B, "print" }, { 0,0,0,0 } }, - { { 0x0060, "print" }, { 0,0,0,0 } }, - { { 0x0061, "print" }, { 0,0,0,0 } }, - { { 0x007A, "print" }, { 0,0,0,0 } }, - { { 0x007B, "print" }, { 0,0,0,0 } }, - { { 0x007E, "print" }, { 0,0,0,0 } }, - { { 0x007F, "print" }, { 0,0,1,0 } }, - { { 0x0080, "print" }, { 0,0,1,0 } }, - { { 0x0000, "punct" }, { 0,0,1,0 } }, - { { 0x001F, "punct" }, { 0,0,1,0 } }, - { { 0x0020, "punct" }, { 0,0,1,0 } }, - { { 0x0021, "punct" }, { 0,0,0,0 } }, - { { 0x002F, "punct" }, { 0,0,0,0 } }, - { { 0x0030, "punct" }, { 0,0,1,0 } }, - { { 0x0039, "punct" }, { 0,0,1,0 } }, - { { 0x003A, "punct" }, { 0,0,0,0 } }, - { { 0x0040, "punct" }, { 0,0,0,0 } }, - { { 0x0041, "punct" }, { 0,0,1,0 } }, - { { 0x005A, "punct" }, { 0,0,1,0 } }, - { { 0x005B, "punct" }, { 0,0,0,0 } }, - { { 0x0060, "punct" }, { 0,0,0,0 } }, - { { 0x0061, "punct" }, { 0,0,1,0 } }, - { { 0x007A, "punct" }, { 0,0,1,0 } }, - { { 0x007B, "punct" }, { 0,0,0,0 } }, - { { 0x007E, "punct" }, { 0,0,0,0 } }, - { { 0x007F, "punct" }, { 0,0,1,0 } }, - { { 0x0080, "punct" }, { 0,0,1,0 } }, - { { 0x0000, "space" }, { 0,0,1,0 } }, - { { 0x001F, "space" }, { 0,0,1,0 } }, - { { 0x0020, "space" }, { 0,0,0,0 } }, - { { 0x0021, "space" }, { 0,0,1,0 } }, - { { 0x002F, "space" }, { 0,0,1,0 } }, - { { 0x007E, "space" }, { 0,0,1,0 } }, - { { 0x007F, "space" }, { 0,0,1,0 } }, - { { 0x0080, "space" }, { 0,0,1,0 } }, - { { 0x0000, "lower" }, { 0,0,1,0 } }, - { { 0x001F, "lower" }, { 0,0,1,0 } }, - { { 0x0020, "lower" }, { 0,0,1,0 } }, - { { 0x0021, "lower" }, { 0,0,1,0 } }, - { { 0x002F, "lower" }, { 0,0,1,0 } }, - { { 0x0030, "lower" }, { 0,0,1,0 } }, - { { 0x0039, "lower" }, { 0,0,1,0 } }, - { { 0x003A, "lower" }, { 0,0,1,0 } }, - { { 0x0040, "lower" }, { 0,0,1,0 } }, - { { 0x0041, "lower" }, { 0,0,1,0 } }, - { { 0x005A, "lower" }, { 0,0,1,0 } }, - { { 0x005B, "lower" }, { 0,0,1,0 } }, - { { 0x0060, "lower" }, { 0,0,1,0 } }, - { { 0x0061, "lower" }, { 0,0,0,0 } }, - { { 0x007A, "lower" }, { 0,0,0,0 } }, - { { 0x007B, "lower" }, { 0,0,1,0 } }, - { { 0x007E, "lower" }, { 0,0,1,0 } }, - { { 0x007F, "lower" }, { 0,0,1,0 } }, - { { 0x0080, "lower" }, { 0,0,1,0 } }, - { { 0x0000, "upper" }, { 0,0,1,0 } }, - { { 0x001F, "upper" }, { 0,0,1,0 } }, - { { 0x0020, "upper" }, { 0,0,1,0 } }, - { { 0x0021, "upper" }, { 0,0,1,0 } }, - { { 0x002F, "upper" }, { 0,0,1,0 } }, - { { 0x0030, "upper" }, { 0,0,1,0 } }, - { { 0x0039, "upper" }, { 0,0,1,0 } }, - { { 0x003A, "upper" }, { 0,0,1,0 } }, - { { 0x0040, "upper" }, { 0,0,1,0 } }, - { { 0x0041, "upper" }, { 0,0,0,0 } }, - { { 0x005A, "upper" }, { 0,0,0,0 } }, - { { 0x005B, "upper" }, { 0,0,1,0 } }, - { { 0x0060, "upper" }, { 0,0,1,0 } }, - { { 0x0061, "upper" }, { 0,0,1,0 } }, - { { 0x007A, "upper" }, { 0,0,1,0 } }, - { { 0x007B, "upper" }, { 0,0,1,0 } }, - { { 0x007E, "upper" }, { 0,0,1,0 } }, - { { 0x007F, "upper" }, { 0,0,1,0 } }, - { { 0x0080, "upper" }, { 0,0,1,0 } }, - { { 0x0000, "xdigit" }, { 0,0,1,0 } }, - { { 0x001F, "xdigit" }, { 0,0,1,0 } }, - { { 0x0020, "xdigit" }, { 0,0,1,0 } }, - { { 0x0021, "xdigit" }, { 0,0,1,0 } }, - { { 0x002F, "xdigit" }, { 0,0,1,0 } }, - { { 0x0030, "xdigit" }, { 0,0,0,0 } }, - { { 0x0039, "xdigit" }, { 0,0,0,0 } }, - { { 0x003A, "xdigit" }, { 0,0,1,0 } }, - { { 0x0040, "xdigit" }, { 0,0,1,0 } }, - { { 0x0041, "xdigit" }, { 0,0,0,0 } }, - { { 0x005A, "xdigit" }, { 0,0,1,0 } }, - { { 0x005B, "xdigit" }, { 0,0,1,0 } }, - { { 0x0060, "xdigit" }, { 0,0,1,0 } }, - { { 0x0061, "xdigit" }, { 0,0,0,0 } }, - { { 0x007A, "xdigit" }, { 0,0,1,0 } }, - { { 0x007B, "xdigit" }, { 0,0,1,0 } }, - { { 0x007E, "xdigit" }, { 0,0,1,0 } }, - { { 0x007F, "xdigit" }, { 0,0,1,0 } }, - { { 0x0080, "xdigit" }, { 0,0,1,0 } }, - { { 0x0061, "xxxxxx" }, { 0,0,1,0 } }, + { { WEOF, "alnum" }, { 0,1,0 } }, + { { 0x0000, "alnum" }, { 0,1,0 } }, + { { 0x001F, "alnum" }, { 0,1,0 } }, + { { 0x0020, "alnum" }, { 0,1,0 } }, + { { 0x0021, "alnum" }, { 0,1,0 } }, + { { 0x002F, "alnum" }, { 0,1,0 } }, + { { 0x0030, "alnum" }, { 0,0,0 } }, + { { 0x0039, "alnum" }, { 0,0,0 } }, + { { 0x003A, "alnum" }, { 0,1,0 } }, + { { 0x0040, "alnum" }, { 0,1,0 } }, + { { 0x0041, "alnum" }, { 0,0,0 } }, + { { 0x005A, "alnum" }, { 0,0,0 } }, + { { 0x005B, "alnum" }, { 0,1,0 } }, + { { 0x0060, "alnum" }, { 0,1,0 } }, + { { 0x0061, "alnum" }, { 0,0,0 } }, + { { 0x007A, "alnum" }, { 0,0,0 } }, + { { 0x007B, "alnum" }, { 0,1,0 } }, + { { 0x007E, "alnum" }, { 0,1,0 } }, + { { 0x007F, "alnum" }, { 0,1,0 } }, + { { 0x0080, "alnum" }, { 0,1,0 } }, + { { 0x0000, "alpha" }, { 0,1,0 } }, + { { 0x001F, "alpha" }, { 0,1,0 } }, + { { 0x0020, "alpha" }, { 0,1,0 } }, + { { 0x0021, "alpha" }, { 0,1,0 } }, + { { 0x002F, "alpha" }, { 0,1,0 } }, + { { 0x0030, "alpha" }, { 0,1,0 } }, + { { 0x0039, "alpha" }, { 0,1,0 } }, + { { 0x003A, "alpha" }, { 0,1,0 } }, + { { 0x0040, "alpha" }, { 0,1,0 } }, + { { 0x0041, "alpha" }, { 0,0,0 } }, + { { 0x005A, "alpha" }, { 0,0,0 } }, + { { 0x005B, "alpha" }, { 0,1,0 } }, + { { 0x0060, "alpha" }, { 0,1,0 } }, + { { 0x0061, "alpha" }, { 0,0,0 } }, + { { 0x007A, "alpha" }, { 0,0,0 } }, + { { 0x007B, "alpha" }, { 0,1,0 } }, + { { 0x007E, "alpha" }, { 0,1,0 } }, + { { 0x007F, "alpha" }, { 0,1,0 } }, + { { 0x0080, "alpha" }, { 0,1,0 } }, + { { 0x0009, "blank" }, { 0,0,0 } }, + { { 0x000B, "blank" }, { 0,1,0 } }, + { { 0x0020, "blank" }, { 0,0,0 } }, + { { 0x0000, "cntrl" }, { 0,0,0 } }, + { { 0x001F, "cntrl" }, { 0,0,0 } }, + { { 0x0020, "cntrl" }, { 0,1,0 } }, + { { 0x0021, "cntrl" }, { 0,1,0 } }, + { { 0x002F, "cntrl" }, { 0,1,0 } }, + { { 0x0030, "cntrl" }, { 0,1,0 } }, + { { 0x0039, "cntrl" }, { 0,1,0 } }, + { { 0x003A, "cntrl" }, { 0,1,0 } }, + { { 0x0040, "cntrl" }, { 0,1,0 } }, + { { 0x0041, "cntrl" }, { 0,1,0 } }, + { { 0x005A, "cntrl" }, { 0,1,0 } }, + { { 0x005B, "cntrl" }, { 0,1,0 } }, + { { 0x0060, "cntrl" }, { 0,1,0 } }, + { { 0x0061, "cntrl" }, { 0,1,0 } }, + { { 0x007A, "cntrl" }, { 0,1,0 } }, + { { 0x007B, "cntrl" }, { 0,1,0 } }, + { { 0x007E, "cntrl" }, { 0,1,0 } }, + { { 0x007F, "cntrl" }, { 0,0,0 } }, + { { 0x0080, "cntrl" }, { 0,0,0 } }, + { { 0x0000, "digit" }, { 0,1,0 } }, + { { 0x001F, "digit" }, { 0,1,0 } }, + { { 0x0020, "digit" }, { 0,1,0 } }, + { { 0x0021, "digit" }, { 0,1,0 } }, + { { 0x002F, "digit" }, { 0,1,0 } }, + { { 0x0030, "digit" }, { 0,0,0 } }, + { { 0x0039, "digit" }, { 0,0,0 } }, + { { 0x003A, "digit" }, { 0,1,0 } }, + { { 0x0040, "digit" }, { 0,1,0 } }, + { { 0x0041, "digit" }, { 0,1,0 } }, + { { 0x005A, "digit" }, { 0,1,0 } }, + { { 0x005B, "digit" }, { 0,1,0 } }, + { { 0x0060, "digit" }, { 0,1,0 } }, + { { 0x0061, "digit" }, { 0,1,0 } }, + { { 0x007A, "digit" }, { 0,1,0 } }, + { { 0x007B, "digit" }, { 0,1,0 } }, + { { 0x007E, "digit" }, { 0,1,0 } }, + { { 0x007F, "digit" }, { 0,1,0 } }, + { { 0x0080, "digit" }, { 0,1,0 } }, + { { 0x0000, "graph" }, { 0,1,0 } }, + { { 0x001F, "graph" }, { 0,1,0 } }, + { { 0x0020, "graph" }, { 0,1,0 } }, + { { 0x0021, "graph" }, { 0,0,0 } }, + { { 0x002F, "graph" }, { 0,0,0 } }, + { { 0x0030, "graph" }, { 0,0,0 } }, + { { 0x0039, "graph" }, { 0,0,0 } }, + { { 0x003A, "graph" }, { 0,0,0 } }, + { { 0x0040, "graph" }, { 0,0,0 } }, + { { 0x0041, "graph" }, { 0,0,0 } }, + { { 0x005A, "graph" }, { 0,0,0 } }, + { { 0x005B, "graph" }, { 0,0,0 } }, + { { 0x0060, "graph" }, { 0,0,0 } }, + { { 0x0061, "graph" }, { 0,0,0 } }, + { { 0x007A, "graph" }, { 0,0,0 } }, + { { 0x007B, "graph" }, { 0,0,0 } }, + { { 0x007E, "graph" }, { 0,0,0 } }, + { { 0x007F, "graph" }, { 0,1,0 } }, + { { 0x0080, "graph" }, { 0,1,0 } }, + { { 0x0000, "print" }, { 0,1,0 } }, + { { 0x001F, "print" }, { 0,1,0 } }, + { { 0x0020, "print" }, { 0,0,0 } }, + { { 0x0021, "print" }, { 0,0,0 } }, + { { 0x002F, "print" }, { 0,0,0 } }, + { { 0x0030, "print" }, { 0,0,0 } }, + { { 0x0039, "print" }, { 0,0,0 } }, + { { 0x003A, "print" }, { 0,0,0 } }, + { { 0x0040, "print" }, { 0,0,0 } }, + { { 0x0041, "print" }, { 0,0,0 } }, + { { 0x005A, "print" }, { 0,0,0 } }, + { { 0x005B, "print" }, { 0,0,0 } }, + { { 0x0060, "print" }, { 0,0,0 } }, + { { 0x0061, "print" }, { 0,0,0 } }, + { { 0x007A, "print" }, { 0,0,0 } }, + { { 0x007B, "print" }, { 0,0,0 } }, + { { 0x007E, "print" }, { 0,0,0 } }, + { { 0x007F, "print" }, { 0,1,0 } }, + { { 0x0080, "print" }, { 0,1,0 } }, + { { 0x0000, "punct" }, { 0,1,0 } }, + { { 0x001F, "punct" }, { 0,1,0 } }, + { { 0x0020, "punct" }, { 0,1,0 } }, + { { 0x0021, "punct" }, { 0,0,0 } }, + { { 0x002F, "punct" }, { 0,0,0 } }, + { { 0x0030, "punct" }, { 0,1,0 } }, + { { 0x0039, "punct" }, { 0,1,0 } }, + { { 0x003A, "punct" }, { 0,0,0 } }, + { { 0x0040, "punct" }, { 0,0,0 } }, + { { 0x0041, "punct" }, { 0,1,0 } }, + { { 0x005A, "punct" }, { 0,1,0 } }, + { { 0x005B, "punct" }, { 0,0,0 } }, + { { 0x0060, "punct" }, { 0,0,0 } }, + { { 0x0061, "punct" }, { 0,1,0 } }, + { { 0x007A, "punct" }, { 0,1,0 } }, + { { 0x007B, "punct" }, { 0,0,0 } }, + { { 0x007E, "punct" }, { 0,0,0 } }, + { { 0x007F, "punct" }, { 0,1,0 } }, + { { 0x0080, "punct" }, { 0,1,0 } }, + { { 0x0000, "space" }, { 0,1,0 } }, + { { 0x001F, "space" }, { 0,1,0 } }, + { { 0x0020, "space" }, { 0,0,0 } }, + { { 0x0021, "space" }, { 0,1,0 } }, + { { 0x002F, "space" }, { 0,1,0 } }, + { { 0x007E, "space" }, { 0,1,0 } }, + { { 0x007F, "space" }, { 0,1,0 } }, + { { 0x0080, "space" }, { 0,1,0 } }, + { { 0x0000, "lower" }, { 0,1,0 } }, + { { 0x001F, "lower" }, { 0,1,0 } }, + { { 0x0020, "lower" }, { 0,1,0 } }, + { { 0x0021, "lower" }, { 0,1,0 } }, + { { 0x002F, "lower" }, { 0,1,0 } }, + { { 0x0030, "lower" }, { 0,1,0 } }, + { { 0x0039, "lower" }, { 0,1,0 } }, + { { 0x003A, "lower" }, { 0,1,0 } }, + { { 0x0040, "lower" }, { 0,1,0 } }, + { { 0x0041, "lower" }, { 0,1,0 } }, + { { 0x005A, "lower" }, { 0,1,0 } }, + { { 0x005B, "lower" }, { 0,1,0 } }, + { { 0x0060, "lower" }, { 0,1,0 } }, + { { 0x0061, "lower" }, { 0,0,0 } }, + { { 0x007A, "lower" }, { 0,0,0 } }, + { { 0x007B, "lower" }, { 0,1,0 } }, + { { 0x007E, "lower" }, { 0,1,0 } }, + { { 0x007F, "lower" }, { 0,1,0 } }, + { { 0x0080, "lower" }, { 0,1,0 } }, + { { 0x0000, "upper" }, { 0,1,0 } }, + { { 0x001F, "upper" }, { 0,1,0 } }, + { { 0x0020, "upper" }, { 0,1,0 } }, + { { 0x0021, "upper" }, { 0,1,0 } }, + { { 0x002F, "upper" }, { 0,1,0 } }, + { { 0x0030, "upper" }, { 0,1,0 } }, + { { 0x0039, "upper" }, { 0,1,0 } }, + { { 0x003A, "upper" }, { 0,1,0 } }, + { { 0x0040, "upper" }, { 0,1,0 } }, + { { 0x0041, "upper" }, { 0,0,0 } }, + { { 0x005A, "upper" }, { 0,0,0 } }, + { { 0x005B, "upper" }, { 0,1,0 } }, + { { 0x0060, "upper" }, { 0,1,0 } }, + { { 0x0061, "upper" }, { 0,1,0 } }, + { { 0x007A, "upper" }, { 0,1,0 } }, + { { 0x007B, "upper" }, { 0,1,0 } }, + { { 0x007E, "upper" }, { 0,1,0 } }, + { { 0x007F, "upper" }, { 0,1,0 } }, + { { 0x0080, "upper" }, { 0,1,0 } }, + { { 0x0000, "xdigit" }, { 0,1,0 } }, + { { 0x001F, "xdigit" }, { 0,1,0 } }, + { { 0x0020, "xdigit" }, { 0,1,0 } }, + { { 0x0021, "xdigit" }, { 0,1,0 } }, + { { 0x002F, "xdigit" }, { 0,1,0 } }, + { { 0x0030, "xdigit" }, { 0,0,0 } }, + { { 0x0039, "xdigit" }, { 0,0,0 } }, + { { 0x003A, "xdigit" }, { 0,1,0 } }, + { { 0x0040, "xdigit" }, { 0,1,0 } }, + { { 0x0041, "xdigit" }, { 0,0,0 } }, + { { 0x005A, "xdigit" }, { 0,1,0 } }, + { { 0x005B, "xdigit" }, { 0,1,0 } }, + { { 0x0060, "xdigit" }, { 0,1,0 } }, + { { 0x0061, "xdigit" }, { 0,0,0 } }, + { { 0x007A, "xdigit" }, { 0,1,0 } }, + { { 0x007B, "xdigit" }, { 0,1,0 } }, + { { 0x007E, "xdigit" }, { 0,1,0 } }, + { { 0x007F, "xdigit" }, { 0,1,0 } }, + { { 0x0080, "xdigit" }, { 0,1,0 } }, + { { 0x0061, "xxxxxx" }, { 0,1,0 } }, { is_last: 1 } } }, { { Tiswctype, TST_LOC_eucJP }, { - { { 0x3029, "alnum" }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0xFE4F, "alnum" }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF19, "alnum" }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20, "alnum" }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A, "alnum" }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40, "alnum" }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A, "alnum" }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF71, "alnum" }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0x3029, "alpha" }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0xFE4F, "alpha" }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF19, "alpha" }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20, "alpha" }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A, "alpha" }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40, "alpha" }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A, "alpha" }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF71, "alpha" }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0x0080, "cntrl" }, { 0,0,0,0 } }, /* CNTRL */ - { { 0x3000, "cntrl" }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3029, "digit" }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x32CB, "digit" }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x3029, "alnum" }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0xFE4F, "alnum" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF19, "alnum" }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20, "alnum" }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A, "alnum" }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40, "alnum" }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A, "alnum" }, { 0,0,0 } }, /* FULL z */ + { { 0xFF71, "alnum" }, { 0,1,0 } }, /* HALF KATA A */ + { { 0x3029, "alpha" }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0xFE4F, "alpha" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF19, "alpha" }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20, "alpha" }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A, "alpha" }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40, "alpha" }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A, "alpha" }, { 0,0,0 } }, /* FULL z */ + { { 0xFF71, "alpha" }, { 0,1,0 } }, /* HALF KATA A */ + { { 0x0080, "cntrl" }, { 0,0,0 } }, /* CNTRL */ + { { 0x3000, "cntrl" }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3029, "digit" }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x32CB, "digit" }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ /* 21: */ - { { 0x33FE, "digit" }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0xFF19, "digit" }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0x3000, "graph" }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020, "graph" }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029, "graph" }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F, "graph" }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037, "graph" }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F, "graph" }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x33FE, "digit" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0xFF19, "digit" }, { 0,0,0 } }, /* FULL 9 */ + { { 0x3000, "graph" }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020, "graph" }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029, "graph" }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F, "graph" }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "graph" }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F, "graph" }, { 0,1,0 } }, /* IDEO. HALF SPACE */ /* 29: */ - { { 0x3041, "graph" }, { 0,0,0,0 } }, /* HIRAGANA a */ + { { 0x3041, "graph" }, { 0,0,0 } }, /* HIRAGANA a */ /* Non jis: */ - { { 0x3094, "graph" }, { 0,0,1,0 } }, /* HIRAGANA u" */ + { { 0x3094, "graph" }, { 0,1,0 } }, /* HIRAGANA u" */ /* Non jis: */ - { { 0x3099, "graph" }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E, "graph" }, { 0,0,0,0 } }, /* ITERATION MARK */ + { { 0x3099, "graph" }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E, "graph" }, { 0,0,0 } }, /* ITERATION MARK */ /* 33: */ - { { 0x30A1, "graph" }, { 0,0,0,0 } }, /* KATAKANA a */ + { { 0x30A1, "graph" }, { 0,0,0 } }, /* KATAKANA a */ /* Non jis: */ - { { 0x30FA, "graph" }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB, "graph" }, { 0,0,0,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE, "graph" }, { 0,0,0,0 } }, /* KATAKANA ITERATION */ - { { 0x3191, "graph" }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243, "graph" }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB, "graph" }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE, "graph" }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE, "graph" }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06, "graph" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007, "graph" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4, "graph" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x30FA, "graph" }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB, "graph" }, { 0,0,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE, "graph" }, { 0,0,0 } }, /* KATAKANA ITERATION */ + { { 0x3191, "graph" }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243, "graph" }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB, "graph" }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE, "graph" }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE, "graph" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ /* 51 */ - { { 0x9FA5, "graph" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9FA5, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* Non jis: */ - { { 0xFE4F, "graph" }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F, "graph" }, { 0,0,0,0 } }, /* FULL SLASH */ - { { 0xFF19, "graph" }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20, "graph" }, { 0,0,0,0 } }, /* FULL @ */ - { { 0xFF3A, "graph" }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40, "graph" }, { 0,0,0,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A, "graph" }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF5E, "graph" }, { 0,0,0,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61, "graph" }, { 0,0,0,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65, "graph" }, { 0,0,0,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66, "graph" }, { 0,0,0,0 } }, /* HALF KATA WO */ - { { 0xFF6F, "graph" }, { 0,0,0,0 } }, /* HALF KATA tu */ - { { 0xFF70, "graph" }, { 0,0,0,0 } }, /* HALF KATA PL - */ - { { 0xFF71, "graph" }, { 0,0,0,0 } }, /* HALF KATA A */ - { { 0xFF9E, "graph" }, { 0,0,0,0 } }, /* HALF KATA MI */ - { { 0x3000, "print" }, { 0,0,0,0 } }, /* IDEO. SPACE */ - { { 0x3020, "print" }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029, "print" }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F, "print" }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037, "print" }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x4E00, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06, "print" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007, "print" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4, "print" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0xFE4F, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F, "graph" }, { 0,0,0 } }, /* FULL SLASH */ + { { 0xFF19, "graph" }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20, "graph" }, { 0,0,0 } }, /* FULL @ */ + { { 0xFF3A, "graph" }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40, "graph" }, { 0,0,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A, "graph" }, { 0,0,0 } }, /* FULL z */ + { { 0xFF5E, "graph" }, { 0,0,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61, "graph" }, { 0,0,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65, "graph" }, { 0,0,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66, "graph" }, { 0,0,0 } }, /* HALF KATA WO */ + { { 0xFF6F, "graph" }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0xFF70, "graph" }, { 0,0,0 } }, /* HALF KATA PL - */ + { { 0xFF71, "graph" }, { 0,0,0 } }, /* HALF KATA A */ + { { 0xFF9E, "graph" }, { 0,0,0 } }, /* HALF KATA MI */ + { { 0x3000, "print" }, { 0,0,0 } }, /* IDEO. SPACE */ + { { 0x3020, "print" }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029, "print" }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F, "print" }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "print" }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x4E00, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ /* 81: */ - { { 0x9FA5, "print" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9FA5, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* Non jis: */ - { { 0xFE4F, "print" }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x3000, "punct" }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020, "punct" }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x302F, "punct" }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037, "punct" }, { 0,0,1,0 } }, /* FEED Separator */ - { { 0x303F, "punct" }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041, "punct" }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094, "punct" }, { 0,0,1,0 } }, /* HIRAGANA u" */ + { { 0xFE4F, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x3000, "punct" }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020, "punct" }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x302F, "punct" }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "punct" }, { 0,1,0 } }, /* FEED Separator */ + { { 0x303F, "punct" }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041, "punct" }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094, "punct" }, { 0,1,0 } }, /* HIRAGANA u" */ /* 90: */ - { { 0x3099, "punct" }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E, "punct" }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1, "punct" }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA, "punct" }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB, "punct" }, { 0,0,0,0 } }, /* KATAKANA MID.DOT */ + { { 0x3099, "punct" }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E, "punct" }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1, "punct" }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA, "punct" }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB, "punct" }, { 0,0,0 } }, /* KATAKANA MID.DOT */ /* 95: */ - { { 0x30FE, "punct" }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191, "punct" }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243, "punct" }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB, "punct" }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE, "punct" }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE, "punct" }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x9007, "punct" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4, "punct" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5, "punct" }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F, "punct" }, { 0,0,0,0 } }, /* FULL SLASH */ + { { 0x30FE, "punct" }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191, "punct" }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243, "punct" }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB, "punct" }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE, "punct" }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE, "punct" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x9007, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F, "punct" }, { 0,0,0 } }, /* FULL SLASH */ /* 105: */ - { { 0xFF19, "punct" }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20, "punct" }, { 0,0,0,0 } }, /* FULL @ */ - { { 0xFF3A, "punct" }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40, "punct" }, { 0,0,0,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A, "punct" }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E, "punct" }, { 0,0,0,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61, "punct" }, { 0,0,0,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65, "punct" }, { 0,0,0,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF70, "punct" }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF9E, "punct" }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0xFF19, "punct" }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20, "punct" }, { 0,0,0 } }, /* FULL @ */ + { { 0xFF3A, "punct" }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40, "punct" }, { 0,0,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A, "punct" }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E, "punct" }, { 0,0,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61, "punct" }, { 0,0,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65, "punct" }, { 0,0,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF70, "punct" }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF9E, "punct" }, { 0,1,0 } }, /* HALF KATA MI */ /* 115: */ - { { 0x3000, "space" }, { 0,0,0,0 } }, /* IDEO. SPACE */ - { { 0x303F, "space" }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041, "lower" }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094, "lower" }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x30A1, "lower" }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA, "lower" }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0xFF66, "lower" }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F, "lower" }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70, "lower" }, { 0,0,1,0 } }, /* HALF KATA PL - */ + { { 0x3000, "space" }, { 0,0,0 } }, /* IDEO. SPACE */ + { { 0x303F, "space" }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041, "lower" }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094, "lower" }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x30A1, "lower" }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA, "lower" }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0xFF66, "lower" }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F, "lower" }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70, "lower" }, { 0,1,0 } }, /* HALF KATA PL - */ /* 124: */ - { { 0xFF71, "lower" }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E, "lower" }, { 0,0,1,0 } }, /* HALF KATA MI */ - { { 0xFF71, "upper" }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF19, "xdigit" }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0x3000, "jspace" }, { 0,0,0,0 } }, /* IDEO. SPACE */ + { { 0xFF71, "lower" }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E, "lower" }, { 0,1,0 } }, /* HALF KATA MI */ + { { 0xFF71, "upper" }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF19, "xdigit" }, { 0,1,0 } }, /* FULL 9 */ + { { 0x3000, "jspace" }, { 0,0,0 } }, /* IDEO. SPACE */ /* Non jis? */ - { { 0x303F, "jspace" }, { 0,0,1,0 } }, /* IDEO.HALF SPACE */ - { { 0xFF19, "jdigit" }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0x3041, "jhira" }, { 0,0,0,0 } }, /* HIRAGANA a */ - { { 0x3094, "jhira" }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x30A1, "jkata" }, { 0,0,0,0 } }, /* KATAKANA a */ + { { 0x303F, "jspace" }, { 0,1,0 } }, /* IDEO.HALF SPACE */ + { { 0xFF19, "jdigit" }, { 0,0,0 } }, /* FULL 9 */ + { { 0x3041, "jhira" }, { 0,0,0 } }, /* HIRAGANA a */ + { { 0x3094, "jhira" }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x30A1, "jkata" }, { 0,0,0 } }, /* KATAKANA a */ /* Non jis: */ - { { 0x30FA, "jkata" }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0xFF66, "jkata" }, { 0,0,0,0 } }, /* HALF KATA WO */ - { { 0xFF6F, "jkata" }, { 0,0,0,0 } }, /* HALF KATA tu */ - { { 0x4E05, "jkanji" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x30FA, "jkata" }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0xFF66, "jkata" }, { 0,0,0 } }, /* HALF KATA WO */ + { { 0xFF6F, "jkata" }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0x4E05, "jkanji" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ #ifdef SHOJI_IS_RIGHT /* <NO_WAIVER>: */ - { { 0x4E06, "jkanji" }, { 0,0,1,1 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E06, "jkanji" }, { 0,1,1 } }, /* CJK UNI.IDEO.NON-J */ #else /* XXX This character does not exist in EUC-JP. */ - { { 0x4E06, "jkanji" }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E06, "jkanji" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ #endif - { { 0x4E07, "jkanji" }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E07, "jkanji" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { is_last: 1 } } }, diff --git a/localedata/tests-mbwc/dat_iswdigit.c b/localedata/tests-mbwc/dat_iswdigit.c index 3edf47957c..de63a8d155 100644 --- a/localedata/tests-mbwc/dat_iswdigit.c +++ b/localedata/tests-mbwc/dat_iswdigit.c @@ -14,106 +14,106 @@ TST_ISW_LOC (DIGIT, digit) = { { TST_ISW_REC (de, digit) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, digit) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,0,0 } }, - { { 0x0039 }, { 0,0,0,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,1,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,1,0 } }, - { { 0x007A }, { 0,0,1,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,0,0 } }, + { { 0x0039 }, { 0,0,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,1,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,1,0 } }, + { { 0x007A }, { 0,1,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, digit) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswgraph.c b/localedata/tests-mbwc/dat_iswgraph.c index f573088393..98583e2fd3 100644 --- a/localedata/tests-mbwc/dat_iswgraph.c +++ b/localedata/tests-mbwc/dat_iswgraph.c @@ -14,106 +14,106 @@ TST_ISW_LOC (GRAPH, graph) = { { TST_ISW_REC (de, graph) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,0,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,0,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,0,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,0,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,0,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,0,0 } }, /* >> */ - { { 0x00BC }, { 0,0,0,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,0,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,0,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,0,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,0,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,0,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,0,0 } }, /* Degree */ + { { 0x00B1 }, { 0,0,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,0,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,0,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,0,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,0,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,0,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,0,0 } }, /* >> */ + { { 0x00BC }, { 0,0,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,0,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,0,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,0,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,0,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,0,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, graph) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,0,0 } }, - { { 0x002F }, { 0,0,0,0 } }, - { { 0x0030 }, { 0,0,0,0 } }, - { { 0x0039 }, { 0,0,0,0 } }, - { { 0x003A }, { 0,0,0,0 } }, - { { 0x0040 }, { 0,0,0,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,0,0 } }, - { { 0x005B }, { 0,0,0,0 } }, - { { 0x0060 }, { 0,0,0,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,0,0 } }, - { { 0x007B }, { 0,0,0,0 } }, - { { 0x007E }, { 0,0,0,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, /* 20 */ + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,0,0 } }, + { { 0x002F }, { 0,0,0 } }, + { { 0x0030 }, { 0,0,0 } }, + { { 0x0039 }, { 0,0,0 } }, + { { 0x003A }, { 0,0,0 } }, + { { 0x0040 }, { 0,0,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,0,0 } }, + { { 0x005B }, { 0,0,0 } }, + { { 0x0060 }, { 0,0,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,0,0 } }, + { { 0x007B }, { 0,0,0 } }, + { { 0x007E }, { 0,0,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, /* 20 */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC( eucJP, graph ) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,0,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ /* non jis */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,0,0 } }, /* ITERATION MARK */ /* 10 */ - { { 0x30A1 }, { 0,0,0,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ /* non jis */ - { { 0x30FB }, { 0,0,0,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,0,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ - { { 0x4E05 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK Wave Low Line */ /* 30 */ - { { 0xFF0F }, { 0,0,0,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,0,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,0,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,0,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,0,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,0,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,0,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,0,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,0,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,0,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,0,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ /* non jis */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ /* 10 */ + { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ /* non jis */ + { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ + { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK Wave Low Line */ /* 30 */ + { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,0,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,0,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,0,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,0,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,0,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,0,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,0,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,0,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,0,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswlower.c b/localedata/tests-mbwc/dat_iswlower.c index 8cd401d28e..23f767a88d 100644 --- a/localedata/tests-mbwc/dat_iswlower.c +++ b/localedata/tests-mbwc/dat_iswlower.c @@ -14,76 +14,76 @@ TST_ISW_LOC (LOWER, lower) = { { TST_ISW_REC (de, lower) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, lower) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,1,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,0,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,1,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,0,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, lower) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,0,0 } }, /* FULL z */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswprint.c b/localedata/tests-mbwc/dat_iswprint.c index 70abb6635e..a7cf34cffb 100644 --- a/localedata/tests-mbwc/dat_iswprint.c +++ b/localedata/tests-mbwc/dat_iswprint.c @@ -14,109 +14,109 @@ TST_ISW_LOC (PRINT, print) = { { TST_ISW_REC (de, print) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,0,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,0,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,0,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,0,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,0,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,0,0 } }, /* >> */ - { { 0x00BC }, { 0,0,0,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,0,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,0,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,0,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,0,0 } }, /* division */ - { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,0,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,0,0 } }, /* Degree */ + { { 0x00B1 }, { 0,0,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,0,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,0,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,0,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,0,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,0,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,0,0 } }, /* >> */ + { { 0x00BC }, { 0,0,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,0,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,0,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,0,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,0,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,0,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, print) { - { { WEOF }, { 0,0,1,0 } }, /* 01 */ - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,0,0 } }, - { { 0x0021 }, { 0,0,0,0 } }, - { { 0x002F }, { 0,0,0,0 } }, - { { 0x0030 }, { 0,0,0,0 } }, - { { 0x0039 }, { 0,0,0,0 } }, - { { 0x003A }, { 0,0,0,0 } }, - { { 0x0040 }, { 0,0,0,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,0,0 } }, - { { 0x005B }, { 0,0,0,0 } }, - { { 0x0060 }, { 0,0,0,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,0,0 } }, - { { 0x007B }, { 0,0,0,0 } }, - { { 0x007E }, { 0,0,0,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, /* 20 */ + { { WEOF }, { 0,1,0 } }, /* 01 */ + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,0,0 } }, + { { 0x0021 }, { 0,0,0 } }, + { { 0x002F }, { 0,0,0 } }, + { { 0x0030 }, { 0,0,0 } }, + { { 0x0039 }, { 0,0,0 } }, + { { 0x003A }, { 0,0,0 } }, + { { 0x0040 }, { 0,0,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,0,0 } }, + { { 0x005B }, { 0,0,0 } }, + { { 0x0060 }, { 0,0,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,0,0 } }, + { { 0x007B }, { 0,0,0 } }, + { { 0x007E }, { 0,0,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, /* 20 */ #ifdef NO_WAIVER - { { 0x3042 }, { 0,0,1,0 } }, /* <WAIVER> */ + { { 0x3042 }, { 0,1,0 } }, /* <WAIVER> */ #endif { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, print) { - { { 0x3000 }, { 0,0,0,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,0,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ /* non jis */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,0,0 } }, /* ITERATION MARK */ /* 10 */ - { { 0x30A1 }, { 0,0,0,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ /* non jis */ - { { 0x30FB }, { 0,0,0,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,0,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ - { { 0x4E05 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,0,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* WAVE LOW LINE */ /* 30 */ - { { 0xFF0F }, { 0,0,0,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,0,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,0,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,0,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,0,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,0,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,0,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,0,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,0,0 } }, /* HALF KATA WO */ /* 40 */ - { { 0xFF6F }, { 0,0,0,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,0,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,0,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,0,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,0,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ /* non jis */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ /* 10 */ + { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ /* non jis */ + { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ + { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* WAVE LOW LINE */ /* 30 */ + { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,0,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,0,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,0,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,0,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,0,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,0,0 } }, /* HALF KATA WO */ /* 40 */ + { { 0xFF6F }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,0,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,0,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,0,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswpunct.c b/localedata/tests-mbwc/dat_iswpunct.c index 0b37a4b10a..710395c717 100644 --- a/localedata/tests-mbwc/dat_iswpunct.c +++ b/localedata/tests-mbwc/dat_iswpunct.c @@ -14,106 +14,106 @@ TST_ISW_LOC (PUNCT, punct) = { { TST_ISW_REC (de, punct) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,0,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,0,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,0,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,0,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,0,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,0,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,0,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,0,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,0,0 } }, /* >> */ - { { 0x00BC }, { 0,0,0,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,0,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,0,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,0,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,0,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,0,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,0,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,0,0 } }, /* Degree */ + { { 0x00B1 }, { 0,0,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,0,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,0,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,0,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,0,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,0,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,0,0 } }, /* >> */ + { { 0x00BC }, { 0,0,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,0,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,0,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,0,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,0,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,0,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, punct) { - { { WEOF }, { 0,0,1,0 } }, /* 01 */ - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,0,0 } }, - { { 0x002F }, { 0,0,0,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,0,0 } }, - { { 0x0040 }, { 0,0,0,0 } }, - { { 0x0041 }, { 0,0,1,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,0,0 } }, - { { 0x0060 }, { 0,0,0,0 } }, - { { 0x0061 }, { 0,0,1,0 } }, - { { 0x007A }, { 0,0,1,0 } }, - { { 0x007B }, { 0,0,0,0 } }, - { { 0x007E }, { 0,0,0,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, /* 20 */ + { { WEOF }, { 0,1,0 } }, /* 01 */ + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,0,0 } }, + { { 0x002F }, { 0,0,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,0,0 } }, + { { 0x0040 }, { 0,0,0 } }, + { { 0x0041 }, { 0,1,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,0,0 } }, + { { 0x0060 }, { 0,0,0 } }, + { { 0x0061 }, { 0,1,0 } }, + { { 0x007A }, { 0,1,0 } }, + { { 0x007B }, { 0,0,0 } }, + { { 0x007E }, { 0,0,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, /* 20 */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, punct) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ /* 10 */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,0,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ /* 20 */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ /* 30 */ - { { 0xFF0F }, { 0,0,0,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,0,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,0,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,0,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,0,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,0,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ /* 40 */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ /* 10 */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ /* 20 */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ /* 30 */ + { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,0,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,0,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,0,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,0,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ /* 40 */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswspace.c b/localedata/tests-mbwc/dat_iswspace.c index ec9e598b46..f5a803d858 100644 --- a/localedata/tests-mbwc/dat_iswspace.c +++ b/localedata/tests-mbwc/dat_iswspace.c @@ -14,110 +14,110 @@ TST_ISW_LOC (SPACE, space) = { { TST_ISW_REC (de, space) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (enUS, space) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x0008 }, { 0,0,1,0 } }, - { { 0x0009 }, { 0,0,0,0 } }, - { { 0x000D }, { 0,0,0,0 } }, - { { 0x000E }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,0,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,1,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,1,0 } }, - { { 0x007A }, { 0,0,1,0 } }, /* 20 */ - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x0008 }, { 0,1,0 } }, + { { 0x0009 }, { 0,0,0 } }, + { { 0x000D }, { 0,0,0 } }, + { { 0x000E }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,0,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,1,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,1,0 } }, + { { 0x007A }, { 0,1,0 } }, /* 20 */ + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC (eucJP, space) { - { { 0x3000 }, { 0,0,0,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ /* No JIS */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,0,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ /* No JIS */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_iswupper.c b/localedata/tests-mbwc/dat_iswupper.c index d83e7bc0df..72b6755ef2 100644 --- a/localedata/tests-mbwc/dat_iswupper.c +++ b/localedata/tests-mbwc/dat_iswupper.c @@ -14,75 +14,75 @@ TST_ISW_LOC (UPPER, upper) = { { TST_ISW_REC (de, upper) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last entry. */ } }, { TST_ISW_REC (enUS, upper) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,1,0 } }, - { { 0x0039 }, { 0,0,1,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,0,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,1,0 } }, - { { 0x007A }, { 0,0,1,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,1,0 } }, + { { 0x0039 }, { 0,1,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,0,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,1,0 } }, + { { 0x007A }, { 0,1,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* Last entry. */ } }, { TST_ISW_REC (eucJP, upper) { - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,0,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last entry. */ } }, diff --git a/localedata/tests-mbwc/dat_iswxdigit.c b/localedata/tests-mbwc/dat_iswxdigit.c index 787bfb7829..ca118e1bc4 100644 --- a/localedata/tests-mbwc/dat_iswxdigit.c +++ b/localedata/tests-mbwc/dat_iswxdigit.c @@ -14,106 +14,106 @@ TST_ISW_LOC (XDIGIT, xdigit) = { { TST_ISW_REC (de, xdigit) { - { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ - { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0x00BB }, { 0,0,1,0 } }, /* >> */ - { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0x00C0 }, { 0,0,1,0 } }, /* A Grave */ - { { 0x00D6 }, { 0,0,1,0 } }, /* O dia */ - { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ - { { 0x00D8 }, { 0,0,1,0 } }, /* O stroke */ - { { 0x00DF }, { 0,0,1,0 } }, /* small Sh */ - { { 0x00E0 }, { 0,0,1,0 } }, /* a grave */ - { { 0x00F6 }, { 0,0,1,0 } }, /* o dia */ - { { 0x00F7 }, { 0,0,1,0 } }, /* division */ - { { 0x00F8 }, { 0,0,1,0 } }, /* o stroke */ - { { 0x00FF }, { 0,0,1,0 } }, /* y dia */ + { { 0x0080 }, { 0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,1,0 } }, /* CTRL */ + { { 0x00A0 }, { 0,1,0 } }, /* NB SPACE */ + { { 0x00A1 }, { 0,1,0 } }, /* UD ! */ + { { 0x00B0 }, { 0,1,0 } }, /* Degree */ + { { 0x00B1 }, { 0,1,0 } }, /* +- sign */ + { { 0x00B2 }, { 0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,1,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,1,0 } }, /* O dia */ + { { 0x00D7 }, { 0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,1,0 } }, /* O stroke */ + { { 0x00DF }, { 0,1,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,1,0 } }, /* a grave */ + { { 0x00F6 }, { 0,1,0 } }, /* o dia */ + { { 0x00F7 }, { 0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,1,0 } }, /* o stroke */ + { { 0x00FF }, { 0,1,0 } }, /* y dia */ { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC( enUS, xdigit ) { - { { WEOF }, { 0,0,1,0 } }, - { { 0x0000 }, { 0,0,1,0 } }, - { { 0x001F }, { 0,0,1,0 } }, - { { 0x0020 }, { 0,0,1,0 } }, - { { 0x0021 }, { 0,0,1,0 } }, - { { 0x002F }, { 0,0,1,0 } }, - { { 0x0030 }, { 0,0,0,0 } }, - { { 0x0039 }, { 0,0,0,0 } }, - { { 0x003A }, { 0,0,1,0 } }, - { { 0x0040 }, { 0,0,1,0 } }, - { { 0x0041 }, { 0,0,0,0 } }, - { { 0x005A }, { 0,0,1,0 } }, - { { 0x005B }, { 0,0,1,0 } }, - { { 0x0060 }, { 0,0,1,0 } }, - { { 0x0061 }, { 0,0,0,0 } }, - { { 0x007A }, { 0,0,1,0 } }, - { { 0x007B }, { 0,0,1,0 } }, - { { 0x007E }, { 0,0,1,0 } }, - { { 0x007F }, { 0,0,1,0 } }, - { { 0x0080 }, { 0,0,1,0 } }, + { { WEOF }, { 0,1,0 } }, + { { 0x0000 }, { 0,1,0 } }, + { { 0x001F }, { 0,1,0 } }, + { { 0x0020 }, { 0,1,0 } }, + { { 0x0021 }, { 0,1,0 } }, + { { 0x002F }, { 0,1,0 } }, + { { 0x0030 }, { 0,0,0 } }, + { { 0x0039 }, { 0,0,0 } }, + { { 0x003A }, { 0,1,0 } }, + { { 0x0040 }, { 0,1,0 } }, + { { 0x0041 }, { 0,0,0 } }, + { { 0x005A }, { 0,1,0 } }, + { { 0x005B }, { 0,1,0 } }, + { { 0x0060 }, { 0,1,0 } }, + { { 0x0061 }, { 0,0,0 } }, + { { 0x007A }, { 0,1,0 } }, + { { 0x007B }, { 0,1,0 } }, + { { 0x007E }, { 0,1,0 } }, + { { 0x007F }, { 0,1,0 } }, + { { 0x0080 }, { 0,1,0 } }, { is_last: 1 } /* Last element. */ } }, { TST_ISW_REC( eucJP, xdigit ) { - { { 0x3000 }, { 0,0,1,0 } }, /* IDEO. SPACE */ - { { 0x3020 }, { 0,0,1,0 } }, /* POSTAL MARK FACE */ - { { 0x3029 }, { 0,0,1,0 } }, /* Hangzhou NUM9 */ - { { 0x302F }, { 0,0,1,0 } }, /* Diacritics(Hangul) */ - { { 0x3037 }, { 0,0,1,0 } }, /* Separator Symbol */ - { { 0x303F }, { 0,0,1,0 } }, /* IDEO. HALF SPACE */ - { { 0x3041 }, { 0,0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,0,1,0 } }, /* HIRAGANA u" */ - { { 0x3099 }, { 0,0,1,0 } }, /* SOUND MARK */ - { { 0x309E }, { 0,0,1,0 } }, /* ITERATION MARK */ - { { 0x30A1 }, { 0,0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,0,1,0 } }, /* KATAKANA wo" */ - { { 0x30FB }, { 0,0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,0,1,0 } }, /* KATAKANA ITERATION */ - { { 0x3191 }, { 0,0,1,0 } }, /* KANBUN REV.MARK */ - { { 0x3243 }, { 0,0,1,0 } }, /* IDEO. MARK (reach) */ - { { 0x32CB }, { 0,0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ - { { 0x32FE }, { 0,0,1,0 } }, /* MARU KATAKANA wo */ - { { 0x33FE }, { 0,0,1,0 } }, /* CJK IDEO.TEL.31th */ - { { 0x4E00 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E05 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x4E07 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4FFF }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9000 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9006 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA5 }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFE4F }, { 0,0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0xFF0F }, { 0,0,1,0 } }, /* FULL SLASH */ - { { 0xFF19 }, { 0,0,1,0 } }, /* FULL 9 */ - { { 0xFF20 }, { 0,0,1,0 } }, /* FULL @ */ - { { 0xFF3A }, { 0,0,1,0 } }, /* FULL Z */ - { { 0xFF40 }, { 0,0,1,0 } }, /* FULL GRAVE ACC. */ - { { 0xFF5A }, { 0,0,1,0 } }, /* FULL z */ - { { 0xFF5E }, { 0,0,1,0 } }, /* FULL ~ (tilde) */ - { { 0xFF61 }, { 0,0,1,0 } }, /* HALF IDEO.STOP. . */ - { { 0xFF65 }, { 0,0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,0,1,0 } }, /* HALF KATA tu */ - { { 0xFF70 }, { 0,0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,0,1,0 } }, /* HALF KATA MI */ + { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ + { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ + { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ + { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ + { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ + { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ + { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ + { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ + { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ + { { 0xFF3A }, { 0,1,0 } }, /* FULL Z */ + { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ + { { 0xFF5A }, { 0,1,0 } }, /* FULL z */ + { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ + { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ + { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_mblen.c b/localedata/tests-mbwc/dat_mblen.c index 7e9ba747fb..ce47c2e402 100644 --- a/localedata/tests-mbwc/dat_mblen.c +++ b/localedata/tests-mbwc/dat_mblen.c @@ -56,17 +56,17 @@ TST_MBLEN tst_mblen_loc [] = { { Tmblen, TST_LOC_de }, { /* 01: a character. */ - { { 1, "\300", USE_MBCURMAX }, { 0, 0, 1, 1 } }, + { { 1, "\300", USE_MBCURMAX }, { 0, 1, 1 } }, /* 02: a character. */ - { { 1, "\309", USE_MBCURMAX }, { 0, 0, 1, 1 } }, + { { 1, "\309", USE_MBCURMAX }, { 0, 1, 1 } }, /* 03: a character + an invalid byte. */ - { { 1, "Z\204", USE_MBCURMAX }, { 0, 0, 1, +1 } }, + { { 1, "Z\204", USE_MBCURMAX }, { 0, 1, +1 } }, /* 04: control/invalid characters. */ - { { 1, "\177\000", USE_MBCURMAX }, { 0, 0, 1, +1 } }, + { { 1, "\177\000", USE_MBCURMAX }, { 0, 1, +1 } }, /* 05: a null string. */ - { { 1, "", USE_MBCURMAX }, { 0, 0, 1, 0 } }, + { { 1, "", USE_MBCURMAX }, { 0, 1, 0 } }, /* 06: a null pointer. */ - { { 0, "", USE_MBCURMAX }, { 0, 0, 0, 0 } }, + { { 0, "", USE_MBCURMAX }, { 0, 0, 0 } }, /* Last element. */ { is_last: 1 } } @@ -75,17 +75,17 @@ TST_MBLEN tst_mblen_loc [] = { { Tmblen, TST_LOC_enUS }, { /* 01: a character. */ - { { 1, "A", USE_MBCURMAX }, { 0, 0, 1, 1 } }, + { { 1, "A", USE_MBCURMAX }, { 0, 1, 1 } }, /* 02: a character. */ - { { 1, "a", USE_MBCURMAX }, { 0, 0, 1, 1 } }, + { { 1, "a", USE_MBCURMAX }, { 0, 1, 1 } }, /* 03: a character + an invalid byte. */ - { { 1, "Z\204", USE_MBCURMAX }, { 0, 0, 1, +1 } }, - /* 04: control/invalid characters. */ - { { 1, "\177\000", USE_MBCURMAX }, { 0, 0, 1, +1 } }, - /* 05: a null string. */ - { { 1, "", USE_MBCURMAX }, { 0, 0, 1, 0 } }, - /* 06: a null pointer. */ - { { 0, "", USE_MBCURMAX }, { 0, 0, 0, 0 } }, + { { 1, "Z\204", USE_MBCURMAX }, { 0, 1, +1 } }, + /* 04: control/invalid characters. */ + { { 1, "\177\000", USE_MBCURMAX }, { 0, 1, +1 } }, + /* 05: a null string. */ + { { 1, "", USE_MBCURMAX }, { 0, 1, 0 } }, + /* 06: a null pointer. */ + { { 0, "", USE_MBCURMAX }, { 0, 0, 0 } }, /* Last element. */ { is_last: 1 } } @@ -94,17 +94,17 @@ TST_MBLEN tst_mblen_loc [] = { { Tmblen, TST_LOC_eucJP }, { /* 01: a character. */ - { { 1, "\264\301", USE_MBCURMAX }, { 0, 0, 1, 2 } }, - /* 02: a character. */ - { { 1, "\216\261", USE_MBCURMAX }, { 0, 0, 1, 2 } }, - /* 03: a character + an invalid byte. */ - { { 1, "\260\241\200", USE_MBCURMAX }, { 0, 0, 1, 2 } }, + { { 1, "\264\301", USE_MBCURMAX }, { 0, 1, 2 } }, + /* 02: a character. */ + { { 1, "\216\261", USE_MBCURMAX }, { 0, 1, 2 } }, + /* 03: a character + an invalid byte. */ + { { 1, "\260\241\200", USE_MBCURMAX }, { 0, 1, 2 } }, /* 04: control/invalid characters. */ - { { 1, "\377\202", USE_MBCURMAX }, { 1, EILSEQ, 1, -1 } }, - /* 05: a null string. */ - { { 1, "", USE_MBCURMAX }, { 0, 0, 1, 0 } }, - /* 06: a null pointer. */ - { { 0, "", USE_MBCURMAX }, { 0, 0, 0, 0 } }, + { { 1, "\377\202", USE_MBCURMAX }, { EILSEQ, 1, -1 } }, + /* 05: a null string. */ + { { 1, "", USE_MBCURMAX }, { 0, 1, 0 } }, + /* 06: a null pointer. */ + { { 0, "", USE_MBCURMAX }, { 0, 0, 0 } }, /* Last element. */ { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c index 8fdef8bf8a..4a69833754 100644 --- a/localedata/tests-mbwc/dat_mbrlen.c +++ b/localedata/tests-mbwc/dat_mbrlen.c @@ -30,9 +30,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, 0, }, - { 1, 0, 1, 0, }, - { 1, 0, 1, 1, }, + { 0, 1, 0, }, + { 0, 1, 0, }, + { 0, 1, 1, }, } } }, @@ -46,9 +46,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, 0, }, - { 1, 0, 1, 1, }, - { 1, 0, 1, 1, }, + { 0, 1, 0, }, + { 0, 1, 1, }, + { 0, 1, 1, }, } } }, @@ -68,9 +68,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, 0, }, - { 1, 0, 1, 1, }, - { 1, 0, 1, 1, }, + { 0, 1, 0, }, + { 0, 1, 1, }, + { 0, 1, 1, }, } } }, @@ -84,9 +84,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, 0, }, - { 1, EILSEQ, 1, -1, }, - { 1, EILSEQ, 1, -1, }, + { 0, 1, 0, }, + { EILSEQ, 1, -1, }, + { EILSEQ, 1, -1, }, } } }, @@ -112,9 +112,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, -2, }, - { 1, 0, 1, 0, }, - { 1, 0, 1, 2, }, + { 0, 1, -2, }, + { 0, 1, 0, }, + { 0, 1, 2, }, } } }, @@ -128,15 +128,15 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, -2, }, + { 0, 1, -2, }, #ifdef SHOJI_IS_RIGHT - { 1, 0, 1, +2, }, + { 0, 1, +2, }, #else /* XXX ISO C explicitly says that the return value does not XXX reflect the bytes contained in the state. */ - { 1, 0, 1, +1, }, + { 0, 1, +1, }, #endif - { 1, 0, 1, 2, }, + { 0, 1, 2, }, } } }, @@ -150,9 +150,9 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 1, 0, 1, 0, }, - { 1, 0, 1, -2, }, - { 1, EILSEQ, 1, -1, }, + { 0, 1, 0, }, + { 0, 1, -2, }, + { EILSEQ, 1, -1, }, } } }, diff --git a/localedata/tests-mbwc/dat_mbrtowc.c b/localedata/tests-mbwc/dat_mbrtowc.c index e8794820b6..375ae17682 100644 --- a/localedata/tests-mbwc/dat_mbrtowc.c +++ b/localedata/tests-mbwc/dat_mbrtowc.c @@ -30,9 +30,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, @@ -46,9 +46,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, @@ -70,9 +70,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, @@ -86,9 +86,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, @@ -108,9 +108,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, @@ -124,9 +124,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, - { 0, 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, + { 0, 1, 1, 0x00C4 }, } } }, diff --git a/localedata/tests-mbwc/dat_mbsrtowcs.c b/localedata/tests-mbwc/dat_mbsrtowcs.c index eddc0607b7..654f309cbb 100644 --- a/localedata/tests-mbwc/dat_mbsrtowcs.c +++ b/localedata/tests-mbwc/dat_mbsrtowcs.c @@ -22,9 +22,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, - { 0,0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, - { 0,0,1,2, { 0x00FC,0x00E4,0x00F6,0x0000 } }, + { 0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, + { 0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, + { 0,1,2, { 0x00FC,0x00E4,0x00F6,0x0000 } }, } } }, @@ -38,9 +38,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,3, { 0x0000 } }, + { 0,1,3, { 0x00FC,0x00E4,0x00F6,0x0000 } }, + { 0,1,0, { 0x0000 } }, + { 0,1,3, { 0x0000 } }, } } }, @@ -63,9 +63,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, } } }, @@ -79,9 +79,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,3, { 0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,0, { 0x0000 } }, + { 0,1,3, { 0x0000 } }, } } }, @@ -104,9 +104,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, - { 0,0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, - { 0,0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, + { 0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, + { 0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, + { 0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, } } }, @@ -120,9 +120,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = { }, { { - { 0,0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,6, { 0x0000 } }, + { 0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, + { 0,1,0, { 0x0000 } }, + { 0,1,6, { 0x0000 } }, } } }, diff --git a/localedata/tests-mbwc/dat_mbstowcs.c b/localedata/tests-mbwc/dat_mbstowcs.c index 4b88fbb8e6..855cca50bb 100644 --- a/localedata/tests-mbwc/dat_mbstowcs.c +++ b/localedata/tests-mbwc/dat_mbstowcs.c @@ -22,9 +22,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, } } }, @@ -38,9 +38,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,3, { 0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,0, { 0x0000 } }, + { 0,1,3, { 0x0000 } }, } } }, @@ -60,9 +60,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,2, { 0x0041,0x0042,0x0043,0x0000 } }, } } }, @@ -76,9 +76,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,3, { 0x0000 } }, + { 0,1,3, { 0x0041,0x0042,0x0043,0x0000 } }, + { 0,1,0, { 0x0000 } }, + { 0,1,3, { 0x0000 } }, } } }, @@ -98,9 +98,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, - { 0,0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, - { 0,0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, + { 0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, + { 0,1,6, { 0x3042,0x3044,0x3046,0x0041,0x0042,0x0043,0x0000 }}, + { 0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, } } }, @@ -124,9 +124,9 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = { }, { { - { 0,0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, - { 0,0,1,0, { 0x0000 } }, - { 0,0,1,6, { 0x0000 } }, + { 0,1,4, { 0x3042,0x3044,0x3046,0x0041,0x0000 } }, + { 0,1,0, { 0x0000 } }, + { 0,1,6, { 0x0000 } }, } } }, diff --git a/localedata/tests-mbwc/dat_mbtowc.c b/localedata/tests-mbwc/dat_mbtowc.c index fc90769e1d..084087f398 100644 --- a/localedata/tests-mbwc/dat_mbtowc.c +++ b/localedata/tests-mbwc/dat_mbtowc.c @@ -76,9 +76,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x00FC }, - { 0, 0, 1, 1, 0x00FC }, - { 0, 0, 1, 1, 0x00FC }, + { 0, 1, 1, 0x00FC }, + { 0, 1, 1, 0x00FC }, + { 0, 1, 1, 0x00FC }, } } }, @@ -92,9 +92,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x007F }, - { 1, 0, 1, 1, 0x0080 }, - { 1, 0, 1, 1, 0x0081 }, + { 0, 1, 1, 0x007F }, + { 0, 1, 1, 0x0080 }, + { 0, 1, 1, 0x0081 }, } } }, @@ -108,9 +108,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 0, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, + { 0, 1, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, } } }, @@ -124,9 +124,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 0, 0x0000 }, } } }, @@ -140,9 +140,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 0, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 0, 0, 0x0000 }, } } }, @@ -162,9 +162,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x0041 }, - { 0, 0, 1, 1, 0x0041 }, - { 0, 0, 1, 1, 0x0041 }, + { 0, 1, 1, 0x0041 }, + { 0, 1, 1, 0x0041 }, + { 0, 1, 1, 0x0041 }, } } }, @@ -178,9 +178,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x007F }, - { 1, EILSEQ, 1, -1, 0x0000 }, - { 1, EILSEQ, 1, -1, 0x0000 }, + { 0, 1, 1, 0x007F }, + { EILSEQ, 1, -1, 0x0000 }, + { EILSEQ, 1, -1, 0x0000 }, } } }, @@ -194,9 +194,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 0, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, + { 0, 1, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, } } }, @@ -210,9 +210,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 0, 0x0000 }, } } }, @@ -226,9 +226,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 1, 1, 0x0000 }, - { 0, 0, 0, 0, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 1, 1, 0x0000 }, + { 0, 0, 0, 0x0000 }, } } }, @@ -249,13 +249,13 @@ TST_MBTOWC tst_mbtowc_loc [] = { { { #ifdef SHOJI_IS_RIGHT - { 1, EILSEQ, 1, -1, 0x0000 }, + { EILSEQ, 1, -1, 0x0000 }, #else /* XXX EILSEQ was introduced in ISO C99. */ - { 0, 0, 1, -1, 0x0000 }, + { 0, 1, -1, 0x0000 }, #endif - { 0, 0, 1, 2, 0x3042 }, - { 0, 0, 1, 2, 0x3042 }, + { 0, 1, 2, 0x3042 }, + { 0, 1, 2, 0x3042 }, } } }, @@ -269,13 +269,13 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, +1, 0x007F }, + { 0, 1, +1, 0x007F }, #ifdef SHOJI_IS_RIGHT - { 1, EILSEQ, 1, -1, 0x0000 }, + { EILSEQ, 1, -1, 0x0000 }, #else - { 0, 0, 1, -1, 0x0000 }, + { 0, 1, -1, 0x0000 }, #endif - { 0, 0, 1, +1, 0x0081 }, + { 0, 1, +1, 0x0081 }, } } }, @@ -289,14 +289,14 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 0, 0x0000 }, + { 0, 1, 0, 0x0000 }, #ifdef SHOJI_IS_RIGHT - { 1, EILSEQ, 1, -1, 0x0000 }, + { EILSEQ, 1, -1, 0x0000 }, #else /* XXX EILSEQ was introduced in ISO C99. */ - { 0, 0, 1, -1, 0x0000 }, + { 0, 1, -1, 0x0000 }, #endif - { 0, 0, 1, 2, 0x0000 }, + { 0, 1, 2, 0x0000 }, } } }, @@ -310,9 +310,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 2, 0x0000 }, - { 0, 0, 1, +1, 0x0000 }, - { 0, 0, 1, 0, 0x0000 }, + { 0, 1, 2, 0x0000 }, + { 0, 1, +1, 0x0000 }, + { 0, 1, 0, 0x0000 }, } } }, @@ -326,9 +326,9 @@ TST_MBTOWC tst_mbtowc_loc [] = { }, { { - { 0, 0, 1, 2, 0x0000 }, - { 0, 0, 1, +1, 0x0000 }, - { 0, 0, 0, 0, 0x0000 }, + { 0, 1, 2, 0x0000 }, + { 0, 1, +1, 0x0000 }, + { 0, 0, 0, 0x0000 }, } } }, diff --git a/localedata/tests-mbwc/dat_strcoll.c b/localedata/tests-mbwc/dat_strcoll.c index 8ef92e4fb9..4afd719e29 100644 --- a/localedata/tests-mbwc/dat_strcoll.c +++ b/localedata/tests-mbwc/dat_strcoll.c @@ -28,31 +28,31 @@ TST_STRCOLL tst_strcoll_loc [] = { { Tstrcoll, TST_LOC_de }, { { /*input.*/ { "ÄBCDEFG", "ÄBCDEFG" }, /* #1 */ - /*expect*/ { 1,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { "XX Ä XX", "XX B XX" }, /* #2 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "XX B XX", "XX Ä XX" }, /* #3 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "B", "a" }, /* #4 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "a", "B" }, /* #5 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "b", "A" }, /* #6 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "A", "b" }, /* #7 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "ä", "B" }, /* #8 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "B", "ä" }, /* #9 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { is_last: 1 } /* Last element. */ } @@ -61,39 +61,39 @@ TST_STRCOLL tst_strcoll_loc [] = { { Tstrcoll, TST_LOC_enUS }, { { /*input.*/ { "ABCDEFG", "ABCDEFG" }, /* #1 */ - /*expect*/ { 1,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { "XX a XX", "XX B XX" }, /* #2 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "XX B XX", "XX a XX" }, /* #3 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /* <WAIVER> */ /*input.*/ { "B", "a" }, /* #4 */ #ifdef SHOJI_IS_RIGHT - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, #else /* XXX We are not testing the C locale. */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, #endif }, { /* <WAIVER> */ /*input.*/ { "a", "B" }, /* #5 */ #ifdef SHOJI_IS_RIGHT - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, #else /* XXX We are not testing the C locale. */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, #endif }, { /*input.*/ { "b", "A" }, /* #6 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "A", "b" }, /* #7 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, #ifdef NO_WAIVER /* XXX I do not yet know whether strcoll really should reject @@ -101,12 +101,12 @@ TST_STRCOLL tst_strcoll_loc [] = { { /* #8 */ /* <WAIVER> */ /*input.*/ { "\244\242\244\244\244\246\244\250\244\252", "ABCDEFG" }, - /*expect*/ { 1,EINVAL,0,0, }, + /*expect*/ { EINVAL,0,0, }, }, { /* #9 */ /* <WAIVER> */ /*input.*/ { "ABCZEFG", "\244\242\244\244\244\246\244\250\244\252" }, - /*expect*/ { 1,EINVAL,0,0, }, + /*expect*/ { EINVAL,0,0, }, }, #endif { is_last: 1 } /* Last element. */ @@ -117,27 +117,27 @@ TST_STRCOLL tst_strcoll_loc [] = { { { /*input.*/ { "\244\242\244\244\244\246\244\250\244\252", "\244\242\244\244\244\246\244\250\244\252" }, /* #1 */ - /*expect*/ { 1,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { "\244\242\244\244\244\246\244\250\244\252", "\244\242\244\244\244\363\244\250\244\252" }, /* #2 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "\244\242\244\244\244\363\244\250\244\252", "\244\242\244\244\244\246\244\250\244\252" }, /* #3 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "B", "a" }, /* #4 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, { /*input.*/ { "a", "B" }, /* #5 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "b", "A" }, /* #6 */ - /*expect*/ { 1,0,0,+1, }, + /*expect*/ { 0,0,+1, }, }, { /*input.*/ { "A", "b" }, /* #7 */ - /*expect*/ { 1,0,0,-1, }, + /*expect*/ { 0,0,-1, }, }, #ifdef NO_WAIVER /* XXX I do not yet know whether strcoll really should reject @@ -145,12 +145,12 @@ TST_STRCOLL tst_strcoll_loc [] = { { /* <WAIVER> */ /*input.*/ { "\200\216\217", "ABCDEFG" }, /* #8 */ - /*expect*/ { 1,EINVAL,0,0, }, + /*expect*/ { EINVAL,0,0, }, }, { /* <WAIVER> */ /*input.*/ { "ABCZEFG", "\200\216\217" }, /* #9 */ - /*expect*/ { 1,EINVAL,0,0, }, + /*expect*/ { EINVAL,0,0, }, }, #endif { is_last: 1 } /* Last element. */ diff --git a/localedata/tests-mbwc/dat_strfmon.c b/localedata/tests-mbwc/dat_strfmon.c index 1252ecfe4e..1e2035375a 100644 --- a/localedata/tests-mbwc/dat_strfmon.c +++ b/localedata/tests-mbwc/dat_strfmon.c @@ -21,77 +21,77 @@ TST_STRFMON tst_strfmon_loc [] = { { /* #01 */ /*inp*/ { 23, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, + /*exp*/ { 0,1,22, "123,00 DM % 123,00 DEM" }, }, { /* #02 */ /*inp*/ { 23, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, + /*exp*/ { 0,1,22, "123,00 DM % 123,00 DEM" }, }, { /* #03 */ /*inp*/ { 22, "%n %% %i", 123.00 }, - /*exp*/ { 1,E2BIG,1,-1, "" }, + /*exp*/ { E2BIG,1,-1, "" }, }, { /* #04 */ /*inp*/ { 30, "%n|%i", 1234.561 }, - /*exp*/ { 1,0,1,24, "1.234,56 DM|1.234,56 DEM" }, + /*exp*/ { 0,1,24, "1.234,56 DM|1.234,56 DEM" }, }, { /* #05 */ /*inp*/ { 32, "%n|%i", -1234.561 }, - /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, + /*exp*/ { 0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, }, { /* #06 */ /*inp*/ { 32, "%12n|%12i", 1234.561 }, - /*exp*/ { 1,0,1,25, " 1.234,56 DM|1.234,56 DEM"}, + /*exp*/ { 0,1,25, " 1.234,56 DM|1.234,56 DEM"}, }, { /* #07 */ /*inp*/ { 32, "%12n|%12i", -1234.561 }, - /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, + /*exp*/ { 0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, }, { /* #08 */ /*inp*/ { 32, "%#5n|%#5i", 1234.561 }, - /*exp*/ { 1,0,1,28, " 1.234,56 DM| 1.234,56 DEM"}, + /*exp*/ { 0,1,28, " 1.234,56 DM| 1.234,56 DEM"}, }, { /* #09 */ /*inp*/ { 32, "%#5n|%#5i", -1234.561 }, - /*exp*/ { 1,0,1,28, "- 1.234,56 DM|- 1.234,56 DEM"}, + /*exp*/ { 0,1,28, "- 1.234,56 DM|- 1.234,56 DEM"}, }, { /* #10 */ /*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 }, - /*exp*/ { 1,0,1,28, " *1.234,56 DM| *1.234,56 DEM"}, + /*exp*/ { 0,1,28, " *1.234,56 DM| *1.234,56 DEM"}, }, { /* #11 */ /*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 }, - /*exp*/ { 1,0,1,28, "-01.234,56 DM|-01.234,56 DEM"}, + /*exp*/ { 0,1,28, "-01.234,56 DM|-01.234,56 DEM"}, }, { /* #12 */ /*inp*/ { 32, "%^#5n|%^#5i", -1234.561 }, - /*exp*/ { 1,0,1,26, "- 1234,56 DM|- 1234,56 DEM"}, + /*exp*/ { 0,1,26, "- 1234,56 DM|- 1234,56 DEM"}, }, { /* #13 */ /*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 }, - /*exp*/ { 1,0,1,22, " 1.234 DM| 1.234 DEM" }, + /*exp*/ { 0,1,22, " 1.234 DM| 1.234 DEM" }, }, { /* #14 */ /*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 }, - /*exp*/ { 1,0,1,27, "- 1.235 DM|- 1.234,5550 DEM"}, + /*exp*/ { 0,1,27, "- 1.235 DM|- 1.234,5550 DEM"}, }, { /* #15 */ /*inp*/ { 32, "%(#5n|%!(#5i", -1234.561 }, - /*exp*/ { 1,0,1,26, "( 1.234,56 DM)|( 1.234,56)"}, + /*exp*/ { 0,1,26, "( 1.234,56 DM)|( 1.234,56)"}, }, { is_last: 1 } } @@ -102,77 +102,77 @@ TST_STRFMON tst_strfmon_loc [] = { { /* #01 */ /*inp*/ { 22, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,20, "$123.00 % USD 123.00" }, + /*exp*/ { 0,1,20, "$123.00 % USD 123.00" }, }, { /* #02 */ /*inp*/ { 21, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,20, "$123.00 % USD 123.00" }, + /*exp*/ { 0,1,20, "$123.00 % USD 123.00" }, }, { /* #03 */ /*inp*/ { 20, "%n %% %i", 123.00 }, - /*exp*/ { 1,E2BIG,1,-1, "" }, + /*exp*/ { E2BIG,1,-1, "" }, }, { /* #04 */ /*inp*/ { 30, "%n|%i", 1234.561 }, - /*exp*/ { 1,0,1,22, "$1,234.56|USD 1,234.56" }, + /*exp*/ { 0,1,22, "$1,234.56|USD 1,234.56" }, }, { /* #05 */ /*inp*/ { 32, "%n|%i", -1234.561 }, - /*exp*/ { 1,0,1,24, "-$1,234.56|-USD 1,234.56" }, + /*exp*/ { 0,1,24, "-$1,234.56|-USD 1,234.56" }, }, { /* #06 */ /*inp*/ { 30, "%12n|%12i", 1234.561 }, - /*exp*/ { 1,0,1,25, " $1,234.56|USD 1,234.56"}, + /*exp*/ { 0,1,25, " $1,234.56|USD 1,234.56"}, }, { /* #07 */ /*inp*/ { 32, "%12n|%12i", -1234.561 }, - /*exp*/ { 1,0,1,26, " -$1,234.56|-USD 1,234.56"}, + /*exp*/ { 0,1,26, " -$1,234.56|-USD 1,234.56"}, }, { /* #08 */ /*inp*/ { 32, "%#5n|%#5i", 1234.561 }, - /*exp*/ { 1,0,1,26, " $ 1,234.56| USD 1,234.56"}, + /*exp*/ { 0,1,26, " $ 1,234.56| USD 1,234.56"}, }, { /* #09 */ /*inp*/ { 32, "%#5n|%#5i", -1234.561 }, - /*exp*/ { 1,0,1,26, "-$ 1,234.56|-USD 1,234.56"}, + /*exp*/ { 0,1,26, "-$ 1,234.56|-USD 1,234.56"}, }, { /* #10 */ /*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 }, - /*exp*/ { 1,0,1,26, " $*1,234.56| USD *1,234.56"}, + /*exp*/ { 0,1,26, " $*1,234.56| USD *1,234.56"}, }, { /* #11 */ /*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 }, - /*exp*/ { 1,0,1,26, "-$01,234.56|-USD 01,234.56"}, + /*exp*/ { 0,1,26, "-$01,234.56|-USD 01,234.56"}, }, { /* #12 */ /*inp*/ { 32, "%^#5n|%^#5i", -1234.561 }, - /*exp*/ { 1,0,1,24, "-$ 1234.56|-USD 1234.56" }, + /*exp*/ { 0,1,24, "-$ 1234.56|-USD 1234.56" }, }, { /* #13 */ /*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 }, - /*exp*/ { 1,0,1,20, " $ 1,234| USD 1,234" }, + /*exp*/ { 0,1,20, " $ 1,234| USD 1,234" }, }, { /* #14 */ /*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 }, - /*exp*/ { 1,0,1,25, "-$ 1,235|-USD 1,234.5550"}, + /*exp*/ { 0,1,25, "-$ 1,235|-USD 1,234.5550"}, }, { /* #15 */ /*inp*/ { 32, "%(#5n|%!(#5i", -1234.561 }, - /*exp*/ { 1,0,1,24, "($ 1,234.56)|( 1,234.56)" }, + /*exp*/ { 0,1,24, "($ 1,234.56)|( 1,234.56)" }, }, { is_last: 1 } } @@ -183,77 +183,77 @@ TST_STRFMON tst_strfmon_loc [] = { { /* #01 */ /*inp*/ { 17, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,15, "\241\357123 % JPY 123" }, + /*exp*/ { 0,1,15, "\241\357123 % JPY 123" }, }, { /* #02 */ /*inp*/ { 16, "%n %% %i", 123.00 }, - /*exp*/ { 1,0,1,15, "\241\357123 % JPY 123" }, + /*exp*/ { 0,1,15, "\241\357123 % JPY 123" }, }, { /* #03 */ /*inp*/ { 15, "%n %% %i", 123.00 }, - /*exp*/ { 1,E2BIG,1,-1, "" }, + /*exp*/ { E2BIG,1,-1, "" }, }, { /* #04 */ /*inp*/ { 30, "%n|%i", 1234.561 }, - /*exp*/ { 1,0,1,17, "\241\3571,235|JPY 1,235" }, + /*exp*/ { 0,1,17, "\241\3571,235|JPY 1,235" }, }, { /* #05 */ /*inp*/ { 32, "%n|%i", -1234.561 }, - /*exp*/ { 1,0,1,19, "\241\357-1,235|JPY -1,235" }, + /*exp*/ { 0,1,19, "\241\357-1,235|JPY -1,235" }, }, { /* #06 */ /*inp*/ { 32, "%12n|%12i", 1234.561 }, - /*exp*/ { 1,0,1,25, " \241\3571,235| JPY 1,235" }, + /*exp*/ { 0,1,25, " \241\3571,235| JPY 1,235" }, }, { /* #07 */ /*inp*/ { 32, "%12n|%12i", -1234.561 }, - /*exp*/ { 1,0,1,25, " \241\357-1,235| JPY -1,235" }, + /*exp*/ { 0,1,25, " \241\357-1,235| JPY -1,235" }, }, { /* #08 */ /*inp*/ { 32, "%#5n|%#5i", 1234.561 }, - /*exp*/ { 1,0,1,21, " \241\357 1,235| JPY 1,235" }, + /*exp*/ { 0,1,21, " \241\357 1,235| JPY 1,235" }, }, { /* #09 */ /*inp*/ { 32, "%#5n|%#5i", -1234.561 }, - /*exp*/ { 1,0,1,21, "\241\357- 1,235|JPY - 1,235" }, + /*exp*/ { 0,1,21, "\241\357- 1,235|JPY - 1,235" }, }, { /* #10 */ /*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 }, - /*exp*/ { 1,0,1,21, " \241\357*1,235| JPY *1,235" }, + /*exp*/ { 0,1,21, " \241\357*1,235| JPY *1,235" }, }, { /* #11 */ /*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 }, - /*exp*/ { 1,0,1,21, "\241\357-01,235|JPY -01,235" }, + /*exp*/ { 0,1,21, "\241\357-01,235|JPY -01,235" }, }, { /* #12 */ /*inp*/ { 32, "%^#5n|%^#5i", -1234.561 }, - /*exp*/ { 1,0,1,19, "\241\357- 1235|JPY - 1235" }, + /*exp*/ { 0,1,19, "\241\357- 1235|JPY - 1235" }, }, { /* #13 */ /*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 }, - /*exp*/ { 1,0,1,21, " \241\357 1,234| JPY 1,234" }, + /*exp*/ { 0,1,21, " \241\357 1,234| JPY 1,234" }, }, { /* #14 */ /*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 }, - /*exp*/ { 1,0,1,26, "\241\357- 1,235|JPY - 1,234.5550"}, + /*exp*/ { 0,1,26, "\241\357- 1,235|JPY - 1,234.5550"}, }, { /* #15 */ /*inp*/ { 32, "%(#5n|%!(#5i", -1234.561 }, - /*exp*/ { 1,0,1,19, "(\241\357 1,235)|( 1,235)" }, + /*exp*/ { 0,1,19, "(\241\357 1,235)|( 1,235)" }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_strxfrm.c b/localedata/tests-mbwc/dat_strxfrm.c index c72db38167..0005f73e46 100644 --- a/localedata/tests-mbwc/dat_strxfrm.c +++ b/localedata/tests-mbwc/dat_strxfrm.c @@ -28,27 +28,27 @@ TST_STRXFRM tst_strxfrm_loc [] = { { Tstrxfrm, TST_LOC_de }, { { /*inp*/ { "\xf6\xc4\xe4\xfc", "\xf6\xc4\xe4\xfc", 17, 17 }, /* #01 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "aA", "Aa", 10, 10 }, /* #02 */ - /*exp*/ { 1,0,0,0 , }, + /*exp*/ { 0,0,0 , }, }, { /*inp*/ { "Aa", "aA", 10, 10 }, /* #03 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "abc", "", 13, 13 }, /* #04 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "a", "B", 7, 7 }, /* #05 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "B", "a", 7, 7 }, /* #06 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /* hiragana == latin1 */ /*inp*/ { "abc", "\244\241\244\242", 13, 9 }, /* #07 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { is_last: 1 } } @@ -57,28 +57,28 @@ TST_STRXFRM tst_strxfrm_loc [] = { { Tstrxfrm, TST_LOC_enUS }, { { /*inp*/ { "abcd", "abcd", 17, 17 }, /* #01 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "aA", "Aa", 10, 10 }, /* #02 */ - /*exp*/ { 1,0,0,0 , }, + /*exp*/ { 0,0,0 , }, }, { /*inp*/ { "Aa", "aA", 10, 10 }, /* #03 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "abc", "", 13, 13 }, /* #04 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "a", "B", 7, 7 }, /* #05 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "B", "a", 7, 7 }, /* #06 */ - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, #ifdef NO_WAIVER { /* <WAIVER> */ /*inp*/ { "abc", "\244\241\244\242", 13, 9 }, /* #07 */ - /*exp*/ { 1,EINVAL,0,0, }, + /*exp*/ { EINVAL,0,0, }, }, #endif { is_last: 1 } @@ -90,22 +90,22 @@ TST_STRXFRM tst_strxfrm_loc [] = { { /* #01 */ /*inp*/ { "\244\242\244\241", "\244\241\244\242", 5, 5 }, - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /* #02 */ /*inp*/ { "\244\241\244\242", "\244\242\244\241", 5, 5 }, - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /* #03 */ /*inp*/ { "\244\242\216\261", "\216\261\244\242", 5, 5 }, - /*exp*/ { 1,0,0,0, }, + /*exp*/ { 0,0,0, }, }, #ifdef NO_WAIVER { /*inp*/ { "AAA", "\216\217", 5, 5 }, /* #04 */ /* <WAIVER> */ - /*exp*/ { 1,EINVAL,0,0, }, + /*exp*/ { EINVAL,0,0, }, }, #endif { is_last: 1 } diff --git a/localedata/tests-mbwc/dat_swscanf.c b/localedata/tests-mbwc/dat_swscanf.c index cce5b336e6..96f6c67c0b 100644 --- a/localedata/tests-mbwc/dat_swscanf.c +++ b/localedata/tests-mbwc/dat_swscanf.c @@ -28,7 +28,9 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%d:%u:%f:%c:%s", 0 }, - { 1,0,1,5, + { /* The fields are: err_val, ret_flag, ret_val, + val_int, val_uns, val_flt, val_c, val_s, val_S. */ + 0,1,5, -1, 2, 3.3, 'ä', "ÄÜ", { 0x0000, }, }, }, @@ -38,7 +40,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%lc", 'C' }, - { 1,0,1,1, + { 0,1,1, 0,0,0,0,"", { 0x00E4, 0x0000 }, }, }, @@ -48,7 +50,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%ls", 'S' }, - { 1,0,1,1, + { 0,1,1, 0,0,0,0,"", { 0x00E4, 0x00C4, 0x0000 }, }, }, @@ -63,7 +65,7 @@ TST_SWSCANF tst_swscanf_loc [] = { 1,EINVAL,1,WEOF, 0,0,0,0,"", { 0x0000 }, #else - { 0,0,1,0, + { 0,1,0, 0,0,0,0,"", { 0x0000 }, #endif }, @@ -84,7 +86,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%d:%u:%f:%c:%s", 0 }, - { 1,0,1,5, + { 0,1,5, -1, 2, 5.43, 'A', "ab", { 0x0000 }, }, }, @@ -95,7 +97,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%C", 'C' }, - { 1,0,1,1, + { 0,1,1, 0,0,0,0,"", { 0x0063, 0x0000 }, }, }, @@ -105,7 +107,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%S", 'S' }, - { 1,0,1,1, + { 0,1,1, 0,0,0,0,"", { 0x0063, 0x0064, 0x0000 }, }, }, @@ -125,7 +127,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%d:%u:%f:%c:%s", 0 }, - { 1,0,1,5, + { 0,1,5, -1, 2, 3.3, 'b', "ab", { 0x0000 } }, }, @@ -135,7 +137,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%ls", 'S' }, - { 1,0,1,1, + { 0,1,1, 0,0,0,0,"", { 0x30A2, 0x30A4, 0x0000 } }, }, @@ -149,7 +151,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, L"%2$d:%1$u:%3$f:%4$c:%5$s", 0 }, - { 1,0,1,5, + { 0,1,5, 0, 1, 3.9, 'a', "cd", { 0x0000 } }, }, @@ -164,7 +166,7 @@ TST_SWSCANF tst_swscanf_loc [] = }, { 0x0001,0x0002,0x0025,0x0053,0x0000 }, 'S' }, - { 1,EILSEQ,1,EOF, + { EILSEQ,1,EOF, 0,0,0,0,"", { 0x0000 } }, }, diff --git a/localedata/tests-mbwc/dat_towctrans.c b/localedata/tests-mbwc/dat_towctrans.c index 1ed53d08cc..9b632c4d20 100644 --- a/localedata/tests-mbwc/dat_towctrans.c +++ b/localedata/tests-mbwc/dat_towctrans.c @@ -39,13 +39,13 @@ TST_TOWCTRANS tst_towctrans_loc [] = { { Ttowctrans, TST_LOC_C }, { #ifdef SHOJI_IS_RIGHT - { { 0x0010, "xxxxxxx" }, { 1,EINVAL,1,0x0010 } }, -#else - { { 0x0010, "xxxxxxx" }, { 1,0, 1,0x0010 } }, -#endif - { { 0x007F, "tolower" }, { 1,0, 1,0x007F } }, - { { 0x0061, "toupper" }, { 1,0, 1,0x0041 } }, - { { 0x0041, "tolower" }, { 1,0, 1,0x0061 } }, + { { 0x0010, "xxxxxxx" }, { EINVAL,1,0x0010 } }, +#else + { { 0x0010, "xxxxxxx" }, { 0, 1,0x0010 } }, +#endif + { { 0x007F, "tolower" }, { 0, 1,0x007F } }, + { { 0x0061, "toupper" }, { 0, 1,0x0041 } }, + { { 0x0041, "tolower" }, { 0, 1,0x0061 } }, { is_last: 1 } } }, @@ -53,37 +53,37 @@ TST_TOWCTRANS tst_towctrans_loc [] = { { Ttowctrans, TST_LOC_de }, { #ifdef SHOJI_IS_RIGHT - { { 0x0010, "tojkata" }, { 1,EINVAL,1,0x0010 } }, -#else - { { 0x0010, "tojkata" }, { 1,0, 1,0x0010 } }, -#endif - { { 0x0080, "tolower" }, { 1,0, 1,0x0080 } }, - { { 0x00EC, "toupper" }, { 1,0, 1,0x00CC } }, - { { 0x00CC, "tolower" }, { 1,0, 1,0x00EC } }, - { is_last: 1 } - } - }, - { - { Ttowctrans, TST_LOC_enUS }, - { -#ifdef SHOJI_IS_RIGHT - { { 0x0010, "xxxxxxx" }, { 1,EINVAL,1,0x0010 } }, -#else - { { 0x0010, "xxxxxxx" }, { 1,0, 1,0x0010 } }, -#endif - { { 0x007F, "tolower" }, { 1,0, 1,0x007F } }, - { { 0x0061, "toupper" }, { 1,0, 1,0x0041 } }, - { { 0x0041, "tolower" }, { 1,0, 1,0x0061 } }, - { is_last: 1 } - } - }, - { + { { 0x0010, "tojkata" }, { EINVAL,1,0x0010 } }, +#else + { { 0x0010, "tojkata" }, { 0, 1,0x0010 } }, +#endif + { { 0x0080, "tolower" }, { 0, 1,0x0080 } }, + { { 0x00EC, "toupper" }, { 0, 1,0x00CC } }, + { { 0x00CC, "tolower" }, { 0, 1,0x00EC } }, + { is_last: 1 } + } + }, + { + { Ttowctrans, TST_LOC_enUS }, + { +#ifdef SHOJI_IS_RIGHT + { { 0x0010, "xxxxxxx" }, { EINVAL,1,0x0010 } }, +#else + { { 0x0010, "xxxxxxx" }, { 0, 1,0x0010 } }, +#endif + { { 0x007F, "tolower" }, { 0, 1,0x007F } }, + { { 0x0061, "toupper" }, { 0, 1,0x0041 } }, + { { 0x0041, "tolower" }, { 0, 1,0x0061 } }, + { is_last: 1 } + } + }, + { { Ttowctrans, TST_LOC_eucJP }, - { - { { 0xFF21, "tolower" }, { 1,0, 1,0xFF41 } }, - { { 0xFF41, "toupper" }, { 1,0, 1,0xFF21 } }, - { { 0x30A1, "tojhira" }, { 1,0, 1,0x3041 } }, - { { 0x3041, "tojkata" }, { 1,0, 1,0x30A1 } }, + { + { { 0xFF21, "tolower" }, { 0, 1,0xFF41 } }, + { { 0xFF41, "toupper" }, { 0, 1,0xFF21 } }, + { { 0x30A1, "tojhira" }, { 0, 1,0x3041 } }, + { { 0x3041, "tojkata" }, { 0, 1,0x30A1 } }, { is_last: 1 } } }, diff --git a/localedata/tests-mbwc/dat_towlower.c b/localedata/tests-mbwc/dat_towlower.c index c5fae1b670..bc80941979 100644 --- a/localedata/tests-mbwc/dat_towlower.c +++ b/localedata/tests-mbwc/dat_towlower.c @@ -14,28 +14,28 @@ TST_TOW_LOC (LOWER, lower) = { { TST_TOW_REC (de, lower) { - { { WEOF }, { 0,0, 1, (wint_t)-1 } }, - { { 0x0080 }, { 0,0, 1, 0x0080 } }, - { { 0x00CC }, { 0,0, 1, 0x00EC } }, - { { 0x00EC }, { 0,0, 1, 0x00EC } }, + { { WEOF }, { 0, 1, (wint_t)-1 } }, + { { 0x0080 }, { 0, 1, 0x0080 } }, + { { 0x00CC }, { 0, 1, 0x00EC } }, + { { 0x00EC }, { 0, 1, 0x00EC } }, { is_last: 1 } /* Last element. */ } }, { TST_TOW_REC (enUS, lower) { - { { WEOF }, { 0,0, 1, (wint_t)-1 } }, - { { 0x007F }, { 0,0, 1, 0x007F } }, - { { 0x0041 }, { 0,0, 1, 0x0061 } }, - { { 0x0061 }, { 0,0, 1, 0x0061 } }, + { { WEOF }, { 0, 1, (wint_t)-1 } }, + { { 0x007F }, { 0, 1, 0x007F } }, + { { 0x0041 }, { 0, 1, 0x0061 } }, + { { 0x0061 }, { 0, 1, 0x0061 } }, { is_last: 1 } /* Last element. */ } }, { TST_TOW_REC (eucJP, lower) { - { { 0x007F }, { 0,0, 1, 0x007F } }, - { { 0x0080 }, { 0,0, 1, 0x0080 } }, - { { 0xFF21 }, { 0,0, 1, 0xFF41 } }, - { { 0xFF41 }, { 0,0, 1, 0xFF41 } }, + { { 0x007F }, { 0, 1, 0x007F } }, + { { 0x0080 }, { 0, 1, 0x0080 } }, + { { 0xFF21 }, { 0, 1, 0xFF41 } }, + { { 0xFF41 }, { 0, 1, 0xFF41 } }, { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_towupper.c b/localedata/tests-mbwc/dat_towupper.c index 74e9dfbdb4..ef706a84ad 100644 --- a/localedata/tests-mbwc/dat_towupper.c +++ b/localedata/tests-mbwc/dat_towupper.c @@ -14,28 +14,28 @@ TST_TOW_LOC (UPPER, upper) = { { TST_TOW_REC (de, upper) { - { { WEOF }, { 0,0, 1, (wint_t)-1 } }, - { { 0x0080 }, { 0,0, 1, 0x0080 } }, - { { 0x00EC }, { 0,0, 1, 0x00CC } }, - { { 0x00CC }, { 0,0, 1, 0x00CC } }, + { { WEOF }, { 0, 1, (wint_t)-1 } }, + { { 0x0080 }, { 0, 1, 0x0080 } }, + { { 0x00EC }, { 0, 1, 0x00CC } }, + { { 0x00CC }, { 0, 1, 0x00CC } }, { is_last: 1 } /* Last element. */ } }, { TST_TOW_REC (enUS, upper) { - { { WEOF }, { 0,0, 1, (wint_t)-1 } }, - { { 0x0080 }, { 0,0, 1, 0x0080 } }, - { { 0x0041 }, { 0,0, 1, 0x0041 } }, - { { 0x0061 }, { 0,0, 1, 0x0041 } }, + { { WEOF }, { 0, 1, (wint_t)-1 } }, + { { 0x0080 }, { 0, 1, 0x0080 } }, + { { 0x0041 }, { 0, 1, 0x0041 } }, + { { 0x0061 }, { 0, 1, 0x0041 } }, { is_last: 1 } /* Last element. */ } }, { TST_TOW_REC (eucJP, upper) { - { { WEOF }, { 0,0, 1, (wint_t)-1 } }, - { { 0x007F }, { 0,0, 1, 0x007F } }, - { { 0xFF41 }, { 0,0, 1, 0xFF21 } }, - { { 0xFF21 }, { 0,0, 1, 0xFF21 } }, + { { WEOF }, { 0, 1, (wint_t)-1 } }, + { { 0x007F }, { 0, 1, 0x007F } }, + { { 0xFF41 }, { 0, 1, 0xFF21 } }, + { { 0xFF21 }, { 0, 1, 0xFF21 } }, { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_wcrtomb.c b/localedata/tests-mbwc/dat_wcrtomb.c index 529232396f..e256363111 100644 --- a/localedata/tests-mbwc/dat_wcrtomb.c +++ b/localedata/tests-mbwc/dat_wcrtomb.c @@ -13,23 +13,23 @@ TST_WCRTOMB tst_wcrtomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x00FC, 0,0 }, - /*expect*/ { 1,0, 1,1, "ü" }, + /*expect*/ { 0, 1,1, "ü" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x00D6, 0,0 }, - /*expect*/ { 1,0, 1,1, "Ö" }, + /*expect*/ { 0, 1,1, "Ö" }, }, /* #03 : error case */ { /*input.*/ { 1, 0xFFA1, 0,0 }, - /*expect*/ { 1, EILSEQ,1,-1, "" }, + /*expect*/ { EILSEQ,1,-1, "" }, }, /* #04 : */ { /*input.*/ { 0, 0x0041, 0,0 }, - /*expect*/ { 1,0, 1,1, "" }, + /*expect*/ { 0, 1,1, "" }, }, /* #05 : */ { /*input.*/ { 0, 0x0092, 0,0 }, - /*expect*/ { 1,0, 1,1, "" }, + /*expect*/ { 0, 1,1, "" }, }, { is_last: 1 } } @@ -39,24 +39,24 @@ TST_WCRTOMB tst_wcrtomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x0041, 0,0 }, - /*expect*/ { 0,0, 1,1, "A" }, + /*expect*/ { 0, 1,1, "A" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x0042, 0,0 }, - /*expect*/ { 0,0, 1,1, "B" }, + /*expect*/ { 0, 1,1, "B" }, }, /* #03 : error case */ /* <WAIVER> x 2 */ { /*input.*/ { 1, 0x0092, 0,0 }, /* assume ascii */ - /*expect*/ { 1, EILSEQ,1,-1, "" }, + /*expect*/ { EILSEQ,1,-1, "" }, }, /* #04 : */ { /*input.*/ { 0, 0x0041, 0,0 }, - /*expect*/ { 1,0, 1,1, "" }, + /*expect*/ { 0, 1,1, "" }, }, /* #05 : */ { /*input.*/ { 0, 0x0092, 0,0 }, - /*expect*/ { 1,0, 1,1, "" }, + /*expect*/ { 0, 1,1, "" }, }, { is_last: 1 } } @@ -66,23 +66,23 @@ TST_WCRTOMB tst_wcrtomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x3042, 0,0 }, - /*expect*/ { 0,0, 1,2, "\244\242" }, + /*expect*/ { 0, 1,2, "\244\242" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x3044, 0,0 }, - /*expect*/ { 0,0, 1,2, "\244\244" }, + /*expect*/ { 0, 1,2, "\244\244" }, }, /* #03 : normal case */ { /*input.*/ { 1, 0x008E, 0,0 }, - /*expect*/ { 1,EILSEQ, 1,-1, "" }, + /*expect*/ { EILSEQ, 1,-1, "" }, }, /* #04 : */ { /*input.*/ { 0, 0x3042, 0,0 }, - /*expect*/ { 1,0, 0,0, "" }, + /*expect*/ { 0, 0,0, "" }, }, /* #05 : */ { /*input.*/ { 0, 0x008E, 0,0 }, - /*expect*/ { 1,0, 0,0, "" }, + /*expect*/ { 0, 0,0, "" }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcscat.c b/localedata/tests-mbwc/dat_wcscat.c index eaca19de18..652504647b 100644 --- a/localedata/tests-mbwc/dat_wcscat.c +++ b/localedata/tests-mbwc/dat_wcscat.c @@ -22,25 +22,25 @@ TST_WCSCAT tst_wcscat_loc [] = { /* 1 */ {{{ 0x00C1,0x00C2,0x0000 }, { 0x00C3,0x00C4,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00C1,0x00C2,0x00C3,0x00C4,0x0000 } }, }, /* 2 */ {{{ 0x0001,0x0002,0x0000 }, { 0x0003,0x0004,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0x0002,0x0003,0x0004,0x0000 } }, }, /* 3 */ {{{ 0x0000 }, { 0x00C3,0x00C4,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00C3,0x00C4,0x0000 } }, }, /* 4 */ {{{ 0x0001,0xFFFF,0x0000 }, { 0x0080,0x0090,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0xFFFF,0x0080,0x0090,0x0000 } }, }, {is_last: 1} @@ -52,25 +52,25 @@ TST_WCSCAT tst_wcscat_loc [] = { /* 1 */ {{{ 0x0041,0x0042,0x0000 }, { 0x0043,0x0044,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0041,0x0042,0x0043,0x0044,0x0000 } }, }, /* 2 */ {{{ 0x0001,0x0002,0x0000 }, { 0x0003,0x0004,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0x0002,0x0003,0x0004,0x0000 } }, }, /* 3 */ {{{ 0x0000 }, { 0x0043,0x0044,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0043,0x0044,0x0000 } }, }, /* 4 */ {{{ 0x0001,0xFFFF,0x0000 }, { 0x0080,0x0090,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0xFFFF,0x0080,0x0090,0x0000 } }, }, {is_last: 1} @@ -82,25 +82,25 @@ TST_WCSCAT tst_wcscat_loc [] = { /* 1 */ {{{ 0x30A2,0x74E0,0x0000 }, { 0xFF71,0x0041,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x30A2,0x74E0,0xFF71,0x0041,0x0000 } }, }, /* 2 */ {{{ 0x0001,0x0002,0x0000 }, { 0x0003,0x0004,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0x0002,0x0003,0x0004,0x0000 } }, }, /* 3 */ {{{ 0x30A2,0xFF71,0x0000 }, { 0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x30A2,0xFF71,0x0000 } }, }, /* 4 */ {{{ 0x0001,0xFFFF,0x0000 }, { 0x0080,0x0090,0x0000 }, }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0001,0xFFFF,0x0080,0x0090,0x0000 } }, }, {is_last: 1} diff --git a/localedata/tests-mbwc/dat_wcschr.c b/localedata/tests-mbwc/dat_wcschr.c index c8d616ae21..78eea8dd83 100644 --- a/localedata/tests-mbwc/dat_wcschr.c +++ b/localedata/tests-mbwc/dat_wcschr.c @@ -11,25 +11,25 @@ TST_WCSCHR tst_wcschr_loc [] = { { { Twcschr, TST_LOC_de }, { { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0x00C0 }, /* #1 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0x00C1 }, /* #2 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0x00C2 }, /* #3 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0x00C3 }, /* #4 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0x0000 }, /* #5 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0000,0x00C2,0x00C3,0x0000 }, 0x00C1 }, /* #6 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x0000,0x00C2,0x00C3,0x0000 }, 0x0000 }, /* #7 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { is_last: 1 } } @@ -37,25 +37,25 @@ TST_WCSCHR tst_wcschr_loc [] = { { { Twcschr, TST_LOC_enUS }, { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 0x0040 }, /* #1 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 0x0041 }, /* #2 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 0x0042 }, /* #3 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 0x0043 }, /* #4 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 0x0000 }, /* #5 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, 0x0041 }, /* #6 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, 0x0000 }, /* #7 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { is_last: 1 } } @@ -63,25 +63,25 @@ TST_WCSCHR tst_wcschr_loc [] = { { { Twcschr, TST_LOC_eucJP }, { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0x3040 }, /* #1 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0x3041 }, /* #2 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0x3042 }, /* #3 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0x3043 }, /* #4 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0x0000 }, /* #5 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, 0x3041 }, /* #6 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, 0x0000 }, /* #7 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0 }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcscmp.c b/localedata/tests-mbwc/dat_wcscmp.c index 72d1c6b641..fba0283ddf 100644 --- a/localedata/tests-mbwc/dat_wcscmp.c +++ b/localedata/tests-mbwc/dat_wcscmp.c @@ -18,35 +18,35 @@ TST_WCSCMP tst_wcscmp_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x00D1,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D3,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D1,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D3,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,0x00D1, }, + /*expect*/ { 0,1,0x00D1, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D1,0x00D3,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,-0x00D1, }, + /*expect*/ { 0,1,-0x00D1, }, }, { /*input.*/ { { 0x00D1,0x00D5,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,-6, }, + /*expect*/ { 0,1,-6, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,-0x00D9, }, + /*expect*/ { 0,1,-0x00D9, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D9,0x0000 }, { 0x00D1,0x00D2,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0x00D9, }, + /*expect*/ { 0,1,0x00D9, }, }, { is_last: 1 } } @@ -56,35 +56,35 @@ TST_WCSCMP tst_wcscmp_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x0041,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0041,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,0x0041, }, + /*expect*/ { 0,1,0x0041, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0041,0x0041,0x0043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,-0x0041, }, + /*expect*/ { 0,1,-0x0041, }, }, { /*input.*/ { { 0x0041,0x0045,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,-6, }, + /*expect*/ { 0,1,-6, }, }, { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,-0x0049, }, + /*expect*/ { 0,1,-0x0049, }, }, { /*input.*/ { { 0x0041,0x0042,0x0049,0x0000 }, { 0x0041,0x0042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0x0049, }, + /*expect*/ { 0,1,0x0049, }, }, { is_last: 1 } } @@ -94,35 +94,35 @@ TST_WCSCMP tst_wcscmp_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x3041,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3041,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,0x3041, }, + /*expect*/ { 0,1,0x3041, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3041,0x3041,0x3043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,-0x3041, }, + /*expect*/ { 0,1,-0x3041, }, }, { /*input.*/ { { 0x3041,0x3045,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,-6, }, + /*expect*/ { 0,1,-6, }, }, { /*input.*/ { { 0x3041,0x3042,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,-0x3049, }, + /*expect*/ { 0,1,-0x3049, }, }, { /*input.*/ { { 0x3041,0x3042,0x3049,0x0000 }, { 0x3041,0x3042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0x3049, }, + /*expect*/ { 0,1,0x3049, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcscoll.c b/localedata/tests-mbwc/dat_wcscoll.c index ffedacab1e..a9ef9abc9e 100644 --- a/localedata/tests-mbwc/dat_wcscoll.c +++ b/localedata/tests-mbwc/dat_wcscoll.c @@ -22,20 +22,20 @@ * if the return value is positive when cmp_flg=+1. * c) When a negative value is expected as a return value, * ...... - * d) When data contains invalid values, set err_flg=1. + * d) When data contains invalid values, set err_val to the expected errno. * Set ret_flg=0 and cmp_flg=0 so that it doesn't compare * the return value with an expected value or doesn't check * the sign of the return value. * * - * ---------------------------------------------------- - * CASE err_flg err_val ret_flg ret_val cmp_flg - * ---------------------------------------------------- - * a) 0 0 1 0 0 - * b) 0 0 0 0 +1 - * c) 0 0 0 0 -1 - * d) 1 EINVAL 0 0 0 - * ---------------------------------------------------- + * ------------------------------------------- + * CASE err_val ret_flg ret_val cmp_flg + * ------------------------------------------- + * a) 0 1 0 0 + * b) 0 0 0 +1 + * c) 0 0 0 -1 + * d) EINVAL 0 0 0 + * ------------------------------------------- */ @@ -45,43 +45,43 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { { /*input.*/ { { 0x00E1,0x00E2,0x00E3,0x0000 }, { 0x00E1,0x00E2,0x00E3,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x0000,0x00E1,0x00E3,0x0000 }, { 0x0000,0x00E2,0x00E3,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x00E1,0x00E1,0x00E3,0x0000 }, { 0x0000,0x00E2,0x00E3,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x0000,0x00E2,0x00E3,0x0000 }, { 0x00E1,0x00E1,0x00E3,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x00E1,0x0042,0x00E3,0x0000 }, { 0x00E1,0x0061,0x00E3,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x00E1,0x0061,0x00E3,0x0000 }, { 0x00E1,0x0042,0x00E3,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x00E1,0x00E2,0x0000 }, { 0x00E1,0x00E2,0x00E9,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x00E1,0x00E2,0x00E9,0x0000 }, { 0x00E1,0x00E2,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x00E1,0x0092,0x00E9,0x0000 }, { 0x00E1,0x008E,0x00E9,0x0000 }, }, /* #9 */ - /*expect*/ { 1,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x00E1,0x008E,0x00E9,0x0000 }, { 0x00E1,0x0092,0x00E9,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { is_last: 1 } } @@ -90,68 +90,68 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x0000,0x0041,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x0041,0x0041,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0041,0x0041,0x0043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, #ifdef SHOJI_IS_RIGHT /* <WAIVER> */ /* assume ascii */ { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0061,0x0043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, /* <WAIVER> */ /* assume ascii */ { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, #else /* XXX Correct order is lowercase before uppercase. */ { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0061,0x0043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, #endif { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0049,0x0000 }, { 0x0041,0x0042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, #ifdef SHOJI_IS_RIGHT { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 }, { 0x0041,0x008E,0x0049,0x0000 }, }, /* #9 */ - /*expect*/ { 1,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 }, { 0x0041,0x0092,0x0049,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, #else /* Do not assume position of character out of range. */ { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 }, { 0x0041,0x008E,0x0049,0x0000 }, }, /* #9 */ - /*expect*/ { 1,0,0,0, 0, }, + /*expect*/ { 0,0,0, 0, }, }, { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 }, { 0x0041,0x0092,0x0049,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,0,0, 0, }, + /*expect*/ { 0,0,0, 0, }, }, #endif { is_last: 1 } @@ -161,43 +161,43 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x0000,0x3041,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, 0, }, + /*expect*/ { 0,1,0, 0, }, }, { /*input.*/ { { 0x3041,0x3041,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3041,0x3041,0x3043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x3041,0x0042,0x3043,0x0000 }, { 0x3041,0x0061,0x3043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x3041,0x0061,0x3043,0x0000 }, { 0x3041,0x0042,0x3043,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x3041,0x3042,0xFF71,0x0000 }, { 0x3041,0x3042,0x30A2,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x3041,0x3042,0x30A2,0x0000 }, { 0x3041,0x3042,0xFF71,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { /*input.*/ { { 0x30FF,0x3092,0x3049,0x0000 }, { 0x3041,0x308E,0x3049,0x0000 }, }, /* #9 */ - /*expect*/ { 0,0,0,0, -1, }, + /*expect*/ { 0,0,0, -1, }, }, { /*input.*/ { { 0x3041,0x308E,0x3049,0x0000 }, { 0x30FF,0x3092,0x3049,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,0,0, +1, }, + /*expect*/ { 0,0,0, +1, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcscpy.c b/localedata/tests-mbwc/dat_wcscpy.c index 94e41754ca..8ae2f1f685 100644 --- a/localedata/tests-mbwc/dat_wcscpy.c +++ b/localedata/tests-mbwc/dat_wcscpy.c @@ -11,27 +11,27 @@ TST_WCSCPY tst_wcscpy_loc [] = { { { Twcscpy, TST_LOC_de }, { { { { 0x00F1,0x00F2,0x00F3,0x0000 }, }, /* 1 */ - { 0,0,0,0, { 0x00F1,0x00F2,0x00F3,0x0000, } }, }, + { 0,0,0, { 0x00F1,0x00F2,0x00F3,0x0000, } }, }, { { { 0x0000,0x00F2,0x00F3,0x0000 }, }, /* 2 */ - { 0,0,0,0, { 0x0000, } }, }, + { 0,0,0, { 0x0000, } }, }, { is_last: 1 } } }, { { Twcscpy, TST_LOC_enUS }, { { { { 0x0041,0x0082,0x0043,0x0000 }, }, /* 1 */ - { 0,0,0,0, { 0x0041,0x0082,0x0043,0x0000, } }, }, + { 0,0,0, { 0x0041,0x0082,0x0043,0x0000, } }, }, { { { 0x0000,0x0082,0x0043,0x0000 }, }, /* 2 */ - { 0,0,0,0, { 0x0000, } }, }, + { 0,0,0, { 0x0000, } }, }, { is_last: 1 } } }, { { Twcscpy, TST_LOC_eucJP }, { { { { 0x3041,0x0092,0x3043,0x0000 }, }, /* 1 */ - { 0,0,0,0, { 0x3041,0x0092,0x3043,0x0000, } }, }, + { 0,0,0, { 0x3041,0x0092,0x3043,0x0000, } }, }, { { { 0x0000,0x0092,0x3043,0x0000 }, }, /* 2 */ - { 0,0,0,0, { 0x0000, } }, }, + { 0,0,0, { 0x0000, } }, }, { is_last: 1 } } }, diff --git a/localedata/tests-mbwc/dat_wcscspn.c b/localedata/tests-mbwc/dat_wcscspn.c index 0b2e1e75e7..ba166f66e1 100644 --- a/localedata/tests-mbwc/dat_wcscspn.c +++ b/localedata/tests-mbwc/dat_wcscspn.c @@ -13,47 +13,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x00D4,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x00D4,0x00D5,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D3,0x0000 }, }, /* #9 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x0000 }, { 0x00D1,0x00D3,0x00D4,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } @@ -62,47 +62,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0044,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0044,0x0045,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0042,0x000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #9 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0043,0x0044,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } @@ -111,47 +111,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x0043,0x0000 }, { 0x3041,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x0043,0x0000 }, { 0x3042,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x3044,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x3044,0x3045,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #9 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x3041,0x3042,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x0000 }, { 0x3041,0x3043,0x3044,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcslen.c b/localedata/tests-mbwc/dat_wcslen.c index 8f3f2d056c..a4c76b9601 100644 --- a/localedata/tests-mbwc/dat_wcslen.c +++ b/localedata/tests-mbwc/dat_wcslen.c @@ -12,7 +12,6 @@ * * a header in each expected data: * - * int err_flg; ... set err_flg=1 to check errno * int err_val; ... expected value for errno * <typ> ret_flg; ... set ret_flg=1 to compare an expected * value with an actual value @@ -25,10 +24,10 @@ TST_WCSLEN tst_wcslen_loc [] = { { { Twcslen, TST_LOC_de }, { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 } }, /* #01 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0000 } }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } @@ -36,10 +35,10 @@ TST_WCSLEN tst_wcslen_loc [] = { { { Twcslen, TST_LOC_enUS }, { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 } }, /* #01 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0000 } }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } @@ -47,10 +46,10 @@ TST_WCSLEN tst_wcslen_loc [] = { { { Twcslen, TST_LOC_eucJP }, { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 } }, /* #01 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0000 } }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsncat.c b/localedata/tests-mbwc/dat_wcsncat.c index 526d800dc0..f9adf9820f 100644 --- a/localedata/tests-mbwc/dat_wcsncat.c +++ b/localedata/tests-mbwc/dat_wcsncat.c @@ -25,37 +25,37 @@ TST_WCSNCAT tst_wcsncat_loc [] = { {{ 0x00D1,0x00D2,0x0000 }, { 0x00D3,0x00D4,0x0000 }, 3 }, /* Expect: */ - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00D1,0x00D2,0x00D3,0x00D4,0x0000 } }, }, /* 2 */ {{{ 0x00D1,0x00D2,0x0000 }, { 0x00D3,0x00D4,0x0000 }, 2 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00D1,0x00D2,0x00D3,0x00D4,0x0000 } }, }, /* 3 */ {{{ 0x00E1,0x00E2,0x0000 }, { 0x00E3,0x00E4,0x0000 }, 1 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00E1,0x00E2,0x00E3,0x0000 } }, }, /* 4 */ {{{ 0x00E1,0x00E2,0x0000 }, { 0x00E3,0x00E4,0x0000 }, 0 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00E1,0x00E2,0x0000 } }, }, /* 5 */ {{{ 0x0000 }, { 0x00D3,0x00D4,0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00D3,0x00D4,0x0000 } }, }, /* 6 */ {{{ 0x00E1,0x00E2,0x0000 }, { 0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x00E1,0x00E2,0x0000 } }, }, {is_last: 1} @@ -70,37 +70,37 @@ TST_WCSNCAT tst_wcsncat_loc [] = { {{ 0x0041,0x0042,0x0000 }, { 0x0043,0x0044,0x0000 }, 3 }, /* Expect: */ - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0041,0x0042,0x0043,0x0044,0x0000 } }, }, /* 2 */ {{{ 0x0041,0x0042,0x0000 }, { 0x0043,0x0044,0x0000 }, 2 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0041,0x0042,0x0043,0x0044,0x0000 } }, }, /* 3 */ {{{ 0x0051,0x0052,0x0000 }, { 0x0053,0x0054,0x0000 }, 1 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0051,0x0052,0x0053,0x0000 } }, }, /* 4 */ {{{ 0x0051,0x0052,0x0000 }, { 0x0053,0x0054,0x0000 }, 0 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0051,0x0052,0x0000 } }, }, /* 5 */ {{{ 0x0000 }, { 0x0043,0x0044,0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0043,0x0044,0x0000 } }, }, /* 6 */ {{{ 0x0051,0x0052,0x0000 }, { 0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x0051,0x0052,0x0000 } }, }, {is_last: 1} @@ -112,37 +112,37 @@ TST_WCSNCAT tst_wcsncat_loc [] = { /* 1 */ {{{ 0x3041,0x3042,0x0000 }, { 0x3043,0x3044,0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x3041,0x3042,0x3043,0x3044,0x0000 } }, }, /* 2 */ {{{ 0x30A2,0x30A3,0x0000 }, { 0xFF71,0xFF72,0x0000 }, 2 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x30A2,0x30A3,0xFF71,0xFF72,0x0000 } }, }, /* 3 */ {{{ 0x3051,0x3052,0x0000 }, { 0x3053,0x3054,0x0000 }, 1 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x3051,0x3052,0x3053,0x0000 } }, }, /* 4 */ {{{ 0x3051,0x3052,0x0000 }, { 0x3053,0x3054,0x0000 }, 0 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x3051,0x3052,0x0000 } }, }, /* 5 */ {{{ 0x0000 }, { 0x3043,0x3044,0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x3043,0x3044,0x0000 } }, }, /* 6 */ {{{ 0x3051,0x3052,0x0000 }, { 0x0000 }, 3 }, - { 0, 0, 0, 0, + { 0, 0, 0, { 0x3051,0x3052,0x0000 } }, }, {is_last: 1} diff --git a/localedata/tests-mbwc/dat_wcsncmp.c b/localedata/tests-mbwc/dat_wcsncmp.c index 4e0b0c2ac1..1d5d248e1d 100644 --- a/localedata/tests-mbwc/dat_wcsncmp.c +++ b/localedata/tests-mbwc/dat_wcsncmp.c @@ -13,39 +13,39 @@ TST_WCSNCMP tst_wcsncmp_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, 4 }, /* #01 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, 3 }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D1,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, 2 }, /* #03 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D0,0x00D2,0x00D3,0x0000 }, 0 }, /* #04 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D1,0x0000 }, 3 }, /* #05 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D3,0x0000 }, 3 }, /* #06 */ - /*expect*/ { 0,0,1,0x00D1, }, + /*expect*/ { 0,1,0x00D1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, 2 }, /* #07 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, 3 }, /* #08 */ - /*expect*/ { 0,0,1,-0x0006, }, + /*expect*/ { 0,1,-0x0006, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x0000 }, 4 }, /* #09 */ - /*expect*/ { 0,0,1,0x00D3, }, + /*expect*/ { 0,1,0x00D3, }, }, { is_last: 1 } } @@ -55,39 +55,39 @@ TST_WCSNCMP tst_wcsncmp_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, 4 }, /* #01 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, 3 }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0041,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, 2 }, /* #03 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0040,0x0042,0x0043,0x0000 }, 0 }, /* #04 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0000,0x0042,0x0041,0x0000 }, 3 }, /* #05 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, 3 }, /* #06 */ - /*expect*/ { 0,0,1,0x0041, }, + /*expect*/ { 0,1,0x0041, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, 2 }, /* #07 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, 3 }, /* #08 */ - /*expect*/ { 0,0,1,-0x0006, }, + /*expect*/ { 0,1,-0x0006, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0000 }, 4 }, /* #09 */ - /*expect*/ { 0,0,1,0x0043, }, + /*expect*/ { 0,1,0x0043, }, }, { is_last: 1 } } @@ -97,39 +97,39 @@ TST_WCSNCMP tst_wcsncmp_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, 4 }, /* #01 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, 3 }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3041,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, 2 }, /* #03 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3040,0x3042,0x3043,0x0000 }, 0 }, /* #04 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x0000,0x3042,0x3041,0x0000 }, 3 }, /* #05 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, 3 }, /* #06 */ - /*expect*/ { 0,0,1,0x3041, }, + /*expect*/ { 0,1,0x3041, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, 2 }, /* #07 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, 3 }, /* #08 */ - /*expect*/ { 0,0,1,-0x0006, }, + /*expect*/ { 0,1,-0x0006, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x0000 }, 4 }, /* #09 */ - /*expect*/ { 0,0,1,0x3043, }, + /*expect*/ { 0,1,0x3043, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsncpy.c b/localedata/tests-mbwc/dat_wcsncpy.c index 6146b7e7f3..9677a519c8 100644 --- a/localedata/tests-mbwc/dat_wcsncpy.c +++ b/localedata/tests-mbwc/dat_wcsncpy.c @@ -24,27 +24,27 @@ TST_WCSNCPY tst_wcsncpy_loc [] = { { /* 1 */ {{ { 0x00D1,0x00D2,0x00D3,0x0000 }, 6 }, - { 0,0,0,0, { 0x00D1,0x00D2,0x00D3,0x0000,0x0000,0x0000,0x0000 } }, + { 0,0,0, { 0x00D1,0x00D2,0x00D3,0x0000,0x0000,0x0000,0x0000 } }, }, /* 2 */ {{ { 0x00D1,0x00D2,0x00D3,0x0000 }, 5 }, - { 0,0,0,0, { 0x00D1,0x00D2,0x00D3,0x0000,0x0000,0x9999,0x0000 } }, + { 0,0,0, { 0x00D1,0x00D2,0x00D3,0x0000,0x0000,0x9999,0x0000 } }, }, /* 3 */ {{ { 0x00D1,0x00D2,0x00D3,0x0000 }, 3 }, - { 0,0,0,0, { 0x00D1,0x00D2,0x00D3,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x00D1,0x00D2,0x00D3,0x9999,0x9999,0x9999,0x0000 } }, }, /* 4 */ {{ { 0x00D1,0x00D2,0x00D3,0x0000 }, 2 }, - { 0,0,0,0, { 0x00D1,0x00D2,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x00D1,0x00D2,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 5 */ {{ { 0x00D1,0x00D2,0x00D3,0x0000 }, 0 }, - { 0,0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 6 */ {{ { 0x0000,0x00D2,0x00D3,0x0000 }, 3 }, - { 0,0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, }, {is_last: 1} } @@ -54,27 +54,27 @@ TST_WCSNCPY tst_wcsncpy_loc [] = { { /* 1 */ {{ { 0x0041,0x0042,0x0043,0x0000 }, 6 }, - { 0,0,0,0, { 0x0041,0x0042,0x0043,0x0000,0x0000,0x0000,0x0000 } }, + { 0,0,0, { 0x0041,0x0042,0x0043,0x0000,0x0000,0x0000,0x0000 } }, }, /* 2 */ {{ { 0x0041,0x0042,0x0043,0x0000 }, 5 }, - { 0,0,0,0, { 0x0041,0x0042,0x0043,0x0000,0x0000,0x9999,0x0000 } }, + { 0,0,0, { 0x0041,0x0042,0x0043,0x0000,0x0000,0x9999,0x0000 } }, }, /* 3 */ {{ { 0x0041,0x0042,0x0043,0x0000 }, 3 }, - { 0,0,0,0, { 0x0041,0x0042,0x0043,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x0041,0x0042,0x0043,0x9999,0x9999,0x9999,0x0000 } }, }, /* 4 */ {{ { 0x0041,0x0042,0x0043,0x0000 }, 2 }, - { 0,0,0,0, { 0x0041,0x0042,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x0041,0x0042,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 5 */ {{ { 0x0041,0x0042,0x0043,0x0000 }, 0 }, - { 0,0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 6 */ {{ { 0x0000,0x0042,0x0043,0x0000 }, 3 }, - { 0,0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, }, {is_last: 1} } @@ -84,27 +84,27 @@ TST_WCSNCPY tst_wcsncpy_loc [] = { { /* 1 */ {{ { 0x3041,0x3042,0x3043,0x0000 }, 6 }, - { 0,0,0,0, { 0x3041,0x3042,0x3043,0x0000,0x0000,0x0000,0x0000 } }, + { 0,0,0, { 0x3041,0x3042,0x3043,0x0000,0x0000,0x0000,0x0000 } }, }, /* 2 */ {{ { 0x3041,0x3042,0x3043,0x0000 }, 5 }, - { 0,0,0,0, { 0x3041,0x3042,0x3043,0x0000,0x0000,0x9999,0x0000 } }, + { 0,0,0, { 0x3041,0x3042,0x3043,0x0000,0x0000,0x9999,0x0000 } }, }, /* 3 */ {{ { 0x3041,0x3042,0x3043,0x0000 }, 3 }, - { 0,0,0,0, { 0x3041,0x3042,0x3043,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x3041,0x3042,0x3043,0x9999,0x9999,0x9999,0x0000 } }, }, /* 4 */ {{ { 0x3041,0x3042,0x3043,0x0000 }, 2 }, - { 0,0,0,0, { 0x3041,0x3042,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x3041,0x3042,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 5 */ {{ { 0x3041,0x3042,0x3043,0x0000 }, 0 }, - { 0,0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x9999,0x9999,0x9999,0x9999,0x9999,0x9999,0x0000 } }, }, /* 6 */ {{ { 0x0000,0x3042,0x3043,0x0000 }, 3 }, - { 0,0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, + { 0,0,0, { 0x0000,0x0000,0x0000,0x9999,0x9999,0x9999,0x0000 } }, }, {is_last: 1} } diff --git a/localedata/tests-mbwc/dat_wcspbrk.c b/localedata/tests-mbwc/dat_wcspbrk.c index f6b6ec6ce6..355313aae6 100644 --- a/localedata/tests-mbwc/dat_wcspbrk.c +++ b/localedata/tests-mbwc/dat_wcspbrk.c @@ -21,47 +21,47 @@ TST_WCSPBRK tst_wcspbrk_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, 0x00D1 }, + /*expect*/ { 0,0,0, 0x00D1 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, 0x00D2 }, + /*expect*/ { 0,0,0, 0x00D2 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, 0x00D3 }, + /*expect*/ { 0,0,0, 0x00D3 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, 0x00D1 }, + /*expect*/ { 0,0,0, 0x00D1 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, 0x00D2 }, + /*expect*/ { 0,0,0, 0x00D2 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, 0x00D1 }, + /*expect*/ { 0,0,0, 0x00D1 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D0,0x00D4,0x00D5,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D5,0x00D0,0x00D4,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { is_last: 1 } } @@ -71,47 +71,47 @@ TST_WCSPBRK tst_wcspbrk_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, 0x0041 }, + /*expect*/ { 0,0,0, 0x0041 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, 0x0042 }, + /*expect*/ { 0,0,0, 0x0042 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, 0x0043 }, + /*expect*/ { 0,0,0, 0x0043 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, 0x0041 }, + /*expect*/ { 0,0,0, 0x0041 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, 0x0042 }, + /*expect*/ { 0,0,0, 0x0042 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, 0x0041 }, + /*expect*/ { 0,0,0, 0x0041 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0040,0x0044,0x0045,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0045,0x0040,0x0044,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { is_last: 1 } } @@ -121,47 +121,47 @@ TST_WCSPBRK tst_wcspbrk_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, 0x3041 }, + /*expect*/ { 0,0,0, 0x3041 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, 0x3042 }, + /*expect*/ { 0,0,0, 0x3042 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, 0x3043 }, + /*expect*/ { 0,0,0, 0x3043 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, 0x3041 }, + /*expect*/ { 0,0,0, 0x3041 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, 0x3042 }, + /*expect*/ { 0,0,0, 0x3042 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, 0x3041 }, + /*expect*/ { 0,0,0, 0x3041 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x3044,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,0,0, 0x3042 }, + /*expect*/ { 0,0,0, 0x3042 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3040,0x3041,0x3042,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,0,0, 0x3041 }, + /*expect*/ { 0,0,0, 0x3041 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3041,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, 0x0000 }, + /*expect*/ { 0,1,(wchar_t *)NULL, 0x0000 }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsrtombs.c b/localedata/tests-mbwc/dat_wcsrtombs.c index 181cfff4e0..c3812cafee 100644 --- a/localedata/tests-mbwc/dat_wcsrtombs.c +++ b/localedata/tests-mbwc/dat_wcsrtombs.c @@ -22,58 +22,58 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = { { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 0, 0, 0}, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1, 0, 0 }, - /*expect*/ { 1,0,1,1, "Ä" }, + /*expect*/ { 0,1,1, "Ä" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,0,1,2, "ÄÖ" }, + /*expect*/ { 0,1,2, "ÄÖ" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3, 0, 0 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4, 0, 0 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 0, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } @@ -83,58 +83,58 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = { { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 0, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 1, 0, 0 }, - /*expect*/ { 1,0,1,1, "A" }, + /*expect*/ { 0,1,1, "A" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,0,1,2, "AB" }, + /*expect*/ { 0,1,2, "AB" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 3, 0, 0 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 4, 0, 0 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 0, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 1, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } @@ -145,58 +145,58 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 0, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,0,1,2, "\244\242" }, + /*expect*/ { 0,1,2, "\244\242" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 4, 0, 0 }, - /*expect*/ { 1,0,1,4, "\244\242\244\244" }, + /*expect*/ { 0,1,4, "\244\242\244\244" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 6, 0, 0 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 7, 0, 0 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 8, 0, 0 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,-1, "" }, + /*expect*/ { EILSEQ,1,-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 0, 0, 0 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 1, 0, 0 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 8, 0, 0 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5, 0, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsspn.c b/localedata/tests-mbwc/dat_wcsspn.c index 8daff4b88f..6a99262db6 100644 --- a/localedata/tests-mbwc/dat_wcsspn.c +++ b/localedata/tests-mbwc/dat_wcsspn.c @@ -12,51 +12,51 @@ TST_WCSSPN tst_wcsspn_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D4,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x00D4,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x0000,0x00D2,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x0000,0x00D2,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D1,0x0000 }, }, /* #12 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { is_last: 1 } } @@ -66,51 +66,51 @@ TST_WCSSPN tst_wcsspn_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0044,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0044,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0042,0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0000,0x0042,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0000,0x0042,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0041,0x0000 }, }, /* #12 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { is_last: 1 } } @@ -120,51 +120,51 @@ TST_WCSSPN tst_wcsspn_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x0000 }, }, /* #1 */ - /*expect*/ { 0,0,1,1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x0000 }, }, /* #2 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3044,0x0000 }, }, /* #4 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x3044,0x0000 }, }, /* #6 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #7 */ - /*expect*/ { 0,0,1,3, }, + /*expect*/ { 0,1,3, }, }, { /*input.*/ { { 0x3041,0x3042,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #8 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3042,0x0000 }, }, /* #9 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x0000,0x3042,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x0000,0x3042,0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,1,0, }, + /*expect*/ { 0,1,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3041,0x0000 }, }, /* #12 */ - /*expect*/ { 0,0,1,2, }, + /*expect*/ { 0,1,2, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsstr.c b/localedata/tests-mbwc/dat_wcsstr.c index e214182c79..e40be35226 100644 --- a/localedata/tests-mbwc/dat_wcsstr.c +++ b/localedata/tests-mbwc/dat_wcsstr.c @@ -20,47 +20,47 @@ TST_WCSSTR tst_wcsstr_loc [] = { { { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D3,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D2,0x00D3,0x00D4,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D0,0x00D1,0x00D2,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { is_last: 1 } } @@ -70,47 +70,47 @@ TST_WCSSTR tst_wcsstr_loc [] = { { { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0043,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0042,0x0043,0x0044,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0040,0x0041,0x0042,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0041,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { is_last: 1 } } @@ -120,47 +120,47 @@ TST_WCSSTR tst_wcsstr_loc [] = { { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x0000 }, }, /* #01 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x0000 }, }, /* #02 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3043,0x0000 }, }, /* #03 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x0000 }, }, /* #04 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x0000 }, }, /* #05 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #06 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3042,0x3043,0x3044,0x0000 }, }, /* #07 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3040,0x3041,0x3042,0x0000 }, }, /* #08 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x0000 }, }, /* #09 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3041,0x0000 }, }, /* #10 */ - /*expect*/ { 0,0,1,(wchar_t *)NULL, }, + /*expect*/ { 0,1,(wchar_t *)NULL, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x0000 }, }, /* #11 */ - /*expect*/ { 0,0,0,0, }, + /*expect*/ { 0,0,0, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcstod.c b/localedata/tests-mbwc/dat_wcstod.c index f677603de6..5de59f0b5a 100644 --- a/localedata/tests-mbwc/dat_wcstod.c +++ b/localedata/tests-mbwc/dat_wcstod.c @@ -23,14 +23,14 @@ TST_WCSTOD tst_wcstod_loc [] = { /*I*/ {{ 0x0030,0x0030,0x0030,0x002C,0x0030,0x0030,0x0030,0x0030,0x0000 }}, /*E*/ - { 0,0,1,0.0, 0.0, 0x0000 } + { 0,1,0.0, 0.0, 0x0000 } }, { /*02*/ /*I*/ {{ 0x0031,0x0032,0x0033,0x002C,0x0034,0x0035,0x0036,0x0040,0x0000 }}, /*E*/ - { 0,0,1,123.456, 123.456, 0x0040 } + { 0,1,123.456, 123.456, 0x0040 } }, { is_last: 1 } } @@ -43,14 +43,14 @@ TST_WCSTOD tst_wcstod_loc [] = { /*I*/ {{ 0x0030,0x0030,0x0030,0x002E,0x0030,0x0030,0x0030,0x0030,0x0000 }}, /*E*/ - { 0,0,1,0.0, 0.0, 0x0000 } + { 0,1,0.0, 0.0, 0x0000 } }, { /*02*/ /*I*/ {{ 0x0031,0x0032,0x0033,0x002E,0x0034,0x0035,0x0036,0x0040,0x0000 }}, /*E*/ - { 0,0,1,123.456, 123.456, 0x0040 } + { 0,1,123.456, 123.456, 0x0040 } }, { is_last: 1 } } @@ -63,7 +63,7 @@ TST_WCSTOD tst_wcstod_loc [] = { /*I*/ {{ 0x0031,0x0032,0x0033,0x002E,0x0034,0x0035,0x0036,0x0040,0x0000 }}, /*E*/ - { 0,0,1,123.456, 123.456, 0x0040 } + { 0,1,123.456, 123.456, 0x0040 } }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcstok.c b/localedata/tests-mbwc/dat_wcstok.c index 8c6dfb0897..d9b50264bd 100644 --- a/localedata/tests-mbwc/dat_wcstok.c +++ b/localedata/tests-mbwc/dat_wcstok.c @@ -39,13 +39,13 @@ TST_WCSTOK tst_wcstok_loc [] = { }, { { - { 0,0, 0,0, + { 0, 0,0, { 0x00D1,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x00D4,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x00D6,0x00D7,0x00D8,0x00D9,0x0000 } }, } @@ -76,13 +76,13 @@ TST_WCSTOK tst_wcstok_loc [] = { }, { { - { 0,0, 0,0, + { 0, 0,0, { 0x0041,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x0044,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x0046,0x0047,0x0048,0x0049,0x0000 } }, } @@ -113,13 +113,13 @@ TST_WCSTOK tst_wcstok_loc [] = { }, { { - { 0,0, 0,0, + { 0, 0,0, { 0x0041,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x0044,0x0000 } }, - { 0,0, 0,0, + { 0, 0,0, { 0x0046,0x0047,0x0048,0x0049,0x0000 } }, } diff --git a/localedata/tests-mbwc/dat_wcstombs.c b/localedata/tests-mbwc/dat_wcstombs.c index 0f136b0897..4a7de0b725 100644 --- a/localedata/tests-mbwc/dat_wcstombs.c +++ b/localedata/tests-mbwc/dat_wcstombs.c @@ -21,58 +21,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = { { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 }, - /*expect*/ { 1,0,1,1, "Ä" }, + /*expect*/ { 0,1,1, "Ä" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2 }, - /*expect*/ { 1,0,1,2, "ÄÖ" }, + /*expect*/ { 0,1,2, "ÄÖ" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 }, - /*expect*/ { 1,0,1,3, "ÄÖÜ" }, + /*expect*/ { 0,1,3, "ÄÖÜ" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } @@ -82,58 +82,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = { { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x00C4,0x0042,0x0043,0x0000 }, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 1 }, - /*expect*/ { 1,0,1,1, "A" }, + /*expect*/ { 0,1,1, "A" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 2 }, - /*expect*/ { 1,0,1,2, "AB" }, + /*expect*/ { 0,1,2, "AB" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 3 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 4 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x0041,0x0042,0x0043,0x0000 }, 5 }, - /*expect*/ { 1,0,1,3, "ABC" }, + /*expect*/ { 0,1,3, "ABC" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 0 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 1 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0041,0x0042,0x0043,0x0000 }, 5 }, - /*expect*/ { 1,0,1,3, "" }, + /*expect*/ { 0,1,3, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5, }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } @@ -144,58 +144,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = { /* #01 : Any chars including a null char should not be stored in s. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 0 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #02 : Only one chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 2 }, - /*expect*/ { 1,0,1,2, "\244\242" }, + /*expect*/ { 0,1,2, "\244\242" }, }, /* #03 : Only two chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 4 }, - /*expect*/ { 1,0,1,4, "\244\242\244\244" }, + /*expect*/ { 0,1,4, "\244\242\244\244" }, }, /* #04 : Only three chars should be stored in s. No null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 6 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #05 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 7 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #06 : Only three chars should be stored in s with a null termination. */ { /*input.*/ { 1,1, { 0x3042,0x3044,0xFF73,0x0000 }, 8 }, - /*expect*/ { 1,0,1,6, "\244\242\244\244\216\263" }, + /*expect*/ { 0,1,6, "\244\242\244\244\216\263" }, }, /* #07 : Invalid mb sequence. No chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2 }, - /*expect*/ { 1,EILSEQ,1,-1, "" }, + /*expect*/ { EILSEQ,1,-1, "" }, }, /* #08 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 0 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #09 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 1 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #10 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x3042,0x3044,0xFF73,0x0000 }, 8 }, - /*expect*/ { 1,0,1,6, "" }, + /*expect*/ { 0,1,6, "" }, }, /* #11 : s is a null pointer. No chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0201,0x0221,0x0000,0x0000 }, 5 }, - /*expect*/ { 1,EILSEQ,1,(size_t)-1, "" }, + /*expect*/ { EILSEQ,1,(size_t)-1, "" }, }, /* #12 : ws is a null wc string, no chars should be stored in s. */ { /*input.*/ { 1,1, { 0x0000 }, 5 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, /* #13 : s is a null pointer, no chars should be stored in s. */ { /*input.*/ { 0,1, { 0x0000 }, 5 }, - /*expect*/ { 1,0,1,0, "" }, + /*expect*/ { 0,1,0, "" }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcswidth.c b/localedata/tests-mbwc/dat_wcswidth.c index a1c7076e60..fd426ef2c1 100644 --- a/localedata/tests-mbwc/dat_wcswidth.c +++ b/localedata/tests-mbwc/dat_wcswidth.c @@ -11,64 +11,64 @@ TST_WCSWIDTH tst_wcswidth_loc [] = { { Twcswidth, TST_LOC_de }, { { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 0 }, /* 01 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 1 }, /* 02 */ - /*expect*/ { 0,0,1,1 }, + /*expect*/ { 0,1,1 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 2 }, /* 03 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 3 }, /* 04 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 }, 4 }, /* 05 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, { /*input.*/ { { 0x0000 }, 1 }, /* 06 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x00C1,0x0001,0x0000 }, 2 }, /* 07 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x0001,0x0000 }, 1 }, /* 08 */ - /*expect*/ { 0,0,1,1 }, + /*expect*/ { 0,1,1 }, }, { /*input.*/ { { 0x00C1,0x0001,0x0000 }, 2 }, /* 09 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x0092,0x0000 }, 2 }, /* 10 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x0020,0x0000 }, 2 }, /* 11 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x0021,0x0000 }, 2 }, /* 12 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x007E,0x0000 }, 2 }, /* 13 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x007F,0x0000 }, 2 }, /* 14 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x0080,0x0000 }, 2 }, /* 15 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x00A0,0x0000 }, 2 }, /* 16 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x00A1,0x0000 }, 2 }, /* 17 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x00FF,0x0000 }, 2 }, /* 18 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x00C1,0x3042,0x0000 }, 2 }, /* 19 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x00C1,0x3044,0x0000 }, 2 }, /* 20 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { is_last: 1 } } @@ -77,82 +77,82 @@ TST_WCSWIDTH tst_wcswidth_loc [] = { { Twcswidth, TST_LOC_enUS }, { { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 0 }, /* 01 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 1 }, /* 02 */ - /*expect*/ { 0,0,1,1 }, + /*expect*/ { 0,1,1 }, }, { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 2 }, /* 03 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, #ifdef SHOJI_IS_RIGHT { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 3 }, /* 04 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 4 }, /* 05 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, #else { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 }, 3 }, /* 04 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, 4 }, /* 05 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, #endif { /*input.*/ { { 0x0000 }, 1 }, /* 06 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x0041,0x0001,0x0000 }, 2 }, /* 07 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0001,0x0000 }, 1 }, /* 08 */ - /*expect*/ { 0,0,1,1 }, + /*expect*/ { 0,1,1 }, }, { /*input.*/ { { 0x0041,0x0001,0x0000 }, 2 }, /* 09 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0092,0x0000 }, 2 }, /* 10 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0020,0x0000 }, 2 }, /* 11 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x0021,0x0000 }, 2 }, /* 12 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x007E,0x0000 }, 2 }, /* 13 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x007F,0x0000 }, 2 }, /* 14 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0080,0x0000 }, 2 }, /* 15 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x00A0,0x0000 }, 2 }, /* 16 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, #ifdef SHOJI_IS_RIGHT { /*input.*/ { { 0x0041,0x00A1,0x0000 }, 2 }, /* 17 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x00FF,0x0000 }, 2 }, /* 18 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, #else { /*input.*/ { { 0x0041,0x007E,0x0000 }, 2 }, /* 17 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x0020,0x0000 }, 2 }, /* 18 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, #endif { /*input.*/ { { 0x0041,0x3042,0x0000 }, 2 }, /* 19 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x3044,0x0000 }, 2 }, /* 20 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { is_last: 1 } } @@ -161,72 +161,72 @@ TST_WCSWIDTH tst_wcswidth_loc [] = { { Twcswidth, TST_LOC_eucJP }, { { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 0 }, /* 01 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 1 }, /* 02 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 2 }, /* 03 */ - /*expect*/ { 0,0,1,4 }, + /*expect*/ { 0,1,4 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 3 }, /* 04 */ - /*expect*/ { 0,0,1,6 }, + /*expect*/ { 0,1,6 }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, 4 }, /* 05 */ - /*expect*/ { 0,0,1,6 }, + /*expect*/ { 0,1,6 }, }, { /*input.*/ { { 0x0000 }, 1 }, /* 06 */ - /*expect*/ { 0,0,1,0 }, + /*expect*/ { 0,1,0 }, }, { /*input.*/ { { 0x008E,0x0001,0x0000 }, 2 }, /* 07 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x3041,0x008E,0x0000 }, 1 }, /* 08 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x3041,0x008E,0x0000 }, 2 }, /* 09 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x3041,0x0001,0x0000 }, 2 }, /* 10 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x3041,0x3000,0x0000 }, 2 }, /* 11 */ - /*expect*/ { 0,0,1,4 }, + /*expect*/ { 0,1,4 }, }, { /*input.*/ { { 0x0041,0x0021,0x0000 }, 2 }, /* 12 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x007E,0x0000 }, 2 }, /* 13 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x007F,0x0000 }, 2 }, /* 14 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x0080,0x0000 }, 2 }, /* 15 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, { /*input.*/ { { 0x0041,0x00A0,0x0000 }, 2 }, /* 16 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, #ifdef NO_WAIVER /* <NO_WAIVER> */ /* returns 3 */ { /*input.*/ { { 0x0041,0x00A1,0x0000 }, 2 }, /* 17 */ - /*expect*/ { 0,0,1,-1 }, + /*expect*/ { 0,1,-1 }, }, #else /* XXX U00A1 is valid -> /x8f/xa2/xc4 in JIS X 0212 */ { /*input.*/ { { 0x0041,0x00A1,0x0000 }, 2 }, /* 17 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, #endif { /*input.*/ { { 0x0041,0xFF71,0x0000 }, 2 }, /* 18 */ - /*expect*/ { 0,0,1,2 }, + /*expect*/ { 0,1,2 }, }, { /*input.*/ { { 0x0041,0x3042,0x0000 }, 2 }, /* 19 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, { /*input.*/ { { 0x0041,0x3044,0x0000 }, 2 }, /* 20 */ - /*expect*/ { 0,0,1,3 }, + /*expect*/ { 0,1,3 }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcsxfrm.c b/localedata/tests-mbwc/dat_wcsxfrm.c index 46f99035c5..0abd0d4d3b 100644 --- a/localedata/tests-mbwc/dat_wcsxfrm.c +++ b/localedata/tests-mbwc/dat_wcsxfrm.c @@ -23,19 +23,19 @@ TST_WCSXFRM tst_wcsxfrm_loc [] = { { Twcsxfrm, TST_LOC_de }, { { /*inp*/ { { 0x00C1,0x0000 }, { 0x00C1,0x0000 }, 7, 7 }, /* #01 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0042,0x0000 }, { 0x0061,0x0000 }, 7, 7 }, /* #02 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0061,0x0000 }, { 0x0042,0x0000 }, 7, 7 }, /* #03 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x00E4,0x0000 }, { 0x00DC,0x0000 }, 7, 7 }, /* #04 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x00DC,0x0000 }, { 0x00E4,0x0000 }, 7, 7 }, /* #05 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { is_last: 1 } } @@ -44,22 +44,22 @@ TST_WCSXFRM tst_wcsxfrm_loc [] = { { Twcsxfrm, TST_LOC_enUS }, { { /*inp*/ { { 0x0041,0x0000 }, { 0x0041,0x0000 }, 7, 7 }, /* #01 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0042,0x0000 }, { 0x0061,0x0000 }, 7, 7 }, /* #02 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0061,0x0000 }, { 0x0042,0x0000 }, 7, 7 }, /* #03 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0000,0x0000 }, { 0x0000,0x0000 }, 7, 7 }, /* #04 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, #ifdef NO_WAIVER { /* <WAIVER> x 2 */ /*inp*/ { { 0x3061,0x0000 }, { 0xFF42,0x0000 }, 7, 7 }, /* #05 */ /* <WAIVER> */ - /*exp*/ { 1,EINVAL, 1,(size_t)-1, }, + /*exp*/ { EINVAL, 1,(size_t)-1, }, }, #endif { is_last: 1 } @@ -69,24 +69,24 @@ TST_WCSXFRM tst_wcsxfrm_loc [] = { { Twcsxfrm, TST_LOC_eucJP }, /* need more test data ! */ { { /*inp*/ { { 0x3041,0x0000 }, { 0x3041,0x0000 }, 7, 7 }, /* #01 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0042,0x0000 }, { 0x0061,0x0000 }, 7, 7 }, /* #02 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x0061,0x0000 }, { 0x0042,0x0000 }, 7, 7 }, /* #03 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0x30A2,0x0000 }, { 0xFF71,0x0000 }, 7, 7 }, /* #04 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, { /*inp*/ { { 0xFF71,0x0000 }, { 0x30A2,0x0000 }, 7, 7 }, /* #05 */ - /*exp*/ { 1,0, 0,0, }, + /*exp*/ { 0, 0,0, }, }, #ifdef NO_WAIVER /* <WAIVER> x 2 */ { /*inp*/ { { 0x008E,0x0000 }, { 0x008F,0x0000 }, 7, 7 }, /* #06 */ - /*exp*/ { 1,EINVAL, 1,(size_t)-1, }, + /*exp*/ { EINVAL, 1,(size_t)-1, }, }, #endif { is_last: 1 } diff --git a/localedata/tests-mbwc/dat_wctob.c b/localedata/tests-mbwc/dat_wctob.c index e4cae62d23..6205048099 100644 --- a/localedata/tests-mbwc/dat_wctob.c +++ b/localedata/tests-mbwc/dat_wctob.c @@ -11,41 +11,41 @@ TST_WCTOB tst_wctob_loc [] = { { { Twctob, TST_LOC_de }, { - { { WEOF }, { 0,0, 1, EOF } }, - { { 0x0020 }, { 0,0, 1, 0x20 } }, - { { 0x0061 }, { 0,0, 1, 0x61 } }, - { { 0x0080 }, { 0,0, 1, 0x80 } }, - { { 0x00C4 }, { 0,0, 1, 0xC4 } }, - { { 0x30C4 }, { 0,0, 1, EOF } }, + { { WEOF }, { 0, 1, EOF } }, + { { 0x0020 }, { 0, 1, 0x20 } }, + { { 0x0061 }, { 0, 1, 0x61 } }, + { { 0x0080 }, { 0, 1, 0x80 } }, + { { 0x00C4 }, { 0, 1, 0xC4 } }, + { { 0x30C4 }, { 0, 1, EOF } }, { is_last: 1 } /* Last element. */ } }, { { Twctob, TST_LOC_enUS }, { - { { WEOF }, { 0,0, 1, EOF } }, - { { 0x0020 }, { 0,0, 1, 0x20 } }, - { { 0x0061 }, { 0,0, 1, 0x61 } }, + { { WEOF }, { 0, 1, EOF } }, + { { 0x0020 }, { 0, 1, 0x20 } }, + { { 0x0061 }, { 0, 1, 0x61 } }, #ifdef SHOJI_IS_RIGHT - { { 0x0080 }, { 0,0, 1, 0x80 } }, - { { 0x00C4 }, { 0,0, 1, 0xC4 } }, + { { 0x0080 }, { 0, 1, 0x80 } }, + { { 0x00C4 }, { 0, 1, 0xC4 } }, #else /* XXX These are no valid characters. */ - { { 0x0080 }, { 0,0, 1, EOF } }, - { { 0x00C4 }, { 0,0, 1, EOF } }, + { { 0x0080 }, { 0, 1, EOF } }, + { { 0x00C4 }, { 0, 1, EOF } }, #endif - { { 0x30C4 }, { 0,0, 1, EOF } }, + { { 0x30C4 }, { 0, 1, EOF } }, { is_last: 1 } /* Last element. */ } }, { { Twctob, TST_LOC_eucJP }, { - { { WEOF }, { 0,0, 1, EOF } }, - { { 0x0020 }, { 0,0, 1, 0x20 } }, - { { 0x0061 }, { 0,0, 1, 0x61 } }, - { { 0x0080 }, { 0,0, 1, 0x80 } }, - { { 0x00FF }, { 0,0, 1, EOF } }, - { { 0x00C4 }, { 0,0, 1, EOF } }, - { { 0x30C4 }, { 0,0, 1, EOF } }, + { { WEOF }, { 0, 1, EOF } }, + { { 0x0020 }, { 0, 1, 0x20 } }, + { { 0x0061 }, { 0, 1, 0x61 } }, + { { 0x0080 }, { 0, 1, 0x80 } }, + { { 0x00FF }, { 0, 1, EOF } }, + { { 0x00C4 }, { 0, 1, EOF } }, + { { 0x30C4 }, { 0, 1, EOF } }, { is_last: 1 } /* Last element. */ } }, diff --git a/localedata/tests-mbwc/dat_wctomb.c b/localedata/tests-mbwc/dat_wctomb.c index 07e1d48402..e9f789f0e5 100644 --- a/localedata/tests-mbwc/dat_wctomb.c +++ b/localedata/tests-mbwc/dat_wctomb.c @@ -59,23 +59,23 @@ TST_WCTOMB tst_wctomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x00C4 }, - /*expect*/ { 0,0,1,1, "Ä" }, + /*expect*/ { 0,1,1, "Ä" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x00DC }, - /*expect*/ { 0,0,1,1, "Ü" }, + /*expect*/ { 0,1,1, "Ü" }, }, /* #03 : normal case */ { /*input.*/ { 1, 0x0092 }, - /*expect*/ { 0,0,1,1, "\222" }, + /*expect*/ { 0,1,1, "\222" }, }, /* #04 : error case */ { /*input.*/ { 1, 0x3041 }, - /*expect*/ { 0,0,1,-1, "" }, + /*expect*/ { 0,1,-1, "" }, }, /* #05 : state dependency */ { /*input.*/ { 0, 0x0000 }, - /*expect*/ { 0,0,0,0, "" }, + /*expect*/ { 0,0,0, "" }, }, { is_last: 1 } } @@ -85,24 +85,24 @@ TST_WCTOMB tst_wctomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x0041 }, - /*expect*/ { 0,0,1,1, "A" }, + /*expect*/ { 0,1,1, "A" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x0042 }, - /*expect*/ { 0,0,1,1, "B" }, + /*expect*/ { 0,1,1, "B" }, }, /* #03 : error case */ /* <WAIVER> */ { /*input.*/ { 1, 0x00C4 }, - /*expect*/ { 0,0,1,-1, "" }, + /*expect*/ { 0,1,-1, "" }, }, /* #04 : error case */ { /*input.*/ { 1, 0x30A4 }, - /*expect*/ { 0,0,1,-1, "" }, + /*expect*/ { 0,1,-1, "" }, }, /* #05 : state dependency */ { /*input.*/ { 0, 0x0000 }, - /*expect*/ { 0,0,0,0, "" }, + /*expect*/ { 0,0,0, "" }, }, { is_last: 1 } } @@ -112,23 +112,23 @@ TST_WCTOMB tst_wctomb_loc [] = { { /* #01 : normal case */ { /*input.*/ { 1, 0x3042 }, - /*expect*/ { 0,0,1,2, "\244\242" }, + /*expect*/ { 0,1,2, "\244\242" }, }, /* #02 : normal case */ { /*input.*/ { 1, 0x3044 }, - /*expect*/ { 0,0,1,2, "\244\244" }, + /*expect*/ { 0,1,2, "\244\244" }, }, /* #03 : normal case */ { /*input.*/ { 1, 0x008E }, - /*expect*/ { 0,0,1,-1, "" }, + /*expect*/ { 0,1,-1, "" }, }, /* #04 : jisX0212 */ { /*input.*/ { 1, 0x00C4 }, - /*expect*/ { 0,0,1,3, "\217\252\243" }, /* jisx0210 returns 3 */ + /*expect*/ { 0,1,3, "\217\252\243" }, /* jisx0210 returns 3 */ }, /* #05 : state dependency */ { /*input.*/ { 0, 0x008E }, - /*expect*/ { 0,0,0,0, "" }, + /*expect*/ { 0,0,0, "" }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wctrans.c b/localedata/tests-mbwc/dat_wctrans.c index b137f74b6a..adb79f77fc 100644 --- a/localedata/tests-mbwc/dat_wctrans.c +++ b/localedata/tests-mbwc/dat_wctrans.c @@ -19,22 +19,22 @@ TST_WCTRANS tst_wctrans_loc [] = { { { Twctrans, TST_LOC_de }, { { /*inp*/ { "" }, /* #1 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "upper" }, /* #2 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "lower" }, /* #3 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "toupper" }, /* #4 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "tolower" }, /* #5 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xxxxx" }, /* #6 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { is_last: 1 } } @@ -42,22 +42,22 @@ TST_WCTRANS tst_wctrans_loc [] = { { { Twctrans, TST_LOC_enUS }, { { /*inp*/ { "" }, /* #1 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "upper" }, /* #2 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "lower" }, /* #3 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "toupper" }, /* #4 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "tolower" }, /* #5 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xxxxx" }, /* #6 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { is_last: 1 } } @@ -65,28 +65,28 @@ TST_WCTRANS tst_wctrans_loc [] = { { { Twctrans, TST_LOC_eucJP }, { { /*inp*/ { "" }, /* #1 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "upper" }, /* #2 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "lower" }, /* #3 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "toupper" }, /* #4 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "tolower" }, /* #5 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xxxxx" }, /* #6 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "tojhira" }, /* #7 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "tojkata" }, /* #8 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wctype.c b/localedata/tests-mbwc/dat_wctype.c index d3e2c9585b..e51b97db99 100644 --- a/localedata/tests-mbwc/dat_wctype.c +++ b/localedata/tests-mbwc/dat_wctype.c @@ -19,52 +19,52 @@ TST_WCTYPE tst_wctype_loc [] = { { { Twctype, TST_LOC_de }, { { /*inp*/ { "alnum" }, /* #01 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "alpha" }, /* #02 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "cntrl" }, /* #03 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "digit" }, /* #04 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "graph" }, /* #05 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "lower" }, /* #06 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "print" }, /* #07 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "punct" }, /* #08 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "space" }, /* #09 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "upper" }, /* #10 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xdigit" }, /* #11 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "" }, /* #12 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "ideograph" }, /* #13 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "english" }, /* #14 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "ascii" }, /* #15 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "special" }, /* #16 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { is_last: 1 } } @@ -72,52 +72,52 @@ TST_WCTYPE tst_wctype_loc [] = { { { Twctype, TST_LOC_enUS }, { { /*inp*/ { "alnum" }, /* #01 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "alpha" }, /* #02 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "cntrl" }, /* #03 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "digit" }, /* #04 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "graph" }, /* #05 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "lower" }, /* #06 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "print" }, /* #07 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "punct" }, /* #08 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "space" }, /* #09 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "upper" }, /* #10 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xdigit" }, /* #11 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "" }, /* #12 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "ideograph" }, /* #13 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "english" }, /* #14 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "ascii" }, /* #15 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "special" }, /* #16 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { is_last: 1 } } @@ -125,58 +125,58 @@ TST_WCTYPE tst_wctype_loc [] = { { { Twctype, TST_LOC_eucJP }, { { /*inp*/ { "alnum" }, /* #01 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "alpha" }, /* #02 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "cntrl" }, /* #03 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "digit" }, /* #04 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "graph" }, /* #05 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "lower" }, /* #06 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "print" }, /* #07 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "punct" }, /* #08 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "space" }, /* #09 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "upper" }, /* #10 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "xdigit" }, /* #11 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "ideogram" }, /* #12 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "phonogram" }, /* #13 */ - /*exp*/ { 0,0,1,0, }, + /*exp*/ { 0,1,0, }, }, { /*inp*/ { "jspace" }, /* #14 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "jhira" }, /* #15 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "jkata" }, /* #16 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "jkanji" }, /* #17 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { /*inp*/ { "jdigit" }, /* #18 */ - /*exp*/ { 0,0,0,0, }, + /*exp*/ { 0,0,0, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/dat_wcwidth.c b/localedata/tests-mbwc/dat_wcwidth.c index 5472d1f559..993b0f6bc7 100644 --- a/localedata/tests-mbwc/dat_wcwidth.c +++ b/localedata/tests-mbwc/dat_wcwidth.c @@ -11,31 +11,31 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { Twcwidth, TST_LOC_de }, { { /*inp*/ { 0x0000 }, /* #01 */ - /*exp*/ { 0,0, 1,0, }, + /*exp*/ { 0, 1,0, }, }, { /*inp*/ { 0x0020 }, /* #02 */ - /*exp*/ { 0,0, 1,1, }, + /*exp*/ { 0, 1,1, }, }, { /*inp*/ { 0x007F }, /* #03 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x0080 }, /* #04 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x00A1 }, /* #05 */ - /*exp*/ { 0,0, 1,1, }, + /*exp*/ { 0, 1,1, }, }, { /*inp*/ { 0x00C1 }, /* #06 */ - /*exp*/ { 0,0, 1,1, }, + /*exp*/ { 0, 1,1, }, }, #ifdef SHOJI_IS_RIGHT /* <WAIVER> */ /* CHECK : wint_t */ { /*inp*/ { 0x3041 }, /* #07 */ - /*exp*/ { 0,0, 1,0, }, + /*exp*/ { 0, 1,0, }, }, #else { /*inp*/ { 0x3041 }, /* #07 */ - /*exp*/ { 0,0, 1,EOF, }, + /*exp*/ { 0, 1,EOF, }, }, #endif { is_last: 1 } @@ -45,25 +45,25 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { Twcwidth, TST_LOC_enUS }, { { /*inp*/ { 0x0000 }, /* #01 */ - /*exp*/ { 0,0, 1,0, }, + /*exp*/ { 0, 1,0, }, }, { /*inp*/ { 0x0020 }, /* #02 */ - /*exp*/ { 0,0, 1,1, }, + /*exp*/ { 0, 1,1, }, }, { /*inp*/ { 0x007F }, /* #03 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x0080 }, /* #04 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x00A1 }, /* #05 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x00C1 }, /* #06 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x3041 }, /* #07 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { is_last: 1 } } @@ -72,34 +72,34 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { Twcwidth, TST_LOC_eucJP }, { { /*inp*/ { 0x0000 }, /* #01 */ - /*exp*/ { 0,0, 1,0, }, + /*exp*/ { 0, 1,0, }, }, { /*inp*/ { 0x0020 }, /* #02 */ - /*exp*/ { 0,0, 1,1, }, + /*exp*/ { 0, 1,1, }, }, { /*inp*/ { 0x007F }, /* #03 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, { /*inp*/ { 0x0080 }, /* #04 */ - /*exp*/ { 0,0, 1,-1, }, + /*exp*/ { 0, 1,-1, }, }, #ifdef SHOJI_IS_RIGHT /* <NO_WAIVER> */ { /*inp*/ { 0x00A1 }, /* #05 */ - /*exp*/ { 0,0, 1,0, }, + /*exp*/ { 0, 1,0, }, }, #else /* XXX U00A1 is a valid character in EUC-JP. */ { /*inp*/ { 0x00A1 }, /* #05 */ - /*exp*/ { 0,0, 1,2, }, + /*exp*/ { 0, 1,2, }, }, #endif /* jisx0212 */ { /*inp*/ { 0x00C1 }, /* #06 */ - /*exp*/ { 0,0, 1,2, }, + /*exp*/ { 0, 1,2, }, }, { /*inp*/ { 0x3041 }, /* #07 */ - /*exp*/ { 0,0, 1,2, }, + /*exp*/ { 0, 1,2, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/tst_funcs.h b/localedata/tests-mbwc/tst_funcs.h index 177ca09567..e686bfef5d 100644 --- a/localedata/tests-mbwc/tst_funcs.h +++ b/localedata/tests-mbwc/tst_funcs.h @@ -53,8 +53,7 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, #define TST_ABS(x) (((x) > 0) ? (x) : -(x)) -#define TMD_ERRET(_type_) int err_flg; \ - int err_val; \ +#define TMD_ERRET(_type_) int err_val; \ int ret_flg; \ _type_ ret_val @@ -87,7 +86,7 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, int warn_count __attribute__ ((unused)); \ int func_id, seq_num = 0; \ const char *locale; \ - int err_flg, err_exp, ret_flg; \ + int err_exp, ret_flg; \ int errno_save = 0; \ _type_ ret_exp; \ _type_ ret @@ -114,13 +113,11 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, for (seq_num=0; seq_num < _count_; seq_num++) #define TST_GET_ERRET(_ofunc_) \ - err_flg = TST_EXPECT (_ofunc_).err_flg; \ err_exp = TST_EXPECT (_ofunc_).err_val; \ ret_flg = TST_EXPECT (_ofunc_).ret_flg; \ ret_exp = TST_EXPECT (_ofunc_).ret_val #define TST_GET_ERRET_SEQ(_ofunc_) \ - err_flg = TST_EXPECT_SEQ (_ofunc_).err_flg; \ err_exp = TST_EXPECT_SEQ (_ofunc_).err_val; \ ret_flg = TST_EXPECT_SEQ (_ofunc_).ret_flg; \ ret_exp = TST_EXPECT_SEQ (_ofunc_).ret_val @@ -131,12 +128,11 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, #define TST_SAVE_ERRNO \ errno_save = errno +/* Test value of ret and of errno if it should have a value. */ #define TST_IF_RETURN(_s_func_) \ - if (err_flg == 1) \ + if (err_exp != 0) \ { \ - /* If no error occured, errno is undefined. Here we check only if \ - errno has the right value if it should have one. */ \ - if ((err_exp == 0) || (errno_save == err_exp)) \ + if (errno_save == err_exp) \ { \ result (fp, C_SUCCESS, _s_func_, locale, rec+1, seq_num+1, 1, \ MS_PASSED); \ |