Update.
2000-07-23 Bruno Haible <haible@clisp.cons.org>
* wctype/wchar-lookup.h: New file.
* wctype/iswctype.c: Include "wchar-lookup.h".
(__iswctype): Support alternate locale format with 3-level tables.
* wctype/iswctype_l.c (__iswctype_l): Likewise.
* wctype/towctrans.c (__towctrans): Likewise.
* wctype/towctrans_l.c (__towctrans_l): Likewise.
* wctype/wcfuncs.c: Include "wchar-lookup.h".
(__ctype32_wctype, __ctype32_wctrans): Declare external.
(__iswalnum, __iswalpha, __iswcntrl, __iswdigit, __iswlower,
__iswgraph, __iswprint, __iswpunct, __iswspace, __iswupper,
__iswxdigit, towlower, towupper): Support alternate locale format
with 3-level tables.
* wctype/wcextra.c (iswblank): Likewise.
* wctype/wcfuncs_l.c: Include "wchar-lookup.h".
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l, __towlower_l, __towupper_l): Support alternate locale
format with 3-level tables.
* wctype/wcextra_l.c (__iswblank_l): Likewise.
* wctype/wctype.c (__wctype): Likewise. In the alternate locale
format, return a 3-level table pointer.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/wctrans.c (wctrans): Likewise.
* wctype/wctype.h (__ISwupper, __ISwlower, __ISwalpha, __ISwdigit,
__ISwxdigit, __ISwspace, __ISwprint, __ISwgraph, __ISwblank,
__ISwcntrl, __ISwpunct, __ISwalnum): New enum values.
(iswctype): Remove macro definition.
* wcsmbs/wcwidth.h: Include "wchar-lookup.h".
(internal_wcwidth): Support alternate locale format with 3-level
tables.
* locale/langinfo.h (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET):
New nl_items.
* locale/categories.def (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET):
Define them as being type "word".
* locale/C-ctype.c (_nl_C_LC_CTYPE): Add initializers for them.
* ctype/ctype-info.c (__ctype32_wctype, __ctype32_wctrans,
__ctype32_width): New exported variables.
* locale/lc-ctype.c (_nl_postload_ctype): Initialize them in the
alternate locale format. Don't initialize __ctype_names and
__ctype_width in the alternate locale format.
* locale/programs/localedef.h (oldstyle_tables): New declaration.
* locale/programs/localedef.c (oldstyle_tables): New variable.
(OPT_OLDSTYLE): New macro.
(options): Add --old-style option.
(parse_opt): Handle --old-style option.
* locale/programs/ld-ctype.c (locale_ctype_t): Add class_offset,
map_offset, class_3level, map_3level, width_3level members.
(ctype_output): Support for alternate locale format: Computation of
nelems changes. _NL_CTYPE_TOUPPER32, _NL_CTYPE_TOLOWER32 and
_NL_CTYPE_CLASS32 only 256 characters. _NL_CTYPE_NAMES empty.
New fields _NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET. Field
_NL_CTYPE_WIDTH now contains the three-level table. Extra elems
now contain both class and map tables.
(struct wctype_table): New type.
(wctype_table_init, wctype_table_add, wctype_table_finalize): New
functions.
(struct wcwidth_table): New type.
(wcwidth_table_init, wcwidth_table_add, wcwidth_table_finalize): New
functions.
(struct wctrans_table): New type.
(wctrans_table_init, wctrans_table_add, wctrans_table_finalize): New
functions.
(allocate_arrays): Support for alternate locale format: Set
plane_size and plane_cnt to 0. Restrict ctype->ctype32_b to the first
256 characters. Compute ctype->class_3level. Restrict ctype->map32[idx]
to the first 256 characters. Compute ctype->map_3level. Set
ctype->class_offset and ctype->map_offset. Compute ctype->width_3level
instead of ctype->width.
2000-07-25 06:37:22 +02:00
|
|
|
/* Test program for iswctype() function in ja_JP locale.
|
|
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public License as
|
|
|
|
published by the Free Software Foundation; either version 2 of the
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
2000-07-25 02:38:27 +02:00
|
|
|
#include <error.h>
|
|
|
|
#include <locale.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
#include <wctype.h>
|
|
|
|
|
|
|
|
int
|
|
|
|
main (void)
|
|
|
|
{
|
|
|
|
wctype_t wct;
|
|
|
|
wchar_t buf[1000];
|
|
|
|
int result = 1;
|
|
|
|
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
wprintf (L"locale = %s\n", setlocale (LC_CTYPE, NULL));
|
|
|
|
|
|
|
|
wct = wctype ("jhira");
|
|
|
|
if (wct == 0)
|
|
|
|
error (EXIT_FAILURE, 0, "jhira: no such character class");
|
|
|
|
|
|
|
|
if (fgetws (buf, sizeof (buf) / sizeof (buf[0]), stdin) != NULL)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
wprintf (L"buf[] = \"%ls\"\n", buf);
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
for (n = 0; buf[n] != L'\0'; ++n)
|
|
|
|
{
|
|
|
|
wprintf (L"jhira(U%04lx = %lc) = %d\n", (long) buf[n], buf[n],
|
|
|
|
iswctype (buf[n], wct));
|
|
|
|
result |= ((buf[n] < 0xff && iswctype (buf[n], wct))
|
|
|
|
|| (buf[n] > 0xff && !iswctype (buf[n], wct)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Update.
2000-07-23 Bruno Haible <haible@clisp.cons.org>
* wctype/wchar-lookup.h: New file.
* wctype/iswctype.c: Include "wchar-lookup.h".
(__iswctype): Support alternate locale format with 3-level tables.
* wctype/iswctype_l.c (__iswctype_l): Likewise.
* wctype/towctrans.c (__towctrans): Likewise.
* wctype/towctrans_l.c (__towctrans_l): Likewise.
* wctype/wcfuncs.c: Include "wchar-lookup.h".
(__ctype32_wctype, __ctype32_wctrans): Declare external.
(__iswalnum, __iswalpha, __iswcntrl, __iswdigit, __iswlower,
__iswgraph, __iswprint, __iswpunct, __iswspace, __iswupper,
__iswxdigit, towlower, towupper): Support alternate locale format
with 3-level tables.
* wctype/wcextra.c (iswblank): Likewise.
* wctype/wcfuncs_l.c: Include "wchar-lookup.h".
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l, __towlower_l, __towupper_l): Support alternate locale
format with 3-level tables.
* wctype/wcextra_l.c (__iswblank_l): Likewise.
* wctype/wctype.c (__wctype): Likewise. In the alternate locale
format, return a 3-level table pointer.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/wctrans.c (wctrans): Likewise.
* wctype/wctype.h (__ISwupper, __ISwlower, __ISwalpha, __ISwdigit,
__ISwxdigit, __ISwspace, __ISwprint, __ISwgraph, __ISwblank,
__ISwcntrl, __ISwpunct, __ISwalnum): New enum values.
(iswctype): Remove macro definition.
* wcsmbs/wcwidth.h: Include "wchar-lookup.h".
(internal_wcwidth): Support alternate locale format with 3-level
tables.
* locale/langinfo.h (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET):
New nl_items.
* locale/categories.def (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET):
Define them as being type "word".
* locale/C-ctype.c (_nl_C_LC_CTYPE): Add initializers for them.
* ctype/ctype-info.c (__ctype32_wctype, __ctype32_wctrans,
__ctype32_width): New exported variables.
* locale/lc-ctype.c (_nl_postload_ctype): Initialize them in the
alternate locale format. Don't initialize __ctype_names and
__ctype_width in the alternate locale format.
* locale/programs/localedef.h (oldstyle_tables): New declaration.
* locale/programs/localedef.c (oldstyle_tables): New variable.
(OPT_OLDSTYLE): New macro.
(options): Add --old-style option.
(parse_opt): Handle --old-style option.
* locale/programs/ld-ctype.c (locale_ctype_t): Add class_offset,
map_offset, class_3level, map_3level, width_3level members.
(ctype_output): Support for alternate locale format: Computation of
nelems changes. _NL_CTYPE_TOUPPER32, _NL_CTYPE_TOLOWER32 and
_NL_CTYPE_CLASS32 only 256 characters. _NL_CTYPE_NAMES empty.
New fields _NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET. Field
_NL_CTYPE_WIDTH now contains the three-level table. Extra elems
now contain both class and map tables.
(struct wctype_table): New type.
(wctype_table_init, wctype_table_add, wctype_table_finalize): New
functions.
(struct wcwidth_table): New type.
(wcwidth_table_init, wcwidth_table_add, wcwidth_table_finalize): New
functions.
(struct wctrans_table): New type.
(wctrans_table_init, wctrans_table_add, wctrans_table_finalize): New
functions.
(allocate_arrays): Support for alternate locale format: Set
plane_size and plane_cnt to 0. Restrict ctype->ctype32_b to the first
256 characters. Compute ctype->class_3level. Restrict ctype->map32[idx]
to the first 256 characters. Compute ctype->map_3level. Set
ctype->class_offset and ctype->map_offset. Compute ctype->width_3level
instead of ctype->width.
2000-07-25 06:37:22 +02:00
|
|
|
wct = wctype ("jkata");
|
|
|
|
if (wct == 0)
|
|
|
|
error (EXIT_FAILURE, 0, "jkata: no such character class");
|
|
|
|
|
|
|
|
if (fgetws (buf, sizeof (buf) / sizeof (buf[0]), stdin) != NULL)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
wprintf (L"buf[] = \"%ls\"\n", buf);
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
for (n = 0; buf[n] != L'\0'; ++n)
|
|
|
|
{
|
|
|
|
wprintf (L"jkata(U%04lx = %lc) = %d\n", (long) buf[n], buf[n],
|
|
|
|
iswctype (buf[n], wct));
|
|
|
|
result |= ((buf[n] < 0xff && iswctype (buf[n], wct))
|
|
|
|
|| (buf[n] > 0xff && !iswctype (buf[n], wct)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wct = wctype ("jdigit");
|
|
|
|
if (wct == 0)
|
|
|
|
error (EXIT_FAILURE, 0, "jdigit: no such character class");
|
|
|
|
|
|
|
|
if (fgetws (buf, sizeof (buf) / sizeof (buf[0]), stdin) != NULL)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
wprintf (L"buf[] = \"%ls\"\n", buf);
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
for (n = 0; buf[n] != L'\0'; ++n)
|
|
|
|
{
|
|
|
|
wprintf (L"jdigit(U%04lx = %lc) = %d\n", (long) buf[n], buf[n],
|
|
|
|
iswctype (buf[n], wct));
|
|
|
|
result |= ((buf[n] < 0xff && iswctype (buf[n], wct))
|
|
|
|
|| (buf[n] > 0xff && !iswctype (buf[n], wct)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wct = wctype ("jspace");
|
|
|
|
if (wct == 0)
|
|
|
|
error (EXIT_FAILURE, 0, "jspace: no such character class");
|
|
|
|
|
|
|
|
if (fgetws (buf, sizeof (buf) / sizeof (buf[0]), stdin) != NULL)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
wprintf (L"buf[] = \"%ls\"\n", buf);
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
for (n = 0; buf[n] != L'\0'; ++n)
|
|
|
|
{
|
|
|
|
wprintf (L"jspace(U%04lx = %lc) = %d\n", (long) buf[n], buf[n],
|
|
|
|
iswctype (buf[n], wct));
|
|
|
|
result |= ((buf[n] < 0xff && iswctype (buf[n], wct))
|
|
|
|
|| (buf[n] > 0xff && !iswctype (buf[n], wct)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wct = wctype ("jkanji");
|
|
|
|
if (wct == 0)
|
|
|
|
error (EXIT_FAILURE, 0, "jkanji: no such character class");
|
|
|
|
|
|
|
|
if (fgetws (buf, sizeof (buf) / sizeof (buf[0]), stdin) != NULL)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
wprintf (L"buf[] = \"%ls\"\n", buf);
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
for (n = 0; buf[n] != L'\0'; ++n)
|
|
|
|
{
|
|
|
|
wprintf (L"jkanji(U%04lx = %lc) = %d\n", (long) buf[n], buf[n],
|
|
|
|
iswctype (buf[n], wct));
|
|
|
|
result |= ((buf[n] < 0xff && iswctype (buf[n], wct))
|
|
|
|
|| (buf[n] > 0xff && !iswctype (buf[n], wct)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-07-25 02:38:27 +02:00
|
|
|
return result;
|
|
|
|
}
|