mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
6d24885784
This patch merges the latest release of gettext into the intl subdirectory. The initial motivation was to include the plural.y changes which enable building with bison 3.0, but the majority of the other changes are merely cosmetic so it seemed like merging the whole directory was simpler than trying to take it piecemeal. The merge was done by copying across the latext gettext code and adding in a few small glibc changes that have been added over the years that seemed beneficial, as well as a couple of small build fixes that should be merged back to gettext. I also reverted the gettext commit: commit 279b57fc367251666f00e8e2b599b83703451afb Author: Bruno Haible <bruno@clisp.org> Date: Fri Jun 14 12:03:49 2002 +0000 Make absolute pathnames inside $LANGUAGE work. As it caused localedata/tst-setlocale3 to fail and it wasn't clear that glibc wanted that behaviour. The merge has dropped many uses of __glibc_likely/unlikely. This is intentional given that it eases merging. It seems to me that the cost of continually rewriting these lines when merging and the risk of adding bugs when doing so outweighs the benefits of using these macros when code is shared with another project. Tested with make check on x86_64. ChangeLog: 2014-12-11 Will Newton <will.newton@linaro.org> Merge gettext 0.19.3 into intl/. This involves a number of cosmetic changes to comments and ANSI function definitions and prototypes throughout all the files. The gettext copyright header is used but with the date ranges taken from the glibc copy. * NEWS: Add gettext merge to 2.21. * intl/bindtextdom.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcgettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dcigettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (INTDIV0_RAISES_SIGFPE): New define. Use gl_* locking primitives rather than __libc_* ones. Include eval-plural.h instead of plural-eval.c. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dgettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/plural-eval.c: Renamed to... * intl/eval-plural.h: ...this. * intl/explodename.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_explode_name): Use strchr instead of __rawmemchr. * intl/finddomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. (_nl_find_domain): Use malloc rather than alloca for allocation of temporary locale name. * intl/gettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/gettextP.h: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. * intl/gmo.h: Switch to gettext copyright. (struct sysdep_string): Move struct segment_pair outside of struct definition. * intl/hash-string.c: Use ANSI definitions and prototypes. * intl/hash-string.h: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/l10nflist.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_normalize_codeset): Avoid integer overflow. * intl/loadinfo.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (LIBINTL_DLL_EXPORTED): New define. (PATH_SEPARATOR): New define. * intl/loadmsgcat.c: Switch to gettext copyright. * intl/localealias.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_expand_alias): Use PATH_SEPARATOR. * intl/ngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/plural-exp.c: Likewise. * intl/plural-exp.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (struct expression): Move definition of enum operator outside of struct definition. * intl/plural.c: Regenerate. * intl/plural.y: Switch to gettext copyright. Use ANSI definitions and prototypes. Port to bison 3.0. * intl/textdomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones.
155 lines
3.9 KiB
C
155 lines
3.9 KiB
C
/* Expression parsing for plural form selection.
|
|
Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
|
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
|
|
|
|
This program is free software: you can redistribute it and/or 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.
|
|
|
|
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 Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "plural-exp.h"
|
|
|
|
#if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) && \
|
|
!defined __cplusplus) \
|
|
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
|
|
|
|
/* These structs are the constant expression for the germanic plural
|
|
form determination. It represents the expression "n != 1". */
|
|
static const struct expression plvar =
|
|
{
|
|
.nargs = 0,
|
|
.operation = var,
|
|
};
|
|
static const struct expression plone =
|
|
{
|
|
.nargs = 0,
|
|
.operation = num,
|
|
.val =
|
|
{
|
|
.num = 1
|
|
}
|
|
};
|
|
const struct expression GERMANIC_PLURAL =
|
|
{
|
|
.nargs = 2,
|
|
.operation = not_equal,
|
|
.val =
|
|
{
|
|
.args =
|
|
{
|
|
[0] = (struct expression *) &plvar,
|
|
[1] = (struct expression *) &plone
|
|
}
|
|
}
|
|
};
|
|
|
|
# define INIT_GERMANIC_PLURAL()
|
|
|
|
#else
|
|
|
|
/* For compilers without support for ISO C 99 struct/union initializers:
|
|
Initialization at run-time. */
|
|
|
|
static struct expression plvar;
|
|
static struct expression plone;
|
|
struct expression GERMANIC_PLURAL;
|
|
|
|
static void
|
|
init_germanic_plural (void)
|
|
{
|
|
if (plone.val.num == 0)
|
|
{
|
|
plvar.nargs = 0;
|
|
plvar.operation = var;
|
|
|
|
plone.nargs = 0;
|
|
plone.operation = num;
|
|
plone.val.num = 1;
|
|
|
|
GERMANIC_PLURAL.nargs = 2;
|
|
GERMANIC_PLURAL.operation = not_equal;
|
|
GERMANIC_PLURAL.val.args[0] = &plvar;
|
|
GERMANIC_PLURAL.val.args[1] = &plone;
|
|
}
|
|
}
|
|
|
|
# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
|
|
|
|
#endif
|
|
|
|
void
|
|
internal_function
|
|
EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
|
const struct expression **pluralp,
|
|
unsigned long int *npluralsp)
|
|
{
|
|
if (nullentry != NULL)
|
|
{
|
|
const char *plural;
|
|
const char *nplurals;
|
|
|
|
plural = strstr (nullentry, "plural=");
|
|
nplurals = strstr (nullentry, "nplurals=");
|
|
if (plural == NULL || nplurals == NULL)
|
|
goto no_plural;
|
|
else
|
|
{
|
|
char *endp;
|
|
unsigned long int n;
|
|
struct parse_args args;
|
|
|
|
/* First get the number. */
|
|
nplurals += 9;
|
|
while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
|
|
++nplurals;
|
|
if (!(*nplurals >= '0' && *nplurals <= '9'))
|
|
goto no_plural;
|
|
#if defined HAVE_STRTOUL || defined _LIBC
|
|
n = strtoul (nplurals, &endp, 10);
|
|
#else
|
|
for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
|
|
n = n * 10 + (*endp - '0');
|
|
#endif
|
|
if (nplurals == endp)
|
|
goto no_plural;
|
|
*npluralsp = n;
|
|
|
|
/* Due to the restrictions bison imposes onto the interface of the
|
|
scanner function we have to put the input string and the result
|
|
passed up from the parser into the same structure which address
|
|
is passed down to the parser. */
|
|
plural += 7;
|
|
args.cp = plural;
|
|
if (PLURAL_PARSE (&args) != 0)
|
|
goto no_plural;
|
|
*pluralp = args.res;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* By default we are using the Germanic form: singular form only
|
|
for `one', the plural form otherwise. Yes, this is also what
|
|
English is using since English is a Germanic language. */
|
|
no_plural:
|
|
INIT_GERMANIC_PLURAL ();
|
|
*pluralp = &GERMANIC_PLURAL;
|
|
*npluralsp = 2;
|
|
}
|
|
}
|