-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
- 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.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; 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,
+ This program 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU 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. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
#include <sys/uio.h>
#include <assert.h>
-#include "linereader.h"
#include "localedef.h"
+#include "linereader.h"
#include "localeinfo.h"
#include "locfile.h"
const char *currency_symbol;
const char *mon_decimal_point;
const char *mon_thousands_sep;
+ uint32_t mon_decimal_point_wc;
+ uint32_t mon_thousands_sep_wc;
char *mon_grouping;
size_t mon_grouping_len;
const char *positive_sign;
uint32_t duo_valid_from;
uint32_t duo_valid_to;
uint32_t conversion_rate[2];
+ char *crncystr;
};
void
-monetary_finish (struct localedef_t *locale, struct charmap_t *charmap)
+monetary_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_monetary_t *monetary
= locale->categories[LC_MONETARY].monetary;
empty one. */
if (monetary == NULL)
{
- error (0, 0, _("No definition for %s category found"),
- "LC_MONETARY");
+ if (! be_quiet)
+ WITH_CUR_LOCALE (error (0, 0, _("\
+No definition for %s category found"), "LC_MONETARY"));
monetary_startup (NULL, locale, 0);
monetary = locale->categories[LC_MONETARY].monetary;
nothing = 1;
}
}
-#define TEST_ELEM(cat) \
- if (monetary->cat == NULL && !be_quiet) \
+#define TEST_ELEM(cat, initval) \
+ if (monetary->cat == NULL) \
{ \
- if (! nothing) \
- error (0, 0, _("%s: field `%s' not defined"), \
- "LC_MONETARY", #cat); \
- monetary->cat = ""; \
+ if (! be_quiet && ! nothing) \
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
+ "LC_MONETARY", #cat)); \
+ monetary->cat = initval; \
}
- TEST_ELEM (int_curr_symbol);
- TEST_ELEM (currency_symbol);
- TEST_ELEM (mon_decimal_point);
- TEST_ELEM (mon_thousands_sep);
- TEST_ELEM (positive_sign);
- TEST_ELEM (negative_sign);
+ TEST_ELEM (int_curr_symbol, "");
+ TEST_ELEM (currency_symbol, "");
+ TEST_ELEM (mon_decimal_point, ".");
+ TEST_ELEM (mon_thousands_sep, "");
+ TEST_ELEM (positive_sign, "");
+ TEST_ELEM (negative_sign, "");
/* The international currency symbol must come from ISO 4217. */
if (monetary->int_curr_symbol != NULL)
{
if (strlen (monetary->int_curr_symbol) != 4)
{
- if (!be_quiet)
- error (0, 0, _("\
+ if (! be_quiet && ! nothing)
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: value of field `int_curr_symbol' has wrong length"),
- "LC_MONETARY");
+ "LC_MONETARY"));
}
- else if (bsearch (monetary->int_curr_symbol, valid_int_curr,
- NR_VALID_INT_CURR, sizeof (const char *),
- (comparison_fn_t) curr_strcmp) == NULL
+ else
+ { /* Check the first three characters against ISO 4217 */
+ char symbol[4];
+ strncpy (symbol, monetary->int_curr_symbol, 3);
+ symbol[3] = '\0';
+ if (bsearch (symbol, valid_int_curr, NR_VALID_INT_CURR,
+ sizeof (const char *),
+ (comparison_fn_t) curr_strcmp) == NULL
&& !be_quiet)
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: value of field `int_curr_symbol' does \
not correspond to a valid name in ISO 4217"),
- "LC_MONETARY");
+ "LC_MONETARY"));
+ }
}
/* 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 (monetary->mon_decimal_point[0] == '\0' && ! be_quiet && ! nothing)
+ if (monetary->mon_decimal_point == NULL)
+ {
+ if (! be_quiet && ! nothing)
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_MONETARY", "mon_decimal_point"));
+ monetary->mon_decimal_point = ".";
+ }
+ else if (monetary->mon_decimal_point[0] == '\0' && ! be_quiet && ! nothing)
{
- error (0, 0, _("\
-%s: value for field `%s' must not be the empty string"),
- "LC_MONETARY", "mon_decimal_point");
+ WITH_CUR_LOCALE (error (0, 0, _("\
+%s: value for field `%s' must not be an empty string"),
+ "LC_MONETARY", "mon_decimal_point"));
}
+ if (monetary->mon_decimal_point_wc == L'\0')
+ monetary->mon_decimal_point_wc = L'.';
- if (monetary->mon_grouping_len == 0 && ! be_quiet && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"),
- "LC_MONETARY", "mon_grouping");
+ if (monetary->mon_grouping_len == 0)
+ {
+ if (! be_quiet && ! nothing)
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_MONETARY", "mon_grouping"));
+
+ monetary->mon_grouping = (char *) "\177";
+ monetary->mon_grouping_len = 1;
+ }
#undef TEST_ELEM
-#define TEST_ELEM(cat, min, max) \
- if (monetary->cat == -2 && ! be_quiet && ! nothing) \
- error (0, 0, _("%s: field `%s' not defined"), \
- "LC_MONETARY", #cat); \
- else if ((monetary->cat < min || monetary->cat > max) && !be_quiet) \
- error (0, 0, _("\
+#define TEST_ELEM(cat, min, max, initval) \
+ if (monetary->cat == -2) \
+ { \
+ if (! be_quiet && ! nothing) \
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
+ "LC_MONETARY", #cat)); \
+ monetary->cat = initval; \
+ } \
+ else if ((monetary->cat < min || monetary->cat > max) \
+ && min < max \
+ && !be_quiet && !nothing) \
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: value for field `%s' must be in range %d...%d"), \
- "LC_MONETARY", #cat, min, max)
+ "LC_MONETARY", #cat, min, max))
-#if 0
-/* The following two test are not really necessary because all values
- the variable could have are valid. */
- TEST_ELEM (int_frac_digits, -128, 127); /* No range check. */
- TEST_ELEM (frac_digits, -128, 127); /* No range check. */
-#endif
- TEST_ELEM (p_cs_precedes, -1, 1);
- TEST_ELEM (p_sep_by_space, -1, 2);
- TEST_ELEM (n_cs_precedes, -1, 1);
- TEST_ELEM (n_sep_by_space, -1, 2);
- TEST_ELEM (p_sign_posn, -1, 4);
- TEST_ELEM (n_sign_posn, -1, 4);
+ TEST_ELEM (int_frac_digits, 1, 0, -1);
+ TEST_ELEM (frac_digits, 1, 0, -1);
+ TEST_ELEM (p_cs_precedes, -1, 1, -1);
+ TEST_ELEM (p_sep_by_space, -1, 2, -1);
+ TEST_ELEM (n_cs_precedes, -1, 1, -1);
+ TEST_ELEM (n_sep_by_space, -1, 2, -1);
+ TEST_ELEM (p_sign_posn, -1, 4, -1);
+ TEST_ELEM (n_sign_posn, -1, 4, -1);
/* The non-POSIX.2 extensions are optional. */
if (monetary->duo_int_curr_symbol == NULL)
monetary->cat = monetary->alt; \
else if ((monetary->cat < min || monetary->cat > max) && !be_quiet \
&& ! nothing) \
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: value for field `%s' must be in range %d...%d"), \
- "LC_MONETARY", #cat, min, max)
+ "LC_MONETARY", #cat, min, max))
TEST_ELEM (int_p_cs_precedes, p_cs_precedes, -1, 1);
TEST_ELEM (int_p_sep_by_space, p_sep_by_space, -1, 2);
monetary->conversion_rate[0] = 1;
monetary->conversion_rate[1] = 1;
}
+
+ /* Create the crncystr entry. */
+ monetary->crncystr = (char *) xmalloc (strlen (monetary->currency_symbol)
+ + 2);
+ monetary->crncystr[0] = monetary->p_cs_precedes ? '-' : '+';
+ strcpy (&monetary->crncystr[1], monetary->currency_symbol);
}
void
-monetary_output (struct localedef_t *locale, struct charmap_t *charmap,
+monetary_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_monetary_t *monetary
= locale->categories[LC_MONETARY].monetary;
- struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)];
- struct locale_file data;
- uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_MONETARY)];
- size_t cnt = 0;
-
- data.magic = LIMAGIC (LC_MONETARY);
- data.n = _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY);
- 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] = iov[0].iov_len + iov[1].iov_len;
- iov[cnt].iov_base = (void *) monetary->int_curr_symbol;
- 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 *) monetary->currency_symbol;
- 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 *) monetary->mon_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 *) monetary->mon_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 = monetary->mon_grouping;
- iov[cnt].iov_len = monetary->mon_grouping_len;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) monetary->positive_sign;
- 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 *) monetary->negative_sign;
- 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 *) &monetary->int_frac_digits;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->frac_digits;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->p_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->p_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->n_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->n_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->p_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->n_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_p_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_p_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_n_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_n_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_p_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->int_n_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
- iov[cnt].iov_base = (void *) monetary->duo_int_curr_symbol;
- 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 *) monetary->duo_currency_symbol;
- 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 *) &monetary->duo_int_frac_digits;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_frac_digits;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_p_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_p_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_n_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_n_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_p_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_p_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_n_cs_precedes;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_n_sep_by_space;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_p_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_n_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_p_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_int_n_sign_posn;
- iov[cnt].iov_len = 1;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->uno_valid_from;
- iov[cnt].iov_len = 4;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->uno_valid_to;
- iov[cnt].iov_len = 4;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_valid_from;
- iov[cnt].iov_len = 4;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) &monetary->duo_valid_to;
- iov[cnt].iov_len = 4;
- ++cnt;
-
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) monetary->conversion_rate;
- iov[cnt].iov_len = 8;
- ++cnt;
-
- assert (cnt == 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY));
-
- write_locale_data (output_path, "LC_MONETARY",
- 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY), iov);
+ struct locale_file file;
+
+ init_locale_data (&file, _NL_ITEM_INDEX (_NL_NUM_LC_MONETARY));
+ add_locale_string (&file, monetary->int_curr_symbol);
+ add_locale_string (&file, monetary->currency_symbol);
+ add_locale_string (&file, monetary->mon_decimal_point);
+ add_locale_string (&file, monetary->mon_thousands_sep);
+ add_locale_raw_data (&file, monetary->mon_grouping,
+ monetary->mon_grouping_len);
+ add_locale_string (&file, monetary->positive_sign);
+ add_locale_string (&file, monetary->negative_sign);
+ add_locale_char (&file, monetary->int_frac_digits);
+ add_locale_char (&file, monetary->frac_digits);
+ add_locale_char (&file, monetary->p_cs_precedes);
+ add_locale_char (&file, monetary->p_sep_by_space);
+ add_locale_char (&file, monetary->n_cs_precedes);
+ add_locale_char (&file, monetary->n_sep_by_space);
+ add_locale_char (&file, monetary->p_sign_posn);
+ add_locale_char (&file, monetary->n_sign_posn);
+ add_locale_string (&file, monetary->crncystr);
+ add_locale_char (&file, monetary->int_p_cs_precedes);
+ add_locale_char (&file, monetary->int_p_sep_by_space);
+ add_locale_char (&file, monetary->int_n_cs_precedes);
+ add_locale_char (&file, monetary->int_n_sep_by_space);
+ add_locale_char (&file, monetary->int_p_sign_posn);
+ add_locale_char (&file, monetary->int_n_sign_posn);
+ add_locale_string (&file, monetary->duo_int_curr_symbol);
+ add_locale_string (&file, monetary->duo_currency_symbol);
+ add_locale_char (&file, monetary->duo_int_frac_digits);
+ add_locale_char (&file, monetary->duo_frac_digits);
+ add_locale_char (&file, monetary->duo_p_cs_precedes);
+ add_locale_char (&file, monetary->duo_p_sep_by_space);
+ add_locale_char (&file, monetary->duo_n_cs_precedes);
+ add_locale_char (&file, monetary->duo_n_sep_by_space);
+ add_locale_char (&file, monetary->duo_int_p_cs_precedes);
+ add_locale_char (&file, monetary->duo_int_p_sep_by_space);
+ add_locale_char (&file, monetary->duo_int_n_cs_precedes);
+ add_locale_char (&file, monetary->duo_int_n_sep_by_space);
+ add_locale_char (&file, monetary->duo_p_sign_posn);
+ add_locale_char (&file, monetary->duo_n_sign_posn);
+ add_locale_char (&file, monetary->duo_int_p_sign_posn);
+ add_locale_char (&file, monetary->duo_int_n_sign_posn);
+ add_locale_uint32 (&file, monetary->uno_valid_from);
+ add_locale_uint32 (&file, monetary->uno_valid_to);
+ add_locale_uint32 (&file, monetary->duo_valid_from);
+ add_locale_uint32 (&file, monetary->duo_valid_to);
+ add_locale_uint32_array (&file, monetary->conversion_rate, 2);
+ add_locale_uint32 (&file, monetary->mon_decimal_point_wc);
+ add_locale_uint32 (&file, monetary->mon_thousands_sep_wc);
+ add_locale_string (&file, charmap->code_set_name);
+ write_locale_data (output_path, LC_MONETARY, "LC_MONETARY", &file);
}
/* The parser for the LC_MONETARY section of the locale definition. */
void
monetary_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* If we see `copy' now we are almost done. */
if (nowtok == tok_copy)
{
- handle_copy (ldfile, charmap, repertoire, result, tok_lc_monetary,
+ handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_monetary,
LC_MONETARY, "LC_MONETARY", ignore_content);
return;
}
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- now = lr_token (ldfile, charmap, NULL); \
+ now = lr_token (ldfile, charmap, result, NULL, verbose); \
if (now->tok != tok_string) \
goto err_label; \
else if (monetary->cat != NULL) \
STR_ELEM (int_curr_symbol);
STR_ELEM (currency_symbol);
- STR_ELEM (mon_decimal_point);
- STR_ELEM (mon_thousands_sep);
STR_ELEM (positive_sign);
STR_ELEM (negative_sign);
STR_ELEM (duo_int_curr_symbol);
STR_ELEM (duo_currency_symbol);
+#define STR_ELEM_WC(cat) \
+ case tok_##cat: \
+ /* 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; \
+ } \
+ \
+ ldfile->return_widestr = 1; \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
+ if (now->tok != tok_string) \
+ goto err_label; \
+ if (monetary->cat != NULL) \
+ lr_error (ldfile, _("\
+%s: field `%s' declared more than once"), "LC_MONETARY", #cat); \
+ else if (!ignore_content && now->val.str.startmb == NULL) \
+ { \
+ lr_error (ldfile, _("\
+%s: unknown character in field `%s'"), "LC_MONETARY", #cat); \
+ monetary->cat = ""; \
+ monetary->cat##_wc = L'\0'; \
+ } \
+ else if (now->val.str.startwc != NULL && now->val.str.lenwc > 2) \
+ { \
+ lr_error (ldfile, _("\
+%s: value for field `%s' must be a single character"), "LC_MONETARY", #cat); \
+ } \
+ else if (!ignore_content) \
+ { \
+ monetary->cat = now->val.str.startmb; \
+ \
+ if (now->val.str.startwc != NULL) \
+ monetary->cat##_wc = *now->val.str.startwc; \
+ } \
+ ldfile->return_widestr = 0; \
+ break
+
+ STR_ELEM_WC (mon_decimal_point);
+ STR_ELEM_WC (mon_thousands_sep);
+
#define INT_ELEM(cat) \
case tok_##cat: \
/* Ignore the rest of the line if we don't need the input of \
break; \
} \
\
- now = lr_token (ldfile, charmap, NULL); \
+ now = lr_token (ldfile, charmap, result, NULL, verbose); \
if (now->tok != tok_minus1 && now->tok != tok_number) \
goto err_label; \
else if (monetary->cat != -2) \
break;
}
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_minus1 && now->tok != tok_number)
goto err_label;
else
grouping[act++] = now->val.num;
/* Next must be semicolon. */
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_semicolon)
break;
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
}
while (now->tok == tok_minus1 || now->tok == tok_number);
if (!ignore_content)
{
+ /* A single -1 means no grouping. */
+ if (act == 1 && grouping[0] == '\177')
+ act--;
grouping[act++] = '\0';
monetary->mon_grouping = xrealloc (grouping, act);
break;
}
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_number)
goto err_label;
if (now->val.num == 0)
{
invalid_conversion_rate:
- lr_error (ldfile, _("conversion rate valze cannot be zero"));
+ lr_error (ldfile, _("conversion rate value cannot be zero"));
if (!ignore_content)
{
monetary->conversion_rate[0] = 1;
if (!ignore_content)
monetary->conversion_rate[0] = now->val.num;
/* Next must be a semicolon. */
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_semicolon)
goto err_label;
/* And another number. */
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_number)
goto err_label;
if (now->val.num == 0)
case tok_end:
/* Next we assume `LC_MONETARY'. */
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok == tok_eof)
break;
if (now->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
projects / thirdparty / glibc.git / blobdiff