diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-28 04:27:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-28 04:27:24 +0000 |
| commit | 0e16ecfa1e7689c0b3be626f9a3441ebb5710c70 (patch) | |
| tree | 12a793be9d9a1f7a4a911239194bae33470dcb23 /localedata/tests-mbwc/dat_wcscoll.c | |
| parent | 37696206076f6f075542adfdc4b1fe49100e9f32 (diff) | |
| download | glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.zip glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.gz glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.bz2 | |
Update.
* locale/programs/ld-ctype.c (ctype_finish): Take all characters from
the input charset into account when generating the hash table.
(allocate_arrays): Correct setting default width. Not all empty slots
in the table are filled, only those not covert explicitly by the
locale description and in the charset.
* stdio-common/vfscanf.c: Make sure to always return WEOF and EOF for
wide character version.
For %C handling, test correct pointer variable for NULL.
* wcsmbs/wctob.c: Handle WEOF special.
* wcsmbs/wcwidth.h: 0xff in width array means invalid character.
* wctype/wctype.h: Protect gcc-isms with __extension__. Avoid
always-true test to avoid warning.
Diffstat (limited to 'localedata/tests-mbwc/dat_wcscoll.c')
| -rw-r--r-- | localedata/tests-mbwc/dat_wcscoll.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/localedata/tests-mbwc/dat_wcscoll.c b/localedata/tests-mbwc/dat_wcscoll.c index d087fc6..ffedaca 100644 --- a/localedata/tests-mbwc/dat_wcscoll.c +++ b/localedata/tests-mbwc/dat_wcscoll.c @@ -104,6 +104,7 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { 0x0041,0x0041,0x0043,0x0000 }, }, /* #4 */ /*expect*/ { 0,0,0,0, -1, }, }, +#ifdef SHOJI_IS_RIGHT /* <WAIVER> */ /* assume ascii */ { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0061,0x0043,0x0000 }, }, /* #5 */ @@ -114,6 +115,17 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { 0x0041,0x0042,0x0043,0x0000 }, }, /* #6 */ /*expect*/ { 0,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, }, + }, + { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 }, + { 0x0041,0x0042,0x0043,0x0000 }, }, /* #6 */ + /*expect*/ { 0,0,0,0, -1, }, + }, +#endif { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #7 */ /*expect*/ { 0,0,0,0, -1, }, @@ -122,6 +134,7 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { 0x0041,0x0042,0x0000 }, }, /* #8 */ /*expect*/ { 0,0,0,0, +1, }, }, +#ifdef SHOJI_IS_RIGHT { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 }, { 0x0041,0x008E,0x0049,0x0000 }, }, /* #9 */ /*expect*/ { 1,0,0,0, +1, }, @@ -130,6 +143,17 @@ TST_WCSCOLL tst_wcscoll_loc [] = { { 0x0041,0x0092,0x0049,0x0000 }, }, /* #10 */ /*expect*/ { 0,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, }, + }, + { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 }, + { 0x0041,0x0092,0x0049,0x0000 }, }, /* #10 */ + /*expect*/ { 0,0,0,0, 0, }, + }, +#endif { is_last: 1 } } }, |