2003-06-13 21:05:42 +00:00
|
|
|
/* Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
|
1996-12-20 01:39:50 +00:00
|
|
|
This file is part of the GNU C Library.
|
1999-08-31 07:04:41 +00:00
|
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
1996-12-20 01:39:50 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
1996-12-20 01:39:50 +00:00
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
#include <errno.h>
|
1999-08-31 07:04:41 +00:00
|
|
|
#include <error.h>
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
#include <stdlib.h>
|
1999-12-13 07:40:47 +00:00
|
|
|
#include <wchar.h>
|
1999-12-31 18:23:00 +00:00
|
|
|
#include <sys/param.h>
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
2002-02-05 23:29:24 +00:00
|
|
|
#include "localedef.h"
|
1999-08-31 07:04:41 +00:00
|
|
|
#include "charmap.h"
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
#include "localeinfo.h"
|
1999-08-31 07:04:41 +00:00
|
|
|
#include "linereader.h"
|
|
|
|
#include "locfile.h"
|
1999-12-31 18:23:00 +00:00
|
|
|
#include "elem-hash.h"
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
|
|
|
/* Uncomment the following line in the production version. */
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
/* #define NDEBUG 1 */
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
#define obstack_chunk_alloc malloc
|
|
|
|
#define obstack_chunk_free free
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
static inline void
|
2003-06-13 21:05:42 +00:00
|
|
|
__attribute ((always_inline))
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (struct obstack *obstack, int32_t data)
|
|
|
|
{
|
|
|
|
if (sizeof (int32_t) == sizeof (int))
|
|
|
|
obstack_int_grow (obstack, data);
|
|
|
|
else
|
|
|
|
obstack_grow (obstack, &data, sizeof (int32_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2003-06-13 21:05:42 +00:00
|
|
|
__attribute ((always_inline))
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (struct obstack *obstack, int32_t data)
|
|
|
|
{
|
|
|
|
if (sizeof (int32_t) == sizeof (int))
|
|
|
|
obstack_int_grow_fast (obstack, data);
|
|
|
|
else
|
|
|
|
obstack_grow (obstack, &data, sizeof (int32_t));
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Forward declaration. */
|
|
|
|
struct element_t;
|
|
|
|
|
|
|
|
/* Data type for list of strings. */
|
|
|
|
struct section_list
|
|
|
|
{
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Successor in the known_sections list. */
|
2000-06-25 18:01:25 +00:00
|
|
|
struct section_list *def_next;
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Successor in the sections list. */
|
1999-08-31 07:04:41 +00:00
|
|
|
struct section_list *next;
|
|
|
|
/* Name of the section. */
|
|
|
|
const char *name;
|
|
|
|
/* First element of this section. */
|
|
|
|
struct element_t *first;
|
|
|
|
/* Last element of this section. */
|
|
|
|
struct element_t *last;
|
|
|
|
/* These are the rules for this section. */
|
|
|
|
enum coll_sort_rule *rules;
|
1999-12-24 05:42:34 +00:00
|
|
|
/* Index of the rule set in the appropriate section of the output file. */
|
|
|
|
int ruleidx;
|
1999-08-31 07:04:41 +00:00
|
|
|
};
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
struct element_t;
|
|
|
|
|
|
|
|
struct element_list_t
|
|
|
|
{
|
|
|
|
/* Number of elements. */
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
struct element_t **w;
|
|
|
|
};
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Data type for collating element. */
|
|
|
|
struct element_t
|
|
|
|
{
|
1999-12-13 07:40:47 +00:00
|
|
|
const char *name;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
const char *mbs;
|
1999-12-24 05:42:34 +00:00
|
|
|
size_t nmbs;
|
1999-08-31 07:04:41 +00:00
|
|
|
const uint32_t *wcs;
|
1999-12-24 05:42:34 +00:00
|
|
|
size_t nwcs;
|
1999-12-20 22:08:01 +00:00
|
|
|
int *mborder;
|
1999-12-18 19:45:25 +00:00
|
|
|
int wcorder;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
/* The following is a bit mask which bits are set if this element is
|
|
|
|
used in the appropriate level. Interesting for the singlebyte
|
|
|
|
weight computation.
|
|
|
|
|
|
|
|
XXX The type here restricts the number of levels to 32. It could
|
2000-05-24 20:04:34 +00:00
|
|
|
be changed if necessary but I doubt this is necessary. */
|
1999-12-20 22:08:01 +00:00
|
|
|
unsigned int used_in_level;
|
|
|
|
|
1999-12-31 18:23:00 +00:00
|
|
|
struct element_list_t *weights;
|
|
|
|
|
1999-12-26 19:11:05 +00:00
|
|
|
/* Nonzero if this is a real character definition. */
|
|
|
|
int is_character;
|
|
|
|
|
2000-05-24 20:04:34 +00:00
|
|
|
/* Order of the character in the sequence. This information will
|
|
|
|
be used in range expressions. */
|
|
|
|
int mbseqorder;
|
|
|
|
int wcseqorder;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Where does the definition come from. */
|
|
|
|
const char *file;
|
|
|
|
size_t line;
|
|
|
|
|
|
|
|
/* Which section does this belong to. */
|
|
|
|
struct section_list *section;
|
|
|
|
|
|
|
|
/* Predecessor and successor in the order list. */
|
|
|
|
struct element_t *last;
|
|
|
|
struct element_t *next;
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
/* Next element in multibyte output list. */
|
|
|
|
struct element_t *mbnext;
|
2000-01-20 00:07:20 +00:00
|
|
|
struct element_t *mblast;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
|
|
|
/* Next element in wide character output list. */
|
|
|
|
struct element_t *wcnext;
|
2000-01-21 05:18:41 +00:00
|
|
|
struct element_t *wclast;
|
1999-08-31 07:04:41 +00:00
|
|
|
};
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
/* Special element value. */
|
|
|
|
#define ELEMENT_ELLIPSIS2 ((struct element_t *) 1)
|
|
|
|
#define ELEMENT_ELLIPSIS3 ((struct element_t *) 2)
|
|
|
|
#define ELEMENT_ELLIPSIS4 ((struct element_t *) 3)
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Data type for collating symbol. */
|
|
|
|
struct symbol_t
|
|
|
|
{
|
2000-08-06 17:13:27 +00:00
|
|
|
const char *name;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Point to place in the order list. */
|
|
|
|
struct element_t *order;
|
|
|
|
|
|
|
|
/* Where does the definition come from. */
|
|
|
|
const char *file;
|
|
|
|
size_t line;
|
|
|
|
};
|
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Sparse table of struct element_t *. */
|
|
|
|
#define TABLE wchead_table
|
|
|
|
#define ELEMENT struct element_t *
|
|
|
|
#define DEFAULT NULL
|
|
|
|
#define ITERATE
|
|
|
|
#define NO_FINALIZE
|
|
|
|
#include "3level.h"
|
|
|
|
|
|
|
|
/* Sparse table of int32_t. */
|
|
|
|
#define TABLE collidx_table
|
|
|
|
#define ELEMENT int32_t
|
|
|
|
#define DEFAULT 0
|
|
|
|
#include "3level.h"
|
|
|
|
|
|
|
|
/* Sparse table of uint32_t. */
|
|
|
|
#define TABLE collseq_table
|
|
|
|
#define ELEMENT uint32_t
|
|
|
|
#define DEFAULT ~((uint32_t) 0)
|
|
|
|
#include "3level.h"
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* The real definition of the struct for the LC_COLLATE locale. */
|
|
|
|
struct locale_collate_t
|
|
|
|
{
|
|
|
|
int col_weight_max;
|
|
|
|
int cur_weight_max;
|
|
|
|
|
|
|
|
/* List of known scripts. */
|
2000-06-25 18:01:25 +00:00
|
|
|
struct section_list *known_sections;
|
|
|
|
/* List of used sections. */
|
1999-08-31 07:04:41 +00:00
|
|
|
struct section_list *sections;
|
|
|
|
/* Current section using definition. */
|
|
|
|
struct section_list *current_section;
|
|
|
|
/* There always can be an unnamed section. */
|
|
|
|
struct section_list unnamed_section;
|
|
|
|
/* To make handling of errors easier we have another section. */
|
|
|
|
struct section_list error_section;
|
2000-06-25 18:01:25 +00:00
|
|
|
/* Sometimes we are defining the values for collating symbols before
|
|
|
|
the first actual section. */
|
|
|
|
struct section_list symbol_section;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Start of the order list. */
|
|
|
|
struct element_t *start;
|
|
|
|
|
|
|
|
/* The undefined element. */
|
|
|
|
struct element_t undefined;
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* This is the cursor for `reorder_after' insertions. */
|
|
|
|
struct element_t *cursor;
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
/* This value is used when handling ellipsis. */
|
|
|
|
struct element_t ellipsis_weight;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Known collating elements. */
|
|
|
|
hash_table elem_table;
|
|
|
|
|
|
|
|
/* Known collating symbols. */
|
|
|
|
hash_table sym_table;
|
|
|
|
|
|
|
|
/* Known collation sequences. */
|
|
|
|
hash_table seq_table;
|
|
|
|
|
|
|
|
struct obstack mempool;
|
|
|
|
|
|
|
|
/* The LC_COLLATE category is a bit special as it is sometimes possible
|
|
|
|
that the definitions from more than one input file contains information.
|
|
|
|
Therefore we keep all relevant input in a list. */
|
|
|
|
struct locale_collate_t *next;
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
/* Arrays with heads of the list for each of the leading bytes in
|
|
|
|
the multibyte sequences. */
|
|
|
|
struct element_t *mbheads[256];
|
1999-12-30 08:09:32 +00:00
|
|
|
|
|
|
|
/* Arrays with heads of the list for each of the leading bytes in
|
|
|
|
the multibyte sequences. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
struct wchead_table wcheads;
|
2000-05-24 20:04:34 +00:00
|
|
|
|
|
|
|
/* The arrays with the collation sequence order. */
|
|
|
|
unsigned char mbseqorder[256];
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
struct collseq_table wcseqorder;
|
1999-08-31 07:04:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* We have a few global variables which are used for reading all
|
|
|
|
LC_COLLATE category descriptions in all files. */
|
1999-12-25 23:41:39 +00:00
|
|
|
static uint32_t nrules;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
/* We need UTF-8 encoding of numbers. */
|
|
|
|
static inline int
|
2003-06-13 21:05:42 +00:00
|
|
|
__attribute ((always_inline))
|
1999-12-24 05:42:34 +00:00
|
|
|
utf8_encode (char *buf, int val)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (val < 0x80)
|
|
|
|
{
|
|
|
|
*buf++ = (char) val;
|
|
|
|
retval = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int step;
|
|
|
|
|
|
|
|
for (step = 2; step < 6; ++step)
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
if ((val & (~(uint32_t)0 << (5 * step + 1))) == 0)
|
1999-12-24 05:42:34 +00:00
|
|
|
break;
|
|
|
|
retval = step;
|
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
*buf = (unsigned char) (~0xff >> step);
|
1999-12-24 05:42:34 +00:00
|
|
|
--step;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
buf[step] = 0x80 | (val & 0x3f);
|
|
|
|
val >>= 6;
|
|
|
|
}
|
|
|
|
while (--step > 0);
|
|
|
|
*buf |= val;
|
|
|
|
}
|
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
return retval;
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
static struct section_list *
|
|
|
|
make_seclist_elem (struct locale_collate_t *collate, const char *string,
|
|
|
|
struct section_list *next)
|
|
|
|
{
|
|
|
|
struct section_list *newp;
|
|
|
|
|
|
|
|
newp = (struct section_list *) obstack_alloc (&collate->mempool,
|
|
|
|
sizeof (*newp));
|
|
|
|
newp->next = next;
|
|
|
|
newp->name = string;
|
|
|
|
newp->first = NULL;
|
2000-09-11 20:33:59 +00:00
|
|
|
newp->last = NULL;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct element_t *
|
1999-12-18 19:45:25 +00:00
|
|
|
new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen,
|
1999-12-26 19:11:05 +00:00
|
|
|
const uint32_t *wcs, const char *name, size_t namelen,
|
|
|
|
int is_character)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
struct element_t *newp;
|
|
|
|
|
|
|
|
newp = (struct element_t *) obstack_alloc (&collate->mempool,
|
|
|
|
sizeof (*newp));
|
1999-12-20 22:08:01 +00:00
|
|
|
newp->name = name == NULL ? NULL : obstack_copy0 (&collate->mempool,
|
|
|
|
name, namelen);
|
1999-12-18 19:45:25 +00:00
|
|
|
if (mbs != NULL)
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
newp->mbs = obstack_copy0 (&collate->mempool, mbs, mbslen);
|
|
|
|
newp->nmbs = mbslen;
|
|
|
|
}
|
1999-12-18 19:45:25 +00:00
|
|
|
else
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
newp->mbs = NULL;
|
|
|
|
newp->nmbs = 0;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
if (wcs != NULL)
|
|
|
|
{
|
1999-12-24 05:42:34 +00:00
|
|
|
size_t nwcs = wcslen ((wchar_t *) wcs);
|
1999-12-13 07:40:47 +00:00
|
|
|
uint32_t zero = 0;
|
|
|
|
obstack_grow (&collate->mempool, wcs, nwcs * sizeof (uint32_t));
|
|
|
|
obstack_grow (&collate->mempool, &zero, sizeof (uint32_t));
|
|
|
|
newp->wcs = (uint32_t *) obstack_finish (&collate->mempool);
|
1999-12-24 05:42:34 +00:00
|
|
|
newp->nwcs = nwcs;
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
else
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
newp->wcs = NULL;
|
|
|
|
newp->nwcs = 0;
|
|
|
|
}
|
1999-12-20 22:08:01 +00:00
|
|
|
newp->mborder = NULL;
|
1999-12-18 19:45:25 +00:00
|
|
|
newp->wcorder = 0;
|
1999-12-20 22:08:01 +00:00
|
|
|
newp->used_in_level = 0;
|
1999-12-26 19:11:05 +00:00
|
|
|
newp->is_character = is_character;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Will be assigned later. XXX */
|
|
|
|
newp->mbseqorder = 0;
|
|
|
|
newp->wcseqorder = 0;
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
/* Will be allocated later. */
|
|
|
|
newp->weights = NULL;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
newp->file = NULL;
|
|
|
|
newp->line = 0;
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
newp->section = collate->current_section;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
newp->last = NULL;
|
|
|
|
newp->next = NULL;
|
|
|
|
|
1999-12-18 19:45:25 +00:00
|
|
|
newp->mbnext = NULL;
|
2000-01-20 00:07:20 +00:00
|
|
|
newp->mblast = NULL;
|
1999-12-18 19:45:25 +00:00
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
newp->wcnext = NULL;
|
|
|
|
newp->wclast = NULL;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct symbol_t *
|
2000-08-06 17:13:27 +00:00
|
|
|
new_symbol (struct locale_collate_t *collate, const char *name, size_t len)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
struct symbol_t *newp;
|
Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* intl/Makefile (copysrc): Add missing > in sed cmd.
Sat Mar 23 17:52:49 1996 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
change value to $(datadir)/i18n. `nls' is not an appropriate
name.
* Makefile (subdirs): Add new subdir wctype.
* ctype/ctype-info.c: Add new global variable __ctype_names
and initialize from _nl_C_LC_CTYPE.
* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
class. Use bit 11.
[_ISbit]: Protect definition of bitmasks because they are also
used in wctype.h.
* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
after successfully pushing back a character.
Fundamental changes in locale implementation. Almost nothing
from the old code is used anymore.
* locale/charmap.c, locale/collate.c, locale/config.h,
locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
locale/locale.c locale/localeconv.c, locale/localedef.c,
locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
locale/numeric.c, locale/setlocale.c, locale/token.h,
locale/xmalloc.c: Removed.
* locale/Makefile: Update for new locale implementation with
program source code distributed in subdir.
* locale/categories.def, locale/iso-4217.def: Updated file
for new locale implementation.
* locale/langinfo.h: Updated for new locale implementation.
(ERA_D_T_FMT, ERA_T_FMT): New official values according to
P1003.2b/D11.
(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
extended LC_CTYPE and LC_COLLATE implementation.
* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
locale/xstrdup.c: Helper functions for locale related programs.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c,
locale/lc-collate.c, locale/lc-ctype.c,
locale/lc-messages.c, locale/lc-monetary.c,
locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
functions, and new generated "C" locale data.
* locale/loadlocale.c: Now handles word fields in locale binary
automatically by changing the endianess if necessary.
* locale/localeinfo.h (LIMAGIC): Changed magic number because
of incompatible changes.
(locale_data): Changed definition to allow word as a value type.
(coll_sort_rule): Values for collation sorting mode.
(_NL_CURRENT_WORD): New macro to access word value of locale entry.
(__collate_table, __collate_extra): Declare new global variables
for collation tables.
* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
* locale/weight.h: Functions to access collation tables.
* posix/unistd.h: Define _POSIX2_LOCALEDEF.
* stdio-common/printf_fp.c: Fix bug with printing certain numbers
< 10^-1. Reported by Bill Metzenthen.
* stdio-common/tfformat.c: Add new test for above bug.
* string/strcoll.c, string/strxfrm.c: Real implementation of
string collation according to ISO C.
* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
Implementation of wide character classes and mapping.
1996-03-28 08:30:38 +00:00
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
newp = (struct symbol_t *) obstack_alloc (&collate->mempool, sizeof (*newp));
|
|
|
|
|
2000-08-06 17:13:27 +00:00
|
|
|
newp->name = obstack_copy0 (&collate->mempool, name, len);
|
1999-08-31 07:04:41 +00:00
|
|
|
newp->order = NULL;
|
|
|
|
|
|
|
|
newp->file = NULL;
|
|
|
|
newp->line = 0;
|
|
|
|
|
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Test whether this name is already defined somewhere. */
|
|
|
|
static int
|
|
|
|
check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap,
|
|
|
|
struct repertoire_t *repertoire, const char *symbol,
|
|
|
|
size_t symbol_len)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
void *ignore = NULL;
|
|
|
|
|
|
|
|
if (find_entry (&charmap->char_table, symbol, symbol_len, &ignore) == 0)
|
|
|
|
{
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_error (ldfile, _("`%.*s' already defined in charmap"),
|
|
|
|
(int) symbol_len, symbol);
|
1999-08-31 07:04:41 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-04-01 17:53:24 +00:00
|
|
|
if (repertoire != NULL
|
|
|
|
&& (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore)
|
|
|
|
== 0))
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_error (ldfile, _("`%.*s' already defined in repertoire"),
|
|
|
|
(int) symbol_len, symbol);
|
1999-08-31 07:04:41 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (find_entry (&collate->sym_table, symbol, symbol_len, &ignore) == 0)
|
|
|
|
{
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_error (ldfile, _("`%.*s' already defined as collating symbol"),
|
|
|
|
(int) symbol_len, symbol);
|
1999-08-31 07:04:41 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (find_entry (&collate->elem_table, symbol, symbol_len, &ignore) == 0)
|
|
|
|
{
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_error (ldfile, _("`%.*s' already defined as collating element"),
|
|
|
|
(int) symbol_len, symbol);
|
1999-08-31 07:04:41 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the direction specification. */
|
|
|
|
static void
|
|
|
|
read_directions (struct linereader *ldfile, struct token *arg,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap,
|
|
|
|
struct repertoire_t *repertoire, struct localedef_t *result)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
int cnt = 0;
|
|
|
|
int max = nrules ?: 10;
|
|
|
|
enum coll_sort_rule *rules = calloc (max, sizeof (*rules));
|
|
|
|
int warned = 0;
|
2001-12-10 01:37:56 +00:00
|
|
|
struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int valid = 0;
|
|
|
|
|
|
|
|
if (arg->tok == tok_forward)
|
|
|
|
{
|
|
|
|
if (rules[cnt] & sort_backward)
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: `forward' and `backward' are mutually excluding each other"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
warned = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (rules[cnt] & sort_forward)
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
1999-12-26 07:29:11 +00:00
|
|
|
%s: `%s' mentioned more than once in definition of weight %d"),
|
1999-08-31 07:04:41 +00:00
|
|
|
"LC_COLLATE", "forward", cnt + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rules[cnt] |= sort_forward;
|
|
|
|
|
|
|
|
valid = 1;
|
|
|
|
}
|
|
|
|
else if (arg->tok == tok_backward)
|
|
|
|
{
|
|
|
|
if (rules[cnt] & sort_forward)
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: `forward' and `backward' are mutually excluding each other"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
warned = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (rules[cnt] & sort_backward)
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
1999-12-26 07:29:11 +00:00
|
|
|
%s: `%s' mentioned more than once in definition of weight %d"),
|
1999-08-31 07:04:41 +00:00
|
|
|
"LC_COLLATE", "backward", cnt + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rules[cnt] |= sort_backward;
|
|
|
|
|
|
|
|
valid = 1;
|
|
|
|
}
|
|
|
|
else if (arg->tok == tok_position)
|
|
|
|
{
|
|
|
|
if (rules[cnt] & sort_position)
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
1999-12-26 07:29:11 +00:00
|
|
|
%s: `%s' mentioned more than once in definition of weight %d"),
|
1999-08-31 07:04:41 +00:00
|
|
|
"LC_COLLATE", "position", cnt + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rules[cnt] |= sort_position;
|
|
|
|
|
|
|
|
valid = 1;
|
|
|
|
}
|
|
|
|
|
1999-09-27 07:12:38 +00:00
|
|
|
if (valid)
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-09-27 07:12:38 +00:00
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok == tok_eof || arg->tok == tok_eol || arg->tok == tok_comma
|
|
|
|
|| arg->tok == tok_semicolon)
|
|
|
|
{
|
|
|
|
if (! valid && ! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: syntax error"), "LC_COLLATE");
|
|
|
|
warned = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* See whether we have to increment the counter. */
|
|
|
|
if (arg->tok != tok_comma && rules[cnt] != 0)
|
1999-12-25 23:41:39 +00:00
|
|
|
{
|
|
|
|
/* Add the default `forward' if we have seen only `position'. */
|
|
|
|
if (rules[cnt] == sort_position)
|
|
|
|
rules[cnt] = sort_position | sort_forward;
|
|
|
|
|
|
|
|
++cnt;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
if (arg->tok == tok_eof || arg->tok == tok_eol)
|
|
|
|
/* End of line or file, so we exit the loop. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
|
|
|
/* See whether we have enough room in the array. */
|
|
|
|
if (cnt == max)
|
|
|
|
{
|
|
|
|
max += 10;
|
|
|
|
rules = (enum coll_sort_rule *) xrealloc (rules,
|
|
|
|
max
|
|
|
|
* sizeof (*rules));
|
|
|
|
memset (&rules[cnt], '\0', (max - cnt) * sizeof (*rules));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (cnt == nrules)
|
|
|
|
{
|
|
|
|
/* There must not be any more rule. */
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: too many rules; first entry only had %d"),
|
|
|
|
"LC_COLLATE", nrules);
|
|
|
|
warned = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (! warned)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: syntax error"), "LC_COLLATE");
|
|
|
|
warned = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
|
|
|
/* Now we know how many rules we have. */
|
|
|
|
nrules = cnt;
|
|
|
|
rules = (enum coll_sort_rule *) xrealloc (rules,
|
|
|
|
nrules * sizeof (*rules));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (cnt < nrules)
|
|
|
|
{
|
|
|
|
/* Not enough rules in this specification. */
|
|
|
|
if (! warned)
|
|
|
|
lr_error (ldfile, _("%s: not enough sorting rules"), "LC_COLLATE");
|
|
|
|
|
|
|
|
do
|
|
|
|
rules[cnt] = sort_forward;
|
|
|
|
while (++cnt < nrules);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
collate->current_section->rules = rules;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
static struct element_t *
|
|
|
|
find_element (struct linereader *ldfile, struct locale_collate_t *collate,
|
2000-06-25 18:01:25 +00:00
|
|
|
const char *str, size_t len)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
void *result = NULL;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
|
|
|
/* Search for the entries among the collation sequences already define. */
|
2003-06-13 21:05:42 +00:00
|
|
|
if (find_entry (&collate->seq_table, str, len, &result) != 0)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
|
|
|
/* Nope, not define yet. So we see whether it is a
|
|
|
|
collation symbol. */
|
|
|
|
void *ptr;
|
|
|
|
|
|
|
|
if (find_entry (&collate->sym_table, str, len, &ptr) == 0)
|
|
|
|
{
|
|
|
|
/* It's a collation symbol. */
|
|
|
|
struct symbol_t *sym = (struct symbol_t *) ptr;
|
|
|
|
result = sym->order;
|
|
|
|
|
|
|
|
if (result == NULL)
|
1999-12-18 19:45:25 +00:00
|
|
|
result = sym->order = new_element (collate, NULL, 0, NULL,
|
1999-12-26 19:11:05 +00:00
|
|
|
NULL, 0, 0);
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
2003-06-13 21:05:42 +00:00
|
|
|
else if (find_entry (&collate->elem_table, str, len, &result) != 0)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
1999-12-20 22:08:01 +00:00
|
|
|
/* It's also no collation element. So it is a character
|
1999-12-13 07:40:47 +00:00
|
|
|
element defined later. */
|
1999-12-26 19:11:05 +00:00
|
|
|
result = new_element (collate, NULL, 0, NULL, str, len, 1);
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Insert it into the sequence table. */
|
|
|
|
insert_entry (&collate->seq_table, str, len, result);
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-06-13 21:05:42 +00:00
|
|
|
return (struct element_t *) result;
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
static void
|
|
|
|
unlink_element (struct locale_collate_t *collate)
|
|
|
|
{
|
1999-12-20 22:08:01 +00:00
|
|
|
if (collate->cursor == collate->start)
|
|
|
|
{
|
|
|
|
assert (collate->cursor->next == NULL);
|
|
|
|
assert (collate->cursor->last == NULL);
|
|
|
|
collate->cursor = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (collate->cursor->next != NULL)
|
|
|
|
collate->cursor->next->last = collate->cursor->last;
|
|
|
|
if (collate->cursor->last != NULL)
|
|
|
|
collate->cursor->last->next = collate->cursor->next;
|
|
|
|
collate->cursor = collate->cursor->last;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
static void
|
|
|
|
insert_weights (struct linereader *ldfile, struct element_t *elem,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap,
|
|
|
|
struct repertoire_t *repertoire, struct localedef_t *result,
|
|
|
|
enum token_t ellipsis)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
|
|
|
int weight_cnt;
|
|
|
|
struct token *arg;
|
2001-12-10 01:37:56 +00:00
|
|
|
struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
|
|
|
/* Initialize all the fields. */
|
|
|
|
elem->file = ldfile->fname;
|
|
|
|
elem->line = ldfile->lineno;
|
2000-09-11 20:33:59 +00:00
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
elem->last = collate->cursor;
|
|
|
|
elem->next = collate->cursor ? collate->cursor->next : NULL;
|
2000-08-28 03:51:40 +00:00
|
|
|
if (collate->cursor != NULL && collate->cursor->next != NULL)
|
|
|
|
collate->cursor->next->last = elem;
|
1999-12-18 19:45:25 +00:00
|
|
|
if (collate->cursor != NULL)
|
|
|
|
collate->cursor->next = elem;
|
1999-12-20 22:08:01 +00:00
|
|
|
if (collate->start == NULL)
|
|
|
|
{
|
|
|
|
assert (collate->cursor == NULL);
|
|
|
|
collate->start = elem;
|
|
|
|
}
|
2000-09-11 20:33:59 +00:00
|
|
|
|
|
|
|
elem->section = collate->current_section;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
|
|
|
if (collate->current_section->first == NULL)
|
|
|
|
collate->current_section->first = elem;
|
|
|
|
if (collate->current_section->last == collate->cursor)
|
|
|
|
collate->current_section->last = elem;
|
|
|
|
|
|
|
|
collate->cursor = elem;
|
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
elem->weights = (struct element_list_t *)
|
|
|
|
obstack_alloc (&collate->mempool, nrules * sizeof (struct element_list_t));
|
|
|
|
memset (elem->weights, '\0', nrules * sizeof (struct element_list_t));
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
weight_cnt = 0;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-12-11 02:51:13 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
if (arg->tok == tok_eof || arg->tok == tok_eol)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (arg->tok == tok_ignore)
|
|
|
|
{
|
|
|
|
/* The weight for this level has to be ignored. We use the
|
|
|
|
null pointer to indicate this. */
|
|
|
|
elem->weights[weight_cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool, sizeof (struct element_t *));
|
|
|
|
elem->weights[weight_cnt].w[0] = NULL;
|
1999-12-13 07:40:47 +00:00
|
|
|
elem->weights[weight_cnt].cnt = 1;
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
2000-06-25 18:01:25 +00:00
|
|
|
else if (arg->tok == tok_bsymbol || arg->tok == tok_ucs4)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
2000-06-25 18:01:25 +00:00
|
|
|
char ucs4str[10];
|
|
|
|
struct element_t *val;
|
|
|
|
char *symstr;
|
|
|
|
size_t symlen;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
if (arg->tok == tok_bsymbol)
|
|
|
|
{
|
|
|
|
symstr = arg->val.str.startmb;
|
|
|
|
symlen = arg->val.str.lenmb;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
snprintf (ucs4str, sizeof (ucs4str), "U%08X", arg->val.ucs4);
|
|
|
|
symstr = ucs4str;
|
|
|
|
symlen = 9;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = find_element (ldfile, collate, symstr, symlen);
|
1999-12-11 02:51:13 +00:00
|
|
|
if (val == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
elem->weights[weight_cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool, sizeof (struct element_t *));
|
|
|
|
elem->weights[weight_cnt].w[0] = val;
|
|
|
|
elem->weights[weight_cnt].cnt = 1;
|
|
|
|
}
|
|
|
|
else if (arg->tok == tok_string)
|
|
|
|
{
|
|
|
|
/* Split the string up in the individual characters and put
|
|
|
|
the element definitions in the list. */
|
|
|
|
const char *cp = arg->val.str.startmb;
|
|
|
|
int cnt = 0;
|
|
|
|
struct element_t *charelem;
|
1999-12-20 22:08:01 +00:00
|
|
|
struct element_t **weights = NULL;
|
|
|
|
int max = 0;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
|
|
|
if (*cp == '\0')
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: empty weight string not allowed"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (*cp == '<')
|
|
|
|
{
|
2000-06-28 23:00:28 +00:00
|
|
|
/* Ahh, it's a bsymbol or an UCS4 value. If it's
|
|
|
|
the latter we have to unify the name. */
|
1999-12-20 22:08:01 +00:00
|
|
|
const char *startp = ++cp;
|
2000-06-28 23:00:28 +00:00
|
|
|
size_t len;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
while (*cp != '>')
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
|
|
|
if (*cp == ldfile->escape_char)
|
|
|
|
++cp;
|
|
|
|
if (*cp == '\0')
|
1999-12-20 22:08:01 +00:00
|
|
|
/* It's a syntax error. */
|
|
|
|
goto syntax;
|
|
|
|
|
|
|
|
++cp;
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
|
2000-06-28 23:00:28 +00:00
|
|
|
if (cp - startp == 5 && startp[0] == 'U'
|
|
|
|
&& isxdigit (startp[1]) && isxdigit (startp[2])
|
|
|
|
&& isxdigit (startp[3]) && isxdigit (startp[4]))
|
|
|
|
{
|
|
|
|
unsigned int ucs4 = strtoul (startp + 1, NULL, 16);
|
|
|
|
char *newstr;
|
|
|
|
|
|
|
|
newstr = (char *) xmalloc (10);
|
|
|
|
snprintf (newstr, 10, "U%08X", ucs4);
|
|
|
|
startp = newstr;
|
|
|
|
|
|
|
|
len = 9;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
len = cp - startp;
|
|
|
|
|
|
|
|
charelem = find_element (ldfile, collate, startp, len);
|
|
|
|
++cp;
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* People really shouldn't use characters directly in
|
|
|
|
the string. Especially since it's not really clear
|
|
|
|
what this means. We interpret all characters in the
|
|
|
|
string as if that would be bsymbols. Otherwise we
|
|
|
|
would have to match back to bsymbols somehow and this
|
1999-12-20 22:08:01 +00:00
|
|
|
is normally not what people normally expect. */
|
2000-06-25 18:01:25 +00:00
|
|
|
charelem = find_element (ldfile, collate, cp++, 1);
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (charelem == NULL)
|
|
|
|
{
|
|
|
|
/* We ignore the rest of the line. */
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the pointer. */
|
1999-12-20 22:08:01 +00:00
|
|
|
if (cnt >= max)
|
|
|
|
{
|
|
|
|
struct element_t **newp;
|
|
|
|
max += 10;
|
|
|
|
newp = (struct element_t **)
|
|
|
|
alloca (max * sizeof (struct element_t *));
|
|
|
|
memcpy (newp, weights, cnt * sizeof (struct element_t *));
|
|
|
|
weights = newp;
|
|
|
|
}
|
|
|
|
weights[cnt++] = charelem;
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
|
|
|
while (*cp != '\0');
|
|
|
|
|
|
|
|
/* Now store the information. */
|
|
|
|
elem->weights[weight_cnt].w = (struct element_t **)
|
1999-12-20 22:08:01 +00:00
|
|
|
obstack_alloc (&collate->mempool,
|
|
|
|
cnt * sizeof (struct element_t *));
|
|
|
|
memcpy (elem->weights[weight_cnt].w, weights,
|
|
|
|
cnt * sizeof (struct element_t *));
|
1999-12-11 02:51:13 +00:00
|
|
|
elem->weights[weight_cnt].cnt = cnt;
|
|
|
|
|
|
|
|
/* We don't need the string anymore. */
|
|
|
|
free (arg->val.str.startmb);
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
else if (ellipsis != tok_none
|
|
|
|
&& (arg->tok == tok_ellipsis2
|
|
|
|
|| arg->tok == tok_ellipsis3
|
|
|
|
|| arg->tok == tok_ellipsis4))
|
|
|
|
{
|
|
|
|
/* It must be the same ellipsis as used in the initial column. */
|
|
|
|
if (arg->tok != ellipsis)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: weights must use the same ellipsis symbol as the name"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
/* The weight for this level will depend on the element
|
|
|
|
iterating over the range. Put a placeholder. */
|
1999-12-13 07:40:47 +00:00
|
|
|
elem->weights[weight_cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool, sizeof (struct element_t *));
|
|
|
|
elem->weights[weight_cnt].w[0] = ELEMENT_ELLIPSIS2;
|
|
|
|
elem->weights[weight_cnt].cnt = 1;
|
|
|
|
}
|
1999-12-11 02:51:13 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
syntax:
|
|
|
|
/* It's a syntax error. */
|
|
|
|
lr_error (ldfile, _("%s: syntax error"), "LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-12-11 02:51:13 +00:00
|
|
|
/* This better should be the end of the line or a semicolon. */
|
|
|
|
if (arg->tok == tok_semicolon)
|
|
|
|
/* OK, ignore this and read the next token. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-12-11 02:51:13 +00:00
|
|
|
else if (arg->tok != tok_eof && arg->tok != tok_eol)
|
|
|
|
{
|
|
|
|
/* It's a syntax error. */
|
|
|
|
lr_error (ldfile, _("%s: syntax error"), "LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (++weight_cnt < nrules);
|
|
|
|
|
|
|
|
if (weight_cnt < nrules)
|
|
|
|
{
|
|
|
|
/* This means the rest of the line uses the current element as
|
|
|
|
the weight. */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
elem->weights[weight_cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool, sizeof (struct element_t *));
|
2000-01-20 00:07:20 +00:00
|
|
|
if (ellipsis == tok_none)
|
|
|
|
elem->weights[weight_cnt].w[0] = elem;
|
|
|
|
else
|
|
|
|
elem->weights[weight_cnt].w[0] = ELEMENT_ELLIPSIS2;
|
1999-12-11 02:51:13 +00:00
|
|
|
elem->weights[weight_cnt].cnt = 1;
|
|
|
|
}
|
|
|
|
while (++weight_cnt < nrules);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (arg->tok == tok_ignore || arg->tok == tok_bsymbol)
|
|
|
|
{
|
|
|
|
/* Too many rule values. */
|
|
|
|
lr_error (ldfile, _("%s: too many values"), "LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
lr_ignore_rest (ldfile, arg->tok != tok_eol && arg->tok != tok_eof);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-18 19:45:25 +00:00
|
|
|
static int
|
2000-06-21 03:59:55 +00:00
|
|
|
insert_value (struct linereader *ldfile, const char *symstr, size_t symlen,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap, struct repertoire_t *repertoire,
|
|
|
|
struct localedef_t *result)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
/* First find out what kind of symbol this is. */
|
|
|
|
struct charseq *seq;
|
|
|
|
uint32_t wc;
|
|
|
|
struct element_t *elem = NULL;
|
2001-12-10 01:37:56 +00:00
|
|
|
struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Try to find the character in the charmap. */
|
2000-06-21 03:59:55 +00:00
|
|
|
seq = charmap_find_value (charmap, symstr, symlen);
|
1999-08-31 07:04:41 +00:00
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
/* Determine the wide character. */
|
|
|
|
if (seq == NULL || seq->ucs4 == UNINITIALIZED_CHAR_VALUE)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
wc = repertoire_find_value (repertoire, symstr, symlen);
|
1999-12-13 07:40:47 +00:00
|
|
|
if (seq != NULL)
|
|
|
|
seq->ucs4 = wc;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
wc = seq->ucs4;
|
|
|
|
|
1999-09-27 16:47:01 +00:00
|
|
|
if (wc == ILLEGAL_CHAR_VALUE && seq == NULL)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
/* It's no character, so look through the collation elements and
|
|
|
|
symbol list. */
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr = elem;
|
|
|
|
if (find_entry (&collate->elem_table, symstr, symlen, &ptr) != 0)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2001-08-04 08:05:56 +00:00
|
|
|
void *result;
|
|
|
|
struct symbol_t *sym = NULL;
|
|
|
|
|
|
|
|
/* It's also collation element. Therefore it's either a
|
|
|
|
collating symbol or it's a character which is not
|
|
|
|
supported by the character set. In the later case we
|
|
|
|
simply create a dummy entry. */
|
|
|
|
if (find_entry (&collate->sym_table, symstr, symlen, &result) == 0)
|
|
|
|
{
|
|
|
|
/* It's a collation symbol. */
|
|
|
|
sym = (struct symbol_t *) result;
|
|
|
|
|
|
|
|
elem = sym->order;
|
|
|
|
}
|
1999-09-27 16:47:01 +00:00
|
|
|
|
|
|
|
if (elem == NULL)
|
2001-08-04 08:05:56 +00:00
|
|
|
{
|
|
|
|
elem = new_element (collate, NULL, 0, NULL, symstr, symlen, 0);
|
|
|
|
|
|
|
|
if (sym != NULL)
|
|
|
|
sym->order = elem;
|
|
|
|
else
|
|
|
|
/* Enter a fake element in the sequence table. This
|
|
|
|
won't cause anything in the output since there is
|
|
|
|
no multibyte or wide character associated with
|
|
|
|
it. */
|
|
|
|
insert_entry (&collate->seq_table, symstr, symlen, elem);
|
|
|
|
}
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
2003-06-13 21:05:42 +00:00
|
|
|
else
|
|
|
|
/* Copy the result back. */
|
|
|
|
elem = ptr;
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
1999-09-27 16:47:01 +00:00
|
|
|
else
|
|
|
|
{
|
1999-12-11 02:51:13 +00:00
|
|
|
/* Otherwise the symbols stands for a character. */
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr = elem;
|
|
|
|
if (find_entry (&collate->seq_table, symstr, symlen, &ptr) != 0)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
1999-12-13 07:40:47 +00:00
|
|
|
uint32_t wcs[2] = { wc, 0 };
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
/* We have to allocate an entry. */
|
1999-12-13 07:40:47 +00:00
|
|
|
elem = new_element (collate, seq != NULL ? seq->bytes : NULL,
|
1999-12-30 16:53:41 +00:00
|
|
|
seq != NULL ? seq->nbytes : 0,
|
|
|
|
wc == ILLEGAL_CHAR_VALUE ? NULL : wcs,
|
2000-06-21 03:59:55 +00:00
|
|
|
symstr, symlen, 1);
|
1999-12-11 02:51:13 +00:00
|
|
|
|
|
|
|
/* And add it to the table. */
|
2000-06-21 03:59:55 +00:00
|
|
|
if (insert_entry (&collate->seq_table, symstr, symlen, elem) != 0)
|
1999-12-11 02:51:13 +00:00
|
|
|
/* This cannot happen. */
|
1999-12-13 07:40:47 +00:00
|
|
|
assert (! "Internal error");
|
1999-12-11 02:51:13 +00:00
|
|
|
}
|
1999-12-24 05:42:34 +00:00
|
|
|
else
|
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
/* Copy the result back. */
|
|
|
|
elem = ptr;
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
/* Maybe the character was used before the definition. In this case
|
|
|
|
we have to insert the byte sequences now. */
|
|
|
|
if (elem->mbs == NULL && seq != NULL)
|
|
|
|
{
|
|
|
|
elem->mbs = obstack_copy0 (&collate->mempool,
|
|
|
|
seq->bytes, seq->nbytes);
|
|
|
|
elem->nmbs = seq->nbytes;
|
|
|
|
}
|
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
if (elem->wcs == NULL && wc != ILLEGAL_CHAR_VALUE)
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
uint32_t wcs[2] = { wc, 0 };
|
|
|
|
|
|
|
|
elem->wcs = obstack_copy (&collate->mempool, wcs, sizeof (wcs));
|
|
|
|
elem->nwcs = 1;
|
|
|
|
}
|
|
|
|
}
|
1999-09-27 16:47:01 +00:00
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Test whether this element is not already in the list. */
|
2000-09-11 20:33:59 +00:00
|
|
|
if (elem->next != NULL || elem == collate->cursor)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-03-20 18:09:38 +00:00
|
|
|
lr_error (ldfile, _("order for `%.*s' already defined at %s:%Zu"),
|
2000-06-21 03:59:55 +00:00
|
|
|
(int) symlen, symstr, elem->file, elem->line);
|
1999-12-11 02:51:13 +00:00
|
|
|
lr_ignore_rest (ldfile, 0);
|
1999-12-18 19:45:25 +00:00
|
|
|
return 1;
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
insert_weights (ldfile, elem, charmap, repertoire, result, tok_none);
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
return 0;
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (struct linereader *ldfile, const char *symstr, size_t symlen,
|
2001-12-10 01:37:56 +00:00
|
|
|
enum token_t ellipsis, const struct charmap_t *charmap,
|
1999-12-13 07:40:47 +00:00
|
|
|
struct repertoire_t *repertoire,
|
2001-12-10 01:37:56 +00:00
|
|
|
struct localedef_t *result)
|
1999-12-13 07:40:47 +00:00
|
|
|
{
|
|
|
|
struct element_t *startp;
|
|
|
|
struct element_t *endp;
|
2001-12-10 01:37:56 +00:00
|
|
|
struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
/* Unlink the entry added for the ellipsis. */
|
|
|
|
unlink_element (collate);
|
|
|
|
startp = collate->cursor;
|
|
|
|
|
|
|
|
/* Process and add the end-entry. */
|
2000-06-21 03:59:55 +00:00
|
|
|
if (symstr != NULL
|
2001-12-10 01:37:56 +00:00
|
|
|
&& insert_value (ldfile, symstr, symlen, charmap, repertoire, result))
|
1999-12-18 19:45:25 +00:00
|
|
|
/* Something went wrong with inserting the to-value. This means
|
|
|
|
we cannot process the ellipsis. */
|
|
|
|
return;
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
/* Reset the cursor. */
|
|
|
|
collate->cursor = startp;
|
|
|
|
|
|
|
|
/* Now we have to handle many different situations:
|
|
|
|
- we have to distinguish between the three different ellipsis forms
|
|
|
|
- the is the ellipsis at the beginning, in the middle, or at the end.
|
|
|
|
*/
|
|
|
|
endp = collate->cursor->next;
|
2000-06-21 03:59:55 +00:00
|
|
|
assert (symstr == NULL || endp != NULL);
|
1999-12-13 07:40:47 +00:00
|
|
|
|
2000-08-06 17:13:27 +00:00
|
|
|
/* XXX The following is probably very wrong since also collating symbols
|
|
|
|
can appear in ranges. But do we want/can refine the test for that? */
|
|
|
|
#if 0
|
1999-12-13 07:40:47 +00:00
|
|
|
/* Both, the start and the end symbol, must stand for characters. */
|
1999-12-26 19:11:05 +00:00
|
|
|
if ((startp != NULL && (startp->name == NULL || ! startp->is_character))
|
|
|
|
|| (endp != NULL && (endp->name == NULL|| ! endp->is_character)))
|
1999-12-13 07:40:47 +00:00
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
2000-08-04 20:27:28 +00:00
|
|
|
%s: the start and the end symbol of a range must stand for characters"),
|
1999-12-13 07:40:47 +00:00
|
|
|
"LC_COLLATE");
|
|
|
|
return;
|
|
|
|
}
|
2000-08-06 17:13:27 +00:00
|
|
|
#endif
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
if (ellipsis == tok_ellipsis3)
|
|
|
|
{
|
1999-12-18 19:45:25 +00:00
|
|
|
/* One requirement we make here: the length of the byte
|
|
|
|
sequences for the first and end character must be the same.
|
|
|
|
This is mainly to prevent unwanted effects and this is often
|
|
|
|
not what is wanted. */
|
1999-12-24 05:42:34 +00:00
|
|
|
size_t len = (startp->mbs != NULL ? startp->nmbs
|
|
|
|
: (endp->mbs != NULL ? endp->nmbs : 0));
|
1999-12-18 19:45:25 +00:00
|
|
|
char mbcnt[len + 1];
|
|
|
|
char mbend[len + 1];
|
|
|
|
|
|
|
|
/* Well, this should be caught somewhere else already. Just to
|
|
|
|
make sure. */
|
|
|
|
assert (startp == NULL || startp->wcs == NULL || startp->wcs[1] == 0);
|
|
|
|
assert (endp == NULL || endp->wcs == NULL || endp->wcs[1] == 0);
|
|
|
|
|
|
|
|
if (startp != NULL && endp != NULL
|
|
|
|
&& startp->mbs != NULL && endp->mbs != NULL
|
1999-12-24 05:42:34 +00:00
|
|
|
&& startp->nmbs != endp->nmbs)
|
1999-12-18 19:45:25 +00:00
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: byte sequences of first and last character must have the same length"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine whether we have to generate multibyte sequences. */
|
|
|
|
if ((startp == NULL || startp->mbs != NULL)
|
|
|
|
&& (endp == NULL || endp->mbs != NULL))
|
|
|
|
{
|
|
|
|
int cnt;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Prepare the beginning byte sequence. This is either from the
|
|
|
|
beginning byte sequence or it is all nulls if it was an
|
|
|
|
initial ellipsis. */
|
|
|
|
if (startp == NULL || startp->mbs == NULL)
|
|
|
|
memset (mbcnt, '\0', len);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy (mbcnt, startp->mbs, len);
|
|
|
|
|
|
|
|
/* And increment it so that the value is the first one we will
|
|
|
|
try to insert. */
|
|
|
|
for (cnt = len - 1; cnt >= 0; --cnt)
|
|
|
|
if (++mbcnt[cnt] != '\0')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mbcnt[len] = '\0';
|
|
|
|
|
|
|
|
/* And the end sequence. */
|
|
|
|
if (endp == NULL || endp->mbs == NULL)
|
|
|
|
memset (mbend, '\0', len);
|
|
|
|
else
|
|
|
|
memcpy (mbend, endp->mbs, len);
|
|
|
|
mbend[len] = '\0';
|
|
|
|
|
|
|
|
/* Test whether we have a correct range. */
|
|
|
|
ret = memcmp (mbcnt, mbend, len);
|
|
|
|
if (ret >= 0)
|
|
|
|
{
|
|
|
|
if (ret > 0)
|
|
|
|
lr_error (ldfile, _("%s: byte sequence of first character of \
|
|
|
|
sequence is not lower than that of the last character"), "LC_COLLATE");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generate the byte sequences data. */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
struct charseq *seq;
|
|
|
|
|
|
|
|
/* Quite a bit of work ahead. We have to find the character
|
|
|
|
definition for the byte sequence and then determine the
|
|
|
|
wide character belonging to it. */
|
|
|
|
seq = charmap_find_symbol (charmap, mbcnt, len);
|
|
|
|
if (seq != NULL)
|
|
|
|
{
|
|
|
|
struct element_t *elem;
|
|
|
|
size_t namelen;
|
|
|
|
|
|
|
|
/* I don't this this can ever happen. */
|
|
|
|
assert (seq->name != NULL);
|
|
|
|
namelen = strlen (seq->name);
|
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
if (seq->ucs4 == UNINITIALIZED_CHAR_VALUE)
|
|
|
|
seq->ucs4 = repertoire_find_value (repertoire, seq->name,
|
|
|
|
namelen);
|
|
|
|
|
1999-12-18 19:45:25 +00:00
|
|
|
/* Now we are ready to insert the new value in the
|
|
|
|
sequence. Find out whether the element is
|
|
|
|
already known. */
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
1999-12-18 19:45:25 +00:00
|
|
|
if (find_entry (&collate->seq_table, seq->name, namelen,
|
2003-06-13 21:05:42 +00:00
|
|
|
&ptr) != 0)
|
1999-12-18 19:45:25 +00:00
|
|
|
{
|
|
|
|
uint32_t wcs[2] = { seq->ucs4, 0 };
|
|
|
|
|
|
|
|
/* We have to allocate an entry. */
|
1999-12-30 16:53:41 +00:00
|
|
|
elem = new_element (collate, mbcnt, len,
|
|
|
|
seq->ucs4 == ILLEGAL_CHAR_VALUE
|
|
|
|
? NULL : wcs, seq->name,
|
1999-12-26 19:11:05 +00:00
|
|
|
namelen, 1);
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
/* And add it to the table. */
|
|
|
|
if (insert_entry (&collate->seq_table, seq->name,
|
|
|
|
namelen, elem) != 0)
|
|
|
|
/* This cannot happen. */
|
|
|
|
assert (! "Internal error");
|
|
|
|
}
|
2003-06-13 21:05:42 +00:00
|
|
|
else
|
|
|
|
/* Copy the result. */
|
|
|
|
elem = ptr;
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
/* Test whether this element is not already in the list. */
|
|
|
|
if (elem->next != NULL || (collate->cursor != NULL
|
|
|
|
&& elem->next == collate->cursor))
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
2000-03-20 18:09:38 +00:00
|
|
|
order for `%.*s' already defined at %s:%Zu"),
|
1999-12-24 05:42:34 +00:00
|
|
|
(int) namelen, seq->name,
|
|
|
|
elem->file, elem->line);
|
1999-12-18 19:45:25 +00:00
|
|
|
goto increment;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enqueue the new element. */
|
|
|
|
elem->last = collate->cursor;
|
2000-01-20 00:07:20 +00:00
|
|
|
if (collate->cursor == NULL)
|
1999-12-20 22:08:01 +00:00
|
|
|
elem->next = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
elem->next = collate->cursor->next;
|
|
|
|
elem->last->next = elem;
|
|
|
|
if (elem->next != NULL)
|
|
|
|
elem->next->last = elem;
|
|
|
|
}
|
|
|
|
if (collate->start == NULL)
|
|
|
|
{
|
|
|
|
assert (collate->cursor == NULL);
|
|
|
|
collate->start = elem;
|
|
|
|
}
|
1999-12-18 19:45:25 +00:00
|
|
|
collate->cursor = elem;
|
|
|
|
|
|
|
|
/* Add the weight value. We take them from the
|
|
|
|
`ellipsis_weights' member of `collate'. */
|
|
|
|
elem->weights = (struct element_list_t *)
|
|
|
|
obstack_alloc (&collate->mempool,
|
|
|
|
nrules * sizeof (struct element_list_t));
|
|
|
|
for (cnt = 0; cnt < nrules; ++cnt)
|
|
|
|
if (collate->ellipsis_weight.weights[cnt].cnt == 1
|
|
|
|
&& (collate->ellipsis_weight.weights[cnt].w[0]
|
|
|
|
== ELEMENT_ELLIPSIS2))
|
|
|
|
{
|
|
|
|
elem->weights[cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool,
|
|
|
|
sizeof (struct element_t *));
|
|
|
|
elem->weights[cnt].w[0] = elem;
|
|
|
|
elem->weights[cnt].cnt = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-01-20 00:07:20 +00:00
|
|
|
/* Simply use the weight from `ellipsis_weight'. */
|
1999-12-18 19:45:25 +00:00
|
|
|
elem->weights[cnt].w =
|
|
|
|
collate->ellipsis_weight.weights[cnt].w;
|
|
|
|
elem->weights[cnt].cnt =
|
|
|
|
collate->ellipsis_weight.weights[cnt].cnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Increment for the next round. */
|
|
|
|
increment:
|
|
|
|
for (cnt = len - 1; cnt >= 0; --cnt)
|
|
|
|
if (++mbcnt[cnt] != '\0')
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Find out whether this was all. */
|
|
|
|
if (cnt < 0 || memcmp (mbcnt, mbend, len) >= 0)
|
|
|
|
/* Yep, that's all. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* For symbolic range we naturally must have a beginning and an
|
|
|
|
end specified by the user. */
|
|
|
|
if (startp == NULL)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: symbolic range ellipsis must not directly follow `order_start'"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
else if (endp == NULL)
|
|
|
|
lr_error (ldfile, _("\
|
2001-05-21 17:38:30 +00:00
|
|
|
%s: symbolic range ellipsis must not be directly followed by `order_end'"),
|
1999-12-13 07:40:47 +00:00
|
|
|
"LC_COLLATE");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Determine the range. To do so we have to determine the
|
|
|
|
common prefix of the both names and then the numeric
|
|
|
|
values of both ends. */
|
|
|
|
size_t lenfrom = strlen (startp->name);
|
|
|
|
size_t lento = strlen (endp->name);
|
|
|
|
char buf[lento + 1];
|
|
|
|
int preflen = 0;
|
|
|
|
long int from;
|
|
|
|
long int to;
|
|
|
|
char *cp;
|
|
|
|
int base = ellipsis == tok_ellipsis2 ? 16 : 10;
|
|
|
|
|
|
|
|
if (lenfrom != lento)
|
|
|
|
{
|
|
|
|
invalid_range:
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
`%s' and `%.*s' are no valid names for symbolic range"),
|
1999-12-24 05:42:34 +00:00
|
|
|
startp->name, (int) lento, endp->name);
|
1999-12-13 07:40:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (startp->name[preflen] == endp->name[preflen])
|
|
|
|
if (startp->name[preflen] == '\0')
|
|
|
|
/* Nothing to be done. The start and end point are identical
|
|
|
|
and while inserting the end point we have already given
|
|
|
|
the user an error message. */
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
++preflen;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
from = strtol (startp->name + preflen, &cp, base);
|
|
|
|
if ((from == UINT_MAX && errno == ERANGE) || *cp != '\0')
|
|
|
|
goto invalid_range;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
to = strtol (endp->name + preflen, &cp, base);
|
|
|
|
if ((to == UINT_MAX && errno == ERANGE) || *cp != '\0')
|
|
|
|
goto invalid_range;
|
|
|
|
|
|
|
|
/* Copy the prefix. */
|
|
|
|
memcpy (buf, startp->name, preflen);
|
|
|
|
|
|
|
|
/* Loop over all values. */
|
|
|
|
for (++from; from < to; ++from)
|
|
|
|
{
|
|
|
|
struct element_t *elem = NULL;
|
|
|
|
struct charseq *seq;
|
|
|
|
uint32_t wc;
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
/* Generate the the name. */
|
2001-10-14 22:33:08 +00:00
|
|
|
sprintf (buf + preflen, base == 10 ? "%ld" : "%lX", from);
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
/* Look whether this name is already defined. */
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
|
|
|
if (find_entry (&collate->seq_table, buf, symlen, &ptr) == 0)
|
1999-12-13 07:40:47 +00:00
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
/* Copy back the result. */
|
|
|
|
elem = ptr;
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
if (elem->next != NULL || (collate->cursor != NULL
|
|
|
|
&& elem->next == collate->cursor))
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
2000-03-20 18:09:38 +00:00
|
|
|
%s: order for `%.*s' already defined at %s:%Zu"),
|
1999-12-24 05:42:34 +00:00
|
|
|
"LC_COLLATE", (int) lenfrom, buf,
|
1999-12-13 07:40:47 +00:00
|
|
|
elem->file, elem->line);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elem->name == NULL)
|
|
|
|
{
|
2000-09-07 09:16:34 +00:00
|
|
|
lr_error (ldfile, _("%s: `%s' must be a character"),
|
1999-12-13 07:40:47 +00:00
|
|
|
"LC_COLLATE", buf);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elem == NULL || (elem->mbs == NULL && elem->wcs == NULL))
|
|
|
|
{
|
|
|
|
/* Search for a character of this name. */
|
|
|
|
seq = charmap_find_value (charmap, buf, lenfrom);
|
|
|
|
if (seq == NULL || seq->ucs4 == UNINITIALIZED_CHAR_VALUE)
|
|
|
|
{
|
|
|
|
wc = repertoire_find_value (repertoire, buf, lenfrom);
|
|
|
|
|
|
|
|
if (seq != NULL)
|
|
|
|
seq->ucs4 = wc;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
wc = seq->ucs4;
|
|
|
|
|
|
|
|
if (wc == ILLEGAL_CHAR_VALUE && seq == NULL)
|
|
|
|
/* We don't know anything about a character with this
|
|
|
|
name. XXX Should we warn? */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (elem == NULL)
|
|
|
|
{
|
|
|
|
uint32_t wcs[2] = { wc, 0 };
|
|
|
|
|
|
|
|
/* We have to allocate an entry. */
|
|
|
|
elem = new_element (collate,
|
|
|
|
seq != NULL ? seq->bytes : NULL,
|
1999-12-18 19:45:25 +00:00
|
|
|
seq != NULL ? seq->nbytes : 0,
|
1999-12-13 07:40:47 +00:00
|
|
|
wc == ILLEGAL_CHAR_VALUE
|
1999-12-30 16:53:41 +00:00
|
|
|
? NULL : wcs, buf, lenfrom, 1);
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Update the element. */
|
|
|
|
if (seq != NULL)
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
elem->mbs = obstack_copy0 (&collate->mempool,
|
|
|
|
seq->bytes, seq->nbytes);
|
|
|
|
elem->nmbs = seq->nbytes;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
if (wc != ILLEGAL_CHAR_VALUE)
|
|
|
|
{
|
|
|
|
uint32_t zero = 0;
|
|
|
|
|
|
|
|
obstack_grow (&collate->mempool,
|
|
|
|
&wc, sizeof (uint32_t));
|
|
|
|
obstack_grow (&collate->mempool,
|
|
|
|
&zero, sizeof (uint32_t));
|
|
|
|
elem->wcs = obstack_finish (&collate->mempool);
|
1999-12-24 05:42:34 +00:00
|
|
|
elem->nwcs = 1;
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
elem->file = ldfile->fname;
|
|
|
|
elem->line = ldfile->lineno;
|
1999-12-24 05:42:34 +00:00
|
|
|
elem->section = collate->current_section;
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Enqueue the new element. */
|
|
|
|
elem->last = collate->cursor;
|
|
|
|
elem->next = collate->cursor->next;
|
|
|
|
elem->last->next = elem;
|
|
|
|
if (elem->next != NULL)
|
|
|
|
elem->next->last = elem;
|
|
|
|
collate->cursor = elem;
|
|
|
|
|
|
|
|
/* Now add the weights. They come from the `ellipsis_weights'
|
|
|
|
member of `collate'. */
|
|
|
|
elem->weights = (struct element_list_t *)
|
|
|
|
obstack_alloc (&collate->mempool,
|
|
|
|
nrules * sizeof (struct element_list_t));
|
|
|
|
for (cnt = 0; cnt < nrules; ++cnt)
|
|
|
|
if (collate->ellipsis_weight.weights[cnt].cnt == 1
|
|
|
|
&& (collate->ellipsis_weight.weights[cnt].w[0]
|
|
|
|
== ELEMENT_ELLIPSIS2))
|
|
|
|
{
|
|
|
|
elem->weights[cnt].w = (struct element_t **)
|
|
|
|
obstack_alloc (&collate->mempool,
|
|
|
|
sizeof (struct element_t *));
|
|
|
|
elem->weights[cnt].w[0] = elem;
|
|
|
|
elem->weights[cnt].cnt = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Simly use the weight from `ellipsis_weight'. */
|
|
|
|
elem->weights[cnt].w =
|
|
|
|
collate->ellipsis_weight.weights[cnt].w;
|
|
|
|
elem->weights[cnt].cnt =
|
|
|
|
collate->ellipsis_weight.weights[cnt].cnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
collate_startup (struct linereader *ldfile, struct localedef_t *locale,
|
1999-12-11 07:25:44 +00:00
|
|
|
struct localedef_t *copy_locale, int ignore_content)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-06-25 18:01:25 +00:00
|
|
|
if (!ignore_content && locale->categories[LC_COLLATE].collate == NULL)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
struct locale_collate_t *collate;
|
|
|
|
|
1999-12-11 07:25:44 +00:00
|
|
|
if (copy_locale == NULL)
|
1999-12-11 20:22:01 +00:00
|
|
|
{
|
|
|
|
collate = locale->categories[LC_COLLATE].collate =
|
|
|
|
(struct locale_collate_t *)
|
|
|
|
xcalloc (1, sizeof (struct locale_collate_t));
|
|
|
|
|
|
|
|
/* Init the various data structures. */
|
|
|
|
init_hash (&collate->elem_table, 100);
|
|
|
|
init_hash (&collate->sym_table, 100);
|
|
|
|
init_hash (&collate->seq_table, 500);
|
|
|
|
obstack_init (&collate->mempool);
|
|
|
|
|
|
|
|
collate->col_weight_max = -1;
|
|
|
|
}
|
1999-12-11 07:25:44 +00:00
|
|
|
else
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Reuse the copy_locale's data structures. */
|
1999-12-11 07:25:44 +00:00
|
|
|
collate = locale->categories[LC_COLLATE].collate =
|
|
|
|
copy_locale->categories[LC_COLLATE].collate;
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
1999-12-11 05:15:37 +00:00
|
|
|
ldfile->translate_strings = 0;
|
1999-08-31 07:04:41 +00:00
|
|
|
ldfile->return_widestr = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2001-12-10 01:37:56 +00:00
|
|
|
collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
1999-12-18 19:45:25 +00:00
|
|
|
/* Now is the time when we can assign the individual collation
|
|
|
|
values for all the symbols. We have possibly different values
|
|
|
|
for the wide- and the multibyte-character symbols. This is done
|
|
|
|
since it might make a difference in the encoding if there is in
|
|
|
|
some cases no multibyte-character but there are wide-characters.
|
|
|
|
(The other way around it is not important since theencoded
|
|
|
|
collation value in the wide-character case is 32 bits wide and
|
|
|
|
therefore requires no encoding).
|
|
|
|
|
|
|
|
The lowest collation value assigned is 2. Zero is reserved for
|
|
|
|
the NUL byte terminating the strings in the `strxfrm'/`wcsxfrm'
|
|
|
|
functions and 1 is used to separate the individual passes for the
|
|
|
|
different rules.
|
|
|
|
|
|
|
|
We also have to construct is list with all the bytes/words which
|
|
|
|
can come first in a sequence, followed by all the elements which
|
|
|
|
also start with this byte/word. The order is reverse which has
|
|
|
|
among others the important effect that longer strings are located
|
|
|
|
first in the list. This is required for the output data since
|
|
|
|
the algorithm used in `strcoll' etc depends on this.
|
|
|
|
|
|
|
|
The multibyte case is easy. We simply sort into an array with
|
|
|
|
256 elements. */
|
|
|
|
struct locale_collate_t *collate = locale->categories[LC_COLLATE].collate;
|
1999-12-20 22:08:01 +00:00
|
|
|
int mbact[nrules];
|
|
|
|
int wcact;
|
2000-05-24 20:04:34 +00:00
|
|
|
int mbseqact;
|
|
|
|
int wcseqact;
|
1999-12-20 22:08:01 +00:00
|
|
|
struct element_t *runp;
|
|
|
|
int i;
|
|
|
|
int need_undefined = 0;
|
1999-12-24 05:42:34 +00:00
|
|
|
struct section_list *sect;
|
|
|
|
int ruleidx;
|
1999-12-30 08:09:32 +00:00
|
|
|
int nr_wide_elems = 0;
|
1999-12-20 22:08:01 +00:00
|
|
|
|
1999-12-26 08:47:27 +00:00
|
|
|
if (collate == NULL)
|
|
|
|
{
|
|
|
|
/* No data, no check. */
|
|
|
|
if (! be_quiet)
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("No definition for %s category found"),
|
|
|
|
"LC_COLLATE"));
|
1999-12-26 08:47:27 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
/* If this assertion is hit change the type in `element_t'. */
|
|
|
|
assert (nrules <= sizeof (runp->used_in_level) * 8);
|
|
|
|
|
1999-12-26 07:29:11 +00:00
|
|
|
/* Make sure that the `position' rule is used either in all sections
|
|
|
|
or in none. */
|
|
|
|
for (i = 0; i < nrules; ++i)
|
|
|
|
for (sect = collate->sections; sect != NULL; sect = sect->next)
|
2000-06-25 18:01:25 +00:00
|
|
|
if (sect->rules != NULL
|
|
|
|
&& ((sect->rules[i] & sort_position)
|
|
|
|
!= (collate->sections->rules[i] & sort_position)))
|
1999-12-26 07:29:11 +00:00
|
|
|
{
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
1999-12-30 18:17:29 +00:00
|
|
|
%s: `position' must be used for a specific level in all sections or none"),
|
2002-02-05 23:29:24 +00:00
|
|
|
"LC_COLLATE"));
|
1999-12-26 07:29:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
/* Find out which elements are used at which level. At the same
|
|
|
|
time we find out whether we have any undefined symbols. */
|
|
|
|
runp = collate->start;
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
|
|
|
if (runp->mbs != NULL)
|
|
|
|
{
|
|
|
|
for (i = 0; i < nrules; ++i)
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
|
|
|
|
for (j = 0; j < runp->weights[i].cnt; ++j)
|
|
|
|
/* A NULL pointer as the weight means IGNORE. */
|
|
|
|
if (runp->weights[i].w[j] != NULL)
|
|
|
|
{
|
|
|
|
if (runp->weights[i].w[j]->weights == NULL)
|
|
|
|
{
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error_at_line (0, 0, runp->file,
|
|
|
|
runp->line,
|
|
|
|
_("symbol `%s' not defined"),
|
|
|
|
runp->weights[i].w[j]->name));
|
1999-12-18 19:45:25 +00:00
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
need_undefined = 1;
|
|
|
|
runp->weights[i].w[j] = &collate->undefined;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Set the bit for the level. */
|
|
|
|
runp->weights[i].w[j]->used_in_level |= 1 << i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Up to the next entry. */
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Walk through the list of defined sequences and assign weights. Also
|
|
|
|
create the data structure which will allow generating the single byte
|
|
|
|
character based tables.
|
|
|
|
|
|
|
|
Since at each time only the weights for each of the rules are
|
|
|
|
only compared to other weights for this rule it is possible to
|
|
|
|
assign more compact weight values than simply counting all
|
1999-12-24 05:42:34 +00:00
|
|
|
weights in sequence. We can assign weights from 3, one for each
|
1999-12-20 22:08:01 +00:00
|
|
|
rule individually and only for those elements, which are actually
|
|
|
|
used for this rule.
|
|
|
|
|
|
|
|
Why is this important? It is not for the wide char table. But
|
|
|
|
it is for the singlebyte output since here larger numbers have to
|
|
|
|
be encoded to make it possible to emit the value as a byte
|
|
|
|
string. */
|
|
|
|
for (i = 0; i < nrules; ++i)
|
1999-12-30 08:09:32 +00:00
|
|
|
mbact[i] = 2;
|
|
|
|
wcact = 2;
|
2000-05-24 20:04:34 +00:00
|
|
|
mbseqact = 0;
|
|
|
|
wcseqact = 0;
|
1999-12-20 22:08:01 +00:00
|
|
|
runp = collate->start;
|
1999-12-18 19:45:25 +00:00
|
|
|
while (runp != NULL)
|
|
|
|
{
|
1999-12-24 05:42:34 +00:00
|
|
|
/* Determine the order. */
|
|
|
|
if (runp->used_in_level != 0)
|
1999-12-18 19:45:25 +00:00
|
|
|
{
|
1999-12-24 05:42:34 +00:00
|
|
|
runp->mborder = (int *) obstack_alloc (&collate->mempool,
|
|
|
|
nrules * sizeof (int));
|
1999-12-18 19:45:25 +00:00
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
for (i = 0; i < nrules; ++i)
|
|
|
|
if ((runp->used_in_level & (1 << i)) != 0)
|
|
|
|
runp->mborder[i] = mbact[i]++;
|
|
|
|
else
|
|
|
|
runp->mborder[i] = 0;
|
|
|
|
}
|
1999-12-20 22:08:01 +00:00
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
if (runp->mbs != NULL)
|
|
|
|
{
|
|
|
|
struct element_t **eptr;
|
2000-01-20 00:07:20 +00:00
|
|
|
struct element_t *lastp = NULL;
|
1999-12-18 19:45:25 +00:00
|
|
|
|
|
|
|
/* Find the point where to insert in the list. */
|
1999-12-20 22:08:01 +00:00
|
|
|
eptr = &collate->mbheads[((unsigned char *) runp->mbs)[0]];
|
1999-12-18 19:45:25 +00:00
|
|
|
while (*eptr != NULL)
|
|
|
|
{
|
1999-12-24 05:42:34 +00:00
|
|
|
if ((*eptr)->nmbs < runp->nmbs)
|
1999-12-18 19:45:25 +00:00
|
|
|
break;
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
if ((*eptr)->nmbs == runp->nmbs)
|
|
|
|
{
|
|
|
|
int c = memcmp ((*eptr)->mbs, runp->mbs, runp->nmbs);
|
|
|
|
|
|
|
|
if (c == 0)
|
|
|
|
{
|
|
|
|
/* This should not happen. It means that we have
|
|
|
|
to symbols with the same byte sequence. It is
|
|
|
|
of course an error. */
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error_at_line (0, 0, (*eptr)->file,
|
|
|
|
(*eptr)->line,
|
|
|
|
_("\
|
|
|
|
symbol `%s' has the same encoding as"), (*eptr)->name);
|
|
|
|
error_at_line (0, 0, runp->file,
|
|
|
|
runp->line,
|
|
|
|
_("symbol `%s'"),
|
|
|
|
runp->name));
|
1999-12-24 05:42:34 +00:00
|
|
|
goto dont_insert;
|
|
|
|
}
|
|
|
|
else if (c < 0)
|
|
|
|
/* Insert it here. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* To the next entry. */
|
2000-01-20 00:07:20 +00:00
|
|
|
lastp = *eptr;
|
1999-12-18 19:45:25 +00:00
|
|
|
eptr = &(*eptr)->mbnext;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the pointers. */
|
|
|
|
runp->mbnext = *eptr;
|
2000-01-20 00:07:20 +00:00
|
|
|
runp->mblast = lastp;
|
|
|
|
if (*eptr != NULL)
|
|
|
|
(*eptr)->mblast = runp;
|
1999-12-18 19:45:25 +00:00
|
|
|
*eptr = runp;
|
1999-12-24 05:42:34 +00:00
|
|
|
dont_insert:
|
2000-12-17 17:06:32 +00:00
|
|
|
;
|
1999-12-18 19:45:25 +00:00
|
|
|
}
|
|
|
|
|
2000-02-13 08:17:12 +00:00
|
|
|
if (runp->used_in_level)
|
1999-12-30 08:09:32 +00:00
|
|
|
{
|
|
|
|
runp->wcorder = wcact++;
|
|
|
|
|
|
|
|
/* We take the opportunity to count the elements which have
|
|
|
|
wide characters. */
|
|
|
|
++nr_wide_elems;
|
|
|
|
}
|
1999-12-18 19:45:25 +00:00
|
|
|
|
2000-05-24 20:04:34 +00:00
|
|
|
if (runp->is_character)
|
|
|
|
{
|
|
|
|
if (runp->nmbs == 1)
|
|
|
|
collate->mbseqorder[((unsigned char *) runp->mbs)[0]] = mbseqact++;
|
|
|
|
|
|
|
|
runp->wcseqorder = wcseqact++;
|
|
|
|
}
|
2002-02-01 21:08:09 +00:00
|
|
|
else if (runp->mbs != NULL && runp->weights != NULL)
|
|
|
|
/* This is for collation elements. */
|
|
|
|
runp->wcseqorder = wcseqact++;
|
2000-05-24 20:04:34 +00:00
|
|
|
|
1999-12-18 19:45:25 +00:00
|
|
|
/* Up to the next entry. */
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
1999-12-20 22:08:01 +00:00
|
|
|
|
|
|
|
/* Find out whether any of the `mbheads' entries is unset. In this
|
|
|
|
case we use the UNDEFINED entry. */
|
|
|
|
for (i = 1; i < 256; ++i)
|
|
|
|
if (collate->mbheads[i] == NULL)
|
|
|
|
{
|
|
|
|
need_undefined = 1;
|
|
|
|
collate->mbheads[i] = &collate->undefined;
|
|
|
|
}
|
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Now to the wide character case. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collate->wcheads.p = 6;
|
|
|
|
collate->wcheads.q = 10;
|
|
|
|
wchead_table_init (&collate->wcheads);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collate->wcseqorder.p = 6;
|
|
|
|
collate->wcseqorder.q = 10;
|
|
|
|
collseq_table_init (&collate->wcseqorder);
|
2000-05-24 20:04:34 +00:00
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
/* Start adding. */
|
|
|
|
runp = collate->start;
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
|
|
|
if (runp->wcs != NULL)
|
|
|
|
{
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
struct element_t *e;
|
1999-12-30 08:09:32 +00:00
|
|
|
struct element_t **eptr;
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
struct element_t *lastp;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
/* Insert the collation sequence value. */
|
2002-02-01 21:08:09 +00:00
|
|
|
if (runp->is_character)
|
|
|
|
collseq_table_add (&collate->wcseqorder, runp->wcs[0],
|
|
|
|
runp->wcseqorder);
|
2000-05-24 20:04:34 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
/* Find the point where to insert in the list. */
|
|
|
|
e = wchead_table_get (&collate->wcheads, runp->wcs[0]);
|
|
|
|
eptr = &e;
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
lastp = NULL;
|
1999-12-30 08:09:32 +00:00
|
|
|
while (*eptr != NULL)
|
|
|
|
{
|
|
|
|
if ((*eptr)->nwcs < runp->nwcs)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if ((*eptr)->nwcs == runp->nwcs)
|
|
|
|
{
|
|
|
|
int c = wmemcmp ((wchar_t *) (*eptr)->wcs,
|
|
|
|
(wchar_t *) runp->wcs, runp->nwcs);
|
|
|
|
|
|
|
|
if (c == 0)
|
|
|
|
{
|
|
|
|
/* This should not happen. It means that we have
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
two symbols with the same byte sequence. It is
|
1999-12-30 08:09:32 +00:00
|
|
|
of course an error. */
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error_at_line (0, 0, (*eptr)->file,
|
|
|
|
(*eptr)->line,
|
|
|
|
_("\
|
|
|
|
symbol `%s' has the same encoding as"), (*eptr)->name);
|
|
|
|
error_at_line (0, 0, runp->file,
|
|
|
|
runp->line,
|
|
|
|
_("symbol `%s'"),
|
|
|
|
runp->name));
|
1999-12-30 08:09:32 +00:00
|
|
|
goto dont_insertwc;
|
|
|
|
}
|
|
|
|
else if (c < 0)
|
|
|
|
/* Insert it here. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* To the next entry. */
|
2000-01-21 05:18:41 +00:00
|
|
|
lastp = *eptr;
|
1999-12-30 08:09:32 +00:00
|
|
|
eptr = &(*eptr)->wcnext;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the pointers. */
|
|
|
|
runp->wcnext = *eptr;
|
2000-01-21 05:18:41 +00:00
|
|
|
runp->wclast = lastp;
|
|
|
|
if (*eptr != NULL)
|
|
|
|
(*eptr)->wclast = runp;
|
1999-12-30 08:09:32 +00:00
|
|
|
*eptr = runp;
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
if (eptr == &e)
|
|
|
|
wchead_table_add (&collate->wcheads, runp->wcs[0], e);
|
1999-12-30 08:09:32 +00:00
|
|
|
dont_insertwc:
|
2000-12-17 17:06:32 +00:00
|
|
|
;
|
1999-12-30 08:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Up to the next entry. */
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collseq_table_finalize (&collate->wcseqorder);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
/* Now determine whether the UNDEFINED entry is needed and if yes,
|
|
|
|
whether it was defined. */
|
1999-12-24 05:42:34 +00:00
|
|
|
collate->undefined.used_in_level = need_undefined ? ~0ul : 0;
|
1999-12-30 18:12:52 +00:00
|
|
|
if (collate->undefined.file == NULL)
|
1999-12-20 22:08:01 +00:00
|
|
|
{
|
1999-12-30 18:12:52 +00:00
|
|
|
if (need_undefined)
|
|
|
|
{
|
2000-06-25 18:01:25 +00:00
|
|
|
/* This seems not to be enforced by recent standards. Don't
|
|
|
|
emit an error, simply append UNDEFINED at the end. */
|
|
|
|
if (0)
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("no definition of `UNDEFINED'")));
|
1999-12-20 22:08:01 +00:00
|
|
|
|
1999-12-30 18:12:52 +00:00
|
|
|
/* Add UNDEFINED at the end. */
|
|
|
|
collate->undefined.mborder =
|
|
|
|
(int *) obstack_alloc (&collate->mempool, nrules * sizeof (int));
|
1999-12-20 22:08:01 +00:00
|
|
|
|
1999-12-30 18:12:52 +00:00
|
|
|
for (i = 0; i < nrules; ++i)
|
|
|
|
collate->undefined.mborder[i] = mbact[i]++;
|
|
|
|
}
|
1999-12-20 22:08:01 +00:00
|
|
|
|
1999-12-30 18:12:52 +00:00
|
|
|
/* In any case we will need the definition for the wide character
|
|
|
|
case. But we will not complain that it is missing since the
|
|
|
|
specification strangely enough does not seem to account for
|
|
|
|
this. */
|
1999-12-20 22:08:01 +00:00
|
|
|
collate->undefined.wcorder = wcact++;
|
|
|
|
}
|
1999-12-24 05:42:34 +00:00
|
|
|
|
|
|
|
/* Finally, try to unify the rules for the sections. Whenever the rules
|
|
|
|
for a section are the same as those for another section give the
|
|
|
|
ruleset the same index. Since there are never many section we can
|
|
|
|
use an O(n^2) algorithm here. */
|
|
|
|
sect = collate->sections;
|
2000-06-25 18:01:25 +00:00
|
|
|
while (sect != NULL && sect->rules == NULL)
|
|
|
|
sect = sect->next;
|
2002-02-14 01:02:42 +00:00
|
|
|
|
|
|
|
/* Bail out if we have no sections because of earlier errors. */
|
|
|
|
if (sect == NULL)
|
|
|
|
{
|
|
|
|
WITH_CUR_LOCALE (error (EXIT_FAILURE, 0,
|
|
|
|
_("too many errors; giving up")));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
ruleidx = 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
struct section_list *osect = collate->sections;
|
|
|
|
|
|
|
|
while (osect != sect)
|
2000-06-25 18:01:25 +00:00
|
|
|
if (osect->rules != NULL
|
|
|
|
&& memcmp (osect->rules, sect->rules, nrules) == 0)
|
1999-12-24 05:42:34 +00:00
|
|
|
break;
|
|
|
|
else
|
|
|
|
osect = osect->next;
|
|
|
|
|
|
|
|
if (osect == sect)
|
|
|
|
sect->ruleidx = ruleidx++;
|
|
|
|
else
|
|
|
|
sect->ruleidx = osect->ruleidx;
|
|
|
|
|
|
|
|
/* Next section. */
|
2000-06-25 18:01:25 +00:00
|
|
|
do
|
|
|
|
sect = sect->next;
|
|
|
|
while (sect != NULL && sect->rules == NULL);
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
while (sect != NULL);
|
2000-09-11 20:33:59 +00:00
|
|
|
/* We are currently not prepared for more than 128 rulesets. But this
|
1999-12-24 05:42:34 +00:00
|
|
|
should never really be a problem. */
|
2000-09-11 20:33:59 +00:00
|
|
|
assert (ruleidx <= 128);
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
static int32_t
|
1999-12-24 05:42:34 +00:00
|
|
|
output_weight (struct obstack *pool, struct locale_collate_t *collate,
|
|
|
|
struct element_t *elem)
|
|
|
|
{
|
|
|
|
size_t cnt;
|
|
|
|
int32_t retval;
|
|
|
|
|
|
|
|
/* Optimize the use of UNDEFINED. */
|
|
|
|
if (elem == &collate->undefined)
|
|
|
|
/* The weights are already inserted. */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* This byte can start exactly one collation element and this is
|
|
|
|
a single byte. We can directly give the index to the weights. */
|
|
|
|
retval = obstack_object_size (pool);
|
|
|
|
|
|
|
|
/* Construct the weight. */
|
|
|
|
for (cnt = 0; cnt < nrules; ++cnt)
|
|
|
|
{
|
|
|
|
char buf[elem->weights[cnt].cnt * 7];
|
|
|
|
int len = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < elem->weights[cnt].cnt; ++i)
|
1999-12-25 23:41:39 +00:00
|
|
|
/* Encode the weight value. We do nothing for IGNORE entries. */
|
|
|
|
if (elem->weights[cnt].w[i] != NULL)
|
1999-12-24 05:42:34 +00:00
|
|
|
len += utf8_encode (&buf[len],
|
|
|
|
elem->weights[cnt].w[i]->mborder[cnt]);
|
|
|
|
|
|
|
|
/* And add the buffer content. */
|
1999-12-25 23:41:39 +00:00
|
|
|
obstack_1grow (pool, len);
|
1999-12-24 05:42:34 +00:00
|
|
|
obstack_grow (pool, buf, len);
|
|
|
|
}
|
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
return retval | ((elem->section->ruleidx & 0x7f) << 24);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
static int32_t
|
|
|
|
output_weightwc (struct obstack *pool, struct locale_collate_t *collate,
|
|
|
|
struct element_t *elem)
|
|
|
|
{
|
|
|
|
size_t cnt;
|
|
|
|
int32_t retval;
|
|
|
|
|
|
|
|
/* Optimize the use of UNDEFINED. */
|
|
|
|
if (elem == &collate->undefined)
|
|
|
|
/* The weights are already inserted. */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* This byte can start exactly one collation element and this is
|
|
|
|
a single byte. We can directly give the index to the weights. */
|
2000-01-20 04:37:53 +00:00
|
|
|
retval = obstack_object_size (pool) / sizeof (int32_t);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
|
|
|
/* Construct the weight. */
|
|
|
|
for (cnt = 0; cnt < nrules; ++cnt)
|
|
|
|
{
|
|
|
|
int32_t buf[elem->weights[cnt].cnt];
|
2000-01-20 04:37:53 +00:00
|
|
|
int i;
|
|
|
|
int32_t j;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
2000-01-20 04:37:53 +00:00
|
|
|
for (i = 0, j = 0; i < elem->weights[cnt].cnt; ++i)
|
1999-12-30 08:09:32 +00:00
|
|
|
if (elem->weights[cnt].w[i] != NULL)
|
2000-01-20 04:37:53 +00:00
|
|
|
buf[j++] = elem->weights[cnt].w[i]->wcorder;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
|
|
|
/* And add the buffer content. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (pool, j);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
2000-01-20 04:37:53 +00:00
|
|
|
obstack_grow (pool, buf, j * sizeof (int32_t));
|
1999-12-30 08:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return retval | ((elem->section->ruleidx & 0x7f) << 24);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
void
|
2001-12-10 01:37:56 +00:00
|
|
|
collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
|
1999-08-31 07:04:41 +00:00
|
|
|
const char *output_path)
|
|
|
|
{
|
1999-12-20 22:08:01 +00:00
|
|
|
struct locale_collate_t *collate = locale->categories[LC_COLLATE].collate;
|
|
|
|
const size_t nelems = _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE);
|
|
|
|
struct iovec iov[2 + nelems];
|
|
|
|
struct locale_file data;
|
|
|
|
uint32_t idx[nelems];
|
|
|
|
size_t cnt;
|
1999-12-24 05:42:34 +00:00
|
|
|
size_t ch;
|
|
|
|
int32_t tablemb[256];
|
|
|
|
struct obstack weightpool;
|
|
|
|
struct obstack extrapool;
|
1999-12-25 23:41:39 +00:00
|
|
|
struct obstack indirectpool;
|
1999-12-24 05:42:34 +00:00
|
|
|
struct section_list *sect;
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
struct collidx_table tablewc;
|
1999-12-31 18:23:00 +00:00
|
|
|
uint32_t elem_size;
|
|
|
|
uint32_t *elem_table;
|
1999-12-24 05:42:34 +00:00
|
|
|
int i;
|
1999-12-31 18:23:00 +00:00
|
|
|
struct element_t *runp;
|
1999-12-24 05:42:34 +00:00
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
data.magic = LIMAGIC (LC_COLLATE);
|
|
|
|
data.n = nelems;
|
|
|
|
iov[0].iov_base = (void *) &data;
|
|
|
|
iov[0].iov_len = sizeof (data);
|
|
|
|
|
|
|
|
iov[1].iov_base = (void *) idx;
|
|
|
|
iov[1].iov_len = sizeof (idx);
|
|
|
|
|
|
|
|
idx[0] = iov[0].iov_len + iov[1].iov_len;
|
|
|
|
cnt = 0;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_NRULES));
|
1999-12-25 23:41:39 +00:00
|
|
|
iov[2 + cnt].iov_base = &nrules;
|
1999-12-20 22:08:01 +00:00
|
|
|
iov[2 + cnt].iov_len = sizeof (uint32_t);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
|
|
++cnt;
|
|
|
|
|
1999-12-26 08:47:27 +00:00
|
|
|
/* If we have no LC_COLLATE data emit only the number of rules as zero. */
|
|
|
|
if (collate == NULL)
|
|
|
|
{
|
1999-12-31 22:21:25 +00:00
|
|
|
int32_t dummy = 0;
|
|
|
|
|
1999-12-26 08:47:27 +00:00
|
|
|
while (cnt < _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE))
|
|
|
|
{
|
1999-12-31 22:21:25 +00:00
|
|
|
/* The words have to be handled specially. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
if (cnt == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB))
|
1999-12-31 22:21:25 +00:00
|
|
|
{
|
|
|
|
iov[2 + cnt].iov_base = &dummy;
|
|
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
iov[2 + cnt].iov_base = NULL;
|
1999-12-31 22:21:25 +00:00
|
|
|
iov[2 + cnt].iov_len = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cnt + 1 < _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE))
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
1999-12-26 08:47:27 +00:00
|
|
|
++cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE));
|
|
|
|
|
2002-04-18 08:08:23 +00:00
|
|
|
write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", 2 + cnt, iov);
|
1999-12-26 08:47:27 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
obstack_init (&weightpool);
|
|
|
|
obstack_init (&extrapool);
|
|
|
|
obstack_init (&indirectpool);
|
|
|
|
|
1999-12-27 05:05:12 +00:00
|
|
|
/* Since we are using the sign of an integer to mark indirection the
|
|
|
|
offsets in the arrays we are indirectly referring to must not be
|
|
|
|
zero since -0 == 0. Therefore we add a bit of dummy content. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&extrapool, 0);
|
|
|
|
obstack_int32_grow (&indirectpool, 0);
|
1999-12-27 05:05:12 +00:00
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
/* Prepare the ruleset table. */
|
|
|
|
for (sect = collate->sections, i = 0; sect != NULL; sect = sect->next)
|
2000-06-25 18:01:25 +00:00
|
|
|
if (sect->rules != NULL && sect->ruleidx == i)
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
1999-12-25 23:41:39 +00:00
|
|
|
int j;
|
|
|
|
|
|
|
|
obstack_make_room (&weightpool, nrules);
|
|
|
|
|
|
|
|
for (j = 0; j < nrules; ++j)
|
|
|
|
obstack_1grow_fast (&weightpool, sect->rules[j]);
|
1999-12-24 05:42:34 +00:00
|
|
|
++i;
|
|
|
|
}
|
|
|
|
/* And align the output. */
|
|
|
|
i = (nrules * i) % __alignof__ (int32_t);
|
|
|
|
if (i > 0)
|
|
|
|
do
|
|
|
|
obstack_1grow (&weightpool, '\0');
|
|
|
|
while (++i < __alignof__ (int32_t));
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_RULESETS));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&weightpool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&weightpool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
/* Generate the 8-bit table. Walk through the lists of sequences
|
|
|
|
starting with the same byte and add them one after the other to
|
|
|
|
the table. In case we have more than one sequence starting with
|
|
|
|
the same byte we have to use extra indirection.
|
|
|
|
|
|
|
|
First add a record for the NUL byte. This entry will never be used
|
|
|
|
so it does not matter. */
|
|
|
|
tablemb[0] = 0;
|
|
|
|
|
|
|
|
/* Now insert the `UNDEFINED' value if it is used. Since this value
|
|
|
|
will probably be used more than once it is good to store the
|
|
|
|
weights only once. */
|
|
|
|
if (collate->undefined.used_in_level != 0)
|
|
|
|
output_weight (&weightpool, collate, &collate->undefined);
|
|
|
|
|
|
|
|
for (ch = 1; ch < 256; ++ch)
|
|
|
|
if (collate->mbheads[ch]->mbnext == NULL
|
2000-01-25 01:00:37 +00:00
|
|
|
&& collate->mbheads[ch]->nmbs <= 1)
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
tablemb[ch] = output_weight (&weightpool, collate,
|
1999-12-25 23:41:39 +00:00
|
|
|
collate->mbheads[ch]);
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The entries in the list are sorted by length and then
|
|
|
|
alphabetically. This is the order in which we will add the
|
2000-03-10 08:41:39 +00:00
|
|
|
elements to the collation table. This allows simply walking
|
|
|
|
the table in sequence and stopping at the first matching
|
1999-12-24 05:42:34 +00:00
|
|
|
entry. Since the longer sequences are coming first in the
|
|
|
|
list they have the possibility to match first, just as it
|
|
|
|
has to be. In the worst case we are walking to the end of
|
|
|
|
the list where we put, if no singlebyte sequence is defined
|
|
|
|
in the locale definition, the weights for UNDEFINED.
|
|
|
|
|
|
|
|
To reduce the length of the search list we compress them a bit.
|
|
|
|
This happens by collecting sequences of consecutive byte
|
|
|
|
sequences in one entry (having and begin and end byte sequence)
|
|
|
|
and add only one index into the weight table. We can find the
|
|
|
|
consecutive entries since they are also consecutive in the list. */
|
|
|
|
struct element_t *runp = collate->mbheads[ch];
|
|
|
|
struct element_t *lastp;
|
|
|
|
|
2000-01-25 01:00:37 +00:00
|
|
|
assert ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) == 0);
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
tablemb[ch] = -obstack_object_size (&extrapool);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Store the current index in the weight table. We know that
|
|
|
|
the current position in the `extrapool' is aligned on a
|
|
|
|
32-bit address. */
|
|
|
|
int32_t weightidx;
|
|
|
|
int added;
|
|
|
|
|
|
|
|
/* Find out wether this is a single entry or we have more than
|
|
|
|
one consecutive entry. */
|
|
|
|
if (runp->mbnext != NULL
|
|
|
|
&& runp->nmbs == runp->mbnext->nmbs
|
|
|
|
&& memcmp (runp->mbs, runp->mbnext->mbs, runp->nmbs - 1) == 0
|
2000-01-20 00:07:20 +00:00
|
|
|
&& (runp->mbs[runp->nmbs - 1]
|
|
|
|
== runp->mbnext->mbs[runp->nmbs - 1] + 1))
|
1999-12-24 05:42:34 +00:00
|
|
|
{
|
|
|
|
int i;
|
2000-01-20 00:07:20 +00:00
|
|
|
struct element_t *series_startp = runp;
|
|
|
|
struct element_t *curp;
|
1999-12-24 05:42:34 +00:00
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
/* Compute how much space we will need. */
|
1999-12-30 08:09:32 +00:00
|
|
|
added = ((sizeof (int32_t) + 1 + 2 * (runp->nmbs - 1)
|
1999-12-24 05:42:34 +00:00
|
|
|
+ __alignof__ (int32_t) - 1)
|
|
|
|
& ~(__alignof__ (int32_t) - 1));
|
2000-01-20 04:37:53 +00:00
|
|
|
assert ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) == 0);
|
1999-12-24 05:42:34 +00:00
|
|
|
obstack_make_room (&extrapool, added);
|
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
/* More than one consecutive entry. We mark this by having
|
|
|
|
a negative index into the indirect table. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool,
|
2000-01-20 00:07:20 +00:00
|
|
|
-(obstack_object_size (&indirectpool)
|
|
|
|
/ sizeof (int32_t)));
|
|
|
|
|
|
|
|
/* Now search first the end of the series. */
|
|
|
|
do
|
|
|
|
runp = runp->mbnext;
|
|
|
|
while (runp->mbnext != NULL
|
|
|
|
&& runp->nmbs == runp->mbnext->nmbs
|
|
|
|
&& memcmp (runp->mbs, runp->mbnext->mbs,
|
|
|
|
runp->nmbs - 1) == 0
|
|
|
|
&& (runp->mbs[runp->nmbs - 1]
|
|
|
|
== runp->mbnext->mbs[runp->nmbs - 1] + 1));
|
|
|
|
|
|
|
|
/* Now walk backward from here to the beginning. */
|
|
|
|
curp = runp;
|
|
|
|
|
2000-01-25 01:00:37 +00:00
|
|
|
assert (runp->nmbs <= 256);
|
2000-01-20 00:07:20 +00:00
|
|
|
obstack_1grow_fast (&extrapool, curp->nmbs - 1);
|
|
|
|
for (i = 1; i < curp->nmbs; ++i)
|
|
|
|
obstack_1grow_fast (&extrapool, curp->mbs[i]);
|
1999-12-24 05:42:34 +00:00
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
/* Now find the end of the consecutive sequence and
|
|
|
|
add all the indeces in the indirect pool. */
|
2000-01-20 00:07:20 +00:00
|
|
|
do
|
1999-12-25 23:41:39 +00:00
|
|
|
{
|
2000-01-20 00:07:20 +00:00
|
|
|
weightidx = output_weight (&weightpool, collate, curp);
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&indirectpool, weightidx);
|
1999-12-25 23:41:39 +00:00
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
curp = curp->mblast;
|
|
|
|
}
|
|
|
|
while (curp != series_startp);
|
1999-12-25 23:41:39 +00:00
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
/* Add the final weight. */
|
|
|
|
weightidx = output_weight (&weightpool, collate, curp);
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&indirectpool, weightidx);
|
2000-01-20 00:07:20 +00:00
|
|
|
|
|
|
|
/* And add the end byte sequence. Without length this
|
|
|
|
time. */
|
|
|
|
for (i = 1; i < curp->nmbs; ++i)
|
|
|
|
obstack_1grow_fast (&extrapool, curp->mbs[i]);
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* A single entry. Simply add the index and the length and
|
|
|
|
string (except for the first character which is already
|
|
|
|
tested for). */
|
|
|
|
int i;
|
|
|
|
|
2000-01-20 00:07:20 +00:00
|
|
|
/* Output the weight info. */
|
|
|
|
weightidx = output_weight (&weightpool, collate, runp);
|
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
added = ((sizeof (int32_t) + 1 + runp->nmbs - 1
|
1999-12-24 05:42:34 +00:00
|
|
|
+ __alignof__ (int32_t) - 1)
|
|
|
|
& ~(__alignof__ (int32_t) - 1));
|
2000-01-25 01:00:37 +00:00
|
|
|
assert ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) == 0);
|
1999-12-24 05:42:34 +00:00
|
|
|
obstack_make_room (&extrapool, added);
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool, weightidx);
|
2000-01-25 01:00:37 +00:00
|
|
|
assert (runp->nmbs <= 256);
|
1999-12-24 05:42:34 +00:00
|
|
|
obstack_1grow_fast (&extrapool, runp->nmbs - 1);
|
2000-01-25 01:00:37 +00:00
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
for (i = 1; i < runp->nmbs; ++i)
|
|
|
|
obstack_1grow_fast (&extrapool, runp->mbs[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add alignment bytes if necessary. */
|
2000-01-20 04:37:53 +00:00
|
|
|
while ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) != 0)
|
|
|
|
obstack_1grow_fast (&extrapool, '\0');
|
1999-12-24 05:42:34 +00:00
|
|
|
|
|
|
|
/* Next entry. */
|
|
|
|
lastp = runp;
|
|
|
|
runp = runp->mbnext;
|
|
|
|
}
|
|
|
|
while (runp != NULL);
|
|
|
|
|
2000-01-25 01:00:37 +00:00
|
|
|
assert ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) == 0);
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
/* If the final entry in the list is not a single character we
|
|
|
|
add an UNDEFINED entry here. */
|
|
|
|
if (lastp->nmbs != 1)
|
|
|
|
{
|
2000-01-25 01:00:37 +00:00
|
|
|
int added = ((sizeof (int32_t) + 1 + 1 + __alignof__ (int32_t) - 1)
|
1999-12-24 05:42:34 +00:00
|
|
|
& ~(__alignof__ (int32_t) - 1));
|
|
|
|
obstack_make_room (&extrapool, added);
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool, 0);
|
1999-12-24 05:42:34 +00:00
|
|
|
/* XXX What rule? We just pick the first. */
|
|
|
|
obstack_1grow_fast (&extrapool, 0);
|
|
|
|
/* Length is zero. */
|
|
|
|
obstack_1grow_fast (&extrapool, 0);
|
|
|
|
|
|
|
|
/* Add alignment bytes if necessary. */
|
2000-01-20 04:37:53 +00:00
|
|
|
while ((obstack_object_size (&extrapool)
|
|
|
|
& (__alignof__ (int32_t) - 1)) != 0)
|
|
|
|
obstack_1grow_fast (&extrapool, '\0');
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-01-20 04:37:53 +00:00
|
|
|
/* Add padding to the tables if necessary. */
|
|
|
|
while ((obstack_object_size (&weightpool) & (__alignof__ (int32_t) - 1))
|
|
|
|
!= 0)
|
|
|
|
obstack_1grow (&weightpool, 0);
|
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
/* Now add the four tables. */
|
1999-12-24 05:42:34 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_TABLEMB));
|
|
|
|
iov[2 + cnt].iov_base = tablemb;
|
|
|
|
iov[2 + cnt].iov_len = sizeof (tablemb);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert ((iov[2 + cnt].iov_len & (__alignof__ (int32_t) - 1)) == 0);
|
1999-12-24 05:42:34 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_WEIGHTMB));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&weightpool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&weightpool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_EXTRAMB));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&extrapool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&extrapool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
|
|
++cnt;
|
|
|
|
|
1999-12-25 23:41:39 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_INDIRECTMB));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&indirectpool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&indirectpool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert ((iov[2 + cnt].iov_len & (__alignof__ (int32_t) - 1)) == 0);
|
1999-12-25 23:41:39 +00:00
|
|
|
++cnt;
|
|
|
|
|
1999-12-24 05:42:34 +00:00
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
/* Now the same for the wide character table. We need to store some
|
|
|
|
more information here. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_GAP1));
|
|
|
|
iov[2 + cnt].iov_base = NULL;
|
|
|
|
iov[2 + cnt].iov_len = 0;
|
1999-12-30 08:09:32 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_GAP2));
|
|
|
|
iov[2 + cnt].iov_base = NULL;
|
|
|
|
iov[2 + cnt].iov_len = 0;
|
1999-12-30 08:09:32 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_GAP3));
|
|
|
|
iov[2 + cnt].iov_base = NULL;
|
|
|
|
iov[2 + cnt].iov_len = 0;
|
1999-12-30 08:09:32 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
1999-12-30 18:12:52 +00:00
|
|
|
/* Since we are using the sign of an integer to mark indirection the
|
|
|
|
offsets in the arrays we are indirectly referring to must not be
|
|
|
|
zero since -0 == 0. Therefore we add a bit of dummy content. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&extrapool, 0);
|
|
|
|
obstack_int32_grow (&indirectpool, 0);
|
1999-12-30 18:12:52 +00:00
|
|
|
|
|
|
|
/* Now insert the `UNDEFINED' value if it is used. Since this value
|
|
|
|
will probably be used more than once it is good to store the
|
|
|
|
weights only once. */
|
2000-01-20 04:37:53 +00:00
|
|
|
if (output_weightwc (&weightpool, collate, &collate->undefined) != 0)
|
|
|
|
abort ();
|
1999-12-30 18:12:52 +00:00
|
|
|
|
2000-01-20 04:37:53 +00:00
|
|
|
/* Generate the table. Walk through the lists of sequences starting
|
|
|
|
with the same wide character and add them one after the other to
|
1999-12-30 08:09:32 +00:00
|
|
|
the table. In case we have more than one sequence starting with
|
|
|
|
the same byte we have to use extra indirection. */
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
{
|
2000-12-27 20:18:52 +00:00
|
|
|
auto void add_to_tablewc (uint32_t ch, struct element_t *runp);
|
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
void add_to_tablewc (uint32_t ch, struct element_t *runp)
|
1999-12-30 08:09:32 +00:00
|
|
|
{
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
if (runp->wcnext == NULL && runp->nwcs == 1)
|
1999-12-30 08:09:32 +00:00
|
|
|
{
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
int32_t weigthidx = output_weightwc (&weightpool, collate, runp);
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collidx_table_add (&tablewc, ch, weigthidx);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* As for the singlebyte table, we recognize sequences and
|
|
|
|
compress them. */
|
|
|
|
struct element_t *lastp;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collidx_table_add (&tablewc, ch,
|
|
|
|
-(obstack_object_size (&extrapool) / sizeof (uint32_t)));
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Store the current index in the weight table. We know that
|
|
|
|
the current position in the `extrapool' is aligned on a
|
|
|
|
32-bit address. */
|
|
|
|
int32_t weightidx;
|
|
|
|
int added;
|
|
|
|
|
|
|
|
/* Find out wether this is a single entry or we have more than
|
|
|
|
one consecutive entry. */
|
|
|
|
if (runp->wcnext != NULL
|
|
|
|
&& runp->nwcs == runp->wcnext->nwcs
|
|
|
|
&& wmemcmp ((wchar_t *) runp->wcs,
|
|
|
|
(wchar_t *)runp->wcnext->wcs,
|
|
|
|
runp->nwcs - 1) == 0
|
|
|
|
&& (runp->wcs[runp->nwcs - 1]
|
|
|
|
== runp->wcnext->wcs[runp->nwcs - 1] + 1))
|
1999-12-30 08:09:32 +00:00
|
|
|
{
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
int i;
|
|
|
|
struct element_t *series_startp = runp;
|
|
|
|
struct element_t *curp;
|
2000-01-21 05:18:41 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Now add first the initial byte sequence. */
|
|
|
|
added = (1 + 1 + 2 * (runp->nwcs - 1)) * sizeof (int32_t);
|
|
|
|
if (sizeof (int32_t) == sizeof (int))
|
|
|
|
obstack_make_room (&extrapool, added);
|
2000-01-21 05:18:41 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* More than one consecutive entry. We mark this by having
|
|
|
|
a negative index into the indirect table. */
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool,
|
|
|
|
-(obstack_object_size (&indirectpool)
|
|
|
|
/ sizeof (int32_t)));
|
|
|
|
obstack_int32_grow_fast (&extrapool, runp->nwcs - 1);
|
2000-01-21 05:18:41 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
do
|
|
|
|
runp = runp->wcnext;
|
|
|
|
while (runp->wcnext != NULL
|
|
|
|
&& runp->nwcs == runp->wcnext->nwcs
|
|
|
|
&& wmemcmp ((wchar_t *) runp->wcs,
|
|
|
|
(wchar_t *)runp->wcnext->wcs,
|
|
|
|
runp->nwcs - 1) == 0
|
|
|
|
&& (runp->wcs[runp->nwcs - 1]
|
|
|
|
== runp->wcnext->wcs[runp->nwcs - 1] + 1));
|
|
|
|
|
|
|
|
/* Now walk backward from here to the beginning. */
|
|
|
|
curp = runp;
|
|
|
|
|
|
|
|
for (i = 1; i < runp->nwcs; ++i)
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool, curp->wcs[i]);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
|
|
|
/* Now find the end of the consecutive sequence and
|
|
|
|
add all the indeces in the indirect pool. */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
weightidx = output_weightwc (&weightpool, collate,
|
|
|
|
curp);
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&indirectpool, weightidx);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
|
|
|
curp = curp->wclast;
|
|
|
|
}
|
|
|
|
while (curp != series_startp);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Add the final weight. */
|
2000-01-21 05:18:41 +00:00
|
|
|
weightidx = output_weightwc (&weightpool, collate, curp);
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&indirectpool, weightidx);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* And add the end byte sequence. Without length this
|
|
|
|
time. */
|
|
|
|
for (i = 1; i < curp->nwcs; ++i)
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow (&extrapool, curp->wcs[i]);
|
1999-12-30 08:09:32 +00:00
|
|
|
}
|
2000-01-21 05:18:41 +00:00
|
|
|
else
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
{
|
|
|
|
/* A single entry. Simply add the index and the length and
|
|
|
|
string (except for the first character which is already
|
|
|
|
tested for). */
|
|
|
|
int i;
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Output the weight info. */
|
|
|
|
weightidx = output_weightwc (&weightpool, collate, runp);
|
2000-01-21 05:18:41 +00:00
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
added = (1 + 1 + runp->nwcs - 1) * sizeof (int32_t);
|
|
|
|
if (sizeof (int) == sizeof (int32_t))
|
|
|
|
obstack_make_room (&extrapool, added);
|
1999-12-30 08:09:32 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool, weightidx);
|
|
|
|
obstack_int32_grow_fast (&extrapool, runp->nwcs - 1);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
for (i = 1; i < runp->nwcs; ++i)
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
obstack_int32_grow_fast (&extrapool, runp->wcs[i]);
|
1999-12-30 08:09:32 +00:00
|
|
|
}
|
|
|
|
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
/* Next entry. */
|
|
|
|
lastp = runp;
|
|
|
|
runp = runp->wcnext;
|
|
|
|
}
|
|
|
|
while (runp != NULL);
|
1999-12-30 08:09:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
tablewc.p = 6;
|
|
|
|
tablewc.q = 10;
|
|
|
|
collidx_table_init (&tablewc);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
wchead_table_iterate (&collate->wcheads, add_to_tablewc);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
collidx_table_finalize (&tablewc);
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
}
|
|
|
|
|
1999-12-30 08:09:32 +00:00
|
|
|
/* Now add the four tables. */
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_TABLEWC));
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
iov[2 + cnt].iov_base = tablewc.result;
|
|
|
|
iov[2 + cnt].iov_len = tablewc.result_size;
|
1999-12-30 08:09:32 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert (iov[2 + cnt].iov_len % sizeof (int32_t) == 0);
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_WEIGHTWC));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&weightpool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&weightpool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert (iov[2 + cnt].iov_len % sizeof (int32_t) == 0);
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_EXTRAWC));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&extrapool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&extrapool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert (iov[2 + cnt].iov_len % sizeof (int32_t) == 0);
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_INDIRECTWC));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&indirectpool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&indirectpool);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-01-20 04:37:53 +00:00
|
|
|
assert (iov[2 + cnt].iov_len % sizeof (int32_t) == 0);
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-30 08:09:32 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
|
1999-12-31 18:23:00 +00:00
|
|
|
/* Finally write the table with collation element names out. It is
|
|
|
|
a hash table with a simple function which gets the name of the
|
|
|
|
character as the input. One character might have many names. The
|
|
|
|
value associated with the name is an index into the weight table
|
|
|
|
where we are then interested in the first-level weight value.
|
|
|
|
|
|
|
|
To determine how large the table should be we are counting the
|
|
|
|
elements have to put in. Since we are using internal chaining
|
|
|
|
using a secondary hash function we have to make the table a bit
|
|
|
|
larger to avoid extremely long search times. We can achieve
|
|
|
|
good results with a 40% larger table than there are entries. */
|
|
|
|
elem_size = 0;
|
|
|
|
runp = collate->start;
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
|
|
|
if (runp->mbs != NULL && runp->weights != NULL)
|
|
|
|
/* Yep, the element really counts. */
|
|
|
|
++elem_size;
|
|
|
|
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
/* Add 40% and find the next prime number. */
|
|
|
|
elem_size = MIN (next_prime (elem_size * 1.4), 257);
|
|
|
|
|
|
|
|
/* Allocate the table. Each entry consists of two words: the hash
|
|
|
|
value and an index in a secondary table which provides the index
|
|
|
|
into the weight table and the string itself (so that a match can
|
|
|
|
be determined). */
|
|
|
|
elem_table = (uint32_t *) obstack_alloc (&extrapool,
|
|
|
|
elem_size * 2 * sizeof (uint32_t));
|
|
|
|
memset (elem_table, '\0', elem_size * 2 * sizeof (uint32_t));
|
|
|
|
|
|
|
|
/* Now add the elements. */
|
|
|
|
runp = collate->start;
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
2001-08-10 05:59:19 +00:00
|
|
|
if (runp->mbs != NULL && runp->weights != NULL && !runp->is_character)
|
1999-12-31 18:23:00 +00:00
|
|
|
{
|
|
|
|
/* Compute the hash value of the name. */
|
|
|
|
uint32_t namelen = strlen (runp->name);
|
|
|
|
uint32_t hash = elem_hash (runp->name, namelen);
|
|
|
|
size_t idx = hash % elem_size;
|
|
|
|
|
|
|
|
if (elem_table[idx * 2] != 0)
|
|
|
|
{
|
|
|
|
/* The spot is already take. Try iterating using the value
|
|
|
|
from the secondary hashing function. */
|
|
|
|
size_t iter = hash % (elem_size - 2);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
idx += iter;
|
|
|
|
if (idx >= elem_size)
|
|
|
|
idx -= elem_size;
|
|
|
|
}
|
|
|
|
while (elem_table[idx * 2] != 0);
|
|
|
|
}
|
2001-08-10 05:59:19 +00:00
|
|
|
/* This is the spot where we will insert the value. */
|
|
|
|
elem_table[idx * 2] = hash;
|
|
|
|
elem_table[idx * 2 + 1] = obstack_object_size (&extrapool);
|
|
|
|
|
|
|
|
/* The the string itself including length. */
|
|
|
|
obstack_1grow (&extrapool, namelen);
|
|
|
|
obstack_grow (&extrapool, runp->name, namelen);
|
|
|
|
|
|
|
|
/* And the multibyte representation. */
|
|
|
|
obstack_1grow (&extrapool, runp->nmbs);
|
|
|
|
obstack_grow (&extrapool, runp->mbs, runp->nmbs);
|
|
|
|
|
|
|
|
/* And align again to 32 bits. */
|
|
|
|
if ((1 + namelen + 1 + runp->nmbs) % sizeof (int32_t) != 0)
|
|
|
|
obstack_grow (&extrapool, "\0\0",
|
|
|
|
(sizeof (int32_t)
|
|
|
|
- ((1 + namelen + 1 + runp->nmbs)
|
|
|
|
% sizeof (int32_t))));
|
|
|
|
|
|
|
|
/* Now some 32-bit values: multibyte collation sequence,
|
|
|
|
wide char string (including length), and wide char
|
|
|
|
collation sequence. */
|
|
|
|
obstack_int32_grow (&extrapool, runp->mbseqorder);
|
|
|
|
|
|
|
|
obstack_int32_grow (&extrapool, runp->nwcs);
|
|
|
|
obstack_grow (&extrapool, runp->wcs,
|
|
|
|
runp->nwcs * sizeof (uint32_t));
|
|
|
|
|
|
|
|
obstack_int32_grow (&extrapool, runp->wcseqorder);
|
1999-12-31 18:23:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare to write out this data. */
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB));
|
|
|
|
iov[2 + cnt].iov_base = &elem_size;
|
|
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-31 18:23:00 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_TABLEMB));
|
|
|
|
iov[2 + cnt].iov_base = elem_table;
|
|
|
|
iov[2 + cnt].iov_len = elem_size * 2 * sizeof (int32_t);
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
1999-12-31 18:23:00 +00:00
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_EXTRAMB));
|
|
|
|
iov[2 + cnt].iov_len = obstack_object_size (&extrapool);
|
|
|
|
iov[2 + cnt].iov_base = obstack_finish (&extrapool);
|
2000-05-24 20:04:34 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQMB));
|
|
|
|
iov[2 + cnt].iov_base = collate->mbseqorder;
|
|
|
|
iov[2 + cnt].iov_len = 256;
|
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
1999-12-31 18:23:00 +00:00
|
|
|
++cnt;
|
|
|
|
|
2000-05-24 20:04:34 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQWC));
|
Update.
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.
2000-09-01 19:36:44 +00:00
|
|
|
iov[2 + cnt].iov_base = collate->wcseqorder.result;
|
|
|
|
iov[2 + cnt].iov_len = collate->wcseqorder.result_size;
|
2001-04-06 17:49:18 +00:00
|
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
2000-09-26 19:13:37 +00:00
|
|
|
assert (idx[cnt] % __alignof__ (int32_t) == 0);
|
2000-05-24 20:04:34 +00:00
|
|
|
++cnt;
|
1999-12-31 18:23:00 +00:00
|
|
|
|
2001-04-06 17:49:18 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_COLLATE_CODESET));
|
|
|
|
iov[2 + cnt].iov_base = (void *) charmap->code_set_name;
|
|
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
|
|
++cnt;
|
|
|
|
|
1999-12-20 22:08:01 +00:00
|
|
|
assert (cnt == _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE));
|
|
|
|
|
2002-04-18 08:08:23 +00:00
|
|
|
write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", 2 + cnt, iov);
|
1999-12-24 08:27:33 +00:00
|
|
|
|
|
|
|
obstack_free (&weightpool, NULL);
|
|
|
|
obstack_free (&extrapool, NULL);
|
1999-12-25 23:41:39 +00:00
|
|
|
obstack_free (&indirectpool, NULL);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
collate_read (struct linereader *ldfile, struct localedef_t *result,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap, const char *repertoire_name,
|
1999-08-31 07:04:41 +00:00
|
|
|
int ignore_content)
|
|
|
|
{
|
|
|
|
struct repertoire_t *repertoire = NULL;
|
|
|
|
struct locale_collate_t *collate;
|
|
|
|
struct token *now;
|
1999-12-11 05:15:37 +00:00
|
|
|
struct token *arg = NULL;
|
1999-08-31 07:04:41 +00:00
|
|
|
enum token_t nowtok;
|
1999-12-13 07:40:47 +00:00
|
|
|
enum token_t was_ellipsis = tok_none;
|
1999-12-11 07:25:44 +00:00
|
|
|
struct localedef_t *copy_locale = NULL;
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Parsing state:
|
|
|
|
0 - start
|
|
|
|
1 - between `order-start' and `order-end'
|
|
|
|
2 - after `order-end'
|
|
|
|
3 - after `reorder-after', waiting for `reorder-end'
|
|
|
|
4 - after `reorder-end'
|
|
|
|
5 - after `reorder-sections-after', waiting for `reorder-sections-end'
|
|
|
|
6 - after `reorder-sections-end'
|
|
|
|
*/
|
|
|
|
int state = 0;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Get the repertoire we have to use. */
|
|
|
|
if (repertoire_name != NULL)
|
|
|
|
repertoire = repertoire_read (repertoire_name);
|
|
|
|
|
|
|
|
/* The rest of the line containing `LC_COLLATE' must be free. */
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
}
|
|
|
|
while (nowtok == tok_eol);
|
|
|
|
|
|
|
|
if (nowtok == tok_copy)
|
|
|
|
{
|
|
|
|
state = 2;
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (now->tok != tok_string)
|
1999-12-11 05:15:37 +00:00
|
|
|
{
|
|
|
|
SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
|
|
|
|
|
1999-12-11 07:25:44 +00:00
|
|
|
skip_category:
|
1999-12-11 05:15:37 +00:00
|
|
|
do
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-12-11 05:15:37 +00:00
|
|
|
while (now->tok != tok_eof && now->tok != tok_end);
|
|
|
|
|
|
|
|
if (now->tok != tok_eof
|
2001-12-10 01:37:56 +00:00
|
|
|
|| (now = lr_token (ldfile, charmap, result, NULL, verbose),
|
2001-02-05 05:57:24 +00:00
|
|
|
now->tok == tok_eof))
|
1999-12-11 05:15:37 +00:00
|
|
|
lr_error (ldfile, _("%s: premature end of file"), "LC_COLLATE");
|
|
|
|
else if (now->tok != tok_lc_collate)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%1$s: definition does not end with `END %1$s'"), "LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-06-26 00:26:21 +00:00
|
|
|
if (! ignore_content)
|
1999-12-11 07:25:44 +00:00
|
|
|
{
|
2000-06-26 00:26:21 +00:00
|
|
|
/* Get the locale definition. */
|
|
|
|
copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
|
|
|
|
repertoire_name, charmap, NULL);
|
|
|
|
if ((copy_locale->avail & COLLATE_LOCALE) == 0)
|
|
|
|
{
|
|
|
|
/* Not yet loaded. So do it now. */
|
|
|
|
if (locfile_read (copy_locale, charmap) != 0)
|
|
|
|
goto skip_category;
|
|
|
|
}
|
1999-12-11 07:25:44 +00:00
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare the data structures. */
|
1999-12-11 07:25:44 +00:00
|
|
|
collate_startup (ldfile, result, copy_locale, ignore_content);
|
1999-08-31 07:04:41 +00:00
|
|
|
collate = result->categories[LC_COLLATE].collate;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
char ucs4buf[10];
|
|
|
|
char *symstr;
|
|
|
|
size_t symlen;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Of course we don't proceed beyond the end of file. */
|
|
|
|
if (nowtok == tok_eof)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Ingore empty lines. */
|
|
|
|
if (nowtok == tok_eol)
|
|
|
|
{
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (nowtok)
|
|
|
|
{
|
2000-06-25 18:01:25 +00:00
|
|
|
case tok_copy:
|
|
|
|
/* Allow copying other locales. */
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
2000-06-25 18:01:25 +00:00
|
|
|
if (now->tok != tok_string)
|
|
|
|
goto err_label;
|
|
|
|
|
|
|
|
if (! ignore_content)
|
|
|
|
load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
|
|
|
|
charmap, result);
|
|
|
|
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
case tok_coll_weight_max:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 0)
|
|
|
|
goto err_label;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_number)
|
|
|
|
goto err_label;
|
|
|
|
if (collate->col_weight_max != -1)
|
|
|
|
lr_error (ldfile, _("%s: duplicate definition of `%s'"),
|
|
|
|
"LC_COLLATE", "col_weight_max");
|
|
|
|
else
|
|
|
|
collate->col_weight_max = arg->val.num;
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_section_symbol:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 0)
|
|
|
|
goto err_label;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
goto err_label;
|
|
|
|
else if (!ignore_content)
|
|
|
|
{
|
|
|
|
/* Check whether this section is already known. */
|
|
|
|
struct section_list *known = collate->sections;
|
|
|
|
while (known != NULL)
|
2000-06-25 18:01:25 +00:00
|
|
|
{
|
|
|
|
if (strcmp (known->name, arg->val.str.startmb) == 0)
|
|
|
|
break;
|
|
|
|
known = known->next;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
if (known != NULL)
|
|
|
|
{
|
|
|
|
lr_error (ldfile,
|
|
|
|
_("%s: duplicate declaration of section `%s'"),
|
|
|
|
"LC_COLLATE", arg->val.str.startmb);
|
|
|
|
free (arg->val.str.startmb);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
collate->sections = make_seclist_elem (collate,
|
|
|
|
arg->val.str.startmb,
|
|
|
|
collate->sections);
|
|
|
|
|
|
|
|
lr_ignore_rest (ldfile, known == NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
free (arg->val.str.startmb);
|
1999-10-06 18:22:29 +00:00
|
|
|
lr_ignore_rest (ldfile, 0);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_collating_element:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-08-03 05:33:30 +00:00
|
|
|
if (state != 0 && state != 2)
|
1999-08-31 07:04:41 +00:00
|
|
|
goto err_label;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
goto err_label;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const char *symbol = arg->val.str.startmb;
|
|
|
|
size_t symbol_len = arg->val.str.lenmb;
|
|
|
|
|
|
|
|
/* Next the `from' keyword. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_from)
|
|
|
|
{
|
|
|
|
free ((char *) symbol);
|
|
|
|
goto err_label;
|
|
|
|
}
|
|
|
|
|
|
|
|
ldfile->return_widestr = 1;
|
1999-12-26 19:11:05 +00:00
|
|
|
ldfile->translate_strings = 1;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Finally the string with the replacement. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-12-26 19:11:05 +00:00
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
ldfile->return_widestr = 0;
|
1999-12-26 19:11:05 +00:00
|
|
|
ldfile->translate_strings = 0;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_string)
|
|
|
|
goto err_label;
|
|
|
|
|
1999-12-30 16:53:41 +00:00
|
|
|
if (!ignore_content && symbol != NULL)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
1999-12-30 16:53:41 +00:00
|
|
|
/* The name is already defined. */
|
|
|
|
if (check_duplicate (ldfile, collate, charmap,
|
|
|
|
repertoire, symbol, symbol_len))
|
|
|
|
goto col_elem_free;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
2000-08-06 17:13:27 +00:00
|
|
|
if (arg->val.str.startmb != NULL)
|
|
|
|
insert_entry (&collate->elem_table, symbol, symbol_len,
|
|
|
|
new_element (collate,
|
|
|
|
arg->val.str.startmb,
|
|
|
|
arg->val.str.lenmb - 1,
|
|
|
|
arg->val.str.startwc,
|
|
|
|
symbol, symbol_len, 0));
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
col_elem_free:
|
|
|
|
if (symbol != NULL)
|
|
|
|
free ((char *) symbol);
|
|
|
|
if (arg->val.str.startmb != NULL)
|
|
|
|
free (arg->val.str.startmb);
|
|
|
|
if (arg->val.str.startwc != NULL)
|
|
|
|
free (arg->val.str.startwc);
|
|
|
|
}
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_collating_symbol:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2000-08-28 03:51:40 +00:00
|
|
|
if (state != 0 && state != 2)
|
1999-08-31 07:04:41 +00:00
|
|
|
goto err_label;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
goto err_label;
|
|
|
|
else
|
|
|
|
{
|
2000-04-06 20:06:57 +00:00
|
|
|
char *symbol = arg->val.str.startmb;
|
1999-08-31 07:04:41 +00:00
|
|
|
size_t symbol_len = arg->val.str.lenmb;
|
2000-04-06 20:06:57 +00:00
|
|
|
char *endsymbol = NULL;
|
|
|
|
size_t endsymbol_len = 0;
|
|
|
|
enum token_t ellipsis = tok_none;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
2000-04-06 20:06:57 +00:00
|
|
|
if (arg->tok == tok_ellipsis2 || arg->tok == tok_ellipsis4)
|
|
|
|
{
|
|
|
|
ellipsis = arg->tok;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire,
|
|
|
|
verbose);
|
2000-04-06 20:06:57 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
{
|
|
|
|
free (symbol);
|
|
|
|
goto err_label;
|
|
|
|
}
|
|
|
|
|
|
|
|
endsymbol = arg->val.str.startmb;
|
|
|
|
endsymbol_len = arg->val.str.lenmb;
|
|
|
|
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
}
|
|
|
|
else if (arg->tok != tok_eol)
|
|
|
|
{
|
|
|
|
free (symbol);
|
|
|
|
goto err_label;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
if (!ignore_content)
|
|
|
|
{
|
2000-04-06 20:06:57 +00:00
|
|
|
if (symbol == NULL
|
|
|
|
|| (ellipsis != tok_none && endsymbol == NULL))
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
1999-08-31 07:04:41 +00:00
|
|
|
%s: unknown character in collating symbol name"),
|
2000-04-06 20:06:57 +00:00
|
|
|
"LC_COLLATE");
|
|
|
|
goto col_sym_free;
|
|
|
|
}
|
|
|
|
else if (ellipsis == tok_none)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-09-11 20:33:59 +00:00
|
|
|
/* A single symbol, no ellipsis. */
|
1999-08-31 07:04:41 +00:00
|
|
|
if (check_duplicate (ldfile, collate, charmap,
|
|
|
|
repertoire, symbol, symbol_len))
|
2000-09-11 20:33:59 +00:00
|
|
|
/* The name is already defined. */
|
1999-08-31 07:04:41 +00:00
|
|
|
goto col_sym_free;
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
insert_entry (&collate->sym_table, symbol, symbol_len,
|
2000-08-06 17:13:27 +00:00
|
|
|
new_symbol (collate, symbol, symbol_len));
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
2000-04-06 20:06:57 +00:00
|
|
|
else if (symbol_len != endsymbol_len)
|
|
|
|
{
|
|
|
|
col_sym_inv_range:
|
|
|
|
lr_error (ldfile,
|
|
|
|
_("invalid names for character range"));
|
|
|
|
goto col_sym_free;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Oh my, we have to handle an ellipsis. First, as
|
|
|
|
usual, determine the common prefix and then
|
|
|
|
convert the rest into a range. */
|
|
|
|
size_t prefixlen;
|
|
|
|
unsigned long int from;
|
|
|
|
unsigned long int to;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
for (prefixlen = 0; prefixlen < symbol_len; ++prefixlen)
|
|
|
|
if (symbol[prefixlen] != endsymbol[prefixlen])
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Convert the rest into numbers. */
|
|
|
|
symbol[symbol_len] = '\0';
|
|
|
|
from = strtoul (&symbol[prefixlen], &endp,
|
|
|
|
ellipsis == tok_ellipsis2 ? 16 : 10);
|
|
|
|
if (*endp != '\0')
|
|
|
|
goto col_sym_inv_range;
|
|
|
|
|
|
|
|
endsymbol[symbol_len] = '\0';
|
|
|
|
to = strtoul (&endsymbol[prefixlen], &endp,
|
|
|
|
ellipsis == tok_ellipsis2 ? 16 : 10);
|
|
|
|
if (*endp != '\0')
|
|
|
|
goto col_sym_inv_range;
|
|
|
|
|
|
|
|
if (from > to)
|
|
|
|
goto col_sym_inv_range;
|
|
|
|
|
|
|
|
/* Now loop over all entries. */
|
|
|
|
while (from <= to)
|
|
|
|
{
|
|
|
|
char *symbuf;
|
|
|
|
|
|
|
|
symbuf = (char *) obstack_alloc (&collate->mempool,
|
|
|
|
symbol_len + 1);
|
|
|
|
|
|
|
|
/* Create the name. */
|
|
|
|
sprintf (symbuf,
|
|
|
|
ellipsis == tok_ellipsis2
|
2000-09-11 20:33:59 +00:00
|
|
|
? "%.*s%.*lX" : "%.*s%.*lu",
|
2000-04-06 20:06:57 +00:00
|
|
|
(int) prefixlen, symbol,
|
|
|
|
(int) (symbol_len - prefixlen), from);
|
|
|
|
|
|
|
|
if (check_duplicate (ldfile, collate, charmap,
|
|
|
|
repertoire, symbuf, symbol_len))
|
2000-09-11 20:33:59 +00:00
|
|
|
/* The name is already defined. */
|
2000-04-06 20:06:57 +00:00
|
|
|
goto col_sym_free;
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
insert_entry (&collate->sym_table, symbuf,
|
2000-08-06 17:13:27 +00:00
|
|
|
symbol_len,
|
|
|
|
new_symbol (collate, symbuf,
|
|
|
|
symbol_len));
|
2000-04-06 20:06:57 +00:00
|
|
|
|
|
|
|
/* Increment the counter. */
|
|
|
|
++from;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto col_sym_free;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
col_sym_free:
|
|
|
|
if (symbol != NULL)
|
2000-04-06 20:06:57 +00:00
|
|
|
free (symbol);
|
|
|
|
if (endsymbol != NULL)
|
|
|
|
free (endsymbol);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_symbol_equivalence:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 0)
|
|
|
|
goto err_label;
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
goto err_label;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const char *newname = arg->val.str.startmb;
|
|
|
|
size_t newname_len = arg->val.str.lenmb;
|
|
|
|
const char *symname;
|
|
|
|
size_t symname_len;
|
2003-06-13 21:05:42 +00:00
|
|
|
void *symval; /* Actually struct symbol_t* */
|
1999-08-31 07:04:41 +00:00
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
{
|
|
|
|
if (newname != NULL)
|
|
|
|
free ((char *) newname);
|
|
|
|
goto err_label;
|
|
|
|
}
|
|
|
|
|
|
|
|
symname = arg->val.str.startmb;
|
|
|
|
symname_len = arg->val.str.lenmb;
|
|
|
|
|
2000-01-27 00:19:43 +00:00
|
|
|
if (newname == NULL)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_error (ldfile, _("\
|
1999-08-31 07:04:41 +00:00
|
|
|
%s: unknown character in equivalent definition name"),
|
2000-01-27 00:19:43 +00:00
|
|
|
"LC_COLLATE");
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
sym_equiv_free:
|
|
|
|
if (newname != NULL)
|
|
|
|
free ((char *) newname);
|
|
|
|
if (symname != NULL)
|
|
|
|
free ((char *) symname);
|
2000-01-27 00:19:43 +00:00
|
|
|
break;
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
2000-01-27 00:19:43 +00:00
|
|
|
if (symname == NULL)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: unknown character in equivalent definition value"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
goto sym_equiv_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* See whether the symbol name is already defined. */
|
|
|
|
if (find_entry (&collate->sym_table, symname, symname_len,
|
2003-06-13 21:05:42 +00:00
|
|
|
&symval) != 0)
|
2000-01-27 00:19:43 +00:00
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: unknown symbol `%s' in equivalent definition"),
|
|
|
|
"LC_COLLATE", symname);
|
|
|
|
goto col_sym_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (insert_entry (&collate->sym_table,
|
|
|
|
newname, newname_len, symval) < 0)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
error while adding equivalent collating symbol"));
|
|
|
|
goto sym_equiv_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
free ((char *) symname);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
2000-01-27 00:19:43 +00:00
|
|
|
lr_ignore_rest (ldfile, 1);
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
case tok_script:
|
|
|
|
/* We get told about the scripts we know. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
2000-06-25 18:01:25 +00:00
|
|
|
if (arg->tok != tok_bsymbol)
|
|
|
|
goto err_label;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct section_list *runp = collate->known_sections;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
while (runp != NULL)
|
|
|
|
if (strncmp (runp->name, arg->val.str.startmb,
|
|
|
|
arg->val.str.lenmb) == 0
|
|
|
|
&& runp->name[arg->val.str.lenmb] == '\0')
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
runp = runp->def_next;
|
|
|
|
|
|
|
|
if (runp != NULL)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("duplicate definition of script `%s'"),
|
|
|
|
runp->name);
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
runp = (struct section_list *) xcalloc (1, sizeof (*runp));
|
2000-09-11 20:33:59 +00:00
|
|
|
name = (char *) xmalloc (arg->val.str.lenmb + 1);
|
|
|
|
memcpy (name, arg->val.str.startmb, arg->val.str.lenmb);
|
2000-06-25 18:01:25 +00:00
|
|
|
name[arg->val.str.lenmb] = '\0';
|
|
|
|
runp->name = name;
|
|
|
|
|
|
|
|
runp->def_next = collate->known_sections;
|
|
|
|
collate->known_sections = runp;
|
|
|
|
}
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
case tok_order_start:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 0 && state != 1)
|
|
|
|
goto err_label;
|
|
|
|
state = 1;
|
|
|
|
|
|
|
|
/* The 14652 draft does not specify whether all `order_start' lines
|
|
|
|
must contain the same number of sort-rules, but 14651 does. So
|
|
|
|
we require this here as well. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok == tok_bsymbol)
|
|
|
|
{
|
|
|
|
/* This better should be a section name. */
|
2000-06-25 18:01:25 +00:00
|
|
|
struct section_list *sp = collate->known_sections;
|
1999-08-31 07:04:41 +00:00
|
|
|
while (sp != NULL
|
2000-06-25 18:01:25 +00:00
|
|
|
&& (sp->name == NULL
|
|
|
|
|| strncmp (sp->name, arg->val.str.startmb,
|
|
|
|
arg->val.str.lenmb) != 0
|
|
|
|
|| sp->name[arg->val.str.lenmb] != '\0'))
|
|
|
|
sp = sp->def_next;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
if (sp == NULL)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: unknown section name `%s'"),
|
|
|
|
"LC_COLLATE", arg->val.str.startmb);
|
|
|
|
/* We use the error section. */
|
|
|
|
collate->current_section = &collate->error_section;
|
1999-12-24 05:42:34 +00:00
|
|
|
|
|
|
|
if (collate->error_section.first == NULL)
|
|
|
|
{
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Insert &collate->error_section at the end of
|
|
|
|
the collate->sections list. */
|
2000-06-25 18:01:25 +00:00
|
|
|
if (collate->sections == NULL)
|
|
|
|
collate->sections = &collate->error_section;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sp = collate->sections;
|
|
|
|
while (sp->next != NULL)
|
|
|
|
sp = sp->next;
|
|
|
|
|
|
|
|
sp->next = &collate->error_section;
|
|
|
|
}
|
2000-09-11 20:33:59 +00:00
|
|
|
collate->error_section.next = NULL;
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* One should not be allowed to open the same
|
|
|
|
section twice. */
|
|
|
|
if (sp->first != NULL)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: multiple order definitions for section `%s'"),
|
|
|
|
"LC_COLLATE", sp->name);
|
1999-12-24 05:42:34 +00:00
|
|
|
else
|
|
|
|
{
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Insert sp in the collate->sections list,
|
|
|
|
right after collate->current_section. */
|
2000-06-25 18:01:25 +00:00
|
|
|
if (collate->current_section == NULL)
|
|
|
|
collate->current_section = sp;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sp->next = collate->current_section->next;
|
|
|
|
collate->current_section->next = sp;
|
|
|
|
}
|
1999-12-24 05:42:34 +00:00
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Next should come the end of the line or a semicolon. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire,
|
|
|
|
verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok == tok_eol)
|
|
|
|
{
|
|
|
|
uint32_t cnt;
|
|
|
|
|
|
|
|
/* This means we have exactly one rule: `forward'. */
|
1999-12-25 23:41:39 +00:00
|
|
|
if (nrules > 1)
|
1999-08-31 07:04:41 +00:00
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: invalid number of sorting rules"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
else
|
1999-12-25 23:41:39 +00:00
|
|
|
nrules = 1;
|
1999-08-31 07:04:41 +00:00
|
|
|
sp->rules = obstack_alloc (&collate->mempool,
|
|
|
|
(sizeof (enum coll_sort_rule)
|
1999-12-25 23:41:39 +00:00
|
|
|
* nrules));
|
|
|
|
for (cnt = 0; cnt < nrules; ++cnt)
|
1999-08-31 07:04:41 +00:00
|
|
|
sp->rules[cnt] = sort_forward;
|
|
|
|
|
|
|
|
/* Next line. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the next token. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire,
|
|
|
|
verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* There is no section symbol. Therefore we use the unnamed
|
|
|
|
section. */
|
|
|
|
collate->current_section = &collate->unnamed_section;
|
|
|
|
|
|
|
|
if (collate->unnamed_section.first != NULL)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: multiple order definitions for unnamed section"),
|
|
|
|
"LC_COLLATE");
|
1999-12-24 05:42:34 +00:00
|
|
|
else
|
|
|
|
{
|
2000-09-11 20:33:59 +00:00
|
|
|
/* Insert &collate->unnamed_section at the beginning of
|
|
|
|
the collate->sections list. */
|
1999-12-24 05:42:34 +00:00
|
|
|
collate->unnamed_section.next = collate->sections;
|
|
|
|
collate->sections = &collate->unnamed_section;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now read the direction names. */
|
2001-12-10 01:37:56 +00:00
|
|
|
read_directions (ldfile, arg, charmap, repertoire, result);
|
1999-12-11 02:51:13 +00:00
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
/* From now we need the strings untranslated. */
|
1999-12-11 02:51:13 +00:00
|
|
|
ldfile->translate_strings = 0;
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_order_end:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 1)
|
|
|
|
goto err_label;
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
/* Handle ellipsis at end of list. */
|
1999-12-18 19:45:25 +00:00
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result);
|
1999-12-18 19:45:25 +00:00
|
|
|
was_ellipsis = tok_none;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
state = 2;
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_reorder_after:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
if (state == 1)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: missing `order_end' keyword"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
state = 2;
|
|
|
|
|
|
|
|
/* Handle ellipsis at end of list. */
|
1999-12-18 19:45:25 +00:00
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (ldfile, arg->val.str.startmb,
|
|
|
|
arg->val.str.lenmb, was_ellipsis, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result);
|
1999-12-18 19:45:25 +00:00
|
|
|
was_ellipsis = tok_none;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
else if (state != 2 && state != 3)
|
1999-08-31 07:04:41 +00:00
|
|
|
goto err_label;
|
|
|
|
state = 3;
|
1999-12-11 05:15:37 +00:00
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
2000-08-28 03:51:40 +00:00
|
|
|
if (arg->tok == tok_bsymbol || arg->tok == tok_ucs4)
|
1999-12-11 05:15:37 +00:00
|
|
|
{
|
|
|
|
/* Find this symbol in the sequence table. */
|
2000-08-28 03:51:40 +00:00
|
|
|
char ucsbuf[10];
|
|
|
|
char *startmb;
|
|
|
|
size_t lenmb;
|
1999-12-11 05:15:37 +00:00
|
|
|
struct element_t *insp;
|
|
|
|
int no_error = 1;
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
1999-12-11 05:15:37 +00:00
|
|
|
|
2000-08-28 03:51:40 +00:00
|
|
|
if (arg->tok == tok_bsymbol)
|
|
|
|
{
|
|
|
|
startmb = arg->val.str.startmb;
|
|
|
|
lenmb = arg->val.str.lenmb;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprintf (ucsbuf, "U%08X", arg->val.ucs4);
|
|
|
|
startmb = ucsbuf;
|
|
|
|
lenmb = 9;
|
|
|
|
}
|
|
|
|
|
2003-06-13 21:05:42 +00:00
|
|
|
if (find_entry (&collate->seq_table, startmb, lenmb, &ptr) == 0)
|
1999-12-11 05:15:37 +00:00
|
|
|
/* Yes, the symbol exists. Simply point the cursor
|
|
|
|
to it. */
|
2003-06-13 21:05:42 +00:00
|
|
|
collate->cursor = (struct element_t *) ptr;
|
1999-12-11 05:15:37 +00:00
|
|
|
else
|
|
|
|
{
|
2000-07-22 03:52:21 +00:00
|
|
|
struct symbol_t *symbp;
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
2000-07-22 03:52:21 +00:00
|
|
|
|
2000-08-28 03:51:40 +00:00
|
|
|
if (find_entry (&collate->sym_table, startmb, lenmb,
|
2003-06-13 21:05:42 +00:00
|
|
|
&ptr) == 0)
|
2000-07-22 03:52:21 +00:00
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
symbp = ptr;
|
|
|
|
|
2000-07-22 03:52:21 +00:00
|
|
|
if (symbp->order->last != NULL
|
|
|
|
|| symbp->order->next != NULL)
|
|
|
|
collate->cursor = symbp->order;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is a collating symbol but its position
|
|
|
|
is not yet defined. */
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: order for collating symbol %.*s not yet defined"),
|
2000-08-28 03:51:40 +00:00
|
|
|
"LC_COLLATE", (int) lenmb, startmb);
|
2000-07-22 03:52:21 +00:00
|
|
|
collate->cursor = NULL;
|
|
|
|
no_error = 0;
|
|
|
|
}
|
|
|
|
}
|
2000-08-28 03:51:40 +00:00
|
|
|
else if (find_entry (&collate->elem_table, startmb, lenmb,
|
2003-06-13 21:05:42 +00:00
|
|
|
&ptr) == 0)
|
2000-07-22 04:25:38 +00:00
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
insp = (struct element_t *) ptr;
|
|
|
|
|
2000-07-22 04:25:38 +00:00
|
|
|
if (insp->last != NULL || insp->next != NULL)
|
|
|
|
collate->cursor = insp;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is a collating element but its position
|
|
|
|
is not yet defined. */
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%s: order for collating element %.*s not yet defined"),
|
2000-08-28 03:51:40 +00:00
|
|
|
"LC_COLLATE", (int) lenmb, startmb);
|
2000-07-22 04:25:38 +00:00
|
|
|
collate->cursor = NULL;
|
|
|
|
no_error = 0;
|
|
|
|
}
|
|
|
|
}
|
2000-07-22 03:52:21 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is bad. The symbol after which we have to
|
|
|
|
insert does not exist. */
|
|
|
|
lr_error (ldfile, _("\
|
1999-12-11 05:15:37 +00:00
|
|
|
%s: cannot reorder after %.*s: symbol not known"),
|
2000-08-28 03:51:40 +00:00
|
|
|
"LC_COLLATE", (int) lenmb, startmb);
|
2000-07-22 03:52:21 +00:00
|
|
|
collate->cursor = NULL;
|
|
|
|
no_error = 0;
|
|
|
|
}
|
1999-12-11 05:15:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lr_ignore_rest (ldfile, no_error);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* This must not happen. */
|
|
|
|
goto err_label;
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_reorder_end:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
break;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 3)
|
|
|
|
goto err_label;
|
|
|
|
state = 4;
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
1999-12-11 20:22:01 +00:00
|
|
|
case tok_reorder_sections_after:
|
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
if (state == 1)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: missing `order_end' keyword"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
state = 2;
|
|
|
|
|
|
|
|
/* Handle ellipsis at end of list. */
|
1999-12-18 19:45:25 +00:00
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result);
|
1999-12-18 19:45:25 +00:00
|
|
|
was_ellipsis = tok_none;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
|
|
|
else if (state == 3)
|
|
|
|
{
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
|
|
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
|
1999-12-13 07:40:47 +00:00
|
|
|
state = 4;
|
|
|
|
}
|
|
|
|
else if (state != 2 && state != 4)
|
1999-12-11 20:22:01 +00:00
|
|
|
goto err_label;
|
|
|
|
state = 5;
|
|
|
|
|
|
|
|
/* Get the name of the sections we are adding after. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
|
1999-12-11 20:22:01 +00:00
|
|
|
if (arg->tok == tok_bsymbol)
|
|
|
|
{
|
|
|
|
/* Now find a section with this name. */
|
|
|
|
struct section_list *runp = collate->sections;
|
|
|
|
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
|
|
|
if (runp->name != NULL
|
|
|
|
&& strlen (runp->name) == arg->val.str.lenmb
|
|
|
|
&& memcmp (runp->name, arg->val.str.startmb,
|
|
|
|
arg->val.str.lenmb) == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (runp != NULL)
|
|
|
|
collate->current_section = runp;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is bad. The section after which we have to
|
|
|
|
reorder does not exist. Therefore we cannot
|
|
|
|
process the whole rest of this reorder
|
|
|
|
specification. */
|
|
|
|
lr_error (ldfile, _("%s: section `%.*s' not known"),
|
1999-12-24 05:42:34 +00:00
|
|
|
"LC_COLLATE", (int) arg->val.str.lenmb,
|
1999-12-11 20:22:01 +00:00
|
|
|
arg->val.str.startmb);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-12-11 20:22:01 +00:00
|
|
|
}
|
|
|
|
while (now->tok == tok_reorder_sections_after
|
|
|
|
|| now->tok == tok_reorder_sections_end
|
|
|
|
|| now->tok == tok_end);
|
|
|
|
|
|
|
|
/* Process the token we just saw. */
|
|
|
|
nowtok = now->tok;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* This must not happen. */
|
|
|
|
goto err_label;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_reorder_sections_end:
|
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (state != 5)
|
|
|
|
goto err_label;
|
|
|
|
state = 6;
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
break;
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
case tok_bsymbol:
|
2000-06-21 03:59:55 +00:00
|
|
|
case tok_ucs4:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
if (state != 0 && state != 1 && state != 3 && state != 5)
|
2000-06-21 03:59:55 +00:00
|
|
|
goto err_label;
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
if ((state == 0 || state == 5) && nowtok == tok_ucs4)
|
1999-08-31 07:04:41 +00:00
|
|
|
goto err_label;
|
|
|
|
|
2000-06-21 03:59:55 +00:00
|
|
|
if (nowtok == tok_ucs4)
|
|
|
|
{
|
|
|
|
snprintf (ucs4buf, sizeof (ucs4buf), "U%08X", now->val.ucs4);
|
|
|
|
symstr = ucs4buf;
|
|
|
|
symlen = 9;
|
|
|
|
}
|
2002-02-14 01:02:42 +00:00
|
|
|
else if (arg != NULL)
|
2000-06-21 03:59:55 +00:00
|
|
|
{
|
|
|
|
symstr = arg->val.str.startmb;
|
|
|
|
symlen = arg->val.str.lenmb;
|
|
|
|
}
|
2002-02-14 01:02:42 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: bad symbol <%.*s>"), "LC_COLLATE",
|
2002-05-01 17:09:58 +00:00
|
|
|
(int) ldfile->token.val.str.lenmb,
|
2002-02-14 01:02:42 +00:00
|
|
|
ldfile->token.val.str.startmb);
|
|
|
|
break;
|
|
|
|
}
|
2000-06-21 03:59:55 +00:00
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
if (state == 0)
|
|
|
|
{
|
|
|
|
/* We are outside an `order_start' region. This means
|
|
|
|
we must only accept definitions of values for
|
|
|
|
collation symbols since these are purely abstract
|
2000-09-11 20:33:59 +00:00
|
|
|
values and don't need directions associated. */
|
2000-06-25 18:01:25 +00:00
|
|
|
struct element_t *seqp;
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
2000-06-25 18:01:25 +00:00
|
|
|
|
2003-06-13 21:05:42 +00:00
|
|
|
if (find_entry (&collate->seq_table, symstr, symlen, &ptr) == 0)
|
2000-06-25 18:01:25 +00:00
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
seqp = ptr;
|
|
|
|
|
2000-06-25 18:01:25 +00:00
|
|
|
/* It's already defined. First check whether this
|
|
|
|
is really a collating symbol. */
|
|
|
|
if (seqp->is_character)
|
|
|
|
goto err_label;
|
|
|
|
|
|
|
|
goto move_entry;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
void *result;
|
|
|
|
|
|
|
|
if (find_entry (&collate->sym_table, symstr, symlen,
|
|
|
|
&result) != 0)
|
|
|
|
/* No collating symbol, it's an error. */
|
|
|
|
goto err_label;
|
|
|
|
|
|
|
|
/* Maybe this is the first time we define a symbol
|
|
|
|
value and it is before the first actual section. */
|
|
|
|
if (collate->sections == NULL)
|
|
|
|
collate->sections = collate->current_section =
|
|
|
|
&collate->symbol_section;
|
|
|
|
}
|
2000-08-06 17:13:27 +00:00
|
|
|
|
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
|
|
|
|
|
|
|
handle_ellipsis (ldfile, symstr, symlen, was_ellipsis,
|
2001-12-10 01:37:56 +00:00
|
|
|
charmap, repertoire, result);
|
2000-08-06 17:13:27 +00:00
|
|
|
|
|
|
|
/* Remember that we processed the ellipsis. */
|
|
|
|
was_ellipsis = tok_none;
|
|
|
|
|
|
|
|
/* And don't add the value a second time. */
|
|
|
|
break;
|
|
|
|
}
|
2000-06-25 18:01:25 +00:00
|
|
|
}
|
|
|
|
else if (state == 3)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
/* It is possible that we already have this collation sequence.
|
|
|
|
In this case we move the entry. */
|
2003-06-13 21:05:42 +00:00
|
|
|
struct element_t *seqp = NULL;
|
2000-08-28 03:51:40 +00:00
|
|
|
void *sym;
|
2003-06-13 21:05:42 +00:00
|
|
|
void *ptr;
|
1999-08-31 07:04:41 +00:00
|
|
|
|
1999-12-11 05:15:37 +00:00
|
|
|
/* If the symbol after which we have to insert was not found
|
|
|
|
ignore all entries. */
|
|
|
|
if (collate->cursor == NULL)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2003-06-13 21:05:42 +00:00
|
|
|
if (find_entry (&collate->seq_table, symstr, symlen, &ptr) == 0)
|
|
|
|
{
|
|
|
|
seqp = (struct element_t *) ptr;
|
|
|
|
goto move_entry;
|
|
|
|
}
|
2000-08-28 03:51:40 +00:00
|
|
|
|
|
|
|
if (find_entry (&collate->sym_table, symstr, symlen, &sym) == 0
|
|
|
|
&& (seqp = ((struct symbol_t *) sym)->order) != NULL)
|
|
|
|
goto move_entry;
|
|
|
|
|
2003-06-13 21:05:42 +00:00
|
|
|
if (find_entry (&collate->elem_table, symstr, symlen, &ptr) == 0
|
|
|
|
&& (seqp = (struct element_t *) ptr,
|
|
|
|
seqp->last != NULL || seqp->next != NULL
|
2001-08-03 05:33:30 +00:00
|
|
|
|| (collate->start != NULL && seqp == collate->start)))
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
2000-06-25 18:01:25 +00:00
|
|
|
move_entry:
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Remove the entry from the old position. */
|
|
|
|
if (seqp->last == NULL)
|
|
|
|
collate->start = seqp->next;
|
|
|
|
else
|
|
|
|
seqp->last->next = seqp->next;
|
|
|
|
if (seqp->next != NULL)
|
|
|
|
seqp->next->last = seqp->last;
|
|
|
|
|
|
|
|
/* We also have to check whether this entry is the
|
|
|
|
first or last of a section. */
|
|
|
|
if (seqp->section->first == seqp)
|
|
|
|
{
|
|
|
|
if (seqp->section->first == seqp->section->last)
|
2000-09-11 20:33:59 +00:00
|
|
|
/* This section has no content anymore. */
|
1999-08-31 07:04:41 +00:00
|
|
|
seqp->section->first = seqp->section->last = NULL;
|
|
|
|
else
|
|
|
|
seqp->section->first = seqp->next;
|
|
|
|
}
|
|
|
|
else if (seqp->section->last == seqp)
|
|
|
|
seqp->section->last = seqp->last;
|
|
|
|
|
1999-12-11 05:15:37 +00:00
|
|
|
/* Now insert it in the new place. */
|
2001-12-10 01:37:56 +00:00
|
|
|
insert_weights (ldfile, seqp, charmap, repertoire, result,
|
2000-08-28 03:51:40 +00:00
|
|
|
tok_none);
|
1999-12-11 05:15:37 +00:00
|
|
|
break;
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
1999-12-11 05:15:37 +00:00
|
|
|
|
|
|
|
/* Otherwise we just add a new entry. */
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
1999-12-11 20:22:01 +00:00
|
|
|
else if (state == 5)
|
|
|
|
{
|
|
|
|
/* We are reordering sections. Find the named section. */
|
|
|
|
struct section_list *runp = collate->sections;
|
|
|
|
struct section_list *prevp = NULL;
|
|
|
|
|
|
|
|
while (runp != NULL)
|
|
|
|
{
|
|
|
|
if (runp->name != NULL
|
2000-06-21 03:59:55 +00:00
|
|
|
&& strlen (runp->name) == symlen
|
|
|
|
&& memcmp (runp->name, symstr, symlen) == 0)
|
1999-12-11 20:22:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
prevp = runp;
|
|
|
|
runp = runp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (runp == NULL)
|
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: section `%.*s' not known"),
|
2000-06-21 03:59:55 +00:00
|
|
|
"LC_COLLATE", (int) symlen, symstr);
|
1999-12-11 20:22:01 +00:00
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (runp != collate->current_section)
|
|
|
|
{
|
|
|
|
/* Remove the named section from the old place and
|
|
|
|
insert it in the new one. */
|
|
|
|
prevp->next = runp->next;
|
|
|
|
|
|
|
|
runp->next = collate->current_section->next;
|
|
|
|
collate->current_section->next = runp;
|
|
|
|
collate->current_section = runp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process the rest of the line which might change
|
|
|
|
the collation rules. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, repertoire,
|
|
|
|
verbose);
|
1999-12-11 20:22:01 +00:00
|
|
|
if (arg->tok != tok_eof && arg->tok != tok_eol)
|
|
|
|
read_directions (ldfile, arg, charmap, repertoire,
|
2001-12-10 01:37:56 +00:00
|
|
|
result);
|
1999-12-11 20:22:01 +00:00
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (was_ellipsis != tok_none)
|
|
|
|
{
|
|
|
|
/* Using the information in the `ellipsis_weight'
|
|
|
|
element and this and the last value we have to handle
|
|
|
|
the ellipsis now. */
|
|
|
|
assert (state == 1);
|
|
|
|
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (ldfile, symstr, symlen, was_ellipsis, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result);
|
1999-12-13 07:40:47 +00:00
|
|
|
|
|
|
|
/* Remember that we processed the ellipsis. */
|
|
|
|
was_ellipsis = tok_none;
|
|
|
|
|
|
|
|
/* And don't add the value a second time. */
|
|
|
|
break;
|
1999-12-11 20:22:01 +00:00
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
/* Now insert in the new place. */
|
2001-12-10 01:37:56 +00:00
|
|
|
insert_value (ldfile, symstr, symlen, charmap, repertoire, result);
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_undefined:
|
1999-09-12 08:28:56 +00:00
|
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
|
|
this line. */
|
|
|
|
if (ignore_content)
|
|
|
|
{
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-08-31 07:04:41 +00:00
|
|
|
if (state != 1)
|
|
|
|
goto err_label;
|
1999-12-11 02:51:13 +00:00
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
|
|
|
lr_error (ldfile,
|
|
|
|
_("%s: cannot have `%s' as end of ellipsis range"),
|
|
|
|
"LC_COLLATE", "UNDEFINED");
|
|
|
|
|
|
|
|
unlink_element (collate);
|
|
|
|
was_ellipsis = tok_none;
|
|
|
|
}
|
|
|
|
|
1999-12-11 02:51:13 +00:00
|
|
|
/* See whether UNDEFINED already appeared somewhere. */
|
|
|
|
if (collate->undefined.next != NULL
|
2000-09-11 20:33:59 +00:00
|
|
|
|| &collate->undefined == collate->cursor)
|
1999-12-11 02:51:13 +00:00
|
|
|
{
|
1999-12-13 07:40:47 +00:00
|
|
|
lr_error (ldfile,
|
2000-03-20 18:09:38 +00:00
|
|
|
_("%s: order for `%.*s' already defined at %s:%Zu"),
|
2000-03-15 03:30:14 +00:00
|
|
|
"LC_COLLATE", 9, "UNDEFINED",
|
2000-03-20 18:09:38 +00:00
|
|
|
collate->undefined.file,
|
1999-12-11 02:51:13 +00:00
|
|
|
collate->undefined.line);
|
|
|
|
lr_ignore_rest (ldfile, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Parse the weights. */
|
|
|
|
insert_weights (ldfile, &collate->undefined, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result, tok_none);
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
2000-09-11 20:33:59 +00:00
|
|
|
case tok_ellipsis2: /* symbolic hexadecimal ellipsis */
|
|
|
|
case tok_ellipsis3: /* absolute ellipsis */
|
|
|
|
case tok_ellipsis4: /* symbolic decimal ellipsis */
|
1999-12-13 07:40:47 +00:00
|
|
|
/* This is the symbolic (decimal or hexadecimal) or absolute
|
|
|
|
ellipsis. */
|
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
goto err_label;
|
1999-09-12 08:28:56 +00:00
|
|
|
|
2000-08-06 17:13:27 +00:00
|
|
|
if (state != 0 && state != 1 && state != 3)
|
1999-08-31 07:04:41 +00:00
|
|
|
goto err_label;
|
|
|
|
|
1999-12-13 07:40:47 +00:00
|
|
|
was_ellipsis = nowtok;
|
|
|
|
|
|
|
|
insert_weights (ldfile, &collate->ellipsis_weight, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result, nowtok);
|
1999-08-31 07:04:41 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case tok_end:
|
|
|
|
/* Next we assume `LC_COLLATE'. */
|
1999-09-12 08:28:56 +00:00
|
|
|
if (!ignore_content)
|
|
|
|
{
|
|
|
|
if (state == 0)
|
|
|
|
/* We must either see a copy statement or have
|
|
|
|
ordering values. */
|
|
|
|
lr_error (ldfile,
|
|
|
|
_("%s: empty category description not allowed"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
else if (state == 1)
|
1999-12-13 07:40:47 +00:00
|
|
|
{
|
|
|
|
lr_error (ldfile, _("%s: missing `order_end' keyword"),
|
|
|
|
"LC_COLLATE");
|
|
|
|
|
|
|
|
/* Handle ellipsis at end of list. */
|
1999-12-18 19:45:25 +00:00
|
|
|
if (was_ellipsis != tok_none)
|
|
|
|
{
|
2000-06-21 03:59:55 +00:00
|
|
|
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
|
2001-12-10 01:37:56 +00:00
|
|
|
repertoire, result);
|
1999-12-18 19:45:25 +00:00
|
|
|
was_ellipsis = tok_none;
|
|
|
|
}
|
1999-12-13 07:40:47 +00:00
|
|
|
}
|
1999-09-12 08:28:56 +00:00
|
|
|
else if (state == 3)
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
|
|
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
|
1999-12-11 20:22:01 +00:00
|
|
|
else if (state == 5)
|
2002-02-05 23:29:24 +00:00
|
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
|
|
%s: missing `reorder-sections-end' keyword"), "LC_COLLATE"));
|
1999-09-12 08:28:56 +00:00
|
|
|
}
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok == tok_eof)
|
|
|
|
break;
|
|
|
|
if (arg->tok == tok_eol)
|
|
|
|
lr_error (ldfile, _("%s: incomplete `END' line"), "LC_COLLATE");
|
|
|
|
else if (arg->tok != tok_lc_collate)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%1$s: definition does not end with `END %1$s'"), "LC_COLLATE");
|
|
|
|
lr_ignore_rest (ldfile, arg->tok == tok_lc_collate);
|
|
|
|
return;
|
|
|
|
|
|
|
|
default:
|
|
|
|
err_label:
|
|
|
|
SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare for the next round. */
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When we come here we reached the end of the file. */
|
|
|
|
lr_error (ldfile, _("%s: premature end of file"), "LC_COLLATE");
|
|
|
|
}
|