mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 19:30:10 +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.
140 lines
4.6 KiB
C
140 lines
4.6 KiB
C
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
|
|
|
|
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. */
|
|
|
|
/* Tables indexed by a wide character are compressed through the use
|
|
of a multi-level lookup. The compression effect comes from blocks
|
|
that don't need particular data and from block that can share their
|
|
data. */
|
|
|
|
/* Bit tables are accessed by cutting wc in four blocks of bits:
|
|
- the high 32-q-p bits,
|
|
- the next q bits,
|
|
- the next p bits,
|
|
- the next 5 bits.
|
|
|
|
+------------------+-----+-----+-----+
|
|
wc = + 32-q-p-5 | q | p | 5 |
|
|
+------------------+-----+-----+-----+
|
|
|
|
p and q are variable. For 16-bit Unicode it is sufficient to
|
|
choose p and q such that q+p+5 <= 16.
|
|
|
|
The table contains the following uint32_t words:
|
|
- q+p+5,
|
|
- s = upper exclusive bound for wc >> (q+p+5),
|
|
- p+5,
|
|
- 2^q-1,
|
|
- 2^p-1,
|
|
- 1st-level table: s offsets, pointing into the 2nd-level table,
|
|
- 2nd-level table: k*2^q offsets, pointing into the 3rd-level table,
|
|
- 3rd-level table: j*2^p words, each containing 32 bits of data.
|
|
*/
|
|
|
|
static __inline int
|
|
wctype_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = (wc >> 5) & mask3;
|
|
uint32_t lookup3 = ((const uint32_t *)(table + lookup2))[index3];
|
|
|
|
return (lookup3 >> (wc & 0x1f)) & 1;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Byte tables are similar to bit tables, except that the addressing
|
|
unit is a single byte, and no 5 bits are used as a word index. */
|
|
|
|
static __inline int
|
|
wcwidth_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = wc & mask3;
|
|
uint8_t lookup3 = ((const uint8_t *)(table + lookup2))[index3];
|
|
|
|
return lookup3;
|
|
}
|
|
}
|
|
}
|
|
return 0xff;
|
|
}
|
|
|
|
/* Mapping tables are similar to bit tables, except that the
|
|
addressing unit is a single signed 32-bit word, containing the
|
|
difference between the desired result and the argument, and no 5
|
|
bits are used as a word index. */
|
|
|
|
static __inline uint32_t
|
|
wctrans_table_lookup (const char *table, uint32_t wc)
|
|
{
|
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
|
uint32_t index1 = wc >> shift1;
|
|
uint32_t bound = ((const uint32_t *) table)[1];
|
|
if (index1 < bound)
|
|
{
|
|
uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
|
|
if (lookup1 != 0)
|
|
{
|
|
uint32_t shift2 = ((const uint32_t *) table)[2];
|
|
uint32_t mask2 = ((const uint32_t *) table)[3];
|
|
uint32_t index2 = (wc >> shift2) & mask2;
|
|
uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
|
|
if (lookup2 != 0)
|
|
{
|
|
uint32_t mask3 = ((const uint32_t *) table)[4];
|
|
uint32_t index3 = wc & mask3;
|
|
int32_t lookup3 = ((const int32_t *)(table + lookup2))[index3];
|
|
|
|
return wc + lookup3;
|
|
}
|
|
}
|
|
}
|
|
return wc;
|
|
}
|