mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-05 09:01:07 +00:00
ef44614405
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.
392 lines
14 KiB
C
392 lines
14 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999, 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. */
|
|
|
|
/*
|
|
* ISO C Standard, Amendment 1, 7.15:
|
|
* Wide-character classification and mapping utilities <wctype.h>
|
|
*/
|
|
|
|
#ifndef _WCTYPE_H
|
|
|
|
#ifndef __need_iswxxx
|
|
# define _WCTYPE_H 1
|
|
|
|
# include <features.h>
|
|
# include <bits/types.h>
|
|
|
|
/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
|
|
there. So define it ourselves if it remains undefined. */
|
|
# define __need_wint_t
|
|
# include <stddef.h>
|
|
# ifndef _WINT_T
|
|
/* Integral type unchanged by default argument promotions that can
|
|
hold any value corresponding to members of the extended character
|
|
set, as well as at least one value that does not correspond to any
|
|
member of the extended character set. */
|
|
# define _WINT_T
|
|
typedef unsigned int wint_t;
|
|
# endif
|
|
|
|
/* Constant expression of type `wint_t' whose value does not correspond
|
|
to any member of the extended character set. */
|
|
# ifndef WEOF
|
|
# define WEOF (0xffffffffu)
|
|
# endif
|
|
#endif
|
|
#undef __need_iswxxx
|
|
|
|
|
|
/* The following part is also used in the <wcsmbs.h> header when compiled
|
|
in the Unix98 compatibility mode. */
|
|
#ifndef __iswxxx_defined
|
|
# define __iswxxx_defined 1
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character classifications. */
|
|
typedef unsigned long int wctype_t;
|
|
|
|
# ifndef _ISwbit
|
|
/* The characteristics are stored always in network byte order (big
|
|
endian). We define the bit value interpretations here dependent on the
|
|
machine's byte order. */
|
|
|
|
# include <endian.h>
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define _ISwbit(bit) (1 << (bit))
|
|
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
# define _ISwbit(bit) \
|
|
((bit) < 8 ? (int) ((1UL << (bit)) << 24) \
|
|
: ((bit) < 16 ? (int) ((1UL << (bit)) << 8) \
|
|
: ((bit) < 24 ? (int) ((1UL << (bit)) >> 8) \
|
|
: (int) ((1UL << (bit)) >> 24))))
|
|
# endif
|
|
|
|
enum
|
|
{
|
|
__ISwupper = 0, /* UPPERCASE. */
|
|
__ISwlower = 1, /* lowercase. */
|
|
__ISwalpha = 2, /* Alphabetic. */
|
|
__ISwdigit = 3, /* Numeric. */
|
|
__ISwxdigit = 4, /* Hexadecimal numeric. */
|
|
__ISwspace = 5, /* Whitespace. */
|
|
__ISwprint = 6, /* Printing. */
|
|
__ISwgraph = 7, /* Graphical. */
|
|
__ISwblank = 8, /* Blank (usually SPC and TAB). */
|
|
__ISwcntrl = 9, /* Control character. */
|
|
__ISwpunct = 10, /* Punctuation. */
|
|
__ISwalnum = 11, /* Alphanumeric. */
|
|
|
|
_ISwupper = _ISwbit (__ISwupper), /* UPPERCASE. */
|
|
_ISwlower = _ISwbit (__ISwlower), /* lowercase. */
|
|
_ISwalpha = _ISwbit (__ISwalpha), /* Alphabetic. */
|
|
_ISwdigit = _ISwbit (__ISwdigit), /* Numeric. */
|
|
_ISwxdigit = _ISwbit (__ISwxdigit), /* Hexadecimal numeric. */
|
|
_ISwspace = _ISwbit (__ISwspace), /* Whitespace. */
|
|
_ISwprint = _ISwbit (__ISwprint), /* Printing. */
|
|
_ISwgraph = _ISwbit (__ISwgraph), /* Graphical. */
|
|
_ISwblank = _ISwbit (__ISwblank), /* Blank (usually SPC and TAB). */
|
|
_ISwcntrl = _ISwbit (__ISwcntrl), /* Control character. */
|
|
_ISwpunct = _ISwbit (__ISwpunct), /* Punctuation. */
|
|
_ISwalnum = _ISwbit (__ISwalnum) /* Alphanumeric. */
|
|
};
|
|
# endif /* Not _ISwbit */
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/*
|
|
* Wide-character classification functions: 7.15.2.1.
|
|
*/
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int iswalnum (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character for which `iswupper' or 'iswlower' is
|
|
true, or any wide character that is one of a locale-specific set of
|
|
wide-characters for which none of `iswcntrl', `iswdigit',
|
|
`iswpunct', or `iswspace' is true. */
|
|
extern int iswalpha (wint_t __wc) __THROW;
|
|
|
|
/* Test for any control wide character. */
|
|
extern int iswcntrl (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int iswdigit (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int iswgraph (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a lowercase letter
|
|
or is one of a locale-specific set of wide characters for which
|
|
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswlower (wint_t __wc) __THROW;
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int iswprint (wint_t __wc) __THROW;
|
|
|
|
/* Test for any printing wide character that is one of a
|
|
locale-specific et of wide characters for which neither `iswspace'
|
|
nor `iswalnum' is true. */
|
|
extern int iswpunct (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a locale-specific
|
|
set of wide characters for which none of `iswalnum', `iswgraph', or
|
|
`iswpunct' is true. */
|
|
extern int iswspace (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to an uppercase letter
|
|
or is one of a locale-specific set of wide character for which none
|
|
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswupper (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a hexadecimal-digit
|
|
character equivalent to that performed be the functions described
|
|
in the previous subclause. */
|
|
extern int iswxdigit (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a standard blank
|
|
wide character or a locale-specific set of wide characters for
|
|
which `iswalnum' is false. */
|
|
# ifdef __USE_GNU
|
|
extern int iswblank (wint_t __wc) __THROW;
|
|
# endif
|
|
|
|
/*
|
|
* Extensible wide-character classification functions: 7.15.2.2.
|
|
*/
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
by the string argument PROPERTY. */
|
|
extern wctype_t __wctype (__const char *__property) __THROW;
|
|
extern wctype_t wctype (__const char *__property) __THROW;
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int __iswctype (wint_t __wc, wctype_t __desc) __THROW;
|
|
extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
|
|
|
|
#if __GNUC__ >= 2 && defined __OPTIMIZE__
|
|
/* The tables are always organized in a way which allows direct access
|
|
for single byte characters. */
|
|
extern unsigned int *__ctype32_b;
|
|
|
|
# define iswalnum(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwalnum) : iswalnum (wc)))
|
|
# define iswalpha(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwalpha) : iswalpha (wc)))
|
|
# define iswcntrl(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwcntrl) : iswcntrl (wc)))
|
|
# define iswdigit(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwdigit) : iswdigit (wc)))
|
|
# define iswlower(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwlower) : iswlower (wc)))
|
|
# define iswgraph(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwgraph) : iswgraph (wc)))
|
|
# define iswprint(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwprint) : iswprint (wc)))
|
|
# define iswpunct(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwpunct) : iswpunct (wc)))
|
|
# define iswspace(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwspace) : iswspace (wc)))
|
|
# define iswupper(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwupper) : iswupper (wc)))
|
|
# define iswxdigit(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwxdigit) : iswxdigit (wc)))
|
|
|
|
# ifdef __USE_GNU
|
|
# define iswblank(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (int) (__ctype32_b[(wint_t) (wc)] & _ISwblank) : iswblank (wc)))
|
|
# endif
|
|
|
|
#endif /* gcc && optimizing */
|
|
|
|
/*
|
|
* Wide-character case-mapping functions: 7.15.3.1.
|
|
*/
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character mappings. */
|
|
typedef __const __int32_t *wctrans_t;
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t towlower (wint_t __wc) __THROW;
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t towupper (wint_t __wc) __THROW;
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t __towctrans (wint_t __wc, wctrans_t __desc) __THROW;
|
|
|
|
#if __GNUC__ >= 2 && defined __OPTIMIZE__
|
|
/* The tables are always organized in a way which allows direct access
|
|
for single byte characters. */
|
|
extern const wint_t *__ctype32_tolower;
|
|
extern const wint_t *__ctype32_toupper;
|
|
|
|
# define towlower(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (wint_t) __ctype32_tolower[(wint_t) (wc)] : towlower (wc)))
|
|
|
|
# define towupper(wc) \
|
|
(__extension__ \
|
|
(__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
|
|
? (wint_t) __ctype32_toupper[(wint_t) (wc)] : towupper (wc)))
|
|
|
|
#endif /* gcc && optimizing */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* need iswxxx. */
|
|
|
|
|
|
/* The remaining definitions and declarations must not appear in the
|
|
<wcsmbs.h> header. */
|
|
#ifdef _WCTYPE_H
|
|
|
|
/*
|
|
* Extensible wide-character mapping functions: 7.15.3.2.
|
|
*/
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Construct value that describes a mapping between wide characters
|
|
identified by the string argument PROPERTY. */
|
|
extern wctrans_t wctrans (__const char *__property) __THROW;
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW;
|
|
|
|
# ifdef __USE_GNU
|
|
/* Declare the interface to extended locale model. */
|
|
# include <xlocale.h>
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int __iswalnum_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character for which `iswupper' or 'iswlower' is
|
|
true, or any wide character that is one of a locale-specific set of
|
|
wide-characters for which none of `iswcntrl', `iswdigit',
|
|
`iswpunct', or `iswspace' is true. */
|
|
extern int __iswalpha_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any control wide character. */
|
|
extern int __iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int __iswdigit_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int __iswgraph_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a lowercase letter
|
|
or is one of a locale-specific set of wide characters for which
|
|
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int __iswlower_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int __iswprint_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any printing wide character that is one of a
|
|
locale-specific et of wide characters for which neither `iswspace'
|
|
nor `iswalnum' is true. */
|
|
extern int __iswpunct_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a locale-specific
|
|
set of wide characters for which none of `iswalnum', `iswgraph', or
|
|
`iswpunct' is true. */
|
|
extern int __iswspace_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to an uppercase letter
|
|
or is one of a locale-specific set of wide character for which none
|
|
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int __iswupper_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a hexadecimal-digit
|
|
character equivalent to that performed be the functions described
|
|
in the previous subclause. */
|
|
extern int __iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a standard blank
|
|
wide character or a locale-specific set of wide characters for
|
|
which `iswalnum' is false. */
|
|
extern int __iswblank_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
by the string argument PROPERTY. */
|
|
extern wctype_t __wctype_l (__const char *__property, __locale_t __locale)
|
|
__THROW;
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int __iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale)
|
|
__THROW;
|
|
|
|
|
|
/*
|
|
* Wide-character case-mapping functions.
|
|
*/
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t __towlower_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t __towupper_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t __towctrans_l (wint_t __wc, wctrans_t __desc,
|
|
__locale_t __locale) __THROW;
|
|
|
|
# endif /* Use GNU. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* __WCTYPE_H defined. */
|
|
|
|
#endif /* wctype.h */
|