mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +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.
128 lines
4.0 KiB
C
128 lines
4.0 KiB
C
/* Expression parsing and evaluation 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/>. */
|
|
|
|
#ifndef _PLURAL_EXP_H
|
|
#define _PLURAL_EXP_H
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#endif
|
|
|
|
#ifndef attribute_hidden
|
|
# define attribute_hidden
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
|
|
enum expression_operator
|
|
{
|
|
/* Without arguments: */
|
|
var, /* The variable "n". */
|
|
num, /* Decimal number. */
|
|
/* Unary operators: */
|
|
lnot, /* Logical NOT. */
|
|
/* Binary operators: */
|
|
mult, /* Multiplication. */
|
|
divide, /* Division. */
|
|
module, /* Modulo operation. */
|
|
plus, /* Addition. */
|
|
minus, /* Subtraction. */
|
|
less_than, /* Comparison. */
|
|
greater_than, /* Comparison. */
|
|
less_or_equal, /* Comparison. */
|
|
greater_or_equal, /* Comparison. */
|
|
equal, /* Comparison for equality. */
|
|
not_equal, /* Comparison for inequality. */
|
|
land, /* Logical AND. */
|
|
lor, /* Logical OR. */
|
|
/* Ternary operators: */
|
|
qmop /* Question mark operator. */
|
|
};
|
|
|
|
/* This is the representation of the expressions to determine the
|
|
plural form. */
|
|
struct expression
|
|
{
|
|
int nargs; /* Number of arguments. */
|
|
enum expression_operator operation;
|
|
union
|
|
{
|
|
unsigned long int num; /* Number value for `num'. */
|
|
struct expression *args[3]; /* Up to three arguments. */
|
|
} val;
|
|
};
|
|
|
|
/* This is the data structure to pass information to the parser and get
|
|
the result in a thread-safe way. */
|
|
struct parse_args
|
|
{
|
|
const char *cp;
|
|
struct expression *res;
|
|
};
|
|
|
|
|
|
/* Names for the libintl functions are a problem. This source code is used
|
|
1. in the GNU C Library library,
|
|
2. in the GNU libintl library,
|
|
3. in the GNU gettext tools.
|
|
The function names in each situation must be different, to allow for
|
|
binary incompatible changes in 'struct expression'. Furthermore,
|
|
1. in the GNU C Library library, the names have a __ prefix,
|
|
2.+3. in the GNU libintl library and in the GNU gettext tools, the names
|
|
must follow ANSI C and not start with __.
|
|
So we have to distinguish the three cases. */
|
|
#ifdef _LIBC
|
|
# define FREE_EXPRESSION __gettext_free_exp
|
|
# define PLURAL_PARSE __gettextparse
|
|
# define GERMANIC_PLURAL __gettext_germanic_plural
|
|
# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
|
|
#elif defined (IN_LIBINTL)
|
|
# define FREE_EXPRESSION libintl_gettext_free_exp
|
|
# define PLURAL_PARSE libintl_gettextparse
|
|
# define GERMANIC_PLURAL libintl_gettext_germanic_plural
|
|
# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
|
|
#else
|
|
# define FREE_EXPRESSION free_plural_expression
|
|
# define PLURAL_PARSE parse_plural_expression
|
|
# define GERMANIC_PLURAL germanic_plural
|
|
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
|
|
#endif
|
|
|
|
extern void FREE_EXPRESSION (struct expression *exp)
|
|
internal_function;
|
|
extern int PLURAL_PARSE (struct parse_args *arg);
|
|
extern const struct expression GERMANIC_PLURAL attribute_hidden;
|
|
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
|
const struct expression **pluralp,
|
|
unsigned long int *npluralsp)
|
|
internal_function;
|
|
|
|
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
|
|
extern unsigned long int plural_eval (const struct expression *pexp,
|
|
unsigned long int n);
|
|
#endif
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _PLURAL_EXP_H */
|