mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
19bc17a905
* 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.
209 lines
6.1 KiB
C
209 lines
6.1 KiB
C
/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <langinfo.h>
|
|
#include <string.h>
|
|
|
|
/* Undefine following line in production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
#include "locales.h"
|
|
#include "localeinfo.h"
|
|
#include "stringtrans.h"
|
|
|
|
void *xmalloc (size_t __n);
|
|
void *xrealloc (void *__ptr, size_t __n);
|
|
|
|
|
|
/* The real definition of the struct for the LC_NUMERIC locale. */
|
|
struct locale_numeric_t
|
|
{
|
|
const char *decimal_point;
|
|
const char *thousands_sep;
|
|
char *grouping;
|
|
size_t grouping_max;
|
|
size_t grouping_act;
|
|
};
|
|
|
|
|
|
void
|
|
numeric_startup (struct linereader *lr, struct localedef_t *locale,
|
|
struct charset_t *charset)
|
|
{
|
|
struct locale_numeric_t *numeric;
|
|
|
|
/* It is important that we always use UCS1 encoding for strings now. */
|
|
encoding_method = ENC_UCS1;
|
|
|
|
locale->categories[LC_NUMERIC].numeric = numeric =
|
|
(struct locale_numeric_t *) xmalloc (sizeof (struct locale_numeric_t));
|
|
|
|
memset (numeric, '\0', sizeof (struct locale_numeric_t));
|
|
|
|
numeric->grouping_max = 80;
|
|
numeric->grouping = (char *) xmalloc (numeric->grouping_max);
|
|
numeric->grouping_act = 0;
|
|
}
|
|
|
|
|
|
void
|
|
numeric_finish (struct localedef_t *locale)
|
|
{
|
|
struct locale_numeric_t *numeric = locale->categories[LC_NUMERIC].numeric;
|
|
|
|
#define TEST_ELEM(cat) \
|
|
if (numeric->cat == NULL) \
|
|
error (0, 0, _("field `%s' in category `%s' not defined"), \
|
|
#cat, "LC_NUMERIC")
|
|
|
|
TEST_ELEM (decimal_point);
|
|
TEST_ELEM (thousands_sep);
|
|
|
|
/* The decimal point must not be empty. This is not said explicitly
|
|
in POSIX but ANSI C (ISO/IEC 9899) says in 4.4.2.1 it has to be
|
|
!= "". */
|
|
if (numeric->decimal_point[0] == '\0')
|
|
{
|
|
error (0, 0, _("\
|
|
value for field `%s' in category `%s' must not be the empty string"),
|
|
"decimal_point", "LC_NUMERIC");
|
|
}
|
|
|
|
if (numeric->grouping_act == 0)
|
|
error (0, 0, _("field `%s' in category `%s' not defined"),
|
|
"grouping", "LC_NUMERIC");
|
|
}
|
|
|
|
|
|
void
|
|
numeric_output (struct localedef_t *locale, const char *output_path)
|
|
{
|
|
struct locale_numeric_t *numeric = locale->categories[LC_NUMERIC].numeric;
|
|
struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_NUMERIC)];
|
|
struct locale_file data;
|
|
u32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_NUMERIC)];
|
|
size_t cnt = 0;
|
|
|
|
if ((locale->binary & (1 << LC_NUMERIC)) != 0)
|
|
{
|
|
iov[0].iov_base = numeric;
|
|
iov[0].iov_len = locale->len[LC_NUMERIC];
|
|
|
|
write_locale_data (output_path, "LC_NUMERIC", 1, iov);
|
|
|
|
return;
|
|
}
|
|
|
|
data.magic = LIMAGIC (LC_NUMERIC);
|
|
data.n = _NL_ITEM_INDEX (_NL_NUM_LC_NUMERIC);
|
|
iov[cnt].iov_base = (void *) &data;
|
|
iov[cnt].iov_len = sizeof (data);
|
|
++cnt;
|
|
|
|
iov[cnt].iov_base = (void *) idx;
|
|
iov[cnt].iov_len = sizeof (idx);
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) (numeric->decimal_point ?: "");
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) (numeric->thousands_sep ?: "");
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = alloca (numeric->grouping_act + 1);
|
|
iov[cnt].iov_len = numeric->grouping_act + 1;
|
|
memcpy (iov[cnt].iov_base, numeric->grouping, numeric->grouping_act);
|
|
((char *) iov[cnt].iov_base)[numeric->grouping_act] = '\0';
|
|
|
|
assert (cnt + 1 == 2 + _NL_ITEM_INDEX (_NL_NUM_LC_NUMERIC));
|
|
|
|
write_locale_data (output_path, "LC_NUMERIC",
|
|
2 + _NL_ITEM_INDEX (_NL_NUM_LC_NUMERIC), iov);
|
|
}
|
|
|
|
|
|
void
|
|
numeric_add (struct linereader *lr, struct localedef_t *locale,
|
|
enum token_t tok, struct token *code,
|
|
struct charset_t *charset)
|
|
{
|
|
struct locale_numeric_t *numeric = locale->categories[LC_NUMERIC].numeric;
|
|
|
|
switch (tok)
|
|
{
|
|
#define STR_ELEM(cat) \
|
|
case tok_##cat: \
|
|
if (numeric->cat != NULL) \
|
|
lr_error (lr, _("\
|
|
field `%s' in category `%s' declared more than once"), \
|
|
#cat, "LC_NUMERIC"); \
|
|
else if (code->val.str.start == NULL) \
|
|
{ \
|
|
lr_error (lr, _("unknown character in field `%s' of category `%s'"),\
|
|
#cat, "LC_NUMERIC"); \
|
|
numeric->cat = ""; \
|
|
} \
|
|
else \
|
|
numeric->cat = code->val.str.start; \
|
|
break
|
|
|
|
STR_ELEM (decimal_point);
|
|
STR_ELEM (thousands_sep);
|
|
|
|
case tok_grouping:
|
|
if (numeric->grouping_act == numeric->grouping_max)
|
|
{
|
|
numeric->grouping_max *= 2;
|
|
numeric->grouping = (char *) xrealloc (numeric->grouping,
|
|
numeric->grouping_max);
|
|
}
|
|
if (numeric->grouping_act > 0
|
|
&& (numeric->grouping[numeric->grouping_act - 1] == '\177'))
|
|
{
|
|
lr_error (lr, _("\
|
|
`-1' must be last entry in `%s' field in `%s' category"),
|
|
"grouping", "LC_NUMERIC");
|
|
--numeric->grouping_act;
|
|
}
|
|
|
|
if (code->tok == tok_minus1)
|
|
numeric->grouping[numeric->grouping_act++] = '\177';
|
|
else if (code->val.num > 126)
|
|
lr_error (lr, _("\
|
|
values for field `%s' in category `%s' must be smaller than 127"),
|
|
"grouping", "LC_NUMERIC");
|
|
else
|
|
numeric->grouping[numeric->grouping_act++] = code->val.num;
|
|
break;
|
|
|
|
default:
|
|
assert (! "unknown token in category `LC_NUMERIC': should not happen");
|
|
}
|
|
}
|