mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
4c7d276eb1
2000-08-31 Bruno Haible <haible@clisp.cons.org> * wctype/wcfuncs.c (iswblank): New function. * wctype/wcfuncs_l.c (__iswblank_l): New function. * wctype/wcextra.c: Remove file. * wctype/wcextra_l.c: Remove file. * wctype/Makefile (distribute): Remove wcextra and wcextra_l. 2000-08-31 Bruno Haible <haible@clisp.cons.org> * locale/programs/ld-collate.c (collate_output): Remove redundant assert call. * string/strcoll.c: Likewise. * string/strxfrm.c: Include assert.h. Add assert calls like in string/strcoll.c. 2000-08-31 Bruno Haible <haible@clisp.cons.org> * locale/categories.def (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions. * locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively. (_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3. (_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4. (_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to _NL_CTYPE_GAP5/6 respectively. * locale/C-ctype.c (_nl_C_LC_CTYPE): Update. * ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables. * locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format. Don't initialize __ctype_names and __ctype_width. * wctype/cname-lookup.h: Remove file. * wctype/Makefile (distribute): Remove cname-lookup.h. * wctype/wchar-lookup.h: Include stdint.h. * wctype/wctype.c (__wctype): Assume new locale format. * wctype/wctype_l.c (__wctype_l): Likewise. * wctype/iswctype.c: Don't include cname-lookup.h. (__iswctype): Assume new locale format. * wctype/iswctype_l.c: Don't include cname-lookup.h. (__iswctype_l): Assume new locale format. * wctype/wctrans.c: Don't include ctype.h. (wctrans): Assume new locale format. * wctype/wctrans_l.c (__wctrans_l): Likewise. * wctype/towctrans.c: Don't include cname-lookup.h. (__towctrans): Assume new locale format. * wctype/towctrans_l.c: Don't include cname-lookup.h. (__towctrans_l): Assume new locale format. * wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include localeinfo.h instead. (__NO_WCTYPE): Remove unused macro. (__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove declarations. (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format. (towlower, towupper): Likewise. * wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include localeinfo.h instead. (__NO_WCTYPE): Remove unused macro. (__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l, __iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l, __iswxdigit_l): Assume new locale format. (__towlower_l, __towupper_l): Likewise. * wcsmbs/wcwidth.h: Don't include cname-lookup.h. (__ctype32_b): Remove declaration. (internal_wcwidth): Assume new locale format. * locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields plane_size, plane_cnt, names, width. Rename map to map_b, rename map32 to map32_b, rename width_3level to width. (ctype_output): Always create new locale format. Don't emit _NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more. (allocate_arrays): Always create new locale format. * locale/C-collate.c (_nl_C_LC_COLLATE): Update. * locale/weightwc.h (findidx): Assume new locale format. * string/strcoll.c (wcscoll): Remove local variables size, layers, names. * string/strxfrm.c (wcsxfrm): Likewise. * posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of local variable collseq to 'const char *'. (SUFFIX): Don't use, don't undefine. * posix/fnmatch.c: Remove SUFFIX definition. * locale/programs/ld-collate.c (struct locale_collate_t): Remove fields plane_size, plane_cnt, wcheads, wcseqorder. Rename wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder. (collate_finish): Always create new locale format. Remove local variables min_total, act_size. (collate_output): Always create new locale format. Remove local variables table_size, names, tablewc. Rename tablewc_3level to tablewc. 2000-08-31 Bruno Haible <haible@clisp.cons.org> * locale/programs/ld-collate.c (obstack_int32_grow, obstack_int32_grow_fast): New inline functions. (output_weightwc, collate_output): Use them where possible.
72 lines
2.8 KiB
C
72 lines
2.8 KiB
C
/* Copyright (C) 1991, 92, 95, 96, 97, 99, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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. */
|
|
|
|
#include <ctype.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
/* Defined in locale/C-ctype.c. */
|
|
extern const char _nl_C_LC_CTYPE_class[];
|
|
extern const char _nl_C_LC_CTYPE_class32[];
|
|
extern const char _nl_C_LC_CTYPE_toupper[];
|
|
extern const char _nl_C_LC_CTYPE_tolower[];
|
|
extern const char _nl_C_LC_CTYPE_class_upper[];
|
|
extern const char _nl_C_LC_CTYPE_class_lower[];
|
|
extern const char _nl_C_LC_CTYPE_class_alpha[];
|
|
extern const char _nl_C_LC_CTYPE_class_digit[];
|
|
extern const char _nl_C_LC_CTYPE_class_xdigit[];
|
|
extern const char _nl_C_LC_CTYPE_class_space[];
|
|
extern const char _nl_C_LC_CTYPE_class_print[];
|
|
extern const char _nl_C_LC_CTYPE_class_graph[];
|
|
extern const char _nl_C_LC_CTYPE_class_blank[];
|
|
extern const char _nl_C_LC_CTYPE_class_cntrl[];
|
|
extern const char _nl_C_LC_CTYPE_class_punct[];
|
|
extern const char _nl_C_LC_CTYPE_class_alnum[];
|
|
extern const char _nl_C_LC_CTYPE_map_toupper[];
|
|
extern const char _nl_C_LC_CTYPE_map_tolower[];
|
|
extern const char _nl_C_LC_CTYPE_width[];
|
|
|
|
#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
|
|
|
|
const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
|
|
const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
|
|
const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
|
|
const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
|
|
const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
|
|
const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
|
|
const char *__ctype32_wctype[12] =
|
|
{
|
|
b(char, class_upper, 32),
|
|
b(char, class_lower, 32),
|
|
b(char, class_alpha, 32),
|
|
b(char, class_digit, 32),
|
|
b(char, class_xdigit, 32),
|
|
b(char, class_space, 32),
|
|
b(char, class_print, 32),
|
|
b(char, class_graph, 32),
|
|
b(char, class_blank, 32),
|
|
b(char, class_cntrl, 32),
|
|
b(char, class_punct, 32),
|
|
b(char, class_alnum, 32)
|
|
};
|
|
const char *__ctype32_wctrans[2] =
|
|
{
|
|
b(char, map_toupper, 0),
|
|
b(char, map_tolower, 0)
|
|
};
|
|
const char *__ctype32_width = b (char, width, 0);
|