intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
/* A Bison parser, made from plural.y
|
|
|
|
|
by GNU bison 1.35. */
|
|
|
|
|
|
|
|
|
|
#define YYBISON 1 /* Identify Bison output. */
|
|
|
|
|
|
|
|
|
|
#define yyparse __gettextparse
|
|
|
|
|
#define yylex __gettextlex
|
|
|
|
|
#define yyerror __gettexterror
|
|
|
|
|
#define yylval __gettextlval
|
|
|
|
|
#define yychar __gettextchar
|
|
|
|
|
#define yydebug __gettextdebug
|
|
|
|
|
#define yynerrs __gettextnerrs
|
|
|
|
|
# define EQUOP2 257
|
|
|
|
|
# define CMPOP2 258
|
|
|
|
|
# define ADDOP2 259
|
|
|
|
|
# define MULOP2 260
|
|
|
|
|
# define NUMBER 261
|
|
|
|
|
|
|
|
|
|
#line 1 "plural.y"
|
|
|
|
|
|
|
|
|
|
/* Expression parsing for plural form selection.
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
Copyright (C) 2000-2020 Free Software Foundation, Inc.
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
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 Library General Public License as published
|
|
|
|
|
by the Free Software Foundation; either version 2, 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
|
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
|
License along with this program; if not, write to the Free Software
|
2005-05-13 10:03:47 +02:00
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
USA. */
|
|
|
|
|
|
|
|
|
|
/* The bison generated parser uses alloca. AIX 3 forces us to put this
|
|
|
|
|
declaration at the beginning of the file. The declaration in bison's
|
|
|
|
|
skeleton file comes too late. This must come before <config.h>
|
|
|
|
|
because <config.h> may include arbitrary system headers. */
|
|
|
|
|
#if defined _AIX && !defined __GNUC__
|
|
|
|
|
#pragma alloca
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
# include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include "plural-exp.h"
|
|
|
|
|
|
|
|
|
|
/* The main function generated by the parser is called __gettextparse,
|
|
|
|
|
but we want it to be called PLURAL_PARSE. */
|
|
|
|
|
#ifndef _LIBC
|
|
|
|
|
# define __gettextparse PLURAL_PARSE
|
|
|
|
|
#endif
|
|
|
|
|
|
intl: Unbreak intl build with bison 3 when no regeneration is needed [PR92008]
As Iain reported, my change broke the case when one has bison >= 3,
but make decides there is no reason to regenerate plural.c, unfortunately
that seems to be a scenario I haven't tested. The problem is that
the pregenerated plural.c has been generated with bison 1.35, but when
config.h says HAVE_BISON3, the code assumes it is the bison3 variant.
What used to work fine is when one has bison >= 3 and plural.c has been
regenerated (e.g. do touch intl/plural.y and it will work), or when
one doesn't have any bison (then nothing is regenerated, but HAVE_BISON3
isn't defined either), or when one has bison < 3 and doesn't need to
regenerate, or when one has bison < 3 and it is regenerated.
The following patch fixes this, by killing the HAVE_BISON3 macro from
config.h, and instead remembering the fact whether plural.c has been created
with bison < 3 or bison >= 3 in a separate new plural-config.h header.
The way this works:
- user doesn't have bison
- user has bison >= 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
- user has bison < 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
pregenerated !USE_BISON3 plural.c and plural-config.h from source
dir is used, nothing in the objdir
- user has bison >= 3 and intl/plural.y is newer
Makefile generates plural.c and USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
- user has bison < 3 and intl/plural.y is newer
Makefile generates plural.c and !USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
I have tested all these cases and make all-yes worked in all the cases.
If one uses the unsupported ./configure where srcdir == objdir, I guess
(though haven't tested) that it should still work, just it would be nice
if such people didn't try to check in the plural{.c,-config.h} they have
regenerated.
What doesn't work, but didn't work before either (just tested gcc-9 branch
too) is when one doesn't have bison and plural.y is newer than plural.c.
Don't do that ;)
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
intl/
* configure.ac: Remove HAVE_BISON3 AC_DEFINE.
* Makefile.in (HEADERS): Add plural-config.h.
(.y.c): Also create plural-config.h.
(dcigettext.o loadmsgcat.o plural.o plural-exp.o): Also depend
on plural-config.h.
(plural-config.h): Depend on plural.c.
* plural-exp.h: Include plural-config.h. Use USE_BISON3 instead
of HAVE_BISON3.
* plural.y: Use USE_BISON3 instead of HAVE_BISON3.
* configure: Regenerated.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* plural-config.h: Generated.
contrib/
* gcc_update: Add intl/plural.y dependency for intl/plural-config.h.
2020-04-16 11:55:00 +02:00
|
|
|
|
#ifndef USE_BISON3
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
#define YYLEX_PARAM &((struct parse_args *) arg)->cp
|
|
|
|
|
#define YYPARSE_PARAM arg
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#endif
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 54 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
#ifndef YYSTYPE
|
|
|
|
|
typedef union {
|
|
|
|
|
unsigned long int num;
|
|
|
|
|
enum operator op;
|
|
|
|
|
struct expression *exp;
|
|
|
|
|
} yystype;
|
|
|
|
|
# define YYSTYPE yystype
|
|
|
|
|
# define YYSTYPE_IS_TRIVIAL 1
|
|
|
|
|
#endif
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 60 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
|
|
|
static struct expression *new_exp PARAMS ((int nargs, enum operator op,
|
|
|
|
|
struct expression * const *args));
|
|
|
|
|
static inline struct expression *new_exp_0 PARAMS ((enum operator op));
|
|
|
|
|
static inline struct expression *new_exp_1 PARAMS ((enum operator op,
|
|
|
|
|
struct expression *right));
|
|
|
|
|
static struct expression *new_exp_2 PARAMS ((enum operator op,
|
|
|
|
|
struct expression *left,
|
|
|
|
|
struct expression *right));
|
|
|
|
|
static inline struct expression *new_exp_3 PARAMS ((enum operator op,
|
|
|
|
|
struct expression *bexp,
|
|
|
|
|
struct expression *tbranch,
|
|
|
|
|
struct expression *fbranch));
|
intl: Unbreak intl build with bison 3 when no regeneration is needed [PR92008]
As Iain reported, my change broke the case when one has bison >= 3,
but make decides there is no reason to regenerate plural.c, unfortunately
that seems to be a scenario I haven't tested. The problem is that
the pregenerated plural.c has been generated with bison 1.35, but when
config.h says HAVE_BISON3, the code assumes it is the bison3 variant.
What used to work fine is when one has bison >= 3 and plural.c has been
regenerated (e.g. do touch intl/plural.y and it will work), or when
one doesn't have any bison (then nothing is regenerated, but HAVE_BISON3
isn't defined either), or when one has bison < 3 and doesn't need to
regenerate, or when one has bison < 3 and it is regenerated.
The following patch fixes this, by killing the HAVE_BISON3 macro from
config.h, and instead remembering the fact whether plural.c has been created
with bison < 3 or bison >= 3 in a separate new plural-config.h header.
The way this works:
- user doesn't have bison
- user has bison >= 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
- user has bison < 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
pregenerated !USE_BISON3 plural.c and plural-config.h from source
dir is used, nothing in the objdir
- user has bison >= 3 and intl/plural.y is newer
Makefile generates plural.c and USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
- user has bison < 3 and intl/plural.y is newer
Makefile generates plural.c and !USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
I have tested all these cases and make all-yes worked in all the cases.
If one uses the unsupported ./configure where srcdir == objdir, I guess
(though haven't tested) that it should still work, just it would be nice
if such people didn't try to check in the plural{.c,-config.h} they have
regenerated.
What doesn't work, but didn't work before either (just tested gcc-9 branch
too) is when one doesn't have bison and plural.y is newer than plural.c.
Don't do that ;)
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
intl/
* configure.ac: Remove HAVE_BISON3 AC_DEFINE.
* Makefile.in (HEADERS): Add plural-config.h.
(.y.c): Also create plural-config.h.
(dcigettext.o loadmsgcat.o plural.o plural-exp.o): Also depend
on plural-config.h.
(plural-config.h): Depend on plural.c.
* plural-exp.h: Include plural-config.h. Use USE_BISON3 instead
of HAVE_BISON3.
* plural.y: Use USE_BISON3 instead of HAVE_BISON3.
* configure: Regenerated.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* plural-config.h: Generated.
contrib/
* gcc_update: Add intl/plural.y dependency for intl/plural-config.h.
2020-04-16 11:55:00 +02:00
|
|
|
|
#ifdef USE_BISON3
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
static int yylex PARAMS ((YYSTYPE *lval, struct parse_args *arg));
|
|
|
|
|
static void yyerror PARAMS ((struct parse_args *arg, const char *str));
|
|
|
|
|
#else
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
|
|
|
|
|
static void yyerror PARAMS ((const char *str));
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#endif
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
|
|
|
|
|
/* Allocation of expressions. */
|
|
|
|
|
|
|
|
|
|
static struct expression *
|
|
|
|
|
new_exp (nargs, op, args)
|
|
|
|
|
int nargs;
|
|
|
|
|
enum operator op;
|
|
|
|
|
struct expression * const *args;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct expression *newp;
|
|
|
|
|
|
|
|
|
|
/* If any of the argument could not be malloc'ed, just return NULL. */
|
|
|
|
|
for (i = nargs - 1; i >= 0; i--)
|
|
|
|
|
if (args[i] == NULL)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Allocate a new expression. */
|
|
|
|
|
newp = (struct expression *) malloc (sizeof (*newp));
|
|
|
|
|
if (newp != NULL)
|
|
|
|
|
{
|
|
|
|
|
newp->nargs = nargs;
|
|
|
|
|
newp->operation = op;
|
|
|
|
|
for (i = nargs - 1; i >= 0; i--)
|
|
|
|
|
newp->val.args[i] = args[i];
|
|
|
|
|
return newp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
for (i = nargs - 1; i >= 0; i--)
|
|
|
|
|
FREE_EXPRESSION (args[i]);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct expression *
|
|
|
|
|
new_exp_0 (op)
|
|
|
|
|
enum operator op;
|
|
|
|
|
{
|
|
|
|
|
return new_exp (0, op, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct expression *
|
|
|
|
|
new_exp_1 (op, right)
|
|
|
|
|
enum operator op;
|
|
|
|
|
struct expression *right;
|
|
|
|
|
{
|
|
|
|
|
struct expression *args[1];
|
|
|
|
|
|
|
|
|
|
args[0] = right;
|
|
|
|
|
return new_exp (1, op, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct expression *
|
|
|
|
|
new_exp_2 (op, left, right)
|
|
|
|
|
enum operator op;
|
|
|
|
|
struct expression *left;
|
|
|
|
|
struct expression *right;
|
|
|
|
|
{
|
|
|
|
|
struct expression *args[2];
|
|
|
|
|
|
|
|
|
|
args[0] = left;
|
|
|
|
|
args[1] = right;
|
|
|
|
|
return new_exp (2, op, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct expression *
|
|
|
|
|
new_exp_3 (op, bexp, tbranch, fbranch)
|
|
|
|
|
enum operator op;
|
|
|
|
|
struct expression *bexp;
|
|
|
|
|
struct expression *tbranch;
|
|
|
|
|
struct expression *fbranch;
|
|
|
|
|
{
|
|
|
|
|
struct expression *args[3];
|
|
|
|
|
|
|
|
|
|
args[0] = bexp;
|
|
|
|
|
args[1] = tbranch;
|
|
|
|
|
args[2] = fbranch;
|
|
|
|
|
return new_exp (3, op, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef YYDEBUG
|
|
|
|
|
# define YYDEBUG 0
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define YYFINAL 27
|
|
|
|
|
#define YYFLAG -32768
|
|
|
|
|
#define YYNTBASE 16
|
|
|
|
|
|
|
|
|
|
/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
|
|
|
|
|
#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
|
|
|
|
|
|
|
|
|
|
/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
|
|
|
|
|
static const char yytranslate[] =
|
|
|
|
|
{
|
|
|
|
|
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
|
|
|
|
|
14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
|
|
|
|
|
2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
|
|
|
2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
|
|
|
|
|
9, 11
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
static const short yyprhs[] =
|
|
|
|
|
{
|
|
|
|
|
0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
|
|
|
|
|
35, 37, 39
|
|
|
|
|
};
|
|
|
|
|
static const short yyrhs[] =
|
|
|
|
|
{
|
|
|
|
|
17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
|
|
|
|
|
17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
|
|
|
|
|
17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
|
|
|
|
|
17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
|
|
|
|
|
17, 15, 0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
|
|
|
|
|
static const short yyrline[] =
|
|
|
|
|
{
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
0, 184, 192, 196, 200, 204, 208, 212, 216, 220,
|
|
|
|
|
224, 228, 233
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
};
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if (YYDEBUG) || defined YYERROR_VERBOSE
|
|
|
|
|
|
|
|
|
|
/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
|
|
|
|
|
static const char *const yytname[] =
|
|
|
|
|
{
|
|
|
|
|
"$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
|
|
|
|
|
"ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
|
|
|
|
|
"start", "exp", 0
|
|
|
|
|
};
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
|
|
|
|
|
static const short yyr1[] =
|
|
|
|
|
{
|
|
|
|
|
0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
|
|
|
|
|
17, 17, 17
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
|
|
|
|
|
static const short yyr2[] =
|
|
|
|
|
{
|
|
|
|
|
0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
|
|
|
|
|
1, 1, 3
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
|
|
|
|
|
doesn't specify something else to do. Zero means the default is an
|
|
|
|
|
error. */
|
|
|
|
|
static const short yydefact[] =
|
|
|
|
|
{
|
|
|
|
|
0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
|
|
|
|
|
6, 7, 8, 0, 2, 0, 0, 0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const short yydefgoto[] =
|
|
|
|
|
{
|
|
|
|
|
25, 5
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const short yypact[] =
|
|
|
|
|
{
|
|
|
|
|
-9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
|
|
|
|
|
-9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
|
|
|
|
|
26, -3,-32768, -9, 34, 21, 53,-32768
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const short yypgoto[] =
|
|
|
|
|
{
|
|
|
|
|
-32768, -1
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define YYLAST 53
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const short yytable[] =
|
|
|
|
|
{
|
|
|
|
|
6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
|
|
|
|
|
19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
|
|
|
|
|
14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
|
|
|
|
|
11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
|
|
|
|
|
11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
|
|
|
|
|
12, 13, 14, 27
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const short yycheck[] =
|
|
|
|
|
{
|
|
|
|
|
1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
|
|
|
|
|
11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
|
|
|
|
|
9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
|
|
|
|
|
6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
|
|
|
|
|
6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
|
|
|
|
|
7, 8, 9, 0
|
|
|
|
|
};
|
|
|
|
|
#define YYPURE 1
|
|
|
|
|
|
|
|
|
|
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
|
|
|
|
|
#line 3 "/usr/local/share/bison/bison.simple"
|
|
|
|
|
|
|
|
|
|
/* Skeleton output parser for bison,
|
|
|
|
|
|
|
|
|
|
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
|
|
|
|
|
Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
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; either version 2, 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 General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
|
|
|
|
|
/* As a special exception, when this file is copied by Bison into a
|
|
|
|
|
Bison output file, you may use that output file without restriction.
|
|
|
|
|
This special exception was added by the Free Software Foundation
|
|
|
|
|
in version 1.24 of Bison. */
|
|
|
|
|
|
|
|
|
|
/* This is the parser code that is written into each bison parser when
|
|
|
|
|
the %semantic_parser declaration is not specified in the grammar.
|
|
|
|
|
It was written by Richard Stallman by simplifying the hairy parser
|
|
|
|
|
used when %semantic_parser is specified. */
|
|
|
|
|
|
|
|
|
|
/* All symbols defined below should begin with yy or YY, to avoid
|
|
|
|
|
infringing on user name space. This should be done even for local
|
|
|
|
|
variables, as they might otherwise be expanded by user macros.
|
|
|
|
|
There are some unavoidable exceptions within include files to
|
|
|
|
|
define necessary library symbols; they are noted "INFRINGES ON
|
|
|
|
|
USER NAME SPACE" below. */
|
|
|
|
|
|
|
|
|
|
#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
|
|
|
|
|
|
|
|
|
|
/* The parser invokes alloca or malloc; define the necessary symbols. */
|
|
|
|
|
|
|
|
|
|
# if YYSTACK_USE_ALLOCA
|
|
|
|
|
# define YYSTACK_ALLOC alloca
|
|
|
|
|
# else
|
|
|
|
|
# ifndef YYSTACK_USE_ALLOCA
|
|
|
|
|
# if defined (alloca) || defined (_ALLOCA_H)
|
|
|
|
|
# define YYSTACK_ALLOC alloca
|
|
|
|
|
# else
|
|
|
|
|
# ifdef __GNUC__
|
|
|
|
|
# define YYSTACK_ALLOC __builtin_alloca
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
# ifdef YYSTACK_ALLOC
|
|
|
|
|
/* Pacify GCC's `empty if-body' warning. */
|
|
|
|
|
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
|
|
|
|
|
# else
|
|
|
|
|
# if defined (__STDC__) || defined (__cplusplus)
|
|
|
|
|
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
|
|
|
|
|
# define YYSIZE_T size_t
|
|
|
|
|
# endif
|
|
|
|
|
# define YYSTACK_ALLOC malloc
|
|
|
|
|
# define YYSTACK_FREE free
|
|
|
|
|
# endif
|
|
|
|
|
#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if (! defined (yyoverflow) \
|
|
|
|
|
&& (! defined (__cplusplus) \
|
|
|
|
|
|| (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
|
|
|
|
|
|
|
|
|
|
/* A type that is properly aligned for any stack member. */
|
|
|
|
|
union yyalloc
|
|
|
|
|
{
|
|
|
|
|
short yyss;
|
|
|
|
|
YYSTYPE yyvs;
|
|
|
|
|
# if YYLSP_NEEDED
|
|
|
|
|
YYLTYPE yyls;
|
|
|
|
|
# endif
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The size of the maximum gap between one aligned stack and the next. */
|
|
|
|
|
# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
|
|
|
|
|
|
|
|
|
|
/* The size of an array large to enough to hold all stacks, each with
|
|
|
|
|
N elements. */
|
|
|
|
|
# if YYLSP_NEEDED
|
|
|
|
|
# define YYSTACK_BYTES(N) \
|
|
|
|
|
((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
|
|
|
|
|
+ 2 * YYSTACK_GAP_MAX)
|
|
|
|
|
# else
|
|
|
|
|
# define YYSTACK_BYTES(N) \
|
|
|
|
|
((N) * (sizeof (short) + sizeof (YYSTYPE)) \
|
|
|
|
|
+ YYSTACK_GAP_MAX)
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
/* Copy COUNT objects from FROM to TO. The source and destination do
|
|
|
|
|
not overlap. */
|
|
|
|
|
# ifndef YYCOPY
|
|
|
|
|
# if 1 < __GNUC__
|
|
|
|
|
# define YYCOPY(To, From, Count) \
|
|
|
|
|
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
|
|
|
|
|
# else
|
|
|
|
|
# define YYCOPY(To, From, Count) \
|
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
register YYSIZE_T yyi; \
|
|
|
|
|
for (yyi = 0; yyi < (Count); yyi++) \
|
|
|
|
|
(To)[yyi] = (From)[yyi]; \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
/* Relocate STACK from its old location to the new one. The
|
|
|
|
|
local variables YYSIZE and YYSTACKSIZE give the old and new number of
|
|
|
|
|
elements in the stack, and YYPTR gives the new location of the
|
|
|
|
|
stack. Advance YYPTR to a properly aligned location for the next
|
|
|
|
|
stack. */
|
|
|
|
|
# define YYSTACK_RELOCATE(Stack) \
|
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
YYSIZE_T yynewbytes; \
|
|
|
|
|
YYCOPY (&yyptr->Stack, Stack, yysize); \
|
|
|
|
|
Stack = &yyptr->Stack; \
|
|
|
|
|
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
|
|
|
|
|
yyptr += yynewbytes / sizeof (*yyptr); \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
|
|
|
|
|
# define YYSIZE_T __SIZE_TYPE__
|
|
|
|
|
#endif
|
|
|
|
|
#if ! defined (YYSIZE_T) && defined (size_t)
|
|
|
|
|
# define YYSIZE_T size_t
|
|
|
|
|
#endif
|
|
|
|
|
#if ! defined (YYSIZE_T)
|
|
|
|
|
# if defined (__STDC__) || defined (__cplusplus)
|
|
|
|
|
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
|
|
|
|
|
# define YYSIZE_T size_t
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
#if ! defined (YYSIZE_T)
|
|
|
|
|
# define YYSIZE_T unsigned int
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define yyerrok (yyerrstatus = 0)
|
|
|
|
|
#define yyclearin (yychar = YYEMPTY)
|
|
|
|
|
#define YYEMPTY -2
|
|
|
|
|
#define YYEOF 0
|
|
|
|
|
#define YYACCEPT goto yyacceptlab
|
|
|
|
|
#define YYABORT goto yyabortlab
|
|
|
|
|
#define YYERROR goto yyerrlab1
|
|
|
|
|
/* Like YYERROR except do call yyerror. This remains here temporarily
|
|
|
|
|
to ease the transition to the new meaning of YYERROR, for GCC.
|
|
|
|
|
Once GCC version 2 has supplanted version 1, this can go. */
|
|
|
|
|
#define YYFAIL goto yyerrlab
|
|
|
|
|
#define YYRECOVERING() (!!yyerrstatus)
|
|
|
|
|
#define YYBACKUP(Token, Value) \
|
|
|
|
|
do \
|
|
|
|
|
if (yychar == YYEMPTY && yylen == 1) \
|
|
|
|
|
{ \
|
|
|
|
|
yychar = (Token); \
|
|
|
|
|
yylval = (Value); \
|
|
|
|
|
yychar1 = YYTRANSLATE (yychar); \
|
|
|
|
|
YYPOPSTACK; \
|
|
|
|
|
goto yybackup; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
yyerror ("syntax error: cannot back up"); \
|
|
|
|
|
YYERROR; \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
|
|
#define YYTERROR 1
|
|
|
|
|
#define YYERRCODE 256
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* YYLLOC_DEFAULT -- Compute the default location (before the actions
|
|
|
|
|
are run).
|
|
|
|
|
|
|
|
|
|
When YYLLOC_DEFAULT is run, CURRENT is set the location of the
|
|
|
|
|
first token. By default, to implement support for ranges, extend
|
|
|
|
|
its range to the last symbol. */
|
|
|
|
|
|
|
|
|
|
#ifndef YYLLOC_DEFAULT
|
|
|
|
|
# define YYLLOC_DEFAULT(Current, Rhs, N) \
|
|
|
|
|
Current.last_line = Rhs[N].last_line; \
|
|
|
|
|
Current.last_column = Rhs[N].last_column;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* YYLEX -- calling `yylex' with the right arguments. */
|
|
|
|
|
|
|
|
|
|
#if YYPURE
|
|
|
|
|
# if YYLSP_NEEDED
|
|
|
|
|
# ifdef YYLEX_PARAM
|
|
|
|
|
# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
|
|
|
|
|
# else
|
|
|
|
|
# define YYLEX yylex (&yylval, &yylloc)
|
|
|
|
|
# endif
|
|
|
|
|
# else /* !YYLSP_NEEDED */
|
|
|
|
|
# ifdef YYLEX_PARAM
|
|
|
|
|
# define YYLEX yylex (&yylval, YYLEX_PARAM)
|
|
|
|
|
# else
|
|
|
|
|
# define YYLEX yylex (&yylval)
|
|
|
|
|
# endif
|
|
|
|
|
# endif /* !YYLSP_NEEDED */
|
|
|
|
|
#else /* !YYPURE */
|
|
|
|
|
# define YYLEX yylex ()
|
|
|
|
|
#endif /* !YYPURE */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Enable debugging if requested. */
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
|
|
|
|
|
# ifndef YYFPRINTF
|
|
|
|
|
# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
|
|
|
|
|
# define YYFPRINTF fprintf
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
# define YYDPRINTF(Args) \
|
|
|
|
|
do { \
|
|
|
|
|
if (yydebug) \
|
|
|
|
|
YYFPRINTF Args; \
|
|
|
|
|
} while (0)
|
|
|
|
|
/* Nonzero means print parse trace. It is left uninitialized so that
|
|
|
|
|
multiple parsers can coexist. */
|
|
|
|
|
int yydebug;
|
|
|
|
|
#else /* !YYDEBUG */
|
|
|
|
|
# define YYDPRINTF(Args)
|
|
|
|
|
#endif /* !YYDEBUG */
|
|
|
|
|
|
|
|
|
|
/* YYINITDEPTH -- initial size of the parser's stacks. */
|
|
|
|
|
#ifndef YYINITDEPTH
|
|
|
|
|
# define YYINITDEPTH 200
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
|
|
|
|
|
if the built-in stack extension method is used).
|
|
|
|
|
|
|
|
|
|
Do not make this value too large; the results are undefined if
|
|
|
|
|
SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
|
|
|
|
|
evaluated with infinite-precision integer arithmetic. */
|
|
|
|
|
|
|
|
|
|
#if YYMAXDEPTH == 0
|
|
|
|
|
# undef YYMAXDEPTH
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef YYMAXDEPTH
|
|
|
|
|
# define YYMAXDEPTH 10000
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef YYERROR_VERBOSE
|
|
|
|
|
|
|
|
|
|
# ifndef yystrlen
|
|
|
|
|
# if defined (__GLIBC__) && defined (_STRING_H)
|
|
|
|
|
# define yystrlen strlen
|
|
|
|
|
# else
|
|
|
|
|
/* Return the length of YYSTR. */
|
|
|
|
|
static YYSIZE_T
|
|
|
|
|
# if defined (__STDC__) || defined (__cplusplus)
|
|
|
|
|
yystrlen (const char *yystr)
|
|
|
|
|
# else
|
|
|
|
|
yystrlen (yystr)
|
|
|
|
|
const char *yystr;
|
|
|
|
|
# endif
|
|
|
|
|
{
|
|
|
|
|
register const char *yys = yystr;
|
|
|
|
|
|
|
|
|
|
while (*yys++ != '\0')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
return yys - yystr - 1;
|
|
|
|
|
}
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
# ifndef yystpcpy
|
|
|
|
|
# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
|
|
|
|
|
# define yystpcpy stpcpy
|
|
|
|
|
# else
|
|
|
|
|
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
|
|
|
|
|
YYDEST. */
|
|
|
|
|
static char *
|
|
|
|
|
# if defined (__STDC__) || defined (__cplusplus)
|
|
|
|
|
yystpcpy (char *yydest, const char *yysrc)
|
|
|
|
|
# else
|
|
|
|
|
yystpcpy (yydest, yysrc)
|
|
|
|
|
char *yydest;
|
|
|
|
|
const char *yysrc;
|
|
|
|
|
# endif
|
|
|
|
|
{
|
|
|
|
|
register char *yyd = yydest;
|
|
|
|
|
register const char *yys = yysrc;
|
|
|
|
|
|
|
|
|
|
while ((*yyd++ = *yys++) != '\0')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
return yyd - 1;
|
|
|
|
|
}
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#line 315 "/usr/local/share/bison/bison.simple"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
|
|
|
|
|
into yyparse. The argument should have type void *.
|
|
|
|
|
It should actually point to an object.
|
|
|
|
|
Grammar actions can access the variable by casting it
|
|
|
|
|
to the proper pointer type. */
|
|
|
|
|
|
|
|
|
|
#ifdef YYPARSE_PARAM
|
|
|
|
|
# if defined (__STDC__) || defined (__cplusplus)
|
|
|
|
|
# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
|
|
|
|
|
# define YYPARSE_PARAM_DECL
|
|
|
|
|
# else
|
|
|
|
|
# define YYPARSE_PARAM_ARG YYPARSE_PARAM
|
|
|
|
|
# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
|
|
|
|
|
# endif
|
|
|
|
|
#else /* !YYPARSE_PARAM */
|
|
|
|
|
# define YYPARSE_PARAM_ARG
|
|
|
|
|
# define YYPARSE_PARAM_DECL
|
|
|
|
|
#endif /* !YYPARSE_PARAM */
|
|
|
|
|
|
|
|
|
|
/* Prevent warning if -Wstrict-prototypes. */
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
|
# ifdef YYPARSE_PARAM
|
|
|
|
|
int yyparse (void *);
|
|
|
|
|
# else
|
|
|
|
|
int yyparse (void);
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
|
|
|
|
|
variables are global, or local to YYPARSE. */
|
|
|
|
|
|
|
|
|
|
#define YY_DECL_NON_LSP_VARIABLES \
|
|
|
|
|
/* The lookahead symbol. */ \
|
|
|
|
|
int yychar; \
|
|
|
|
|
\
|
|
|
|
|
/* The semantic value of the lookahead symbol. */ \
|
|
|
|
|
YYSTYPE yylval; \
|
|
|
|
|
\
|
|
|
|
|
/* Number of parse errors so far. */ \
|
|
|
|
|
int yynerrs;
|
|
|
|
|
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
# define YY_DECL_VARIABLES \
|
|
|
|
|
YY_DECL_NON_LSP_VARIABLES \
|
|
|
|
|
\
|
|
|
|
|
/* Location data for the lookahead symbol. */ \
|
|
|
|
|
YYLTYPE yylloc;
|
|
|
|
|
#else
|
|
|
|
|
# define YY_DECL_VARIABLES \
|
|
|
|
|
YY_DECL_NON_LSP_VARIABLES
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* If nonreentrant, generate the variables here. */
|
|
|
|
|
|
|
|
|
|
#if !YYPURE
|
|
|
|
|
YY_DECL_VARIABLES
|
|
|
|
|
#endif /* !YYPURE */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
yyparse (YYPARSE_PARAM_ARG)
|
|
|
|
|
YYPARSE_PARAM_DECL
|
|
|
|
|
{
|
|
|
|
|
/* If reentrant, generate the variables here. */
|
|
|
|
|
#if YYPURE
|
|
|
|
|
YY_DECL_VARIABLES
|
|
|
|
|
#endif /* !YYPURE */
|
|
|
|
|
|
|
|
|
|
register int yystate;
|
|
|
|
|
register int yyn;
|
|
|
|
|
int yyresult;
|
|
|
|
|
/* Number of tokens to shift before error messages enabled. */
|
|
|
|
|
int yyerrstatus;
|
|
|
|
|
/* Lookahead token as an internal (translated) token number. */
|
|
|
|
|
int yychar1 = 0;
|
|
|
|
|
|
|
|
|
|
/* Three stacks and their tools:
|
|
|
|
|
`yyss': related to states,
|
|
|
|
|
`yyvs': related to semantic values,
|
|
|
|
|
`yyls': related to locations.
|
|
|
|
|
|
|
|
|
|
Refer to the stacks thru separate pointers, to allow yyoverflow
|
|
|
|
|
to reallocate them elsewhere. */
|
|
|
|
|
|
|
|
|
|
/* The state stack. */
|
|
|
|
|
short yyssa[YYINITDEPTH];
|
|
|
|
|
short *yyss = yyssa;
|
|
|
|
|
register short *yyssp;
|
|
|
|
|
|
|
|
|
|
/* The semantic value stack. */
|
|
|
|
|
YYSTYPE yyvsa[YYINITDEPTH];
|
|
|
|
|
YYSTYPE *yyvs = yyvsa;
|
|
|
|
|
register YYSTYPE *yyvsp;
|
|
|
|
|
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
/* The location stack. */
|
|
|
|
|
YYLTYPE yylsa[YYINITDEPTH];
|
|
|
|
|
YYLTYPE *yyls = yylsa;
|
|
|
|
|
YYLTYPE *yylsp;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
|
|
|
|
|
#else
|
|
|
|
|
# define YYPOPSTACK (yyvsp--, yyssp--)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
YYSIZE_T yystacksize = YYINITDEPTH;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The variables used to return semantic value and location from the
|
|
|
|
|
action routines. */
|
|
|
|
|
YYSTYPE yyval;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
YYLTYPE yyloc;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* When reducing, the number of symbols on the RHS of the reduced
|
|
|
|
|
rule. */
|
|
|
|
|
int yylen;
|
|
|
|
|
|
|
|
|
|
YYDPRINTF ((stderr, "Starting parse\n"));
|
|
|
|
|
|
|
|
|
|
yystate = 0;
|
|
|
|
|
yyerrstatus = 0;
|
|
|
|
|
yynerrs = 0;
|
|
|
|
|
yychar = YYEMPTY; /* Cause a token to be read. */
|
|
|
|
|
|
|
|
|
|
/* Initialize stack pointers.
|
|
|
|
|
Waste one element of value and location stack
|
|
|
|
|
so that they stay on the same level as the state stack.
|
|
|
|
|
The wasted elements are never initialized. */
|
|
|
|
|
|
|
|
|
|
yyssp = yyss;
|
|
|
|
|
yyvsp = yyvs;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
yylsp = yyls;
|
|
|
|
|
#endif
|
|
|
|
|
goto yysetstate;
|
|
|
|
|
|
|
|
|
|
/*------------------------------------------------------------.
|
|
|
|
|
| yynewstate -- Push a new state, which is found in yystate. |
|
|
|
|
|
`------------------------------------------------------------*/
|
|
|
|
|
yynewstate:
|
|
|
|
|
/* In all cases, when you get here, the value and location stacks
|
|
|
|
|
have just been pushed. so pushing a state here evens the stacks.
|
|
|
|
|
*/
|
|
|
|
|
yyssp++;
|
|
|
|
|
|
|
|
|
|
yysetstate:
|
|
|
|
|
*yyssp = yystate;
|
|
|
|
|
|
|
|
|
|
if (yyssp >= yyss + yystacksize - 1)
|
|
|
|
|
{
|
|
|
|
|
/* Get the current used size of the three stacks, in elements. */
|
|
|
|
|
YYSIZE_T yysize = yyssp - yyss + 1;
|
|
|
|
|
|
|
|
|
|
#ifdef yyoverflow
|
|
|
|
|
{
|
|
|
|
|
/* Give user a chance to reallocate the stack. Use copies of
|
|
|
|
|
these so that the &'s don't force the real ones into
|
|
|
|
|
memory. */
|
|
|
|
|
YYSTYPE *yyvs1 = yyvs;
|
|
|
|
|
short *yyss1 = yyss;
|
|
|
|
|
|
|
|
|
|
/* Each stack pointer address is followed by the size of the
|
|
|
|
|
data in use in that stack, in bytes. */
|
|
|
|
|
# if YYLSP_NEEDED
|
|
|
|
|
YYLTYPE *yyls1 = yyls;
|
|
|
|
|
/* This used to be a conditional around just the two extra args,
|
|
|
|
|
but that might be undefined if yyoverflow is a macro. */
|
|
|
|
|
yyoverflow ("parser stack overflow",
|
|
|
|
|
&yyss1, yysize * sizeof (*yyssp),
|
|
|
|
|
&yyvs1, yysize * sizeof (*yyvsp),
|
|
|
|
|
&yyls1, yysize * sizeof (*yylsp),
|
|
|
|
|
&yystacksize);
|
|
|
|
|
yyls = yyls1;
|
|
|
|
|
# else
|
|
|
|
|
yyoverflow ("parser stack overflow",
|
|
|
|
|
&yyss1, yysize * sizeof (*yyssp),
|
|
|
|
|
&yyvs1, yysize * sizeof (*yyvsp),
|
|
|
|
|
&yystacksize);
|
|
|
|
|
# endif
|
|
|
|
|
yyss = yyss1;
|
|
|
|
|
yyvs = yyvs1;
|
|
|
|
|
}
|
|
|
|
|
#else /* no yyoverflow */
|
|
|
|
|
# ifndef YYSTACK_RELOCATE
|
|
|
|
|
goto yyoverflowlab;
|
|
|
|
|
# else
|
|
|
|
|
/* Extend the stack our own way. */
|
|
|
|
|
if (yystacksize >= YYMAXDEPTH)
|
|
|
|
|
goto yyoverflowlab;
|
|
|
|
|
yystacksize *= 2;
|
|
|
|
|
if (yystacksize > YYMAXDEPTH)
|
|
|
|
|
yystacksize = YYMAXDEPTH;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
short *yyss1 = yyss;
|
|
|
|
|
union yyalloc *yyptr =
|
|
|
|
|
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
|
|
|
|
|
if (! yyptr)
|
|
|
|
|
goto yyoverflowlab;
|
|
|
|
|
YYSTACK_RELOCATE (yyss);
|
|
|
|
|
YYSTACK_RELOCATE (yyvs);
|
|
|
|
|
# if YYLSP_NEEDED
|
|
|
|
|
YYSTACK_RELOCATE (yyls);
|
|
|
|
|
# endif
|
|
|
|
|
# undef YYSTACK_RELOCATE
|
|
|
|
|
if (yyss1 != yyssa)
|
|
|
|
|
YYSTACK_FREE (yyss1);
|
|
|
|
|
}
|
|
|
|
|
# endif
|
|
|
|
|
#endif /* no yyoverflow */
|
|
|
|
|
|
|
|
|
|
yyssp = yyss + yysize - 1;
|
|
|
|
|
yyvsp = yyvs + yysize - 1;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
yylsp = yyls + yysize - 1;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
|
|
|
|
|
(unsigned long int) yystacksize));
|
|
|
|
|
|
|
|
|
|
if (yyssp >= yyss + yystacksize - 1)
|
|
|
|
|
YYABORT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
|
|
|
|
|
|
|
|
|
|
goto yybackup;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-----------.
|
|
|
|
|
| yybackup. |
|
|
|
|
|
`-----------*/
|
|
|
|
|
yybackup:
|
|
|
|
|
|
|
|
|
|
/* Do appropriate processing given the current state. */
|
|
|
|
|
/* Read a lookahead token if we need one and don't already have one. */
|
|
|
|
|
/* yyresume: */
|
|
|
|
|
|
|
|
|
|
/* First try to decide what to do without reference to lookahead token. */
|
|
|
|
|
|
|
|
|
|
yyn = yypact[yystate];
|
|
|
|
|
if (yyn == YYFLAG)
|
|
|
|
|
goto yydefault;
|
|
|
|
|
|
|
|
|
|
/* Not known => get a lookahead token if don't already have one. */
|
|
|
|
|
|
|
|
|
|
/* yychar is either YYEMPTY or YYEOF
|
|
|
|
|
or a valid token in external form. */
|
|
|
|
|
|
|
|
|
|
if (yychar == YYEMPTY)
|
|
|
|
|
{
|
|
|
|
|
YYDPRINTF ((stderr, "Reading a token: "));
|
|
|
|
|
yychar = YYLEX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert token to internal form (in yychar1) for indexing tables with */
|
|
|
|
|
|
|
|
|
|
if (yychar <= 0) /* This means end of input. */
|
|
|
|
|
{
|
|
|
|
|
yychar1 = 0;
|
|
|
|
|
yychar = YYEOF; /* Don't call YYLEX any more */
|
|
|
|
|
|
|
|
|
|
YYDPRINTF ((stderr, "Now at end of input.\n"));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
yychar1 = YYTRANSLATE (yychar);
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
/* We have to keep this `#if YYDEBUG', since we use variables
|
|
|
|
|
which are defined only if `YYDEBUG' is set. */
|
|
|
|
|
if (yydebug)
|
|
|
|
|
{
|
|
|
|
|
YYFPRINTF (stderr, "Next token is %d (%s",
|
|
|
|
|
yychar, yytname[yychar1]);
|
|
|
|
|
/* Give the individual parser a way to print the precise
|
|
|
|
|
meaning of a token, for further debugging info. */
|
|
|
|
|
# ifdef YYPRINT
|
|
|
|
|
YYPRINT (stderr, yychar, yylval);
|
|
|
|
|
# endif
|
|
|
|
|
YYFPRINTF (stderr, ")\n");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
yyn += yychar1;
|
|
|
|
|
if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
|
|
|
|
|
goto yydefault;
|
|
|
|
|
|
|
|
|
|
yyn = yytable[yyn];
|
|
|
|
|
|
|
|
|
|
/* yyn is what to do for this token type in this state.
|
|
|
|
|
Negative => reduce, -yyn is rule number.
|
|
|
|
|
Positive => shift, yyn is new state.
|
|
|
|
|
New state is final state => don't bother to shift,
|
|
|
|
|
just return success.
|
|
|
|
|
0, or most negative number => error. */
|
|
|
|
|
|
|
|
|
|
if (yyn < 0)
|
|
|
|
|
{
|
|
|
|
|
if (yyn == YYFLAG)
|
|
|
|
|
goto yyerrlab;
|
|
|
|
|
yyn = -yyn;
|
|
|
|
|
goto yyreduce;
|
|
|
|
|
}
|
|
|
|
|
else if (yyn == 0)
|
|
|
|
|
goto yyerrlab;
|
|
|
|
|
|
|
|
|
|
if (yyn == YYFINAL)
|
|
|
|
|
YYACCEPT;
|
|
|
|
|
|
|
|
|
|
/* Shift the lookahead token. */
|
|
|
|
|
YYDPRINTF ((stderr, "Shifting token %d (%s), ",
|
|
|
|
|
yychar, yytname[yychar1]));
|
|
|
|
|
|
|
|
|
|
/* Discard the token being shifted unless it is eof. */
|
|
|
|
|
if (yychar != YYEOF)
|
|
|
|
|
yychar = YYEMPTY;
|
|
|
|
|
|
|
|
|
|
*++yyvsp = yylval;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
*++yylsp = yylloc;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Count tokens shifted since error; after three, turn off error
|
|
|
|
|
status. */
|
|
|
|
|
if (yyerrstatus)
|
|
|
|
|
yyerrstatus--;
|
|
|
|
|
|
|
|
|
|
yystate = yyn;
|
|
|
|
|
goto yynewstate;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-----------------------------------------------------------.
|
|
|
|
|
| yydefault -- do the default action for the current state. |
|
|
|
|
|
`-----------------------------------------------------------*/
|
|
|
|
|
yydefault:
|
|
|
|
|
yyn = yydefact[yystate];
|
|
|
|
|
if (yyn == 0)
|
|
|
|
|
goto yyerrlab;
|
|
|
|
|
goto yyreduce;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-----------------------------.
|
|
|
|
|
| yyreduce -- Do a reduction. |
|
|
|
|
|
`-----------------------------*/
|
|
|
|
|
yyreduce:
|
|
|
|
|
/* yyn is the number of a rule to reduce with. */
|
|
|
|
|
yylen = yyr2[yyn];
|
|
|
|
|
|
|
|
|
|
/* If YYLEN is nonzero, implement the default value of the action:
|
|
|
|
|
`$$ = $1'.
|
|
|
|
|
|
|
|
|
|
Otherwise, the following line sets YYVAL to the semantic value of
|
|
|
|
|
the lookahead token. This behavior is undocumented and Bison
|
|
|
|
|
users should not rely upon it. Assigning to YYVAL
|
|
|
|
|
unconditionally makes the parser a bit smaller, and it avoids a
|
|
|
|
|
GCC warning that YYVAL may be used uninitialized. */
|
|
|
|
|
yyval = yyvsp[1-yylen];
|
|
|
|
|
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
/* Similarly for the default location. Let the user run additional
|
|
|
|
|
commands if for instance locations are ranges. */
|
|
|
|
|
yyloc = yylsp[1-yylen];
|
|
|
|
|
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
/* We have to keep this `#if YYDEBUG', since we use variables which
|
|
|
|
|
are defined only if `YYDEBUG' is set. */
|
|
|
|
|
if (yydebug)
|
|
|
|
|
{
|
|
|
|
|
int yyi;
|
|
|
|
|
|
|
|
|
|
YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
|
|
|
|
|
yyn, yyrline[yyn]);
|
|
|
|
|
|
|
|
|
|
/* Print the symbols being reduced, and their result. */
|
|
|
|
|
for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
|
|
|
|
|
YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
|
|
|
|
|
YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
switch (yyn) {
|
|
|
|
|
|
|
|
|
|
case 1:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 185 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
if (yyvsp[0].exp == NULL)
|
|
|
|
|
YYABORT;
|
|
|
|
|
((struct parse_args *) arg)->res = yyvsp[0].exp;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 193 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 197 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 201 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 205 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 6:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 209 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 7:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 213 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 8:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 217 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 9:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 221 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 10:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 225 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = new_exp_0 (var);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 11:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 229 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
if ((yyval.exp = new_exp_0 (num)) != NULL)
|
|
|
|
|
yyval.exp->val.num = yyvsp[0].num;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 12:
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 234 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
{
|
|
|
|
|
yyval.exp = yyvsp[-1].exp;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#line 705 "/usr/local/share/bison/bison.simple"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
yyvsp -= yylen;
|
|
|
|
|
yyssp -= yylen;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
yylsp -= yylen;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
if (yydebug)
|
|
|
|
|
{
|
|
|
|
|
short *yyssp1 = yyss - 1;
|
|
|
|
|
YYFPRINTF (stderr, "state stack now");
|
|
|
|
|
while (yyssp1 != yyssp)
|
|
|
|
|
YYFPRINTF (stderr, " %d", *++yyssp1);
|
|
|
|
|
YYFPRINTF (stderr, "\n");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
*++yyvsp = yyval;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
*++yylsp = yyloc;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Now `shift' the result of the reduction. Determine what state
|
|
|
|
|
that goes to, based on the state we popped back to and the rule
|
|
|
|
|
number reduced by. */
|
|
|
|
|
|
|
|
|
|
yyn = yyr1[yyn];
|
|
|
|
|
|
|
|
|
|
yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
|
|
|
|
|
if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
|
|
|
|
|
yystate = yytable[yystate];
|
|
|
|
|
else
|
|
|
|
|
yystate = yydefgoto[yyn - YYNTBASE];
|
|
|
|
|
|
|
|
|
|
goto yynewstate;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*------------------------------------.
|
|
|
|
|
| yyerrlab -- here on detecting error |
|
|
|
|
|
`------------------------------------*/
|
|
|
|
|
yyerrlab:
|
|
|
|
|
/* If not already recovering from an error, report this error. */
|
|
|
|
|
if (!yyerrstatus)
|
|
|
|
|
{
|
|
|
|
|
++yynerrs;
|
|
|
|
|
|
|
|
|
|
#ifdef YYERROR_VERBOSE
|
|
|
|
|
yyn = yypact[yystate];
|
|
|
|
|
|
|
|
|
|
if (yyn > YYFLAG && yyn < YYLAST)
|
|
|
|
|
{
|
|
|
|
|
YYSIZE_T yysize = 0;
|
|
|
|
|
char *yymsg;
|
|
|
|
|
int yyx, yycount;
|
|
|
|
|
|
|
|
|
|
yycount = 0;
|
|
|
|
|
/* Start YYX at -YYN if negative to avoid negative indexes in
|
|
|
|
|
YYCHECK. */
|
|
|
|
|
for (yyx = yyn < 0 ? -yyn : 0;
|
|
|
|
|
yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
|
|
|
|
|
if (yycheck[yyx + yyn] == yyx)
|
|
|
|
|
yysize += yystrlen (yytname[yyx]) + 15, yycount++;
|
|
|
|
|
yysize += yystrlen ("parse error, unexpected ") + 1;
|
|
|
|
|
yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
|
|
|
|
|
yymsg = (char *) YYSTACK_ALLOC (yysize);
|
|
|
|
|
if (yymsg != 0)
|
|
|
|
|
{
|
|
|
|
|
char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
|
|
|
|
|
yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
|
|
|
|
|
|
|
|
|
|
if (yycount < 5)
|
|
|
|
|
{
|
|
|
|
|
yycount = 0;
|
|
|
|
|
for (yyx = yyn < 0 ? -yyn : 0;
|
|
|
|
|
yyx < (int) (sizeof (yytname) / sizeof (char *));
|
|
|
|
|
yyx++)
|
|
|
|
|
if (yycheck[yyx + yyn] == yyx)
|
|
|
|
|
{
|
|
|
|
|
const char *yyq = ! yycount ? ", expecting " : " or ";
|
|
|
|
|
yyp = yystpcpy (yyp, yyq);
|
|
|
|
|
yyp = yystpcpy (yyp, yytname[yyx]);
|
|
|
|
|
yycount++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yyerror (yymsg);
|
|
|
|
|
YYSTACK_FREE (yymsg);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
yyerror ("parse error; also virtual memory exhausted");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif /* defined (YYERROR_VERBOSE) */
|
|
|
|
|
yyerror ("parse error");
|
|
|
|
|
}
|
|
|
|
|
goto yyerrlab1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*--------------------------------------------------.
|
|
|
|
|
| yyerrlab1 -- error raised explicitly by an action |
|
|
|
|
|
`--------------------------------------------------*/
|
|
|
|
|
yyerrlab1:
|
|
|
|
|
if (yyerrstatus == 3)
|
|
|
|
|
{
|
|
|
|
|
/* If just tried and failed to reuse lookahead token after an
|
|
|
|
|
error, discard it. */
|
|
|
|
|
|
|
|
|
|
/* return failure if at end of input */
|
|
|
|
|
if (yychar == YYEOF)
|
|
|
|
|
YYABORT;
|
|
|
|
|
YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
|
|
|
|
|
yychar, yytname[yychar1]));
|
|
|
|
|
yychar = YYEMPTY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Else will try to reuse lookahead token after shifting the error
|
|
|
|
|
token. */
|
|
|
|
|
|
|
|
|
|
yyerrstatus = 3; /* Each real token shifted decrements this */
|
|
|
|
|
|
|
|
|
|
goto yyerrhandle;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------.
|
|
|
|
|
| yyerrdefault -- current state does not do anything special for the |
|
|
|
|
|
| error token. |
|
|
|
|
|
`-------------------------------------------------------------------*/
|
|
|
|
|
yyerrdefault:
|
|
|
|
|
#if 0
|
|
|
|
|
/* This is wrong; only states that explicitly want error tokens
|
|
|
|
|
should shift them. */
|
|
|
|
|
|
|
|
|
|
/* If its default is to accept any token, ok. Otherwise pop it. */
|
|
|
|
|
yyn = yydefact[yystate];
|
|
|
|
|
if (yyn)
|
|
|
|
|
goto yydefault;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------.
|
|
|
|
|
| yyerrpop -- pop the current state because it cannot handle the |
|
|
|
|
|
| error token |
|
|
|
|
|
`---------------------------------------------------------------*/
|
|
|
|
|
yyerrpop:
|
|
|
|
|
if (yyssp == yyss)
|
|
|
|
|
YYABORT;
|
|
|
|
|
yyvsp--;
|
|
|
|
|
yystate = *--yyssp;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
yylsp--;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if YYDEBUG
|
|
|
|
|
if (yydebug)
|
|
|
|
|
{
|
|
|
|
|
short *yyssp1 = yyss - 1;
|
|
|
|
|
YYFPRINTF (stderr, "Error: state stack now");
|
|
|
|
|
while (yyssp1 != yyssp)
|
|
|
|
|
YYFPRINTF (stderr, " %d", *++yyssp1);
|
|
|
|
|
YYFPRINTF (stderr, "\n");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/*--------------.
|
|
|
|
|
| yyerrhandle. |
|
|
|
|
|
`--------------*/
|
|
|
|
|
yyerrhandle:
|
|
|
|
|
yyn = yypact[yystate];
|
|
|
|
|
if (yyn == YYFLAG)
|
|
|
|
|
goto yyerrdefault;
|
|
|
|
|
|
|
|
|
|
yyn += YYTERROR;
|
|
|
|
|
if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
|
|
|
|
|
goto yyerrdefault;
|
|
|
|
|
|
|
|
|
|
yyn = yytable[yyn];
|
|
|
|
|
if (yyn < 0)
|
|
|
|
|
{
|
|
|
|
|
if (yyn == YYFLAG)
|
|
|
|
|
goto yyerrpop;
|
|
|
|
|
yyn = -yyn;
|
|
|
|
|
goto yyreduce;
|
|
|
|
|
}
|
|
|
|
|
else if (yyn == 0)
|
|
|
|
|
goto yyerrpop;
|
|
|
|
|
|
|
|
|
|
if (yyn == YYFINAL)
|
|
|
|
|
YYACCEPT;
|
|
|
|
|
|
|
|
|
|
YYDPRINTF ((stderr, "Shifting error token, "));
|
|
|
|
|
|
|
|
|
|
*++yyvsp = yylval;
|
|
|
|
|
#if YYLSP_NEEDED
|
|
|
|
|
*++yylsp = yylloc;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
yystate = yyn;
|
|
|
|
|
goto yynewstate;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------.
|
|
|
|
|
| yyacceptlab -- YYACCEPT comes here. |
|
|
|
|
|
`-------------------------------------*/
|
|
|
|
|
yyacceptlab:
|
|
|
|
|
yyresult = 0;
|
|
|
|
|
goto yyreturn;
|
|
|
|
|
|
|
|
|
|
/*-----------------------------------.
|
|
|
|
|
| yyabortlab -- YYABORT comes here. |
|
|
|
|
|
`-----------------------------------*/
|
|
|
|
|
yyabortlab:
|
|
|
|
|
yyresult = 1;
|
|
|
|
|
goto yyreturn;
|
|
|
|
|
|
|
|
|
|
/*---------------------------------------------.
|
|
|
|
|
| yyoverflowab -- parser overflow comes here. |
|
|
|
|
|
`---------------------------------------------*/
|
|
|
|
|
yyoverflowlab:
|
|
|
|
|
yyerror ("parser stack overflow");
|
|
|
|
|
yyresult = 2;
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
|
|
yyreturn:
|
|
|
|
|
#ifndef yyoverflow
|
|
|
|
|
if (yyss != yyssa)
|
|
|
|
|
YYSTACK_FREE (yyss);
|
|
|
|
|
#endif
|
|
|
|
|
return yyresult;
|
|
|
|
|
}
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#line 239 "plural.y"
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
internal_function
|
|
|
|
|
FREE_EXPRESSION (exp)
|
|
|
|
|
struct expression *exp;
|
|
|
|
|
{
|
|
|
|
|
if (exp == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Handle the recursive case. */
|
|
|
|
|
switch (exp->nargs)
|
|
|
|
|
{
|
|
|
|
|
case 3:
|
|
|
|
|
FREE_EXPRESSION (exp->val.args[2]);
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case 2:
|
|
|
|
|
FREE_EXPRESSION (exp->val.args[1]);
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case 1:
|
|
|
|
|
FREE_EXPRESSION (exp->val.args[0]);
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
intl: Unbreak intl build with bison 3 when no regeneration is needed [PR92008]
As Iain reported, my change broke the case when one has bison >= 3,
but make decides there is no reason to regenerate plural.c, unfortunately
that seems to be a scenario I haven't tested. The problem is that
the pregenerated plural.c has been generated with bison 1.35, but when
config.h says HAVE_BISON3, the code assumes it is the bison3 variant.
What used to work fine is when one has bison >= 3 and plural.c has been
regenerated (e.g. do touch intl/plural.y and it will work), or when
one doesn't have any bison (then nothing is regenerated, but HAVE_BISON3
isn't defined either), or when one has bison < 3 and doesn't need to
regenerate, or when one has bison < 3 and it is regenerated.
The following patch fixes this, by killing the HAVE_BISON3 macro from
config.h, and instead remembering the fact whether plural.c has been created
with bison < 3 or bison >= 3 in a separate new plural-config.h header.
The way this works:
- user doesn't have bison
- user has bison >= 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
- user has bison < 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
pregenerated !USE_BISON3 plural.c and plural-config.h from source
dir is used, nothing in the objdir
- user has bison >= 3 and intl/plural.y is newer
Makefile generates plural.c and USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
- user has bison < 3 and intl/plural.y is newer
Makefile generates plural.c and !USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
I have tested all these cases and make all-yes worked in all the cases.
If one uses the unsupported ./configure where srcdir == objdir, I guess
(though haven't tested) that it should still work, just it would be nice
if such people didn't try to check in the plural{.c,-config.h} they have
regenerated.
What doesn't work, but didn't work before either (just tested gcc-9 branch
too) is when one doesn't have bison and plural.y is newer than plural.c.
Don't do that ;)
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
intl/
* configure.ac: Remove HAVE_BISON3 AC_DEFINE.
* Makefile.in (HEADERS): Add plural-config.h.
(.y.c): Also create plural-config.h.
(dcigettext.o loadmsgcat.o plural.o plural-exp.o): Also depend
on plural-config.h.
(plural-config.h): Depend on plural.c.
* plural-exp.h: Include plural-config.h. Use USE_BISON3 instead
of HAVE_BISON3.
* plural.y: Use USE_BISON3 instead of HAVE_BISON3.
* configure: Regenerated.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* plural-config.h: Generated.
contrib/
* gcc_update: Add intl/plural.y dependency for intl/plural-config.h.
2020-04-16 11:55:00 +02:00
|
|
|
|
#ifdef USE_BISON3
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
static int
|
|
|
|
|
yylex (lval, arg)
|
|
|
|
|
YYSTYPE *lval;
|
|
|
|
|
struct parse_args *arg;
|
|
|
|
|
{
|
|
|
|
|
const char **pexp = &arg->cp;
|
|
|
|
|
#else
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
static int
|
|
|
|
|
yylex (lval, pexp)
|
|
|
|
|
YYSTYPE *lval;
|
|
|
|
|
const char **pexp;
|
|
|
|
|
{
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#endif
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
const char *exp = *pexp;
|
|
|
|
|
int result;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
if (exp[0] == '\0')
|
|
|
|
|
{
|
|
|
|
|
*pexp = exp;
|
|
|
|
|
return YYEOF;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (exp[0] != ' ' && exp[0] != '\t')
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
++exp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = *exp++;
|
|
|
|
|
switch (result)
|
|
|
|
|
{
|
|
|
|
|
case '0': case '1': case '2': case '3': case '4':
|
|
|
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
|
|
|
{
|
|
|
|
|
unsigned long int n = result - '0';
|
|
|
|
|
while (exp[0] >= '0' && exp[0] <= '9')
|
|
|
|
|
{
|
|
|
|
|
n *= 10;
|
|
|
|
|
n += exp[0] - '0';
|
|
|
|
|
++exp;
|
|
|
|
|
}
|
|
|
|
|
lval->num = n;
|
|
|
|
|
result = NUMBER;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '=':
|
|
|
|
|
if (exp[0] == '=')
|
|
|
|
|
{
|
|
|
|
|
++exp;
|
|
|
|
|
lval->op = equal;
|
|
|
|
|
result = EQUOP2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
result = YYERRCODE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '!':
|
|
|
|
|
if (exp[0] == '=')
|
|
|
|
|
{
|
|
|
|
|
++exp;
|
|
|
|
|
lval->op = not_equal;
|
|
|
|
|
result = EQUOP2;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '&':
|
|
|
|
|
case '|':
|
|
|
|
|
if (exp[0] == result)
|
|
|
|
|
++exp;
|
|
|
|
|
else
|
|
|
|
|
result = YYERRCODE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '<':
|
|
|
|
|
if (exp[0] == '=')
|
|
|
|
|
{
|
|
|
|
|
++exp;
|
|
|
|
|
lval->op = less_or_equal;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
lval->op = less_than;
|
|
|
|
|
result = CMPOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '>':
|
|
|
|
|
if (exp[0] == '=')
|
|
|
|
|
{
|
|
|
|
|
++exp;
|
|
|
|
|
lval->op = greater_or_equal;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
lval->op = greater_than;
|
|
|
|
|
result = CMPOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '*':
|
|
|
|
|
lval->op = mult;
|
|
|
|
|
result = MULOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '/':
|
|
|
|
|
lval->op = divide;
|
|
|
|
|
result = MULOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
|
lval->op = module;
|
|
|
|
|
result = MULOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '+':
|
|
|
|
|
lval->op = plus;
|
|
|
|
|
result = ADDOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '-':
|
|
|
|
|
lval->op = minus;
|
|
|
|
|
result = ADDOP2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'n':
|
|
|
|
|
case '?':
|
|
|
|
|
case ':':
|
|
|
|
|
case '(':
|
|
|
|
|
case ')':
|
|
|
|
|
/* Nothing, just return the character. */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ';':
|
|
|
|
|
case '\n':
|
|
|
|
|
case '\0':
|
|
|
|
|
/* Be safe and let the user call this function again. */
|
|
|
|
|
--exp;
|
|
|
|
|
result = YYEOF;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
result = YYERRCODE;
|
|
|
|
|
#if YYDEBUG != 0
|
|
|
|
|
--exp;
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*pexp = exp;
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
intl: Unbreak intl build with bison 3 when no regeneration is needed [PR92008]
As Iain reported, my change broke the case when one has bison >= 3,
but make decides there is no reason to regenerate plural.c, unfortunately
that seems to be a scenario I haven't tested. The problem is that
the pregenerated plural.c has been generated with bison 1.35, but when
config.h says HAVE_BISON3, the code assumes it is the bison3 variant.
What used to work fine is when one has bison >= 3 and plural.c has been
regenerated (e.g. do touch intl/plural.y and it will work), or when
one doesn't have any bison (then nothing is regenerated, but HAVE_BISON3
isn't defined either), or when one has bison < 3 and doesn't need to
regenerate, or when one has bison < 3 and it is regenerated.
The following patch fixes this, by killing the HAVE_BISON3 macro from
config.h, and instead remembering the fact whether plural.c has been created
with bison < 3 or bison >= 3 in a separate new plural-config.h header.
The way this works:
- user doesn't have bison
- user has bison >= 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
- user has bison < 3, but intl/{plural-config.h,plural.c} aren't older than intl/plural.y
pregenerated !USE_BISON3 plural.c and plural-config.h from source
dir is used, nothing in the objdir
- user has bison >= 3 and intl/plural.y is newer
Makefile generates plural.c and USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
- user has bison < 3 and intl/plural.y is newer
Makefile generates plural.c and !USE_BISON3 plural-config.h in the
objdir, which is then used in preference to srcdir copies
I have tested all these cases and make all-yes worked in all the cases.
If one uses the unsupported ./configure where srcdir == objdir, I guess
(though haven't tested) that it should still work, just it would be nice
if such people didn't try to check in the plural{.c,-config.h} they have
regenerated.
What doesn't work, but didn't work before either (just tested gcc-9 branch
too) is when one doesn't have bison and plural.y is newer than plural.c.
Don't do that ;)
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
intl/
* configure.ac: Remove HAVE_BISON3 AC_DEFINE.
* Makefile.in (HEADERS): Add plural-config.h.
(.y.c): Also create plural-config.h.
(dcigettext.o loadmsgcat.o plural.o plural-exp.o): Also depend
on plural-config.h.
(plural-config.h): Depend on plural.c.
* plural-exp.h: Include plural-config.h. Use USE_BISON3 instead
of HAVE_BISON3.
* plural.y: Use USE_BISON3 instead of HAVE_BISON3.
* configure: Regenerated.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* plural-config.h: Generated.
contrib/
* gcc_update: Add intl/plural.y dependency for intl/plural-config.h.
2020-04-16 11:55:00 +02:00
|
|
|
|
#ifdef USE_BISON3
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
static void
|
|
|
|
|
yyerror (arg, str)
|
|
|
|
|
struct parse_args *arg;
|
|
|
|
|
#else
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
static void
|
|
|
|
|
yyerror (str)
|
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
2020-04-16 10:12:30 +02:00
|
|
|
|
#endif
|
intl: New directory; see intl/ChangeLog for details.
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
From-SVN: r68928
2003-07-04 20:18:54 +02:00
|
|
|
|
const char *str;
|
|
|
|
|
{
|
|
|
|
|
/* Do nothing. We don't print error messages here. */
|
|
|
|
|
}
|