warnings: sort the messages by location

Sort the warnings by location (file, line number, column). They are built
using an obstack then stored in a list, and finally sorted just before
being printed, at the end.

* src/complain.c, src/complain.h: New warning struct, obstack, and
implementation
* src/location.c, location.h (location_obstack_caret,
location_obstack_print): New
* src/main.c: Print the warnings
* src/muscle-tab.c, src/reader.c, src/scan-code.l, src/symtab.c: Adapt for
multi-part warnings
* tests/actions.at, tests/conflicts.at, tests/existing.at, tests/input.at,
* tests/reduce.at, tests/regression.at, tests/skeleton.at: Update testsuite

.gitignore

@@ -1,16 +1,7 @@
-*.eps
-*.log
-*.o
-*.pdf
-*.png
-*.stamp
-*.trs
-*~
-.deps
-.dirstamp
 /*.cache
 /*.flc
 /*.prj
+/*~
 /.tarball-version
 /.version
 /ABOUT-NLS

.prev-version

@@ -1 +1 @@
-3.0.5
+3.0

AUTHORS

@@ -24,7 +24,7 @@ and nasty bugs.
 
 -----
 
-Copyright (C) 1998-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 1998-2013 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 

ChangeLog-2012

@@ -26733,8 +26733,8 @@
 
 	-----
 
-	Copyright (C) 1987-1988, 1991-2015, 2018 Free Software
+	Copyright (C) 1987-1988, 1991-2013 Free Software Foundation,
-	Foundation, Inc.
+	Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice and this

Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-# Copyright (C) 2001-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
@@ -24,10 +24,8 @@ SUBDIRS = po runtime-po .
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
-EXTRA_DIST = .prev-version .version cfg.mk PACKAGING \
+EXTRA_DIST = .prev-version .version \
-  ChangeLog-1998 ChangeLog-2012 ChangeLog
+  cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
-
-dist_doc_DATA = AUTHORS COPYING NEWS README THANKS TODO
 
 ## Running the bison from this tarball.  To generate our own parser,
 ## but also to run the tests.  Of course, you ought to keep a sane
@@ -39,9 +37,8 @@ AM_YFLAGS = -d -v -Werror -Wall -Wno-yacc --report=all
 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)
-# Find builddir/src/scan-code.c etc.  For some reason "-I./lib"
+# Find builddir/src/scan-code.c etc.
-# instead of "-Ilib" avoids infinite recursions on #include_next.
+AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
-AM_CPPFLAGS = -I. -I./lib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =

NEWS

@@ -1,297 +1,7 @@
 GNU Bison NEWS
 
-* Noteworthy changes in release 3.1 (2018-08-27) [stable]
+* Noteworthy changes in release ?.? (????-??-??) [?]
 
-** Backward incompatible changes
-
-  Compiling Bison now requires a C99 compiler---as announced during the
-  release of Bison 3.0, five years ago.  Generated parsers do not require a
-  C99 compiler.
-
-  Support for DJGPP, which have been unmaintained and untested for years, is
-  obsolete. Unless there is activity to revive it, the next release of Bison
-  will have it removed.
-
-** New features
-
-*** Typed midrule actions
-
-  Because their type is unknown to Bison, the values of midrule actions are
-  not treated like the others: they don't have %printer and %destructor
-  support.  It also prevents C++ (Bison) variants to handle them properly.
-
-  Typed midrule actions address these issues.  Instead of:
-
-    exp: { $<ival>$ = 1; } { $<ival>$ = 2; }   { $$ = $<ival>1 + $<ival>2; }
-
-  write:
-
-    exp: <ival>{ $$ = 1; } <ival>{ $$ = 2; }   { $$ = $1 + $2; }
-
-*** Reports include the type of the symbols
-
-  The sections about terminal and nonterminal symbols of the '*.output' file
-  now specify their declared type.  For instance, for:
-
-    %token <ival> NUM
-
-  the report now shows '<ival>':
-
-    Terminals, with rules where they appear
-
-    NUM <ival> (258) 5
-
-*** Diagnostics about useless rules
-
-  In the following grammar, the 'exp' nonterminal is trivially useless.  So,
-  of course, its rules are useless too.
-
-    %%
-    input: '0' | exp
-    exp: exp '+' exp | exp '-' exp | '(' exp ')'
-
-  Previously all the useless rules were reported, including those whose
-  left-hand side is the 'exp' nonterminal:
-
-    warning: 1 nonterminal useless in grammar [-Wother]
-    warning: 4 rules useless in grammar [-Wother]
-    2.14-16: warning: nonterminal useless in grammar: exp [-Wother]
-     input: '0' | exp
-                  ^^^
-    2.14-16: warning: rule useless in grammar [-Wother]
-     input: '0' | exp
-                  ^^^
-    3.6-16: warning: rule useless in grammar [-Wother]
-     exp: exp '+' exp | exp '-' exp | '(' exp ')'
-          ^^^^^^^^^^^
-    3.20-30: warning: rule useless in grammar [-Wother]
-     exp: exp '+' exp | exp '-' exp | '(' exp ')'
-                        ^^^^^^^^^^^
-    3.34-44: warning: rule useless in grammar [-Wother]
-     exp: exp '+' exp | exp '-' exp | '(' exp ')'
-                                      ^^^^^^^^^^^
-
-  Now, rules whose left-hand side symbol is useless are no longer reported
-  as useless.  The locations of the errors have also been adjusted to point
-  to the first use of the nonterminal as a left-hand side of a rule:
-
-    warning: 1 nonterminal useless in grammar [-Wother]
-    warning: 4 rules useless in grammar [-Wother]
-    3.1-3: warning: nonterminal useless in grammar: exp [-Wother]
-     exp: exp '+' exp | exp '-' exp | '(' exp ')'
-     ^^^
-    2.14-16: warning: rule useless in grammar [-Wother]
-     input: '0' | exp
-                  ^^^
-
-*** C++: Generated parsers can be compiled with -fno-exceptions (lalr1.cc)
-
-  When compiled with exceptions disabled, the generated parsers no longer
-  uses try/catch clauses.
-
-  Currently only GCC and Clang are supported.
-
-** Documentation
-
-*** A demonstration of variants
-
-  A new example was added (installed in .../share/doc/bison/examples),
-  'variant.yy', which shows how to use (Bison) variants in C++.
-
-  The other examples were made nicer to read.
-
-*** Some features are no longer 'experimental'
-
-  The following features, mature enough, are no longer flagged as
-  experimental in the documentation: push parsers, default %printer and
-  %destructor (typed: <*> and untyped: <>), %define api.value.type union and
-  variant, Java parsers, XML output, LR family (lr, ielr, lalr), and
-  semantic predicates (%?).
-
-** Bug fixes
-
-*** GLR: Predicates support broken by #line directives
-
-  Predicates (%?) in GLR such as
-
-    widget:
-      %? {new_syntax} 'w' id new_args
-    | %?{!new_syntax} 'w' id old_args
-
-  were issued with #lines in the middle of C code.
-
-*** Printer and destructor with broken #line directives
-
-  The #line directives were not properly escaped when emitting the code for
-  %printer/%destructor, which resulted in compiler errors if there are
-  backslashes or double-quotes in the grammar file name.
-
-*** Portability on ICC
-
-  The Intel compiler claims compatibility with GCC, yet rejects its _Pragma.
-  Generated parsers now work around this.
-
-*** Various
-
-  There were several small fixes in the test suite and in the build system,
-  many warnings in bison and in the generated parsers were eliminated.  The
-  documentation also received its share of minor improvements.
-
-  Useless code was removed from C++ parsers, and some of the generated
-  constructors are more 'natural'.
-
-* Noteworthy changes in release 3.0.5 (2018-05-27) [stable]
-
-** Bug fixes
-
-*** C++: Fix support of 'syntax_error'
-
-  One incorrect 'inline' resulted in linking errors about the constructor of
-  the syntax_error exception.
-
-*** C++: Fix warnings
-
-  GCC 7.3 (with -O1 or -O2 but not -O0 or -O3) issued null-dereference
-  warnings about yyformat being possibly null.  It also warned about the
-  deprecated implicit definition of copy constructors when there's a
-  user-defined (copy) assignment operator.
-
-*** Location of errors
-
-  In C++ parsers, out-of-bounds errors can happen when a rule with an empty
-  ride-hand side raises a syntax error.  The behavior of the default parser
-  (yacc.c) in such a condition was undefined.
-
-  Now all the parsers match the behavior of glr.c: @$ is used as the
-  location of the error.  This handles gracefully rules with and without
-  rhs.
-
-*** Portability fixes in the test suite
-
-  On some platforms, some Java and/or C++ tests were failing.
-
-* Noteworthy changes in release 3.0.4 (2015-01-23) [stable]
-
-** Bug fixes
-
-*** C++ with Variants (lalr1.cc)
-
-  Fix a compiler warning when no %destructor use $$.
-
-*** Test suites
-
-  Several portability issues in tests were fixed.
-
-* Noteworthy changes in release 3.0.3 (2015-01-15) [stable]
-
-** Bug fixes
-
-*** C++ with Variants (lalr1.cc)
-
-  Problems with %destructor and '%define parse.assert' have been fixed.
-
-*** Named %union support (yacc.c, glr.c)
-
-  Bison 3.0 introduced a regression on named %union such as
-
-    %union foo { int ival; };
-
-  The possibility to use a name was introduced "for Yacc compatibility".
-  It is however not required by POSIX Yacc, and its usefulness is not clear.
-
-*** %define api.value.type union with %defines (yacc.c, glr.c)
-
-  The C parsers were broken when %defines was used together with "%define
-  api.value.type union".
-
-*** Redeclarations are reported in proper order
-
-  On
-
-    %token FOO "foo"
-    %printer {} "foo"
-    %printer {} FOO
-
-  bison used to report:
-
-    /tmp/foo.yy:2.10-11: error: %printer redeclaration for FOO
-     %printer {} "foo"
-              ^^
-    /tmp/foo.yy:3.10-11:     previous declaration
-     %printer {} FOO
-              ^^
-
-  Now, the "previous" declaration is always the first one.
-
-
-** Documentation
-
-  Bison now installs various files in its docdir (which defaults to
-  '/usr/local/share/doc/bison'), including the three fully blown examples
-  extracted from the documentation:
-
-   - rpcalc
-     Reverse Polish Calculator, a simple introductory example.
-   - mfcalc
-     Multi-function Calc, a calculator with memory and functions and located
-     error messages.
-   - calc++
-     a calculator in C++ using variant support and token constructors.
-
-* Noteworthy changes in release 3.0.2 (2013-12-05) [stable]
-
-** Bug fixes
-
-*** Generated source files when errors are reported
-
-  When warnings are issued and -Werror is set, bison would still generate
-  the source files (*.c, *.h...).  As a consequence, some runs of "make"
-  could fail the first time, but not the second (as the files were generated
-  anyway).
-
-  This is fixed: bison no longer generates this source files, but, of
-  course, still produces the various reports (*.output, *.xml, etc.).
-
-*** %empty is used in reports
-
-  Empty right-hand sides are denoted by '%empty' in all the reports (text,
-  dot, XML and formats derived from it).
-
-*** YYERROR and variants
-
-  When C++ variant support is enabled, an error triggered via YYERROR, but
-  not caught via error recovery, resulted in a double deletion.
-
-* Noteworthy changes in release 3.0.1 (2013-11-12) [stable]
-
-** Bug fixes
-
-*** Errors in caret diagnostics
-
-  On some platforms, some errors could result in endless diagnostics.
-
-*** Fixes of the -Werror option
-
-  Options such as "-Werror -Wno-error=foo" were still turning "foo"
-  diagnostics into errors instead of warnings.  This is fixed.
-
-  Actually, for consistency with GCC, "-Wno-error=foo -Werror" now also
-  leaves "foo" diagnostics as warnings.  Similarly, with "-Werror=foo
-  -Wno-error", "foo" diagnostics are now errors.
-
-*** GLR Predicates
-
-  As demonstrated in the documentation, one can now leave spaces between
-  "%?" and its "{".
-
-*** Installation
-
-  The yacc.1 man page is no longer installed if --disable-yacc was
-  specified.
-
-*** Fixes in the test suite
-
-  Bugs and portability issues.
 
 * Noteworthy changes in release 3.0 (2013-07-25) [stable]
 
@@ -2918,7 +2628,7 @@ Output file does not redefine const for C++.
 
 -----
 
-Copyright (C) 1995-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 

PACKAGING

@@ -36,7 +36,7 @@ to the bison package.
 
 -----
 
-Copyright (C) 2002, 2005, 2009-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 

README

@@ -7,7 +7,7 @@ instructions.
 
 Bison requires GNU m4 1.4.6 or later.  See:
 
-      https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz
+      ftp://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz
 
 ** Internationalization
 Bison supports two catalogues: one for Bison itself (i.e., for the
@@ -37,14 +37,14 @@ test case in each bug report.
 For any copyright year range specified as YYYY-ZZZZ in this package,
 note that the range specifies every single year in that closed interval.
 
------
 
 Local Variables:
 mode: outline
-fill-column: 76
 End:
 
-Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018 Free Software
+-----
+
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2013 Free Software
 Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.

README-alpha

@@ -12,7 +12,7 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 

README-hacking

@@ -9,19 +9,19 @@ Everything related to the development of Bison is on Savannah:
 * Administrivia
 
 ** If you incorporate a change from somebody on the net:
-First, if it is a large change, you must make sure they have signed the
+First, if it is a large change, you must make sure they have signed
-appropriate paperwork.  Second, be sure to add their name and email address
+the appropriate paperwork.  Second, be sure to add their name and
-to THANKS.
+email address to THANKS.
 
 ** If a change fixes a test, mention the test in the commit message.
 
 ** Bug reports
-If somebody reports a new bug, mention his name in the commit message and in
+If somebody reports a new bug, mention his name in the commit message
-the test case you write.  Put him into THANKS.
+and in the test case you write.  Put him into THANKS.
 
-The correct response to most actual bugs is to write a new test case which
+The correct response to most actual bugs is to write a new test case
-demonstrates the bug.  Then fix the bug, re-run the test suite, and check
+which demonstrates the bug.  Then fix the bug, re-run the test suite,
-everything in.
+and check everything in.
 
 
 * Hacking
@@ -30,17 +30,17 @@ everything in.
 Which include serious bug fixes, must be mentioned in NEWS.
 
 ** Translations
-Only user visible strings are to be translated: error messages, bits of the
+Only user visible strings are to be translated: error messages, bits
-.output file etc.  This excludes impossible error messages (comparable to
+of the .output file etc.  This excludes impossible error messages
-assert/abort), and all the --trace output which is meant for the maintainers
+(comparable to assert/abort), and all the --trace output which is
-only.
+meant for the maintainers only.
 
 ** Horizontal tabs
 Do not add horizontal tab characters to any file in Bison's repository
 except where required.  For example, do not use tabs to format C code.
-However, make files, ChangeLog, and some regular expressions require tabs.
+However, make files, ChangeLog, and some regular expressions require
-Also, test cases might need to contain tabs to check that Bison properly
+tabs.  Also, test cases might need to contain tabs to check that Bison
-processes tabs in its input.
+properly processes tabs in its input.
 
 
 * Working from the repository
@@ -62,22 +62,13 @@ tools we depend upon, including:
 - Gettext <http://www.gnu.org/software/gettext/>
 - Graphviz <http://www.graphviz.org>
 - Gzip <http://www.gnu.org/software/gzip/>
-- Help2man <http://www.gnu.org/software/help2man/>
 - Perl <http://www.cpan.org/>
 - Rsync <http://samba.anu.edu.au/rsync/>
 - Tar <http://www.gnu.org/software/tar/>
-- Texinfo <http://www.gnu.org/software/texinfo/>
 
 Valgrind <http://valgrind.org/> is also highly recommended, if it supports
 your architecture.
 
-If you're using a GNU/Linux distribution, the easiest way to install the
-above packages depends on your system.  The following shell command should
-work for Debian-based systems such as Ubuntu:
-
-  sudo apt-get install \
-    autoconf automake autopoint flex graphviz help2man texinfo valgrind
-
 Bison is written using Bison grammars, so there are bootstrapping issues.
 The bootstrap script attempts to discover when the C code generated from the
 grammars is out of date, and to bootstrap with an out-of-date version of the
@@ -103,19 +94,15 @@ to perform the first checkout of the submodules, run
 
        $ git submodule update --init
 
+Git submodule support is weak before versions 1.6 and later, you
+should probably upgrade Git if your version is older.
+
 The next step is to get other files needed to build, which are
 extracted from other source packages:
 
         $ ./bootstrap
 
-Bootstrapping updates the submodules to the versions registered in the
+And there you are!  Just
-top-level directory.  To change gnulib, first check out the version you want
-in `gnulib`, then commit this change in Bison's repository, and finally run
-bootstrap.
-
-If it fails with missing symbols (e.g., "error: possibly undefined macro:
-AC_PROG_GNU_M4"), you are likely to have forgotten the submodule
-initialization part.  Otherwise, there you are!  Just
 
         $ ./configure
         $ make
@@ -139,12 +126,13 @@ explicitly by the user.
 *** Updating Bison
 
 If you pull a newer version of a branch, say via "git pull", you might
-import requests for updated submodules.  A simple "git diff" will reveal if
+import requests for updated submodules.  A simple "git diff" will
-the current version of the submodule (i.e., the actual contents of the
+reveal if the current version of the submodule (i.e., the actual
-gnulib directory) and the current request from the subscriber (i.e., the
+contents of the gnulib directory) and the current request from the
-reference of the version of gnulib that the Bison repository requests)
+subscriber (i.e., the reference of the version of gnulib that the
-differ.  To upgrade the submodules (i.e., to check out the version that is
+Bison repository requests) differ.  To upgrade the submodules (i.e.,
-actually requested by the subscriber, run "git submodule update".
+to check out the version that is actually requested by the subscriber,
+run "git submodule update".
 
         $ git pull
         $ git submodule update
@@ -168,8 +156,8 @@ Register your changes.
 
         $ git checkin ...
 
-For a suggestion of what gnulib commit might be stable enough for a formal
+For a suggestion of what gnulib commit might be stable enough for a
-release, see the ChangeLog in the latest gnulib snapshot at:
+formal release, see the ChangeLog in the latest gnulib snapshot at:
 
         http://erislabs.net/ianb/projects/gnulib/
 
@@ -179,9 +167,9 @@ The Autoconf files we use are currently:
         lib/m4sugar/m4sugar.m4
         lib/m4sugar/foreach.m4
 
-These files don't change very often in Autoconf, so it should be relatively
+These files don't change very often in Autoconf, so it should be
-straight-forward to examine the differences in order to decide whether to
+relatively straight-forward to examine the differences in order to
-update.
+decide whether to update.
 
 * Test suite
 
@@ -244,99 +232,102 @@ suite.  So currently, do not try to run valgrind on Mac OS X.
 Try to run the test suite with more severe conditions before a
 release:
 
-- Configure the package with --enable-gcc-warnings, so that one checks that
+- Configure the package with --enable-gcc-warnings, so that one checks
-  1. Bison compiles cleanly, 2. the parsers it produces compile cleanly too.
+  that 1. Bison compiles cleanly, 2. the parsers it produces compile
+  cleanly too.
 
-- Maybe build with -DGNULIB_POSIXCHECK, which suggests gnulib modules that
+- Maybe build with -DGNULIB_POSIXCHECK, which suggests gnulib modules
-  can fix portability issues.  See if you really want to pay attention to
+  that can fix portability issues.  See if you really want to pay
-  its warnings; there's no need to obey blindly to it
+  attention to its warnings; there's no need to obey blindly to it
   (<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00057.html>).
 
-- Check with "make syntax-check" if there are issues diagnosed by gnulib.
+- Check with "make syntax-check" if there are issues diagnosed by
+  gnulib.
 
 - run "make maintainer-check" which:
   - runs "valgrind -q bison" to run Bison under Valgrind.
   - runs the parsers under Valgrind.
   - runs the test suite with G++ as C compiler...
 
-- run "make maintainer-push-check", which runs "make maintainer-check" while
+- run "make maintainer-push-check", which runs "make maintainer-check"
-  activating the push implementation and its pull interface wrappers in many
+  while activating the push implementation and its pull interface wrappers
-  test cases that were originally written to exercise only the pull
+  in many test cases that were originally written to exercise only the
-  implementation.  This makes certain the push implementation can perform
+  pull implementation.  This makes certain the push implementation can
-  every task the pull implementation can.
+  perform every task the pull implementation can.
 
-- run "make maintainer-xml-check", which runs "make maintainer-check" while
+- run "make maintainer-xml-check", which runs "make maintainer-check"
-  checking Bison's XML automaton report for every working grammar passed to
+  while checking Bison's XML automaton report for every working grammar
-  Bison in the test suite.  The check just diffs the output of Bison's
+  passed to Bison in the test suite.  The check just diffs the output of
-  included XSLT style sheets with the output of --report=all and --graph.
+  Bison's included XSLT style sheets with the output of --report=all and
+  --graph.
 
 - running "make maintainer-release-check" takes care of running
   maintainer-check, maintainer-push-check and maintainer-xml-check.
 
-- Change tests/atlocal/CFLAGS to add your preferred options.  For instance,
+- Change tests/atlocal/CFLAGS to add your preferred options.  For
-  "-traditional" to check that the parsers are K&R.  Note that it does not
+  instance, "-traditional" to check that the parsers are K&R.  Note
-  make sense for glr.c, which should be ANSI, but currently is actually GNU
+  that it does not make sense for glr.c, which should be ANSI, but
-  C, nor for lalr1.cc.
+  currently is actually GNU C, nor for lalr1.cc.
 
-- Test with a very recent version of GCC for both C and C++.  Testing with
+- Test with a very recent version of GCC for both C and C++.  Testing
-  older versions that are still in use is nice too.
+  with older versions that are still in use is nice too.
 
 
 * Release Procedure
-This section needs to be updated to take into account features from gnulib.
+This section needs to be updated to take into account features from
-In particular, be sure to read README-release.
+gnulib.  In particular, be sure to read README-release.
 
 ** Update the submodules.  See above.
 
 ** Update maintainer tools, such as Autoconf.  See above.
 
 ** Try to get the *.pot files to the Translation Project at least one
-week before a stable release, to give them time to translate them.  Before
+week before a stable release, to give them time to translate them.
-generating the *.pot files, make sure that po/POTFILES.in and
+Before generating the *.pot files, make sure that po/POTFILES.in and
-runtime-po/POTFILES.in list all files with translatable strings.  This
+runtime-po/POTFILES.in list all files with translatable strings.
-helps: grep -l '\<_(' *
+This helps: grep -l '\<_(' *
 
 ** Tests
 See above.
 
 ** Update the foreign files
-Running "./bootstrap" in the top level should update them all for you.  This
+Running "./bootstrap" in the top level should update them all for you.
-covers PO files too.  Sometimes a PO file contains problems that causes it
+This covers PO files too.  Sometimes a PO file contains problems that
-to be rejected by recent Gettext releases; please report these to the
+causes it to be rejected by recent Gettext releases; please report
-Translation Project.
+these to the Translation Project.
 
 ** Update README
-Make sure the information in README is current.  Most notably, make sure it
+Make sure the information in README is current.  Most notably, make sure
-recommends a version of GNU M4 that is compatible with the latest Bison
+it recommends a version of GNU M4 that is compatible with the latest
-sources.
+Bison sources.
 
 ** Check copyright years.
-We update years in copyright statements throughout Bison once at the start
+We update years in copyright statements throughout Bison once at the
-of every year by running "make update-copyright".  However, before a
+start of every year by running "make update-copyright".  However, before
-release, it's good to verify that it's actually been run.  Besides the
+a release, it's good to verify that it's actually been run.  Besides the
-copyright statement for each Bison file, check the copyright statements that
+copyright statement for each Bison file, check the copyright statements
-the skeletons insert into generated parsers, and check all occurrences of
+that the skeletons insert into generated parsers, and check all
-PACKAGE_COPYRIGHT_YEAR in configure.ac.
+occurrences of PACKAGE_COPYRIGHT_YEAR in configure.ac.
 
 ** Update NEWS, commit and tag.
-See do-release-commit-and-tag in README-release.  For a while, we used beta
+See do-release-commit-and-tag in README-release.  For a while, we used
-names such as "2.6_rc1".  Now that we use gnulib in the release procedure,
+beta names such as "2.6_rc1".  Now that we use gnulib in the release
-we must use "2.5.90", which has the additional benefit of being properly
+procedure, we must use "2.5.90", which has the additional benefit of
-sorted in "git tag -l".
+being properly sorted in "git tag -l".
 
 ** make alpha, beta, or stable
 See README-release.
 
 ** Upload
-There are two ways to upload the tarballs to the GNU servers: using gnupload
+There are two ways to upload the tarballs to the GNU servers: using
-(from gnulib), or by hand.  Obviously prefer the former.  But in either
+gnupload (from gnulib), or by hand.  Obviously prefer the former.  But
-case, be sure to read the following paragraph.
+in either case, be sure to read the following paragraph.
 
 *** Setup
 You need "gnupg".
 
-Make sure your public key has been uploaded at least to keys.gnupg.net.  You
+Make sure your public key has been uploaded at least to
-can upload it with:
+keys.gnupg.net.  You can upload it with:
 
   gpg --keyserver keys.gnupg.net --send-keys F125BDF3
 
@@ -345,8 +336,8 @@ where F125BDF3 should be replaced with your key ID.
 *** Using gnupload
 You need "ncftp".
 
-At the end "make stable" (or alpha/beta) will display the procedure to run.
+At the end "make stable" (or alpha/beta) will display the procedure to
-Just copy and paste it in your shell.
+run.  Just copy and paste it in your shell.
 
 *** By hand
 
@@ -408,9 +399,9 @@ sections that have been removed or renamed):
    $ ls -lt
 
 Remove these files and commit their removal to CVS.  For each of these
-files, add a line to the file .symlinks.  This will ensure that hyperlinks
+files, add a line to the file .symlinks.  This will ensure that
-to the removed files will redirect to the entire manual; this is better than
+hyperlinks to the removed files will redirect to the entire manual; this
-a 404 error.
+is better than a 404 error.
 
 There is a problem with 'index.html' being written twice (once for POSIX
 function 'index', once for the table of contents); you can ignore this
@@ -429,18 +420,19 @@ Complete/fix the announcement file.  The generated list of recipients
 ([email protected], [email protected], [email protected],
 [email protected], and [email protected]) is
 appropriate for a stable release or a "serious beta".  For any other
-release, drop at least [email protected].  For an example of how to fill out
+release, drop at least [email protected].  For an example of how to
-the rest of the template, search the mailing list archives for the most
+fill out the rest of the template, search the mailing list archives
-recent release announcement.
+for the most recent release announcement.
 
 For a stable release, send the same announcement on the comp.compilers
-newsgroup by sending email to [email protected].  Do not make any Cc as the
+newsgroup by sending email to [email protected].  Do not make any Cc as
-moderator will throw away anything cross-posted or Cc'ed.  It really needs
+the moderator will throw away anything cross-posted or Cc'ed.  It really
-to be a separate message.
+needs to be a separate message.
 
 ** Prepare NEWS
-So that developers don't accidentally add new items to the old NEWS entry,
+So that developers don't accidentally add new items to the old NEWS
-create a new empty entry in line 3 (without the two leading spaces):
+entry, create a new empty entry in line 3 (without the two leading
+spaces):
 
   * Noteworthy changes in release ?.? (????-??-??) [?]
 
@@ -448,7 +440,7 @@ Push these changes.
 
 -----
 
-Copyright (C) 2002-2005, 2007-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2005, 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 

THANKS

@@ -1,8 +1,7 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 
-Aaro Koskinen             [email protected]
+Аскар Сафин              [email protected]
-Аскар Сафин               [email protected]
 Airy Andre                [email protected]
 Akim Demaille             [email protected]
 Albert Chin-A-Young       [email protected]
@@ -12,20 +11,16 @@ Andreas Schwab            [email protected]
 Andrew Suffield           [email protected]
 Angelo Borsotti           [email protected]
 Anthony Heading           [email protected]
-Antonio Silva Correia     [email protected]
 Arnold Robbins            [email protected]
 Art Haas                  [email protected]
-Askar Safin               [email protected]
 Baron Schwartz            [email protected]
 Ben Pfaff                 [email protected]
 Benoit Perrot             [email protected]
-Bernd Edlinger            [email protected]
 Bernd Kiefer              [email protected]
 Bert Deknuydt             [email protected]
 Bill Allombert            [email protected]
 Bob Rossi                 [email protected]
 Brandon Lucia             [email protected]
-Brooks Moses              [email protected]
 Bruce Lilly               [email protected]
 Bruno Haible              [email protected]
 Charles-Henri de Boysson  [email protected]
@@ -36,14 +31,10 @@ Cris van Pelt             [email protected]
 Csaba Raduly              [email protected]
 Dagobert Michelsen        [email protected]
 Daniel Frużyński          [email protected]
-Daniel Galloway           [email protected]
 Daniel Hagerty            [email protected]
 David J. MacKenzie        [email protected]
 David Kastrup             [email protected]
-David Michael             [email protected]
-Dengke Du                 [email protected]
 Dennis Clarke             [email protected]
-Derek Clegg               [email protected]
 Derek M. Jones            [email protected]
 Di-an Jan                 [email protected]
 Dick Streefland           [email protected]
@@ -53,34 +44,29 @@ Enrico Scholz             [email protected]
 Eric Blake                [email protected]
 Evgeny Stambulchik        [email protected]
 Fabrice Bauzac            [email protected]
-Ferdinand Thiessen        [email protected]
 Florian Krohm             [email protected]
 Frank Heckenbach          [email protected]
 Frans Englich             [email protected]
 Gabriel Rassoul           [email protected]
-Gary L Peskin             [email protected]
 Georg Sauthoff            [email protected]
 George Neuner             [email protected]
 Gilles Espinasse          [email protected]
 Goran Uddeborg            [email protected]
 Guido Trentalancia        [email protected]
 H. Merijn Brand           [email protected]
-Hans Åberg                haberg[email protected]
+Hans Aberg                haberg@matematik.su.se
 Jan Nieuwenhuizen         [email protected]
-Jannick                   [email protected]
 Jerry Quinn               [email protected]
 Jesse Thilo               [email protected]
 Jim Kent                  [email protected]
 Jim Meyering              [email protected]
 Joel E. Denny             [email protected]
 Johan van Selst           [email protected]
-John Horigan              [email protected]
 Jonathan Fabrizio         [email protected]
 Jonathan Nieder           [email protected]
 Juan Manuel Guerrero      [email protected]
 Kees Zeelenberg           [email protected]
 Keith Browne              [email protected]
-Ken Moffat                [email protected]
 Laurent Mascherpa         [email protected]
 Lie Yan                   [email protected]
 Magnus Fromreide          [email protected]
@@ -92,21 +78,14 @@ Martin Mokrejs            [email protected]
 Martin Nylin              [email protected]
 Matt Kraai                [email protected]
 Matt Rosing               [email protected]
-Maxim Prohorenko          [email protected]
-Michael Catanzaro         [email protected]
-Michael Felt              [email protected]
 Michael Hayes             [email protected]
 Michael Raskin            [email protected]
-Michel d'Hooge            [email protected]
 Michiel De Wilde          [email protected]
 Mickael Labau             [email protected]
 Mike Castle               [email protected]
-Mike Sullivan             [email protected]
-Nate Guerin               [email protected]
 Neil Booth                [email protected]
 Nelson H. F. Beebe        [email protected]
 Nick Bowler               [email protected]
-Nicolas Bedon             [email protected]
 Nicolas Burrus            [email protected]
 Nicolas Tisserand         [email protected]
 Noah Friedman             [email protected]
@@ -114,7 +93,6 @@ Odd Arild Olsen           [email protected]
 Oleg Smolsky              [email protected]
 Oleksii Taran             [email protected]
 Paolo Bonzini             [email protected]
-Paolo Simone Gasparello   [email protected]
 Pascal Bart               [email protected]
 Paul Eggert               [email protected]
 Paul Hilfinger            [email protected]
@@ -124,21 +102,16 @@ Peter Fales               [email protected]
 Peter Hamorsky            [email protected]
 Peter Simons              [email protected]
 Petr Machata              [email protected]
-Pho                       [email protected]
 Piotr Gackiewicz          [email protected]
-Piotr Marcińczyk          [email protected]
 Quentin Hocquet           [email protected]
 Quoc Peyrot               [email protected]
 R Blake                   [email protected]
 Raja R Harinath           [email protected]
 Ralf Wildenhues           [email protected]
-Rich Wilson               [email protected]
 Richard Stallman          [email protected]
-Rici Lake                 [email protected]
-Rob Conde                 [email protected]
 Rob Vermaas               [email protected]
 Robert Anisko             [email protected]
-Robert Yang               liezhi.yang@windriver.com
+Rob Conde                 rob.conde@ai-solutions.com
 Roland Levillain          [email protected]
 Satya Kiran Popuri        [email protected]
 Sebastian Setzer          [email protected]
@@ -146,16 +119,13 @@ Sebastien Fricker         [email protected]
 Sergei Steshenko          [email protected]
 Shura                     [email protected]
 Stefano Lattarini         [email protected]
-Stephen Cameron           [email protected]
 Steve Murphy              [email protected]
 Sum Wu                    [email protected]
 Théophile Ranquet         [email protected]
 Thiru Ramakrishnan        [email protected]
-Thomas Jahns              [email protected]
 Tim Josling               [email protected]
 Tim Landscheidt           [email protected]
 Tim Van Holder            [email protected]
-Tobias Frost              [email protected]
 Tom Lane                  [email protected]
 Tom Tromey                [email protected]
 Tommy Nordgren            [email protected]
@@ -171,9 +141,7 @@ Wojciech Polak            [email protected]
 Wolfgang S. Kechel        [email protected]
 Wolfram Wagner            [email protected]
 Wwp                       [email protected]
-xolodho                   [email protected]
 Zack Weinberg             [email protected]
-長田偉伸                   [email protected]
 
 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keeping this list up to date.
@@ -185,7 +153,7 @@ End:
 
 -----
 
-Copyright (C) 2000-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 

TODO

@@ -112,7 +112,7 @@ We could (should?) also treat the case of the undef_token, which is
 numbered 257 for yylex, and 2 internal.  Both appear for instance in
 toknum:
 
-  const unsigned short
+  const unsigned short int
   parser::yytoken_number_[] =
   {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -369,8 +369,7 @@ End:
 
 -----
 
-Copyright (C) 2001-2004, 2006, 2008-2015, 2018 Free Software Foundation,
+Copyright (C) 2001-2004, 2006, 2008-2013 Free Software Foundation, Inc.
-Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 

bootstrap

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2018-07-25.07; # UTC
+scriptversion=2013-07-03.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 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
@@ -17,7 +17,7 @@ scriptversion=2018-07-25.07; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Originally written by Paul Eggert.  The canonical version of this
 # script is maintained as build-aux/bootstrap in gnulib, however, to
@@ -42,13 +42,8 @@ export LC_ALL
 
 local_gl_dir=gl
 
-# Honor $PERL, but work even if there is none.
-PERL="${PERL-perl}"
-
 me=$0
 
-default_gnulib_url=git://git.sv.gnu.org/gnulib
-
 usage() {
   cat <<EOF
 Usage: $me [OPTION]...
@@ -78,37 +73,6 @@ contents are read as shell variables to configure the bootstrap.
 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
 are honored.
 
-Gnulib sources can be fetched in various ways:
-
- * If this package is in a git repository with a 'gnulib' submodule
-   configured, then that submodule is initialized and updated and sources
-   are fetched from there.  If \$GNULIB_SRCDIR is set (directly or via
-   --gnulib-srcdir) and is a git repository, then it is used as a reference.
-
- * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
-   then sources are fetched from that local directory.  If it is a git
-   repository and \$GNULIB_REVISION is set, then that revision is checked
-   out.
-
- * Otherwise, if this package is in a git repository with a 'gnulib'
-   submodule configured, then that submodule is initialized and updated and
-   sources are fetched from there.
-
- * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
-   cloned into that directory using git from \$GNULIB_URL, defaulting to
-   $default_gnulib_url.
-   If \$GNULIB_REVISION is set, then that revision is checked out.
-
- * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
-   used.  If it is a git repository and \$GNULIB_REVISION is set, then that
-   revision is checked out.
-
-If you maintain a package and want to pin a particular revision of the
-Gnulib sources that has been tested with your package, then there are two
-possible approaches: either configure a 'gnulib' submodule with the
-appropriate revision, or set \$GNULIB_REVISION (and if necessary
-\$GNULIB_URL) in $me.conf.
-
 Running without arguments will suffice in most cases.
 EOF
 }
@@ -168,13 +132,13 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync --include '*.po' --exclude '*' -Lrtvz \
+"rsync --delete --exclude '*.s1' -Lrtvz \
  'translationproject.org::tp/latest/%s/' '%s'"
 
 # Fallback for downloading .po files (if rsync fails).
 po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
- https://translationproject.org/latest/%s/"
+ http://translationproject.org/latest/%s/"
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
 # fall back to the package name (1st argument with munging)
@@ -203,15 +167,7 @@ source_base=lib
 m4_base=m4
 doc_base=doc
 tests_base=tests
-gnulib_extra_files="
+gnulib_extra_files=''
-        build-aux/install-sh
-        build-aux/mdate-sh
-        build-aux/texinfo.tex
-        build-aux/depcomp
-        build-aux/config.guess
-        build-aux/config.sub
-        doc/INSTALL
-"
 
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
 gnulib_tool_option_extras=
@@ -253,26 +209,12 @@ bootstrap_sync=false
 # Use git to update gnulib sources
 use_git=true
 
-check_exists() {
-  if test "$1" = "--verbose"; then
-    ($2 --version </dev/null) >/dev/null 2>&1
-    if test $? -ge 126; then
-      # If not found, run with diagnostics as one may be
-      # presented with env variables to set to find the right version
-      ($2 --version </dev/null)
-    fi
-  else
-    ($1 --version </dev/null) >/dev/null 2>&1
-  fi
-
-  test $? -lt 126
-}
-
 # find_tool ENVVAR NAMES...
 # -------------------------
 # Search for a required program.  Use the value of ENVVAR, if set,
-# otherwise find the first of the NAMES that can be run.
+# otherwise find the first of the NAMES that can be run (i.e.,
-# If found, set ENVVAR to the program name, die otherwise.
+# supports --version).  If found, set ENVVAR to the program name,
+# die otherwise.
 #
 # FIXME: code duplication, see also gnu-web-doc-update.
 find_tool ()
@@ -282,21 +224,27 @@ find_tool ()
   find_tool_names=$@
   eval "find_tool_res=\$$find_tool_envvar"
   if test x"$find_tool_res" = x; then
-    for i; do
+    for i
-      if check_exists $i; then
+    do
-        find_tool_res=$i
+      if ($i --version </dev/null) >/dev/null 2>&1; then
-        break
+       find_tool_res=$i
+       break
       fi
     done
+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "
   fi
-  if test x"$find_tool_res" = x; then
+  test x"$find_tool_res" != x \
-    warn_ "one of these is required: $find_tool_names;"
+    || die "one of these is required: $find_tool_names"
-    die   "alternatively set $find_tool_envvar to a compatible tool"
+  ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
-  fi
+    || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
   eval "$find_tool_envvar=\$find_tool_res"
   eval "export $find_tool_envvar"
 }
 
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
+find_tool SHA1SUM sha1sum gsha1sum shasum
+
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -305,18 +253,24 @@ case "$0" in
   *) test -r "$0.conf" && . ./"$0.conf" ;;
 esac
 
+# Extra files from gnulib, which override files from other sources.
+test -z "${gnulib_extra_files}" && \
+  gnulib_extra_files="
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
+        doc/INSTALL
+"
+
 if test "$vc_ignore" = auto; then
   vc_ignore=
   test -d .git && vc_ignore=.gitignore
   test -d CVS && vc_ignore="$vc_ignore .cvsignore"
 fi
 
-if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
-  use_gnulib=false
-else
-  use_gnulib=true
-fi
-
 # Translate configuration into internal form.
 
 # Parse options.
@@ -372,7 +326,7 @@ insert_if_absent() {
     die "Error: Duplicate entries in $file: " $duplicate_entries
   fi
   linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
+  linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
   if [ $linesold != $linesnew ] ; then
     { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
       || die "insert_if_absent $file $str: failed"
@@ -453,30 +407,28 @@ sort_ver() { # sort -V is not generally available
   done
 }
 
-get_version_sed='
-# Move version to start of line.
-s/.*[v ]\([0-9]\)/\1/
-
-# Skip lines that do not start with version.
-/^[0-9]/!d
-
-# Remove characters after the version.
-s/[^.a-z0-9-].*//
-
-# The first component must be digits only.
-s/^\([0-9]*\)[a-z-].*/\1/
-
-#the following essentially does s/5.005/5.5/
-s/\.0*\([1-9]\)/.\1/g
-p
-q'
-
 get_version() {
   app=$1
 
-  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+  $app --version >/dev/null 2>&1 || return 1
 
-  $app --version 2>&1 | sed -n "$get_version_sed"
+  $app --version 2>&1 |
+  sed -n '# Move version to start of line.
+          s/.*[v ]\([0-9]\)/\1/
+
+          # Skip lines that do not start with version.
+          /^[0-9]/!d
+
+          # Remove characters after the version.
+          s/[^.a-z0-9-].*//
+
+          # The first component must be digits only.
+          s/^\([0-9]*\)[a-z-].*/\1/
+
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
+          q'
 }
 
 check_versions() {
@@ -496,7 +448,6 @@ check_versions() {
     test "$appvar" = TAR && appvar=AMTAR
     case $appvar in
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.
-        PERL::*) ;; # Keep perl modules as-is
         *) eval "app=\${$appvar-$app}" ;;
     esac
 
@@ -514,22 +465,12 @@ check_versions() {
           ret=1
           continue
         } ;;
-      # Another check is for perl modules.  These can be written as
-      # e.g. perl::XML::XPath in case of XML::XPath module, etc.
-      perl::*)
-        # Extract module name
-        app="${app#perl::}"
-        if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
-          warn_ "Error: perl module '$app' not found"
-          ret=1
-        fi
-        continue
-        ;;
     esac
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.
-      if ! check_exists --verbose $app; then
+      $app --version >/dev/null 2>&1
+      if [ 126 -le $? ]; then
         warn_ "Error: '$app' not found"
         ret=1
       fi
@@ -562,12 +503,6 @@ print_versions() {
   # can't depend on column -t
 }
 
-# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
-# Also find the compatible sha1 utility on the BSDs
-if test x"$SKIP_PO" = x; then
-  find_tool SHA1SUM sha1sum gsha1sum shasum sha1
-fi
-
 use_libtool=0
 # We'd like to use grep -E, to see if any of LT_INIT,
 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
@@ -613,21 +548,13 @@ if ! printf "$buildreq" | check_versions; then
   fi
 fi
 
-# Warn the user if autom4te appears to be broken; this causes known
-# issues with at least gettext 0.18.3.
-probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
-if test "x$probe" != xhi; then
-  warn_ "WARNING: your autom4te wrapper eats stdin;"
-  warn_ "if bootstrap fails, consider upgrading your autotools"
-fi
-
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
-if $use_git && test -d .git && check_exists git; then
+if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then
   if git config merge.merge-changelog.driver >/dev/null ; then
     :
-  elif check_exists git-merge-changelog; then
+  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
     echo "$0: initializing git-merge-changelog driver"
     git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
     git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
@@ -647,94 +574,84 @@ git_modules_config () {
   test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
-if $use_gnulib; then
+if $use_git; then
-  if $use_git; then
+  gnulib_path=$(git_modules_config submodule.gnulib.path)
-    gnulib_path=$(git_modules_config submodule.gnulib.path)
+  test -z "$gnulib_path" && gnulib_path=gnulib
-    test -z "$gnulib_path" && gnulib_path=gnulib
+fi
+
+# Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
+
+case ${GNULIB_SRCDIR--} in
+-)
+  # Note that $use_git is necessarily true in this case.
+  if git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    git submodule init || exit $?
+    git submodule update || exit $?
+
+  elif [ ! -d "$gnulib_path" ]; then
+    echo "$0: getting gnulib files..."
+
+    trap cleanup_gnulib 1 2 13 15
+
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+    git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
+      cleanup_gnulib
+
+    trap - 1 2 13 15
   fi
-
+  GNULIB_SRCDIR=$gnulib_path
-  # Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
+  ;;
-  # submodule, for use in the rest of the script.
+*)
-
+  # Use GNULIB_SRCDIR directly or as a reference.
-  case ${GNULIB_SRCDIR--} in
+  if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
-  -)
+        git_modules_config submodule.gnulib.url >/dev/null; then
-    # Note that $use_git is necessarily true in this case.
+    echo "$0: getting gnulib files..."
-    if git_modules_config submodule.gnulib.url >/dev/null; then
+    if git submodule -h|grep -- --reference > /dev/null; then
-      echo "$0: getting gnulib files..."
+      # Prefer the one-liner available in git 1.6.4 or newer.
-      git submodule init -- "$gnulib_path" || exit $?
+      git submodule update --init --reference "$GNULIB_SRCDIR" \
-      git submodule update -- "$gnulib_path" || exit $?
+        "$gnulib_path" || exit $?
-
+    else
-    elif [ ! -d "$gnulib_path" ]; then
+      # This fallback allows at least git 1.5.5.
-      echo "$0: getting gnulib files..."
+      if test -f "$gnulib_path"/gnulib-tool; then
-
+        # Since file already exists, assume submodule init already complete.
-      trap cleanup_gnulib 1 2 13 15
+        git submodule update || exit $?
-
+      else
-      shallow=
+        # Older git can't clone into an empty directory.
-      if test -z "$GNULIB_REVISION"; then
+        rmdir "$gnulib_path" 2>/dev/null
-        git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+        git clone --reference "$GNULIB_SRCDIR" \
+          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+          && git submodule init && git submodule update \
+          || exit $?
       fi
-      git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
-        || cleanup_gnulib
-
-      trap - 1 2 13 15
     fi
     GNULIB_SRCDIR=$gnulib_path
-    ;;
-  *)
-    # Use GNULIB_SRCDIR directly or as a reference.
-    if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
-          git_modules_config submodule.gnulib.url >/dev/null; then
-      echo "$0: getting gnulib files..."
-      if git submodule -h|grep -- --reference > /dev/null; then
-        # Prefer the one-liner available in git 1.6.4 or newer.
-        git submodule update --init --reference "$GNULIB_SRCDIR" \
-          "$gnulib_path" || exit $?
-      else
-        # This fallback allows at least git 1.5.5.
-        if test -f "$gnulib_path"/gnulib-tool; then
-          # Since file already exists, assume submodule init already complete.
-          git submodule update -- "$gnulib_path" || exit $?
-        else
-          # Older git can't clone into an empty directory.
-          rmdir "$gnulib_path" 2>/dev/null
-          git clone --reference "$GNULIB_SRCDIR" \
-            "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-            && git submodule init -- "$gnulib_path" \
-            && git submodule update -- "$gnulib_path" \
-            || exit $?
-        fi
-      fi
-      GNULIB_SRCDIR=$gnulib_path
-    fi
-    ;;
-  esac
-
-  if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
-     && ! git_modules_config submodule.gnulib.url >/dev/null; then
-    (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
   fi
+  ;;
+esac
 
-  # $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
-  # we no longer need to use git or $gnulib_path below here.
+# we no longer need to use git or $gnulib_path below here.
 
-  if $bootstrap_sync; then
+if $bootstrap_sync; then
-    cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
-      echo "$0: updating bootstrap and restarting..."
+    echo "$0: updating bootstrap and restarting..."
-      case $(sh -c 'echo "$1"' -- a) in
+    case $(sh -c 'echo "$1"' -- a) in
-        a) ignored=--;;
+      a) ignored=--;;
-        *) ignored=ignored;;
+      *) ignored=ignored;;
-      esac
+    esac
-      exec sh -c \
+    exec sh -c \
-        'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-        $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
-        "$0" "$@" --no-bootstrap-sync
+      "$0" "$@" --no-bootstrap-sync
-    }
+  }
-  fi
-
-  gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-  <$gnulib_tool || exit $?
 fi
 
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+<$gnulib_tool || exit $?
+
 # Get translations.
 
 download_po_files() {
@@ -743,7 +660,7 @@ download_po_files() {
   echo "$me: getting translations into $subdir for $domain..."
   cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
   eval "$cmd" && return
-  # Fallback to HTTPS.
+  # Fallback to HTTP.
   cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
   eval "$cmd"
 }
@@ -775,10 +692,11 @@ update_po_files() {
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
         ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
+        ! $SHA1SUM -c --status "$cksum_file" \
+            < "$new_po" > /dev/null; then
       echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
-          && $SHA1SUM < "$new_po" > "$cksum_file" || return
+          && $SHA1SUM < "$new_po" > "$cksum_file"
     fi
   done
 }
@@ -834,9 +752,9 @@ symlink_to_dir()
       # Leave any existing symlink alone, if it already points to the source,
       # so that broken build tools that care about symlink times
       # aren't confused into doing unnecessary builds.  Conversely, if the
-      # existing symlink's timestamp is older than the source, make it afresh,
+      # existing symlink's time stamp is older than the source, make it afresh,
       # so that broken tools aren't confused into skipping needed builds.  See
-      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
+      # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
       src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
       dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
@@ -942,33 +860,31 @@ fi
 
 # Import from gnulib.
 
-if $use_gnulib; then
+gnulib_tool_options="\
-  gnulib_tool_options="\
+ --import\
-   --no-changelog\
+ --no-changelog\
-   --aux-dir=$build_aux\
+ --aux-dir $build_aux\
-   --doc-base=$doc_base\
+ --doc-base $doc_base\
-   --lib=$gnulib_name\
+ --lib $gnulib_name\
-   --m4-base=$m4_base/\
+ --m4-base $m4_base/\
-   --source-base=$source_base/\
+ --source-base $source_base/\
-   --tests-base=$tests_base\
+ --tests-base $tests_base\
-   --local-dir=$local_gl_dir\
+ --local-dir $local_gl_dir\
-   $gnulib_tool_option_extras\
+ $gnulib_tool_option_extras\
-  "
+"
-  if test $use_libtool = 1; then
+if test $use_libtool = 1; then
-    case "$gnulib_tool_options " in
+  case "$gnulib_tool_options " in
-      *' --libtool '*) ;;
+    *' --libtool '*) ;;
-      *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+    *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
-    esac
+  esac
-  fi
-  echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-  $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
-    || die "gnulib-tool failed"
-
-  for file in $gnulib_files; do
-    symlink_to_dir "$GNULIB_SRCDIR" $file \
-      || die "failed to symlink $file"
-  done
 fi
+echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+
+for file in $gnulib_files; do
+  symlink_to_dir "$GNULIB_SRCDIR" $file \
+    || die "failed to symlink $file"
+done
 
 bootstrap_post_import_hook \
   || die "bootstrap_post_import_hook failed"
@@ -1065,9 +981,9 @@ bootstrap_epilogue
 echo "$0: done.  Now you can run './configure'."
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

bootstrap.conf

@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 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
@@ -17,8 +17,7 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-  argmatch assert
+  argmatch assert calloc-posix close closeout config-h c-strcase
-  calloc-posix close closeout config-h c-strcase
   configmake
   dirname
   error extensions fdl fopen-safer
@@ -34,9 +33,8 @@ gnulib_modules='
   quote quotearg
   readme-release
   realloc-posix
-  spawn-pipe stdbool stpcpy strdup-posix strerror strverscmp
+  spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
-  unistd unistd-safer unlink unlocked-io
+  unistd unistd-safer unlocked-io update-copyright unsetenv verify
-  update-copyright unsetenv verify
   warnings
   xalloc
   xalloc-die
@@ -82,7 +80,7 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 bootstrap_post_import_hook()
 {
   # Massage lib/gnulib.mk before using it later in the bootstrapping process.
-  build-aux/prefix-gnulib-mk --lib-name="$gnulib_name" "lib/$gnulib_mk"
+  build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog

build-aux/.gitignore

@@ -1,4 +1,6 @@
 /announce-gen
+/arg-nonnull.h
+/c++defs.h
 /compile
 /config.guess
 /config.rpath
@@ -14,12 +16,14 @@
 /install-sh
 /javacomp.sh.in
 /javaexec.sh.in
+/link-warning.h
 /mdate-sh
 /missing
-/prefix-gnulib-mk
 /test-driver
 /texinfo.tex
 /update-copyright
 /useless-if-before-free
 /vc-list-files
+/warn-on-use.h
 /ylwrap
+/prefix-gnulib-mk

build-aux/Linux.valgrind

@@ -1,48 +0,0 @@
-# Copyright (C) 2012-2015, 2018 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Valgrind suppression file for Bison.
-
-# Linux prague 4.1.2-2-ARCH #1 SMP PREEMPT Wed Jul 15 08:30:32 UTC 2015
-# x86_64 GNU/Linux
-{
-   Probably exception handling from G++ 5.1.
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:pool
-   fun:__static_initialization_and_destruction_0
-   fun:_GLOBAL__sub_I_eh_alloc.cc
-   fun:call_init.part.0
-   fun:_dl_init
-   obj:/usr/lib/ld-2.21.so
-}
-
-# Linux seattle 2.6.32-5-amd64 #1 SMP Thu Mar 22 17:26:33 UTC 2012
-# x86_64 GNU/Linux
-{
-   index
-   Memcheck:Cond
-   fun:index
-   fun:expand_dynamic_string_token
-   fun:_dl_map_object
-   fun:map_doit
-   fun:_dl_catch_error
-   fun:do_preload
-   fun:dl_main
-   fun:_dl_sysdep_start
-   fun:_dl_start
-   obj:/lib/ld-2.11.3.so
-}

build-aux/darwin11.4.0.valgrind

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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

build-aux/git-log-fix

@@ -2,9 +2,6 @@
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
 
-975bb564319aa4f4204c48aba265757ba207a80f
-s/Edligner/Edlinger/;
-
 0db2648930e3b6c376a539aabe368aade83ee29a
 s/--flags/--feature/;
 s/flag_flag/feature_flag/;

build-aux/linux-gnu.valgrind

@@ -0,0 +1,16 @@
+# Linux seattle 2.6.32-5-amd64 #1 SMP Thu Mar 22 17:26:33 UTC 2012
+# x86_64 GNU/Linux
+{
+   index
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+   fun:_dl_sysdep_start
+   fun:_dl_start
+   obj:/lib/ld-2.11.3.so
+}

build-aux/local.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 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
@@ -13,10 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST +=					\
+EXTRA_DIST +=                                   \
-  build-aux/Darwin.valgrind			\
+  build-aux/cross-options.pl                    \
-  build-aux/Linux.valgrind			\
+  build-aux/darwin11.4.0.valgrind               \
-  build-aux/cross-options.pl			\
+  build-aux/linux-gnu.valgrind                  \
-  build-aux/move-if-change			\
+  build-aux/move-if-change                      \
-  build-aux/prev-version.txt			\
+  build-aux/prev-version.txt                    \
   build-aux/update-b4-copyright

build-aux/snippet/.gitignore

@@ -0,0 +1,4 @@
+/_Noreturn.h
+/arg-nonnull.h
+/c++defs.h
+/warn-on-use.h

build-aux/update-b4-copyright

@@ -3,7 +3,7 @@
 # Update b4_copyright invocations or b4_copyright_years definitions to
 # include the current year.
 
-# Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 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

build-aux/update-package-copyright-year

@@ -2,7 +2,7 @@
 
 # In configure.ac, update PACKAGE_COPYRIGHT_YEAR to the current year.
 
-# Copyright (C) 2010-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2010-2013 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

cfg.mk

@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2008-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 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
@@ -34,7 +34,7 @@ _is-dist-target = $(filter-out %clean maintainer-check% maintainer-%-check, \
   $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
 
 url_dir_list = \
-  https://$(gnu_rel_host)/gnu/bison
+  ftp://$(gnu_rel_host)/gnu/bison
 
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =			\
@@ -158,24 +158,23 @@ sc_space_before_open_paren:
 
 exclude = \
   $(foreach a,$(1),$(eval $(subst $$,$$$$,exclude_file_name_regexp--sc_$(a))))
-$(call exclude,                                                         \
+$(call exclude,								\
-  bindtextdomain=^lib/main.c$$                                          \
+  bindtextdomain=^lib/main.c$$						\
-  preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$          \
+  preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$		\
-  program_name=^lib/main.c$$                                            \
+  program_name=^lib/main.c$$						\
-  prohibit_always-defined_macros=^data/yacc.c$$|^djgpp/                 \
+  prohibit_always-defined_macros=^data/yacc.c$$|^djgpp/			\
-  prohibit_always-defined_macros+=?|^lib/timevar.c$$                    \
+  prohibit_always-defined_macros+=?|^lib/timevar.c$$			\
-  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$      \
+  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$	\
-  prohibit_always-defined_macros+=?|^tests/regression.at$$              \
+  prohibit_always-defined_macros+=?|^tests/regression.at$$		\
-  prohibit_always_true_header_tests=^djgpp/subpipe.h$$|^lib/timevar.c$$ \
+  prohibit_always_true_header_tests=^djgpp/subpipe.h$$|^lib/timevar.c$$	\
-  prohibit_always_true_header_tests+=?|^m4/timevar.m4$$                 \
+  prohibit_always_true_header_tests+=?|^m4/timevar.m4$$			\
-  prohibit_defined_have_decl_tests=?|^lib/timevar.c$$                   \
+  prohibit_defined_have_decl_tests=?|^lib/timevar.c$$			\
   prohibit_doubled_word=^tests/named-refs.at$$                          \
-  prohibit_magic_number_exit=^doc/bison.texi$$                          \
+  prohibit_magic_number_exit=^doc/bison.texi$$				\
-  prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$      \
+  prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$	\
-  prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$                    \
+  prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$			\
-  prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git|Makefile$$  \
+  prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git		\
-  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$            \
+  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$		\
   space_before_open_paren=^(data/|djgpp/)                               \
-  two_space_separator_in_usage=^(bootstrap)                             \
+  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$)	\
-  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$)     \
 )

configure.ac

@@ -1,6 +1,6 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
-# Copyright (C) 2001-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
@@ -26,14 +26,18 @@ m4_pattern_forbid([^gl_[A-Z]])
 AC_INIT([GNU Bison],
         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
         [[email protected]])
-AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2018])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2013])
 AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT_YEAR], [$PACKAGE_COPYRIGHT_YEAR],
                    [The copyright year for this package])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
-# We use Automake 1.14's %D% and %C%.
+# Automake 1.10.3 and 1.11.1 fix a security flaw discussed here:
+#
+#   http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131
+#
+# To avoid 1.11, we make 1.11.1 the minimum version.
 #
 # We want gnits strictness only when rolling a stable release.  For
 # release candidates, we use version strings like 2.4.3_rc1, but gnits
@@ -41,7 +45,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # releases, we want to be able run make dist without being required to
 # add a bogus NEWS entry.  In that case, the version string
 # automatically contains a dash, which we also let disable gnits.
-AM_INIT_AUTOMAKE([1.14 dist-xz nostdinc
+AM_INIT_AUTOMAKE([1.11.1 dist-xz nostdinc
                  color-tests parallel-tests
                  silent-rules]
                  m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
@@ -71,18 +75,15 @@ AC_CACHE_CHECK([whether pragma GCC diagnostic push works],
   CFLAGS=$save_CFLAGS])
 
 AC_ARG_ENABLE([gcc-warnings],
-[  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended).
+[  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
-                           Also, issue synclines from the examples/ to
-                           the corresponding source in the Texinfo doc.],
 [case $enable_gcc_warnings in
    yes|no) ;;
    *)  AC_MSG_ERROR([invalid value for --gcc-warnings: $enable_gcc_warnings]);;
  esac],
               [enable_gcc_warnings=no])
-AM_CONDITIONAL([ENABLE_GCC_WARNINGS], [test "$enable_gcc_warnings" = yes])
 if test "$enable_gcc_warnings" = yes; then
-  warn_common='-Wall -Wextra -Wno-sign-compare -Wcast-align -Wdocumentation
+  warn_common='-Wall -Wextra -Wno-sign-compare -Wcast-align
-    -Wformat -Wnull-dereference -Wpointer-arith -Wwrite-strings'
+    -Wformat -Wpointer-arith -Wwrite-strings'
   warn_c='-Wbad-function-cast -Wshadow -Wstrict-prototypes'
   warn_cxx='-Wnoexcept'
   # Warnings for the test suite only.
@@ -90,12 +91,7 @@ if test "$enable_gcc_warnings" = yes; then
   # -fno-color-diagnostics: Clang's use of colors in the error
   # messages is confusing the tests looking at the compiler's output
   # (e.g., synclines.at).
-  #
+  warn_tests='-Wundef -pedantic -Wsign-compare -fno-color-diagnostics'
-  # -Wno-keyword-macro: We use the "#define private public" dirty
-  # trick in the test suite to check some private implementation
-  # details for lalr1.cc.
-  warn_tests='-Wundef -pedantic -Wdeprecated -Wsign-compare -fno-color-diagnostics
-    -Wno-keyword-macro'
 
   AC_LANG_PUSH([C])
   # Clang supports many of GCC's -W options, but only issues warnings
@@ -153,7 +149,6 @@ if test "$enable_gcc_warnings" = yes; then
   # ... possiby in std=c++11 mode.
   gl_WARN_ADD([-Wno-zero-as-null-pointer-constant], [FLEX_SCANNER_CXXFLAGS])
   CXXFLAGS=$save_CXXFLAGS
-  gl_WARN_ADD([-fno-exceptions], [CXXFLAGS_NO_EXCEPTIONS])
   AC_LANG_POP([C++])
 fi
 
@@ -166,17 +161,21 @@ AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],
      [do not build a yacc command or an -ly library])],
   , [enable_yacc=yes])
-AM_CONDITIONAL([ENABLE_YACC], [test "$enable_yacc" = yes])
+case $enable_yacc in
+yes)
+  YACC_SCRIPT=src/yacc
+  YACC_LIBRARY=lib/liby.a;;
+*)
+  YACC_SCRIPT=
+  YACC_LIBRARY=;;
+esac
+AC_SUBST([YACC_SCRIPT])
+AC_SUBST([YACC_LIBRARY])
 
 # Checks for programs.
 AM_MISSING_PROG([DOT], [dot])
 AC_PROG_LEX
-$LEX_IS_FLEX || test "X$LEX" = X: || {
+$LEX_IS_FLEX || AC_MSG_ERROR([Flex is required])
-  AC_MSG_WARN([bypassing lex because flex is required])
-  LEX=:
-}
-AM_CONDITIONAL([FLEX_CXX_WORKS],
-  [$LEX_IS_FLEX && test $bison_cv_cxx_works = yes])
 AC_PROG_YACC
 AC_PROG_RANLIB
 AC_PROG_GNU_M4
@@ -226,27 +225,23 @@ AC_CONFIG_FILES([etc/bench.pl], [chmod +x etc/bench.pl])
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
-
 AC_CHECK_PROGS([VALGRIND], [valgrind])
-# Use something simpler that $host_os to select our suppression file.
+case $VALGRIND:$host_os in
-uname=`uname`
-case $VALGRIND:$uname in
   '':*) ;;
-  *:Darwin)
+  *:darwin*)
     # See README-hacking.
+    # VALGRIND+='-q --suppressions=$(abs_top_srcdir)/build-aux/darwin11.4.0.valgrind'
     VALGRIND=;;
   *:*)
-    suppfile=build-aux/$uname.valgrind
+    suppfile=build-aux/$host_os.valgrind
     if test -f "$srcdir/$suppfile"; then
-      AC_SUBST([VALGRIND_OPTS_SUPPRESSION],
+      VALGRIND="$VALGRIND --gen-suppressions=all"
-               ["--suppressions=\$(abs_top_srcdir)/$suppfile"])
+      VALGRIND="$VALGRIND --suppressions=\$(abs_top_srcdir)/$suppfile"
     fi
+    AC_SUBST([VALGRIND_PREBISON], ["$VALGRIND -q"])
     ;;
 esac
 
-# Whether we cannot run the compiled bison.
-AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
-
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])

data/README

@@ -1,3 +1,5 @@
+-*- outline -*-
+
 This directory contains data needed by Bison.
 
 * Skeletons
@@ -50,11 +52,7 @@ into various formats.
 
 -----
 
-Local Variables:
+Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc.
-mode: outline
-End:
-
-Copyright (C) 2002, 2008-2015, 2018 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 

data/bison.m4

@@ -2,7 +2,7 @@
 
 # Language-independent M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2013 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
@@ -437,6 +437,7 @@ m4_define([b4_symbol_action_location],
 # b4_symbol_action(SYMBOL-NUM, KIND)
 # ----------------------------------
 # Run the action KIND (destructor or printer) for SYMBOL-NUM.
+# Same as in C, but using references instead of pointers.
 m4_define([b4_symbol_action],
 [b4_symbol_if([$1], [has_$2],
 [b4_dollar_pushdef([(*yyvaluep)],
@@ -444,7 +445,7 @@ m4_define([b4_symbol_action],
                                 [m4_dquote(b4_symbol([$1], [type]))]),
                    [(*yylocationp)])dnl
     b4_symbol_case_([$1])[]dnl
-b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])
+b4_syncline([b4_symbol([$1], [$2_line])], ["b4_symbol([$1], [$2_file])"])
       b4_symbol([$1], [$2])
 b4_syncline([@oline@], [@ofile@])
         break;
@@ -1060,6 +1061,3 @@ b4_percent_define_ifdef([api.value.type],
                 [['%s' and '%s' cannot be used together]],
                 [%yacc],
                 [%define api.value.type "union"])])])])
-
-# api.value.union.name.
-b4_percent_define_check_kind([api.value.union.name], [keyword])

data/c++-skel.m4

@@ -2,8 +2,7 @@
 
 # C++ skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018 Free Software Foundation,
+# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
-# 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

data/c++.m4

@@ -2,7 +2,7 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -17,11 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Sanity checks, before defaults installed by c.m4.
-b4_percent_define_ifdef([[api.value.union.name]],
-  [b4_complain_at(b4_percent_define_get_loc([[api.value.union.name]]),
-                  [named %union is invalid in C++])])
-
 m4_include(b4_pkgdatadir/[c.m4])
 
 # b4_comment(TEXT, [PREFIX])
@@ -30,16 +25,6 @@ m4_include(b4_pkgdatadir/[c.m4])
 m4_define([b4_comment],
 [b4_comment_([$1], [$2// ], [$2// ])])
 
-# b4_inline(hh|cc)
-# ----------------
-# Expand to `inline\n  ` if $1 is hh.
-m4_define([b4_inline],
-[m4_case([$1],
-  [cc], [],
-  [hh], [[inline
-  ]],
-  [m4_fatal([$0: invalid argument: $1])])])
-
 ## -------- ##
 ## Checks.  ##
 ## -------- ##
@@ -184,12 +169,9 @@ m4_define([b4_public_types_declare],
     /// (External) token type, as returned by yylex.
     typedef token::yytokentype token_type;
 
-    /// Symbol type: an internal symbol number.
+    /// Internal symbol number.
     typedef int symbol_number_type;
 
-    /// The symbol type number to denote an empty symbol.
-    enum { empty_symbol = -2 };
-
     /// Internal symbol number for tokens (subsumed by symbol_number_type).
     typedef ]b4_int_type_for([b4_translate])[ token_number_type;
 
@@ -222,15 +204,8 @@ m4_define([b4_public_types_declare],
                     const semantic_type& v]b4_locations_if([,
                     const location_type& l])[);
 
-      /// Destroy the symbol.
       ~basic_symbol ();
 
-      /// Destroy contents, and record that is empty.
-      void clear ();
-
-      /// Whether empty.
-      bool empty () const;
-
       /// Destructive move, \a s is emptied into this.
       void move (basic_symbol& s);
 
@@ -260,23 +235,21 @@ m4_define([b4_public_types_declare],
       /// Constructor from (external) token numbers.
       by_type (kind_type t);
 
-      /// Record that this symbol is empty.
-      void clear ();
-
       /// Steal the symbol type from \a that.
       void move (by_type& that);
 
       /// The (internal) type number (corresponding to \a type).
-      /// \a empty when empty.
+      /// -1 when this symbol is empty.
       symbol_number_type type_get () const;
 
       /// The token.
       token_type token () const;
 
+      enum { empty = 0 };
+
       /// The symbol type.
-      /// \a empty_symbol when empty.
+      /// -1 when this symbol is empty.
-      /// An int, not token_number_type, to be able to store empty_symbol.
+      token_number_type type;
-      int type;
     };
 
     /// "External" symbols: returned by the scanner.
@@ -285,33 +258,38 @@ m4_define([b4_public_types_declare],
 ]b4_symbol_constructor_declare])
 
 
-# b4_public_types_define(hh|cc)
+# b4_public_types_define
-# -----------------------------
+# ----------------------
 # Provide the implementation needed by the public types.
 m4_define([b4_public_types_define],
-[  b4_inline([$1])b4_parser_class_name[::syntax_error::syntax_error (]b4_locations_if([const location_type& l, ])[const std::string& m)
+[[  inline
+  ]b4_parser_class_name[::syntax_error::syntax_error (]b4_locations_if([const location_type& l, ])[const std::string& m)
     : std::runtime_error (m)]b4_locations_if([
     , location (l)])[
   {}
 
   // basic_symbol.
   template <typename Base>
+  inline
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol ()
-    : value ()]b4_locations_if([
+    : value ()
-    , location ()])[
   {}
 
   template <typename Base>
+  inline
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
     : Base (other)
-    , value (]b4_variant_if([], [other.value])[)]b4_locations_if([
+    , value ()]b4_locations_if([
     , location (other.location)])[
-  {]b4_variant_if([
+  {
-    b4_symbol_variant([other.type_get ()], [value], [copy],
+    ]b4_variant_if([b4_symbol_variant([other.type_get ()], [value], [copy],
-                      [other.value])])[
+                                      [other.value])],
+                   [value = other.value;])[
   }
 
+
   template <typename Base>
+  inline
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
           [typename Base::kind_type t],
           [const semantic_type& v],
@@ -328,6 +306,7 @@ m4_define([b4_public_types_define],
 ]b4_type_foreach([b4_basic_symbol_constructor_define])], [[
   /// Constructor for valueless symbols.
   template <typename Base>
+  inline
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
           [typename Base::kind_type t],
           b4_locations_if([const location_type& l]))[)
@@ -337,19 +316,11 @@ m4_define([b4_public_types_define],
   {}]])[
 
   template <typename Base>
+  inline
   ]b4_parser_class_name[::basic_symbol<Base>::~basic_symbol ()
-  {
-    clear ();
-  }
-
-  template <typename Base>
-  void
-  ]b4_parser_class_name[::basic_symbol<Base>::clear ()
   {]b4_variant_if([[
     // User destructor.
     symbol_number_type yytype = this->type_get ();
-    basic_symbol<Base>& yysym = *this;
-    (void) yysym;
     switch (yytype)
     {
 ]b4_symbol_foreach([b4_symbol_destructor])dnl
@@ -359,21 +330,14 @@ m4_define([b4_public_types_define],
 
     // Type destructor.
   ]b4_symbol_variant([[yytype]], [[value]], [[template destroy]])])[
-    Base::clear ();
-  }
-
-  template <typename Base>
-  bool
-  ]b4_parser_class_name[::basic_symbol<Base>::empty () const
-  {
-    return Base::type_get () == empty_symbol;
   }
 
   template <typename Base>
+  inline
   void
   ]b4_parser_class_name[::basic_symbol<Base>::move (basic_symbol& s)
   {
-    super_type::move (s);
+    super_type::move(s);
     ]b4_variant_if([b4_symbol_variant([this->type_get ()], [value], [move],
                                       [s.value])],
                    [value = s.value;])[]b4_locations_if([
@@ -381,38 +345,38 @@ m4_define([b4_public_types_define],
   }
 
   // by_type.
-  ]b4_inline([$1])b4_parser_class_name[::by_type::by_type ()
+  inline
-    : type (empty_symbol)
+  ]b4_parser_class_name[::by_type::by_type ()
+     : type (empty)
   {}
 
-  ]b4_inline([$1])b4_parser_class_name[::by_type::by_type (const by_type& other)
+  inline
+  ]b4_parser_class_name[::by_type::by_type (const by_type& other)
     : type (other.type)
   {}
 
-  ]b4_inline([$1])b4_parser_class_name[::by_type::by_type (token_type t)
+  inline
+  ]b4_parser_class_name[::by_type::by_type (token_type t)
     : type (yytranslate_ (t))
   {}
 
-  ]b4_inline([$1])[void
+  inline
-  ]b4_parser_class_name[::by_type::clear ()
+  void
-  {
-    type = empty_symbol;
-  }
-
-  ]b4_inline([$1])[void
   ]b4_parser_class_name[::by_type::move (by_type& that)
   {
     type = that.type;
-    that.clear ();
+    that.type = empty;
   }
 
-  ]b4_inline([$1])[int
+  inline
+  int
   ]b4_parser_class_name[::by_type::type_get () const
   {
     return type;
   }
 ]b4_token_ctor_if([[
-  ]b4_inline([$1])b4_parser_class_name[::token_type
+  inline
+  ]b4_parser_class_name[::token_type
   ]b4_parser_class_name[::by_type::token () const
   {
     // YYTOKNUM[NUM] -- (External) token number corresponding to the
@@ -438,13 +402,14 @@ m4_define([b4_symbol_constructor_declare], [])
 m4_define([b4_symbol_constructor_define], [])
 
 
-# b4_yytranslate_define(cc|hh)
+# b4_yytranslate_define
-# ----------------------------
+# ---------------------
-# Define yytranslate_.  Sometimes used in the header file ($1=hh),
+# Define yytranslate_.  Sometimes used in the header file,
 # sometimes in the cc file.
 m4_define([b4_yytranslate_define],
 [[  // Symbol number corresponding to token number t.
-  ]b4_inline([$1])b4_parser_class_name[::token_number_type
+  inline
+  ]b4_parser_class_name[::token_number_type
   ]b4_parser_class_name[::yytranslate_ (]b4_token_ctor_if([token_type],
                                                           [int])[ t)
   {
@@ -454,12 +419,12 @@ m4_define([b4_yytranslate_define],
     {
 ]b4_translate[
     };
-    const unsigned user_token_number_max_ = ]b4_user_token_number_max[;
+    const unsigned int user_token_number_max_ = ]b4_user_token_number_max[;
     const token_number_type undef_token_ = ]b4_undef_token_number[;
 
-    if (static_cast<int> (t) <= yyeof_)
+    if (static_cast<int>(t) <= yyeof_)
       return yyeof_;
-    else if (static_cast<unsigned> (t) <= user_token_number_max_)
+    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
       return translate_table[t];
     else
       return undef_token_;

data/c-like.m4

@@ -2,7 +2,7 @@
 
 # Common code for C-like languages (C, C++, Java, etc.)
 
-# Copyright (C) 2012-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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

data/c-skel.m4

@@ -2,8 +2,7 @@
 
 # C skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018 Free Software Foundation,
+# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
-# 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

data/c.m4

@@ -2,7 +2,7 @@
 
 # C M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2013 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
@@ -97,8 +97,7 @@ m4_define([b4_api_PREFIX],
 m4_define_default([b4_prefix], [b4_api_prefix])
 
 # If the %union is not named, its name is YYSTYPE.
-b4_percent_define_default([[api.value.union.name]],
+m4_define_default([b4_union_name], [b4_api_PREFIX[]STYPE])
-                          [b4_api_PREFIX[][STYPE]])
 
 
 ## ------------------------ ##
@@ -172,10 +171,10 @@ m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
        b4_ints_in($@,   [-128],   [127]), [1], [signed char],
 
-       b4_ints_in($@,      [0], [65535]), [1], [unsigned short],
+       b4_ints_in($@,      [0], [65535]), [1], [unsigned short int],
-       b4_ints_in($@, [-32768], [32767]), [1], [short],
+       b4_ints_in($@, [-32768], [32767]), [1], [short int],
 
-       m4_eval([0 <= $1]),                [1], [unsigned],
+       m4_eval([0 <= $1]),                [1], [unsigned int],
 
                                                [int])])
 
@@ -206,32 +205,13 @@ m4_define([b4_table_value_equals],
 
 # b4_attribute_define
 # -------------------
-# Provide portable compiler "attributes".
+# Provide portability for __attribute__.
 m4_define([b4_attribute_define],
-[#ifndef YY_ATTRIBUTE
+[#ifndef __attribute__
-# if (defined __GNUC__                                               \
+/* This feature is available in gcc versions 2.5 and later.  */
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+# if (! defined __GNUC__ || __GNUC__ < 2 \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+#  define __attribute__(Spec) /* empty */
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
@@ -242,7 +222,7 @@ m4_define([b4_attribute_define],
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -270,14 +250,14 @@ m4_define([b4_attribute_define],
 
 # b4_null_define
 # --------------
-# Portability issues: define a YY_NULLPTR appropriate for the current
+# Portability issues: define a YY_NULL appropriate for the current
 # language (C, C++98, or C++11).
 m4_define([b4_null_define],
-[# ifndef YY_NULLPTR
+[# ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
+#   define YY_NULL nullptr
 #  else
-#   define YY_NULLPTR 0
+#   define YY_NULL 0
 #  endif
 # endif[]dnl
 ])
@@ -286,7 +266,7 @@ m4_define([b4_null_define],
 # b4_null
 # -------
 # Return a null pointer constant.
-m4_define([b4_null], [YY_NULLPTR])
+m4_define([b4_null], [YY_NULL])
 
 # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
 # -------------------------------------------------------------
@@ -459,8 +439,7 @@ b4_syncline([@oline@], [@ofile@])
 # ------------------------------------
 m4_define([b4_predicate_case],
 [  case $1:
-    if (! (
+    if (! ($2)) YYERROR;
-$2)) YYERROR;
 b4_syncline([@oline@], [@ofile@])
     break;])
 
@@ -562,15 +541,15 @@ b4_locations_if([, yylocationp])[]b4_user_args[);
 # b4_symbol_type_register(SYMBOL-NUM)
 # -----------------------------------
 # Symbol SYMBOL-NUM has a type (for variant) instead of a type-tag.
-# Extend the definition of %union's body (b4_union_members) with a
+# Extend the definition of %union's body with a field of that type,
-# field of that type, and extend the symbol's "type" field to point to
+# and extend the symbol's "type" field to point to the field name,
-# the field name, instead of the type name.
+# instead of the type name.
 m4_define([b4_symbol_type_register],
 [m4_define([b4_symbol($1, type_tag)],
            [b4_symbol_if([$1], [has_id],
                          [b4_symbol([$1], [id])],
                          [yytype_[]b4_symbol([$1], [number])])])dnl
-m4_append([b4_union_members],
+m4_append([b4_user_union_members],
 m4_expand([
   b4_symbol_tag_comment([$1])dnl
   b4_symbol([$1], [type]) b4_symbol([$1], [type_tag]);]))
@@ -610,9 +589,10 @@ m4_copy_force([b4_symbol_value_union], [b4_symbol_value])
 ])
 
 
-# -------------------------- #
+# ---------------- #
-# api.value.type = variant.  #
+# api.value.type.  #
-# -------------------------- #
+# ---------------- #
+
 
 # b4_value_type_setup_variant
 # ---------------------------
@@ -687,13 +667,11 @@ typedef ]b4_percent_define_get([[api.value.type]])[ ]b4_api_PREFIX[STYPE;
 [m4_bmatch(b4_percent_define_get([[api.value.type]]),
 [union\|union-directive],
 [[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED
-]b4_percent_define_get_syncline([[api.value.union.name]])[
+typedef union ]b4_union_name[ ]b4_api_PREFIX[STYPE;
-union ]b4_percent_define_get([[api.value.union.name]])[
+union ]b4_union_name[
 {
 ]b4_user_union_members[
 };
-]b4_percent_define_get_syncline([[api.value.union.name]])[
-typedef union ]b4_percent_define_get([[api.value.union.name]])[ ]b4_api_PREFIX[STYPE;
 # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1
 # define ]b4_api_PREFIX[STYPE_IS_DECLARED 1
 #endif
@@ -805,7 +783,7 @@ m4_define([b4_yy_location_print_define],
 
 /* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
 
-YY_ATTRIBUTE_UNUSED
+__attribute__((__unused__))
 ]b4_function_define([yy_location_print_],
     [static unsigned],
                [[FILE *yyo],                    [yyo]],

data/glr.c

@@ -2,7 +2,7 @@
 
 # GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -178,42 +178,9 @@ m4_if(b4_skeleton, ["glr.c"],
 ## Output files.  ##
 ## -------------- ##
 
-# Unfortunately the order of generation between the header and the
-# implementation file matters (for glr.c) because of the current
-# implementation of api.value.type=union.  In that case we still use a
-# union for YYSTYPE, but we generate the contents of this union when
-# setting up YYSTYPE.  This is needed for other aspects, such as
-# defining yy_symbol_value_print, since we need to now the name of the
-# members of this union.
-#
-# To avoid this issue, just generate the header before the
-# implementation file.  But we should also make them more independant.
-
-# ----------------- #
-# The header file.  #
-# ----------------- #
-
-# glr.cc produces its own header.
-m4_if(b4_skeleton, ["glr.c"],
-[b4_defines_if(
-[b4_output_begin([b4_spec_defines_file])
-b4_copyright([Skeleton interface for Bison GLR parsers in C],
-             [2002-2015, 2018])[
-
-]b4_cpp_guard_open([b4_spec_defines_file])[
-]b4_shared_declarations[
-]b4_cpp_guard_close([b4_spec_defines_file])[
-]b4_output_end()
-])])
-
-
-# ------------------------- #
-# The implementation file.  #
-# ------------------------- #
-
 b4_output_begin([b4_parser_file_name])
 b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-             [2002-2015, 2018])[
+             [2002-2013])[
 
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
@@ -337,7 +304,7 @@ b4_percent_code_get[]dnl
 #define YYMAXUTOK   ]b4_user_token_number_max[
 
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
@@ -398,9 +365,9 @@ static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] =
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 ]dnl Do not use b4_int_type_for here, since there are places where
-dnl pointers onto yyconfl are taken, whose type is "short*".
+dnl pointers onto yyconfl are taken, whose type is "short int *".
 dnl We probably ought to introduce a type for confl.
-[static const short yyconfl[] =
+[static const short int yyconfl[] =
 {
   ]b4_conflicting_rules[
 };
@@ -478,9 +445,9 @@ int yydebug;
 
 struct yyGLRStack;
 static void yypstack (struct yyGLRStack* yystackp, size_t yyk)
-  YY_ATTRIBUTE_UNUSED;
+  __attribute__ ((__unused__));
 static void yypdumpstack (struct yyGLRStack* yystackp)
-  YY_ATTRIBUTE_UNUSED;
+  __attribute__ ((__unused__));
 
 #else /* !]b4_api_PREFIX[DEBUG */
 
@@ -613,7 +580,7 @@ typedef int yyRuleNum;
 typedef int yySymbol;
 
 /** Item references, as in LALR(1) machine */
-typedef short yyItemNum;
+typedef short int yyItemNum;
 
 typedef struct yyGLRState yyGLRState;
 typedef struct yyGLRStateSet yyGLRStateSet;
@@ -702,15 +669,19 @@ struct yyGLRStack {
 static void yyexpandGLRStack (yyGLRStack* yystackp);
 #endif
 
-static _Noreturn void
+static void yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg)
+  __attribute__ ((__noreturn__));
+static void
 yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg)
 {
-  if (yymsg != YY_NULLPTR)
+  if (yymsg != YY_NULL)
     yyerror (]b4_yyerror_args[yymsg);
   YYLONGJMP (yystackp->yyexception_buffer, 1);
 }
 
-static _Noreturn void
+static void yyMemoryExhausted (yyGLRStack* yystackp)
+  __attribute__ ((__noreturn__));
+static void
 yyMemoryExhausted (yyGLRStack* yystackp)
 {
   YYLONGJMP (yystackp->yyexception_buffer, 2);
@@ -731,7 +702,7 @@ yytokenName (yySymbol yytoken)
 /** Fill in YYVSP[YYLOW1 .. YYLOW0-1] from the chain of states starting
  *  at YYVSP[YYLOW0].yystate.yypred.  Leaves YYVSP[YYLOW1].yystate.yypred
  *  containing the pointer to the next state in the chain.  */
-static void yyfillin (yyGLRStackItem *, int, int) YY_ATTRIBUTE_UNUSED;
+static void yyfillin (yyGLRStackItem *, int, int) __attribute__ ((__unused__));
 static void
 yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
 {
@@ -748,7 +719,7 @@ yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
       else
         /* The effect of using yysval or yyloc (in an immediate rule) is
          * undefined.  */
-        yyvsp[i].yystate.yysemantics.yyfirstVal = YY_NULLPTR;]b4_locations_if([[
+        yyvsp[i].yystate.yysemantics.yyfirstVal = YY_NULL;]b4_locations_if([[
       yyvsp[i].yystate.yyloc = s->yyloc;]])[
       s = yyvsp[i].yystate.yypred = s->yypred;
     }
@@ -758,7 +729,7 @@ yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
  * YYVSP[YYLOW1 .. *YYLOW-1] as in yyfillin and set *YYLOW = YYLOW1.
  * For convenience, always return YYLOW1.  */
 static inline int yyfill (yyGLRStackItem *, int *, int, yybool)
-     YY_ATTRIBUTE_UNUSED;
+     __attribute__ ((__unused__));
 static inline int
 yyfill (yyGLRStackItem *yyvsp, int *yylow, int yylow1, yybool yynormal)
 {
@@ -780,7 +751,8 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
               yyGLRStack* yystackp,
               YYSTYPE* yyvalp]b4_locuser_formals[)
 {
-  yybool yynormal YY_ATTRIBUTE_UNUSED = (yystackp->yysplitPoint == YY_NULLPTR);
+  yybool yynormal __attribute__ ((__unused__)) =
+    (yystackp->yysplitPoint == YY_NULL);
   int yylow;
 ]b4_parse_param_use([yyvalp], [yylocp])dnl
 [  YYUSE (yyrhslen);
@@ -808,7 +780,6 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     *yyvalp = yyval_default;
   else
     *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;]b4_locations_if([[
-  /* Default location. */
   YYLLOC_DEFAULT ((*yylocp), (yyvsp - yyrhslen), yyrhslen);
   yystackp->yyerror_range[1].yystate.yyloc = *yylocp;
 ]])[
@@ -865,10 +836,12 @@ yydestroyGLRState (char const *yymsg, yyGLRState *yys]b4_user_formals[)
       if (yydebug)
         {
           if (yys->yysemantics.yyfirstVal)
-            YYFPRINTF (stderr, "%s unresolved", yymsg);
+            YYFPRINTF (stderr, "%s unresolved ", yymsg);
           else
-            YYFPRINTF (stderr, "%s incomplete", yymsg);
+            YYFPRINTF (stderr, "%s incomplete ", yymsg);
-          YY_SYMBOL_PRINT ("", yystos[yys->yylrState], YY_NULLPTR, &yys->yyloc);
+          yy_symbol_print (stderr, yystos[yys->yylrState],
+                           YY_NULL]b4_locuser_args([&yys->yyloc])[);
+          YYFPRINTF (stderr, "\n");
         }
 #endif
 
@@ -923,7 +896,7 @@ yydefaultAction (yyStateNum yystate)
  */
 static inline void
 yygetLRActions (yyStateNum yystate, int yytoken,
-                int* yyaction, const short** yyconflicts)
+                int* yyaction, const short int** yyconflicts)
 {
   int yyindex = yypact[yystate] + yytoken;
   if (yypact_value_is_default (yypact[yystate])
@@ -944,18 +917,14 @@ yygetLRActions (yyStateNum yystate, int yytoken,
     }
 }
 
-/** Compute post-reduction state.
- * \param yystate   the current state
- * \param yysym     the nonterminal to push on the stack
- */
 static inline yyStateNum
-yyLRgotoState (yyStateNum yystate, yySymbol yysym)
+yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
 {
-  int yyr = yypgoto[yysym - YYNTOKENS] + yystate;
+  int yyr = yypgoto[yylhs - YYNTOKENS] + yystate;
   if (0 <= yyr && yyr <= YYLAST && yycheck[yyr] == yystate)
     return yytable[yyr];
   else
-    return yydefgoto[yysym - YYNTOKENS];
+    return yydefgoto[yylhs - YYNTOKENS];
 }
 
 static inline yybool
@@ -997,7 +966,6 @@ yyaddDeferredAction (yyGLRStack* yystackp, size_t yyk, yyGLRState* yystate,
 {
   yySemanticOption* yynewOption =
     &yynewGLRStackItem (yystackp, yyfalse)->yyoption;
-  YYASSERT (!yynewOption->yyisState);
   yynewOption->yystate = yyrhs;
   yynewOption->yyrule = yyrule;
   if (yystackp->yytops.yylookaheadNeeds[yyk])
@@ -1025,7 +993,7 @@ yyinitStateSet (yyGLRStateSet* yyset)
   yyset->yystates = (yyGLRState**) YYMALLOC (16 * sizeof yyset->yystates[0]);
   if (! yyset->yystates)
     return yyfalse;
-  yyset->yystates[0] = YY_NULLPTR;
+  yyset->yystates[0] = YY_NULL;
   yyset->yylookaheadNeeds =
     (yybool*) YYMALLOC (16 * sizeof yyset->yylookaheadNeeds[0]);
   if (! yyset->yylookaheadNeeds)
@@ -1055,8 +1023,8 @@ yyinitGLRStack (yyGLRStack* yystackp, size_t yysize)
   if (!yystackp->yyitems)
     return yyfalse;
   yystackp->yynextFree = yystackp->yyitems;
-  yystackp->yysplitPoint = YY_NULLPTR;
+  yystackp->yysplitPoint = YY_NULL;
-  yystackp->yylastDeleted = YY_NULLPTR;
+  yystackp->yylastDeleted = YY_NULL;
   return yyinitStateSet (&yystackp->yytops);
 }
 
@@ -1095,10 +1063,10 @@ yyexpandGLRStack (yyGLRStack* yystackp)
         {
           yyGLRState* yys0 = &yyp0->yystate;
           yyGLRState* yys1 = &yyp1->yystate;
-          if (yys0->yypred != YY_NULLPTR)
+          if (yys0->yypred != YY_NULL)
             yys1->yypred =
               YYRELOC (yyp0, yyp1, yys0->yypred, yystate);
-          if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != YY_NULLPTR)
+          if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != YY_NULL)
             yys1->yysemantics.yyfirstVal =
               YYRELOC (yyp0, yyp1, yys0->yysemantics.yyfirstVal, yyoption);
         }
@@ -1106,18 +1074,18 @@ yyexpandGLRStack (yyGLRStack* yystackp)
         {
           yySemanticOption* yyv0 = &yyp0->yyoption;
           yySemanticOption* yyv1 = &yyp1->yyoption;
-          if (yyv0->yystate != YY_NULLPTR)
+          if (yyv0->yystate != YY_NULL)
             yyv1->yystate = YYRELOC (yyp0, yyp1, yyv0->yystate, yystate);
-          if (yyv0->yynext != YY_NULLPTR)
+          if (yyv0->yynext != YY_NULL)
             yyv1->yynext = YYRELOC (yyp0, yyp1, yyv0->yynext, yyoption);
         }
     }
-  if (yystackp->yysplitPoint != YY_NULLPTR)
+  if (yystackp->yysplitPoint != YY_NULL)
     yystackp->yysplitPoint = YYRELOC (yystackp->yyitems, yynewItems,
-                                      yystackp->yysplitPoint, yystate);
+                                 yystackp->yysplitPoint, yystate);
 
   for (yyn = 0; yyn < yystackp->yytops.yysize; yyn += 1)
-    if (yystackp->yytops.yystates[yyn] != YY_NULLPTR)
+    if (yystackp->yytops.yystates[yyn] != YY_NULL)
       yystackp->yytops.yystates[yyn] =
         YYRELOC (yystackp->yyitems, yynewItems,
                  yystackp->yytops.yystates[yyn], yystate);
@@ -1141,7 +1109,7 @@ yyfreeGLRStack (yyGLRStack* yystackp)
 static inline void
 yyupdateSplit (yyGLRStack* yystackp, yyGLRState* yys)
 {
-  if (yystackp->yysplitPoint != YY_NULLPTR && yystackp->yysplitPoint > yys)
+  if (yystackp->yysplitPoint != YY_NULL && yystackp->yysplitPoint > yys)
     yystackp->yysplitPoint = yys;
 }
 
@@ -1149,9 +1117,9 @@ yyupdateSplit (yyGLRStack* yystackp, yyGLRState* yys)
 static inline void
 yymarkStackDeleted (yyGLRStack* yystackp, size_t yyk)
 {
-  if (yystackp->yytops.yystates[yyk] != YY_NULLPTR)
+  if (yystackp->yytops.yystates[yyk] != YY_NULL)
     yystackp->yylastDeleted = yystackp->yytops.yystates[yyk];
-  yystackp->yytops.yystates[yyk] = YY_NULLPTR;
+  yystackp->yytops.yystates[yyk] = YY_NULL;
 }
 
 /** Undelete the last stack in *YYSTACKP that was marked as deleted.  Can
@@ -1160,12 +1128,12 @@ yymarkStackDeleted (yyGLRStack* yystackp, size_t yyk)
 static void
 yyundeleteLastStack (yyGLRStack* yystackp)
 {
-  if (yystackp->yylastDeleted == YY_NULLPTR || yystackp->yytops.yysize != 0)
+  if (yystackp->yylastDeleted == YY_NULL || yystackp->yytops.yysize != 0)
     return;
   yystackp->yytops.yystates[0] = yystackp->yylastDeleted;
   yystackp->yytops.yysize = 1;
   YYDPRINTF ((stderr, "Restoring last deleted stack as stack #0.\n"));
-  yystackp->yylastDeleted = YY_NULLPTR;
+  yystackp->yylastDeleted = YY_NULL;
 }
 
 static inline void
@@ -1175,7 +1143,7 @@ yyremoveDeletes (yyGLRStack* yystackp)
   yyi = yyj = 0;
   while (yyj < yystackp->yytops.yysize)
     {
-      if (yystackp->yytops.yystates[yyi] == YY_NULLPTR)
+      if (yystackp->yytops.yystates[yyi] == YY_NULL)
         {
           if (yyi == yyj)
             {
@@ -1196,7 +1164,7 @@ yyremoveDeletes (yyGLRStack* yystackp)
           if (yyj != yyi)
             {
               YYDPRINTF ((stderr, "Rename stack %lu -> %lu.\n",
-                          (unsigned long) yyi, (unsigned long) yyj));
+                          (unsigned long int) yyi, (unsigned long int) yyj));
             }
           yyj += 1;
         }
@@ -1233,13 +1201,12 @@ yyglrShiftDefer (yyGLRStack* yystackp, size_t yyk, yyStateNum yylrState,
                  size_t yyposn, yyGLRState* yyrhs, yyRuleNum yyrule)
 {
   yyGLRState* yynewState = &yynewGLRStackItem (yystackp, yytrue)->yystate;
-  YYASSERT (yynewState->yyisState);
 
   yynewState->yylrState = yylrState;
   yynewState->yyposn = yyposn;
   yynewState->yyresolved = yyfalse;
   yynewState->yypred = yystackp->yytops.yystates[yyk];
-  yynewState->yysemantics.yyfirstVal = YY_NULLPTR;
+  yynewState->yysemantics.yyfirstVal = YY_NULL;
   yystackp->yytops.yystates[yyk] = yynewState;
 
   /* Invokes YY_RESERVE_GLRSTACK.  */
@@ -1267,8 +1234,8 @@ yy_reduce_print (int yynormal, yyGLRStackItem* yyvsp, size_t yyk,
   int yylow = 1;])[
   int yyi;
   YYFPRINTF (stderr, "Reducing stack %lu by rule %d (line %lu):\n",
-             (unsigned long) yyk, yyrule - 1,
+             (unsigned long int) yyk, yyrule - 1,
-             (unsigned long) yyrline[yyrule]);
+             (unsigned long int) yyrline[yyrule]);
   if (! yynormal)
     yyfillin (yyvsp, 1, -yynrhs);
   /* The symbols being reduced.  */
@@ -1299,7 +1266,7 @@ yydoAction (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
 {
   int yynrhs = yyrhsLength (yyrule);
 
-  if (yystackp->yysplitPoint == YY_NULLPTR)
+  if (yystackp->yysplitPoint == YY_NULL)
     {
       /* Standard special case: single stack.  */
       yyGLRStackItem* yyrhs = (yyGLRStackItem*) yystackp->yytops.yystates[yyk];
@@ -1351,16 +1318,17 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
 {
   size_t yyposn = yystackp->yytops.yystates[yyk]->yyposn;
 
-  if (yyforceEval || yystackp->yysplitPoint == YY_NULLPTR)
+  if (yyforceEval || yystackp->yysplitPoint == YY_NULL)
     {
-      YYSTYPE yysval;]b4_locations_if([[
+      YYRESULTTAG yyflag;
-      YYLTYPE yyloc;]])[
+      YYSTYPE yysval;]b4_locations_if([
+      YYLTYPE yyloc;])[
 
-      YYRESULTTAG yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
+      yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
-      if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULLPTR)
+      if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULL)
         {
           YYDPRINTF ((stderr, "Parse on stack %lu rejected by rule #%d.\n",
-                     (unsigned long) yyk, yyrule - 1));
+                     (unsigned long int) yyk, yyrule - 1));
         }
       if (yyflag != yyok)
         return yyflag;
@@ -1388,9 +1356,9 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
       YYDPRINTF ((stderr,
                   "Reduced stack %lu by rule #%d; action deferred.  "
                   "Now in state %d.\n",
-                  (unsigned long) yyk, yyrule - 1, yynewLRState));
+                  (unsigned long int) yyk, yyrule - 1, yynewLRState));
       for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
-        if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULLPTR)
+        if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULL)
           {
             yyGLRState *yysplit = yystackp->yysplitPoint;
             yyGLRState *yyp = yystackp->yytops.yystates[yyi];
@@ -1401,8 +1369,8 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
                     yyaddDeferredAction (yystackp, yyk, yyp, yys0, yyrule);
                     yymarkStackDeleted (yystackp, yyk);
                     YYDPRINTF ((stderr, "Merging stack %lu into stack %lu.\n",
-                                (unsigned long) yyk,
+                                (unsigned long int) yyk,
-                                (unsigned long) yyi));
+                                (unsigned long int) yyi));
                     return yyok;
                   }
                 yyp = yyp->yypred;
@@ -1417,7 +1385,7 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
 static size_t
 yysplitStack (yyGLRStack* yystackp, size_t yyk)
 {
-  if (yystackp->yysplitPoint == YY_NULLPTR)
+  if (yystackp->yysplitPoint == YY_NULL)
     {
       YYASSERT (yyk == 0);
       yystackp->yysplitPoint = yystackp->yytops.yystates[yyk];
@@ -1427,7 +1395,7 @@ yysplitStack (yyGLRStack* yystackp, size_t yyk)
       yyGLRState** yynewStates;
       yybool* yynewLookaheadNeeds;
 
-      yynewStates = YY_NULLPTR;
+      yynewStates = YY_NULL;
 
       if (yystackp->yytops.yycapacity
           > (YYSIZEMAX / (2 * sizeof yynewStates[0])))
@@ -1438,7 +1406,7 @@ yysplitStack (yyGLRStack* yystackp, size_t yyk)
         (yyGLRState**) YYREALLOC (yystackp->yytops.yystates,
                                   (yystackp->yytops.yycapacity
                                    * sizeof yynewStates[0]));
-      if (yynewStates == YY_NULLPTR)
+      if (yynewStates == YY_NULL)
         yyMemoryExhausted (yystackp);
       yystackp->yytops.yystates = yynewStates;
 
@@ -1446,7 +1414,7 @@ yysplitStack (yyGLRStack* yystackp, size_t yyk)
         (yybool*) YYREALLOC (yystackp->yytops.yylookaheadNeeds,
                              (yystackp->yytops.yycapacity
                               * sizeof yynewLookaheadNeeds[0]));
-      if (yynewLookaheadNeeds == YY_NULLPTR)
+      if (yynewLookaheadNeeds == YY_NULL)
         yyMemoryExhausted (yystackp);
       yystackp->yytops.yylookaheadNeeds = yynewLookaheadNeeds;
     }
@@ -1510,9 +1478,9 @@ yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
           yySemanticOption* yyz1 = yys1->yysemantics.yyfirstVal;
           while (yytrue)
             {
-              if (yyz1 == *yyz0p || yyz1 == YY_NULLPTR)
+              if (yyz1 == *yyz0p || yyz1 == YY_NULL)
                 break;
-              else if (*yyz0p == YY_NULLPTR)
+              else if (*yyz0p == YY_NULL)
                 {
                   *yyz0p = yyz1;
                   break;
@@ -1633,7 +1601,7 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
 
   for (yyi = yynrhs, yys = yyx->yystate; 0 < yyi; yyi -= 1, yys = yys->yypred)
     yystates[yyi] = yys;
-  if (yys == YY_NULLPTR)
+  if (yys == YY_NULL)
     {
       yyleftmost_state.yyposn = 0;
       yystates[0] = &yyleftmost_state;
@@ -1648,8 +1616,8 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
   else
     YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %lu .. %lu>\n",
                yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
-               yyx->yyrule - 1, (unsigned long) (yys->yyposn + 1),
+               yyx->yyrule - 1, (unsigned long int) (yys->yyposn + 1),
-               (unsigned long) yyx->yystate->yyposn);
+               (unsigned long int) yyx->yystate->yyposn);
   for (yyi = 1; yyi <= yynrhs; yyi += 1)
     {
       if (yystates[yyi]->yyresolved)
@@ -1660,8 +1628,8 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
           else
             YYFPRINTF (stderr, "%*s%s <tokens %lu .. %lu>\n", yyindent+2, "",
                        yytokenName (yystos[yystates[yyi]->yylrState]),
-                       (unsigned long) (yystates[yyi-1]->yyposn + 1),
+                       (unsigned long int) (yystates[yyi-1]->yyposn + 1),
-                       (unsigned long) yystates[yyi]->yyposn);
+                       (unsigned long int) yystates[yyi]->yyposn);
         }
       else
         yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);
@@ -1693,7 +1661,7 @@ yyreportAmbiguity (yySemanticOption* yyx0,
  *  ending at YYS1.  Has no effect on previously resolved states.
  *  The first semantic option of a state is always chosen.  */
 static void
-yyresolveLocations (yyGLRState *yys1, int yyn1,
+yyresolveLocations (yyGLRState* yys1, int yyn1,
                     yyGLRStack *yystackp]b4_user_formals[)
 {
   if (0 < yyn1)
@@ -1704,9 +1672,9 @@ yyresolveLocations (yyGLRState *yys1, int yyn1,
           yyGLRStackItem yyrhsloc[1 + YYMAXRHS];
           int yynrhs;
           yySemanticOption *yyoption = yys1->yysemantics.yyfirstVal;
-          YYASSERT (yyoption);
+          YYASSERT (yyoption != YY_NULL);
           yynrhs = yyrhsLength (yyoption->yyrule);
-          if (0 < yynrhs)
+          if (yynrhs > 0)
             {
               yyGLRState *yys;
               int yyn;
@@ -1729,7 +1697,18 @@ yyresolveLocations (yyGLRState *yys1, int yyn1,
               yyGLRState *yyprevious = yyoption->yystate;
               yyrhsloc[0].yystate.yyloc = yyprevious->yyloc;
             }
-          YYLLOC_DEFAULT ((yys1->yyloc), yyrhsloc, yynrhs);
+          {
+            int yychar_current = yychar;
+            YYSTYPE yylval_current = yylval;
+            YYLTYPE yylloc_current = yylloc;
+            yychar = yyoption->yyrawchar;
+            yylval = yyoption->yyval;
+            yylloc = yyoption->yyloc;
+            YYLLOC_DEFAULT ((yys1->yyloc), yyrhsloc, yynrhs);
+            yychar = yychar_current;
+            yylval = yylval_current;
+            yylloc = yylloc_current;
+          }
         }
     }
 }]])[
@@ -1752,7 +1731,7 @@ yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[)
   YYRESULTTAG yyflag;]b4_locations_if([
   YYLTYPE *yylocp = &yys->yyloc;])[
 
-  for (yypp = &yyoptionList->yynext; *yypp != YY_NULLPTR; )
+  for (yypp = &yyoptionList->yynext; *yypp != YY_NULL; )
     {
       yySemanticOption* yyp = *yypp;
 
@@ -1794,7 +1773,7 @@ yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[)
       int yyprec = yydprec[yybest->yyrule];
       yyflag = yyresolveAction (yybest, yystackp, &yysval]b4_locuser_args[);
       if (yyflag == yyok)
-        for (yyp = yybest->yynext; yyp != YY_NULLPTR; yyp = yyp->yynext)
+        for (yyp = yybest->yynext; yyp != YY_NULL; yyp = yyp->yynext)
           {
             if (yyprec == yydprec[yyp->yyrule])
               {
@@ -1821,14 +1800,14 @@ yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[)
       yys->yysemantics.yysval = yysval;
     }
   else
-    yys->yysemantics.yyfirstVal = YY_NULLPTR;
+    yys->yysemantics.yyfirstVal = YY_NULL;
   return yyflag;
 }
 
 static YYRESULTTAG
 yyresolveStack (yyGLRStack* yystackp]b4_user_formals[)
 {
-  if (yystackp->yysplitPoint != YY_NULLPTR)
+  if (yystackp->yysplitPoint != YY_NULL)
     {
       yyGLRState* yys;
       int yyn;
@@ -1848,10 +1827,10 @@ yycompressStack (yyGLRStack* yystackp)
 {
   yyGLRState* yyp, *yyq, *yyr;
 
-  if (yystackp->yytops.yysize != 1 || yystackp->yysplitPoint == YY_NULLPTR)
+  if (yystackp->yytops.yysize != 1 || yystackp->yysplitPoint == YY_NULL)
     return;
 
-  for (yyp = yystackp->yytops.yystates[0], yyq = yyp->yypred, yyr = YY_NULLPTR;
+  for (yyp = yystackp->yytops.yystates[0], yyq = yyp->yypred, yyr = YY_NULL;
        yyp != yystackp->yysplitPoint;
        yyr = yyp, yyp = yyq, yyq = yyp->yypred)
     yyp->yypred = yyr;
@@ -1859,10 +1838,10 @@ yycompressStack (yyGLRStack* yystackp)
   yystackp->yyspaceLeft += yystackp->yynextFree - yystackp->yyitems;
   yystackp->yynextFree = ((yyGLRStackItem*) yystackp->yysplitPoint) + 1;
   yystackp->yyspaceLeft -= yystackp->yynextFree - yystackp->yyitems;
-  yystackp->yysplitPoint = YY_NULLPTR;
+  yystackp->yysplitPoint = YY_NULL;
-  yystackp->yylastDeleted = YY_NULLPTR;
+  yystackp->yylastDeleted = YY_NULL;
 
-  while (yyr != YY_NULLPTR)
+  while (yyr != YY_NULL)
     {
       yystackp->yynextFree->yystate = *yyr;
       yyr = yyr->yypred;
@@ -1877,11 +1856,11 @@ static YYRESULTTAG
 yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
                    size_t yyposn]b4_pure_formals[)
 {
-  while (yystackp->yytops.yystates[yyk] != YY_NULLPTR)
+  while (yystackp->yytops.yystates[yyk] != YY_NULL)
     {
       yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState;
       YYDPRINTF ((stderr, "Stack %lu Entering state %d\n",
-                  (unsigned long) yyk, yystate));
+                  (unsigned long int) yyk, yystate));
 
       YYASSERT (yystate != YYFINAL);
 
@@ -1892,7 +1871,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
           if (yyrule == 0)
             {
               YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                          (unsigned long) yyk));
+                          (unsigned long int) yyk));
               yymarkStackDeleted (yystackp, yyk);
               return yyok;
             }
@@ -1902,7 +1881,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
               YYDPRINTF ((stderr,
                           "Stack %lu dies "
                           "(predicate failure or explicit user error).\n",
-                          (unsigned long) yyk));
+                          (unsigned long int) yyk));
               yymarkStackDeleted (yystackp, yyk);
               return yyok;
             }
@@ -1913,7 +1892,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
         {
           yySymbol yytoken;
           int yyaction;
-          const short* yyconflicts;
+          const short int* yyconflicts;
 
           yystackp->yytops.yylookaheadNeeds[yyk] = yytrue;
           if (yychar == YYEMPTY)
@@ -1940,8 +1919,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
               YYRESULTTAG yyflag;
               size_t yynewStack = yysplitStack (yystackp, yyk);
               YYDPRINTF ((stderr, "Splitting off stack %lu from %lu.\n",
-                          (unsigned long) yynewStack,
+                          (unsigned long int) yynewStack,
-                          (unsigned long) yyk));
+                          (unsigned long int) yyk));
               yyflag = yyglrReduce (yystackp, yynewStack,
                                     *yyconflicts,
                                     yyimmediate[*yyconflicts]]b4_user_args[);
@@ -1951,7 +1930,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
               else if (yyflag == yyerr)
                 {
                   YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                              (unsigned long) yynewStack));
+                              (unsigned long int) yynewStack));
                   yymarkStackDeleted (yystackp, yynewStack);
                 }
               else
@@ -1964,7 +1943,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
           else if (yyisErrorAction (yyaction))
             {
               YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                          (unsigned long) yyk));
+                          (unsigned long int) yyk));
               yymarkStackDeleted (yystackp, yyk);
               break;
             }
@@ -1977,7 +1956,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
                   YYDPRINTF ((stderr,
                               "Stack %lu dies "
                               "(predicate failure or explicit user error).\n",
-                              (unsigned long) yyk));
+                              (unsigned long int) yyk));
                   yymarkStackDeleted (yystackp, yyk);
                   break;
                 }
@@ -1999,13 +1978,13 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
 #else
   {
   yySymbol yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-  size_t yysize0 = yytnamerr (YY_NULLPTR, yytokenName (yytoken));
+  size_t yysize0 = yytnamerr (YY_NULL, yytokenName (yytoken));
   size_t yysize = yysize0;
   yybool yysize_overflow = yyfalse;
-  char* yymsg = YY_NULLPTR;
+  char* yymsg = YY_NULL;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
+  const char *yyformat = YY_NULL;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -2061,7 +2040,7 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
                   }
                 yyarg[yycount++] = yytokenName (yyx);
                 {
-                  size_t yysz = yysize + yytnamerr (YY_NULLPTR, yytokenName (yyx));
+                  size_t yysz = yysize + yytnamerr (YY_NULL, yytokenName (yyx));
                   yysize_overflow |= yysz < yysize;
                   yysize = yysz;
                 }
@@ -2075,7 +2054,6 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
       case N:                           \
         yyformat = S;                   \
       break
-    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -2140,7 +2118,7 @@ yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
       {
         yySymbol yytoken;
         if (yychar == YYEOF)
-          yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR);
+          yyFail (yystackp][]b4_lpure_args[, YY_NULL);
         if (yychar != YYEMPTY)
           {]b4_locations_if([[
             /* We throw away the lookahead, but the error range
@@ -2181,10 +2159,10 @@ yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
 
   /* Reduce to one stack.  */
   for (yyk = 0; yyk < yystackp->yytops.yysize; yyk += 1)
-    if (yystackp->yytops.yystates[yyk] != YY_NULLPTR)
+    if (yystackp->yytops.yystates[yyk] != YY_NULL)
       break;
   if (yyk >= yystackp->yytops.yysize)
-    yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR);
+    yyFail (yystackp][]b4_lpure_args[, YY_NULL);
   for (yyk += 1; yyk < yystackp->yytops.yysize; yyk += 1)
     yymarkStackDeleted (yystackp, yyk);
   yyremoveDeletes (yystackp);
@@ -2192,7 +2170,7 @@ yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
 
   /* Now pop stack until we find a state that shifts the error token.  */
   yystackp->yyerrState = 3;
-  while (yystackp->yytops.yystates[0] != YY_NULLPTR)
+  while (yystackp->yytops.yystates[0] != YY_NULL)
     {
       yyGLRState *yys = yystackp->yytops.yystates[0];
       yyj = yypact[yys->yylrState];
@@ -2216,14 +2194,14 @@ yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
             }
         }]b4_locations_if([[
       yystackp->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
-      if (yys->yypred != YY_NULLPTR)
+      if (yys->yypred != YY_NULL)
         yydestroyGLRState ("Error: popping", yys]b4_user_args[);
       yystackp->yytops.yystates[0] = yys->yypred;
       yystackp->yynextFree -= 1;
       yystackp->yyspaceLeft += 1;
     }
-  if (yystackp->yytops.yystates[0] == YY_NULLPTR)
+  if (yystackp->yytops.yystates[0] == YY_NULL)
-    yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR);
+    yyFail (yystackp][]b4_lpure_args[, YY_NULL);
 }
 
 #define YYCHK1(YYE)                                                          \
@@ -2286,7 +2264,7 @@ b4_dollar_popdef])[]dnl
         {
           yyRuleNum yyrule;
           int yyaction;
-          const short* yyconflicts;
+          const short int* yyconflicts;
 
           yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;
           YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -2296,8 +2274,8 @@ b4_dollar_popdef])[]dnl
             {
               yyrule = yydefaultAction (yystate);
               if (yyrule == 0)
-                {]b4_locations_if([[
+                {
-                  yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
+]b4_locations_if([[               yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
                   yyreportSyntaxError (&yystack]b4_user_args[);
                   goto yyuser_error;
                 }
@@ -2336,8 +2314,8 @@ b4_dollar_popdef])[]dnl
                     yystack.yyerrState -= 1;
                 }
               else if (yyisErrorAction (yyaction))
-                {]b4_locations_if([[
+                {
-                  yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
+]b4_locations_if([[               yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
                   yyreportSyntaxError (&yystack]b4_user_args[);
                   goto yyuser_error;
                 }
@@ -2382,8 +2360,8 @@ b4_dollar_popdef])[]dnl
               if (yystack.yytops.yysize == 0)
                 yyFail (&yystack][]b4_lpure_args[, YY_("syntax error"));
               YYCHK1 (yyresolveStack (&yystack]b4_user_args[));
-              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));]b4_locations_if([[
+              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
-              yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
+]b4_locations_if([[           yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
               yyreportSyntaxError (&yystack]b4_user_args[);
               goto yyuser_error;
             }
@@ -2399,17 +2377,17 @@ b4_dollar_popdef])[]dnl
           for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
             {
               int yyaction;
-              const short* yyconflicts;
+              const short int* yyconflicts;
               yyStateNum yystate = yystack.yytops.yystates[yys]->yylrState;
               yygetLRActions (yystate, yytoken_to_shift, &yyaction,
                               &yyconflicts);
               /* Note that yyconflicts were handled by yyprocessOneStack.  */
-              YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long) yys));
+              YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long int) yys));
               YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, &yylval, &yylloc);
               yyglrShift (&yystack, yys, yyaction, yyposn,
                           &yylval]b4_locations_if([, &yylloc])[);
               YYDPRINTF ((stderr, "Stack %lu now in state #%d\n",
-                          (unsigned long) yys,
+                          (unsigned long int) yys,
                           yystack.yytops.yystates[yys]->yylrState));
             }
 
@@ -2464,9 +2442,9 @@ b4_dollar_popdef])[]dnl
               {
                 while (yystates[yyk])
                   {
-                    yyGLRState *yys = yystates[yyk];]b4_locations_if([[
+                    yyGLRState *yys = yystates[yyk];
-                    yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
+]b4_locations_if([[                 yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]]
-                    if (yys->yypred != YY_NULLPTR)
+)[                  if (yys->yypred != YY_NULL)
                       yydestroyGLRState ("Cleanup: popping", yys]b4_user_args[);
                     yystates[yyk] = yys->yypred;
                     yystack.yynextFree -= 1;
@@ -2492,13 +2470,13 @@ yy_yypstack (yyGLRState* yys)
       YYFPRINTF (stderr, " -> ");
     }
   YYFPRINTF (stderr, "%d@@%lu", yys->yylrState,
-             (unsigned long) yys->yyposn);
+             (unsigned long int) yys->yyposn);
 }
 
 static void
 yypstates (yyGLRState* yyst)
 {
-  if (yyst == YY_NULLPTR)
+  if (yyst == YY_NULL)
     YYFPRINTF (stderr, "<null>");
   else
     yy_yypstack (yyst);
@@ -2512,7 +2490,7 @@ yypstack (yyGLRStack* yystackp, size_t yyk)
 }
 
 #define YYINDEX(YYX)                                                         \
-    ((YYX) == YY_NULLPTR ? -1 : (yyGLRStackItem*) (YYX) - yystackp->yyitems)
+    ((YYX) == YY_NULL ? -1 : (yyGLRStackItem*) (YYX) - yystackp->yyitems)
 
 
 static void
@@ -2523,35 +2501,31 @@ yypdumpstack (yyGLRStack* yystackp)
   for (yyp = yystackp->yyitems; yyp < yystackp->yynextFree; yyp += 1)
     {
       YYFPRINTF (stderr, "%3lu. ",
-                 (unsigned long) (yyp - yystackp->yyitems));
+                 (unsigned long int) (yyp - yystackp->yyitems));
       if (*(yybool *) yyp)
         {
-          YYASSERT (yyp->yystate.yyisState);
-          YYASSERT (yyp->yyoption.yyisState);
           YYFPRINTF (stderr, "Res: %d, LR State: %d, posn: %lu, pred: %ld",
                      yyp->yystate.yyresolved, yyp->yystate.yylrState,
-                     (unsigned long) yyp->yystate.yyposn,
+                     (unsigned long int) yyp->yystate.yyposn,
-                     (long) YYINDEX (yyp->yystate.yypred));
+                     (long int) YYINDEX (yyp->yystate.yypred));
           if (! yyp->yystate.yyresolved)
             YYFPRINTF (stderr, ", firstVal: %ld",
-                       (long) YYINDEX (yyp->yystate
+                       (long int) YYINDEX (yyp->yystate
                                              .yysemantics.yyfirstVal));
         }
       else
         {
-          YYASSERT (!yyp->yystate.yyisState);
-          YYASSERT (!yyp->yyoption.yyisState);
           YYFPRINTF (stderr, "Option. rule: %d, state: %ld, next: %ld",
                      yyp->yyoption.yyrule - 1,
-                     (long) YYINDEX (yyp->yyoption.yystate),
+                     (long int) YYINDEX (yyp->yyoption.yystate),
-                     (long) YYINDEX (yyp->yyoption.yynext));
+                     (long int) YYINDEX (yyp->yyoption.yynext));
         }
       YYFPRINTF (stderr, "\n");
     }
   YYFPRINTF (stderr, "Tops:");
   for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
-    YYFPRINTF (stderr, "%lu: %ld; ", (unsigned long) yyi,
+    YYFPRINTF (stderr, "%lu: %ld; ", (unsigned long int) yyi,
-               (long) YYINDEX (yystackp->yytops.yystates[yyi]));
+               (long int) YYINDEX (yystackp->yytops.yystates[yyi]));
   YYFPRINTF (stderr, "\n");
 }
 #endif
@@ -2574,3 +2548,16 @@ m4_if(b4_prefix, [yy], [],
 
 ]b4_epilogue[]dnl
 b4_output_end()
+
+# glr.cc produces its own header.
+m4_if(b4_skeleton, ["glr.c"],
+[b4_defines_if(
+[b4_output_begin([b4_spec_defines_file])
+b4_copyright([Skeleton interface for Bison GLR parsers in C],
+             [2002-2013])[
+
+]b4_cpp_guard_open([b4_spec_defines_file])[
+]b4_shared_declarations[
+]b4_cpp_guard_close([b4_spec_defines_file])[
+]b4_output_end()
+])])

data/glr.cc

@@ -1,6 +1,6 @@
 # C++ GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -177,7 +177,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
   | Print this symbol.  |
   `--------------------*/
 
-  void
+  inline void
   ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,
                            const semantic_type* yyvaluep]b4_locations_if([[,
                            const location_type* yylocationp]])[)
@@ -329,7 +329,7 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]],
 b4_defines_if(
 [b4_output_begin([b4_spec_defines_file])
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002-2015, 2018])[
+             [2002-2013])[
 
 // C++ GLR parser skeleton written by Akim Demaille.
 

data/java-skel.m4

@@ -2,7 +2,7 @@
 
 # Java skeleton dispatching for Bison.
 
-# Copyright (C) 2007, 2009-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2013 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

data/java.m4

@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2007-2013 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

data/lalr1.cc

@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -107,7 +107,7 @@ b4_dollar_pushdef([yysym.value],
                                 [m4_dquote(b4_symbol([$1], [type]))]),
                    [yysym.location])dnl
       b4_symbol_case_([$1])
-b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])
+b4_syncline([b4_symbol([$1], [$2_line])], ["b4_symbol([$1], [$2_file])"])
         b4_symbol([$1], [$2])
 b4_syncline([@oline@], [@ofile@])
         break;
@@ -131,7 +131,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))])])
 
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018])
+           [2002-2013])
 
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
@@ -142,24 +142,21 @@ b4_bison_locations_if([# Backward compatibility.
 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 
-# b4_shared_declarations(hh|cc)
+# b4_shared_declarations
-# -----------------------------
+# ----------------------
-# Declaration that might either go into the header (if --defines, $1 = hh)
+# Declaration that might either go into the header (if --defines)
 # or open coded in the parser body.
 m4_define([b4_shared_declarations],
 [b4_percent_code_get([[requires]])[
 ]b4_parse_assert_if([# include <cassert>])[
-# include <cstdlib> // std::abort
+# include <vector>
 # include <iostream>
 # include <stdexcept>
-# include <string>
+# include <string>]b4_defines_if([[
-# include <vector>]b4_defines_if([[
 # include "stack.hh"
 ]b4_bison_locations_if([[# include "location.hh"]])])[
 ]b4_variant_if([b4_variant_includes])[
 
-]b4_attribute_define[
-]b4_null_define[
 ]b4_YYDEBUG_define[
 
 ]b4_namespace_open[
@@ -186,14 +183,14 @@ b4_location_define])])[
 
 #if ]b4_api_PREFIX[DEBUG
     /// The current debugging stream.
-    std::ostream& debug_stream () const YY_ATTRIBUTE_PURE;
+    std::ostream& debug_stream () const;
     /// Set the current debugging stream.
     void set_debug_stream (std::ostream &);
 
     /// Type for debugging levels.
     typedef int debug_level_type;
     /// The current debugging level.
-    debug_level_type debug_level () const YY_ATTRIBUTE_PURE;
+    debug_level_type debug_level () const;
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
 #endif
@@ -216,14 +213,14 @@ b4_location_define])])[
 
     /// Generate an error message.
     /// \param yystate   the state where the error occurred.
-    /// \param yyla      the lookahead token.
+    /// \param yytoken   the lookahead token type, or yyempty_.
     virtual std::string yysyntax_error_ (state_type yystate,
-                                         const symbol_type& yyla) const;
+                                         symbol_number_type yytoken) const;
 
     /// Compute post-reduction state.
     /// \param yystate   the current state
-    /// \param yysym     the nonterminal to push on the stack
+    /// \param yylhs     the nonterminal to push on the stack
-    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
+    state_type yy_lr_goto_state_ (state_type yystate, int yylhs);
 
     /// Whether the given \c yypact_ value indicates a defaulted state.
     /// \param yyvalue   the value to check
@@ -270,7 +267,7 @@ b4_location_define])])[
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg     Why this token is reclaimed.
     ///                  If null, print nothing.
-    /// \param yysym     The symbol.
+    /// \param s         The symbol.
     template <typename Base>
     void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
 
@@ -290,21 +287,16 @@ b4_location_define])])[
       /// Copy constructor.
       by_state (const by_state& other);
 
-      /// Record that this symbol is empty.
-      void clear ();
-
       /// Steal the symbol type from \a that.
       void move (by_state& that);
 
       /// The (internal) type number (corresponding to \a state).
-      /// \a empty_symbol when empty.
+      /// "empty" when empty.
       symbol_number_type type_get () const;
 
-      /// The state number used to denote an empty symbol.
+      enum { empty = 0 };
-      enum { empty_state = -1 };
 
       /// The state.
-      /// \a empty when empty.
       state_type state;
     };
 
@@ -315,8 +307,6 @@ b4_location_define])])[
       typedef basic_symbol<by_state> super_type;
       /// Construct an empty symbol.
       stack_symbol_type ();
-      /// Copy construct (for efficiency).
-      stack_symbol_type (const stack_symbol_type& that);
       /// Steal the contents from \a sym to build this.
       stack_symbol_type (state_type s, symbol_type& sym);
       /// Assignment, needed by push_back.
@@ -345,25 +335,26 @@ b4_location_define])])[
     void yypush_ (const char* m, state_type s, symbol_type& sym);
 
     /// Pop \a n symbols the three stacks.
-    void yypop_ (unsigned n = 1);
+    void yypop_ (unsigned int n = 1);
 
-    /// Constants.
+    // Constants.
     enum
     {
       yyeof_ = 0,
-      yylast_ = ]b4_last[,     ///< Last index in yytable_.
+      yylast_ = ]b4_last[,           //< Last index in yytable_.
-      yynnts_ = ]b4_nterms_number[,  ///< Number of nonterminal symbols.
+      yynnts_ = ]b4_nterms_number[,  //< Number of nonterminal symbols.
-      yyfinal_ = ]b4_final_state_number[, ///< Termination state number.
+      yyempty_ = -2,
+      yyfinal_ = ]b4_final_state_number[, //< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = ]b4_tokens_number[  ///< Number of tokens.
+      yyntokens_ = ]b4_tokens_number[    //< Number of tokens.
     };
 
 ]b4_parse_param_vars[
   };
 
-]b4_token_ctor_if([b4_yytranslate_define([$1])[
+]b4_token_ctor_if([b4_yytranslate_define
-]b4_public_types_define([$1])])[
+b4_public_types_define])[
 ]b4_namespace_close[
 
 ]b4_percent_define_flag_if([[global_tokens_and_yystype]],
@@ -389,7 +380,7 @@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 // C++ LALR(1) parser skeleton written by Akim Demaille.
 
 ]b4_cpp_guard_open([b4_spec_defines_file])[
-]b4_shared_declarations(hh)[
+]b4_shared_declarations[
 ]b4_cpp_guard_close([b4_spec_defines_file])
 b4_output_end()
 ])
@@ -409,7 +400,7 @@ m4_if(b4_prefix, [yy], [],
 ]b4_null_define[
 
 ]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
-               [b4_shared_declarations([cc])])[
+               [b4_shared_declarations])[
 
 // User implementation prologue.
 ]b4_user_post_prologue[
@@ -427,15 +418,6 @@ m4_if(b4_prefix, [yy], [],
 # endif
 #endif
 
-// Whether we are compiled with exception support.
-#ifndef YY_EXCEPTIONS
-# if defined __GNUC__ && !defined __EXCEPTIONS
-#  define YY_EXCEPTIONS 0
-# else
-#  define YY_EXCEPTIONS 1
-# endif
-#endif
-
 ]b4_locations_if([dnl
 [#define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
 ]b4_yylloc_default_define])[
@@ -455,7 +437,7 @@ m4_if(b4_prefix, [yy], [],
     {                                           \
       *yycdebug_ << Title << ' ';               \
       yy_print_ (*yycdebug_, Symbol);           \
-      *yycdebug_ << '\n';                       \
+      *yycdebug_ << std::endl;                  \
     }                                           \
   } while (false)
 
@@ -474,14 +456,14 @@ m4_if(b4_prefix, [yy], [],
 #else // !]b4_api_PREFIX[DEBUG
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE (Symbol)
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
-# define YY_REDUCE_PRINT(Rule)           static_cast<void> (0)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
-# define YY_STACK_PRINT()                static_cast<void> (0)
+# define YY_STACK_PRINT()                static_cast<void>(0)
 
 #endif // !]b4_api_PREFIX[DEBUG
 
 #define yyerrok         (yyerrstatus_ = 0)
-#define yyclearin       (yyla.clear ())
+#define yyclearin       (yyempty = true)
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
@@ -545,63 +527,56 @@ m4_if(b4_prefix, [yy], [],
   | Symbol types.  |
   `---------------*/
 
-]b4_token_ctor_if([], [b4_public_types_define([cc])])[
+]b4_token_ctor_if([], [b4_public_types_define])[
 
   // by_state.
+  inline
   ]b4_parser_class_name[::by_state::by_state ()
-    : state (empty_state)
+    : state (empty)
   {}
 
+  inline
   ]b4_parser_class_name[::by_state::by_state (const by_state& other)
     : state (other.state)
   {}
 
-  void
+  inline
-  ]b4_parser_class_name[::by_state::clear ()
-  {
-    state = empty_state;
-  }
-
   void
   ]b4_parser_class_name[::by_state::move (by_state& that)
   {
     state = that.state;
-    that.clear ();
+    that.state = empty;
   }
 
+  inline
   ]b4_parser_class_name[::by_state::by_state (state_type s)
     : state (s)
   {}
 
+  inline
   ]b4_parser_class_name[::symbol_number_type
   ]b4_parser_class_name[::by_state::type_get () const
   {
-    if (state == empty_state)
+    return state == empty ? 0 : yystos_[state];
-      return empty_symbol;
-    else
-      return yystos_[state];
   }
 
+  inline
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()
   {}
 
-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that)
+
-    : super_type (that.state]b4_locations_if([, that.location])[)
+  inline
+  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
+    : super_type (s]b4_locations_if([, that.location])[)
   {
     ]b4_variant_if([b4_symbol_variant([that.type_get ()],
-                                      [value], [copy], [that.value])],
+                                      [value], [move], [that.value])],
                    [[value = that.value;]])[
-  }
-
-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
-    : super_type (s]b4_variant_if([], [, that.value])[]b4_locations_if([, that.location])[)
-  {]b4_variant_if([
-    b4_symbol_variant([that.type_get ()],
-                      [value], [move], [that.value])])[
     // that is emptied.
-    that.type = empty_symbol;
+    that.type = empty;
   }
 
+  inline
   ]b4_parser_class_name[::stack_symbol_type&
   ]b4_parser_class_name[::stack_symbol_type::operator= (const stack_symbol_type& that)
   {
@@ -615,6 +590,7 @@ m4_if(b4_prefix, [yy], [],
 
 
   template <typename Base>
+  inline
   void
   ]b4_parser_class_name[::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
   {
@@ -634,10 +610,6 @@ m4_if(b4_prefix, [yy], [],
     std::ostream& yyoutput = yyo;
     YYUSE (yyoutput);
     symbol_number_type yytype = yysym.type_get ();
-    // Avoid a (spurious) G++ 4.8 warning about "array subscript is
-    // below array bounds".
-    if (yysym.empty ())
-      std::abort ();
     yyo << (yytype < yyntokens_ ? "token" : "nterm")
         << ' ' << yytname_[yytype] << " ("]b4_locations_if([
         << yysym.location << ": "])[;
@@ -646,6 +618,7 @@ m4_if(b4_prefix, [yy], [],
   }
 #endif
 
+  inline
   void
   ]b4_parser_class_name[::yypush_ (const char* m, state_type s, symbol_type& sym)
   {
@@ -653,6 +626,7 @@ m4_if(b4_prefix, [yy], [],
     yypush_ (m, t);
   }
 
+  inline
   void
   ]b4_parser_class_name[::yypush_ (const char* m, stack_symbol_type& s)
   {
@@ -661,8 +635,9 @@ m4_if(b4_prefix, [yy], [],
     yystack_.push (s);
   }
 
+  inline
   void
-  ]b4_parser_class_name[::yypop_ (unsigned n)
+  ]b4_parser_class_name[::yypop_ (unsigned int n)
   {
     yystack_.pop (n);
   }
@@ -694,23 +669,23 @@ m4_if(b4_prefix, [yy], [],
   }
 #endif // ]b4_api_PREFIX[DEBUG
 
-  ]b4_parser_class_name[::state_type
+  inline ]b4_parser_class_name[::state_type
-  ]b4_parser_class_name[::yy_lr_goto_state_ (state_type yystate, int yysym)
+  ]b4_parser_class_name[::yy_lr_goto_state_ (state_type yystate, int yylhs)
   {
-    int yyr = yypgoto_[yysym - yyntokens_] + yystate;
+    int yyr = yypgoto_[yylhs - yyntokens_] + yystate;
     if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate)
       return yytable_[yyr];
     else
-      return yydefgoto_[yysym - yyntokens_];
+      return yydefgoto_[yylhs - yyntokens_];
   }
 
-  bool
+  inline bool
   ]b4_parser_class_name[::yy_pact_value_is_default_ (int yyvalue)
   {
     return yyvalue == yypact_ninf_;
   }
 
-  bool
+  inline bool
   ]b4_parser_class_name[::yy_table_value_is_error_ (int yyvalue)
   {
     return yyvalue == yytable_ninf_;
@@ -719,9 +694,11 @@ m4_if(b4_prefix, [yy], [],
   int
   ]b4_parser_class_name[::parse ()
   {
+    /// Whether yyla contains a lookahead.
+    bool yyempty = true;
+
     // State.
     int yyn;
-    /// Length of the RHS of the rule being reduced.
     int yylen = 0;
 
     // Error handling.
@@ -734,14 +711,17 @@ m4_if(b4_prefix, [yy], [],
     /// The locations where the error started and ended.
     stack_symbol_type yyerror_range[3];]])[
 
+    /// $$ and @@$.
+    stack_symbol_type yylhs;
+
     /// The return value of parse ().
     int yyresult;
 
-#if YY_EXCEPTIONS
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
     try
-#endif // YY_EXCEPTIONS
       {
-    YYCDEBUG << "Starting parse\n";
+    YYCDEBUG << "Starting parse" << std::endl;
 
 ]m4_ifdef([b4_initial_action], [
 b4_dollar_pushdef([yyla.value], [], [yyla.location])dnl
@@ -754,11 +734,11 @@ b4_dollar_popdef])[]dnl
        location values to have been already stored, initialize these
        stacks with a primary value.  */
     yystack_.clear ();
-    yypush_ (YY_NULLPTR, 0, yyla);
+    yypush_ (YY_NULL, 0, yyla);
 
     // A new symbol was pushed on the stack.
   yynewstate:
-    YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
+    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
@@ -768,30 +748,28 @@ b4_dollar_popdef])[]dnl
 
     // Backup.
   yybackup:
+
     // Try to take a decision without lookahead.
     yyn = yypact_[yystack_[0].state];
     if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
     // Read a lookahead token.
-    if (yyla.empty ())
+    if (yyempty)
       {
         YYCDEBUG << "Reading a token: ";
-#if YY_EXCEPTIONS
         try
-#endif // YY_EXCEPTIONS
           {]b4_token_ctor_if([[
             symbol_type yylookahead (]b4_lex[);
             yyla.move (yylookahead);]], [[
             yyla.type = yytranslate_ (]b4_lex[);]])[
           }
-#if YY_EXCEPTIONS
         catch (const syntax_error& yyexc)
           {
             error (yyexc);
             goto yyerrlab1;
           }
-#endif // YY_EXCEPTIONS
+        yyempty = false;
       }
     YY_SYMBOL_PRINT ("Next token is", yyla);
 
@@ -811,6 +789,9 @@ b4_dollar_popdef])[]dnl
         goto yyreduce;
       }
 
+    // Discard the token being shifted.
+    yyempty = true;
+
     // Count tokens shifted since error; after three, turn off error status.
     if (yyerrstatus_)
       --yyerrstatus_;
@@ -833,60 +814,52 @@ b4_dollar_popdef])[]dnl
   `-----------------------------*/
   yyreduce:
     yylen = yyr2_[yyn];
-    {
+    yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([
-      stack_symbol_type yylhs;
+    /* Variants are always initialized to an empty instance of the
-      yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([
+       correct type. The default $$=$1 action is NOT applied when using
-      /* Variants are always initialized to an empty instance of the
+       variants.  */
-         correct type. The default '$$ = $1' action is NOT applied
+    b4_symbol_variant([[yyr1_@{yyn@}]], [yylhs.value], [build])],[
-         when using variants.  */
+    /* If YYLEN is nonzero, implement the default value of the action:
-      b4_symbol_variant([[yyr1_@{yyn@}]], [yylhs.value], [build])], [
+       '$$ = $1'.  Otherwise, use the top of the stack.
-      /* If YYLEN is nonzero, implement the default value of the
-         action: '$$ = $1'.  Otherwise, use the top of the stack.
 
-         Otherwise, the following line sets YYLHS.VALUE to garbage.
+       Otherwise, the following line sets YYLHS.VALUE to garbage.
-         This behavior is undocumented and Bison users should not rely
+       This behavior is undocumented and Bison
-         upon it.  */
+       users should not rely upon it.  */
-      if (yylen)
+    if (yylen)
-        yylhs.value = yystack_@{yylen - 1@}.value;
+      yylhs.value = yystack_@{yylen - 1@}.value;
-      else
+    else
-        yylhs.value = yystack_@{0@}.value;])[
+      yylhs.value = yystack_@{0@}.value;])[
 ]b4_locations_if([dnl
 [
-      // Default location.
+    // Compute the default @@$.
+    {
+      slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
+      YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+    }]])[
+
+    // Perform the reduction.
+    YY_REDUCE_PRINT (yyn);
+    try
       {
-        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
+        switch (yyn)
-        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+          {
-        yyerror_range[1].location = yylhs.location;
-      }]])[
-
-      // Perform the reduction.
-      YY_REDUCE_PRINT (yyn);
-#if YY_EXCEPTIONS
-      try
-#endif // YY_EXCEPTIONS
-        {
-          switch (yyn)
-            {
 ]b4_user_actions[
-            default:
+          default:
-              break;
+            break;
-            }
+          }
-        }
+      }
-#if YY_EXCEPTIONS
+    catch (const syntax_error& yyexc)
-      catch (const syntax_error& yyexc)
+      {
-        {
+        error (yyexc);
-          error (yyexc);
+        YYERROR;
-          YYERROR;
+      }
-        }
+    YY_SYMBOL_PRINT ("-> $$ =", yylhs);
-#endif // YY_EXCEPTIONS
+    yypop_ (yylen);
-      YY_SYMBOL_PRINT ("-> $$ =", yylhs);
+    yylen = 0;
-      yypop_ (yylen);
+    YY_STACK_PRINT ();
-      yylen = 0;
-      YY_STACK_PRINT ();
 
-      // Shift the result of the reduction.
+    // Shift the result of the reduction.
-      yypush_ (YY_NULLPTR, yylhs);
+    yypush_ (YY_NULL, yylhs);
-    }
     goto yynewstate;
 
   /*--------------------------------------.
@@ -898,7 +871,8 @@ b4_dollar_popdef])[]dnl
       {
         ++yynerrs_;
         error (]b4_join(b4_locations_if([yyla.location]),
-                        [[yysyntax_error_ (yystack_[0].state, yyla)]])[);
+                        [[yysyntax_error_ (yystack_[0].state,
+                                           yyempty ? yyempty_ : yyla.type_get ())]])[);
       }
 
 ]b4_locations_if([[
@@ -911,10 +885,10 @@ b4_dollar_popdef])[]dnl
         // Return failure if at end of input.
         if (yyla.type_get () == yyeof_)
           YYABORT;
-        else if (!yyla.empty ())
+        else if (!yyempty)
           {
             yy_destroy_ ("Error: discarding", yyla);
-            yyla.clear ();
+            yyempty = true;
           }
       }
 
@@ -931,7 +905,11 @@ b4_dollar_popdef])[]dnl
        YYERROR and the label yyerrorlab therefore never appears in user
        code.  */
     if (false)
-      goto yyerrorlab;
+      goto yyerrorlab;]b4_locations_if([[
+    yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[
+    /* $$ was initialized before running the user action.  */
+    YY_SYMBOL_PRINT ("Error: discarding", yylhs);
+    yylhs.~stack_symbol_type();]])[
     /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
@@ -989,7 +967,7 @@ b4_dollar_popdef])[]dnl
     goto yyreturn;
 
   yyreturn:
-    if (!yyla.empty ())
+    if (!yyempty)
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
 
     /* Do not reclaim the symbols of the rule whose action triggered
@@ -1003,38 +981,38 @@ b4_dollar_popdef])[]dnl
 
     return yyresult;
   }
-#if YY_EXCEPTIONS
     catch (...)
       {
-        YYCDEBUG << "Exception caught: cleaning lookahead and stack\n";
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
         // Do not try to display the values of the reclaimed symbols,
-        // as their printers might throw an exception.
+        // as their printer might throw an exception.
-        if (!yyla.empty ())
+        if (!yyempty)
-          yy_destroy_ (YY_NULLPTR, yyla);
+          yy_destroy_ (YY_NULL, yyla);
 
         while (1 < yystack_.size ())
           {
-            yy_destroy_ (YY_NULLPTR, yystack_[0]);
+            yy_destroy_ (YY_NULL, yystack_[0]);
             yypop_ ();
           }
         throw;
       }
-#endif // YY_EXCEPTIONS
   }
 
   void
   ]b4_parser_class_name[::error (const syntax_error& yyexc)
   {
     error (]b4_join(b4_locations_if([yyexc.location]),
-                    [[yyexc.what ()]])[);
+                    [[yyexc.what()]])[);
   }
 
   // Generate an error message.
   std::string
   ]b4_parser_class_name[::yysyntax_error_ (]dnl
-b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
+b4_error_verbose_if([state_type yystate, symbol_number_type yytoken],
-                    [state_type, const symbol_type&])[) const
+                    [state_type, symbol_number_type])[) const
   {]b4_error_verbose_if([[
+    std::string yyres;
     // Number of reported tokens (one for the "unexpected", one per
     // "expected").
     size_t yycount = 0;
@@ -1048,7 +1026,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
          the only way this function was invoked is if the default action
          is an error action.  In that case, don't check for expected
          tokens because there are none.
-       - The only way there can be no lookahead present (in yyla) is
+       - The only way there can be no lookahead present (in yytoken) is
          if this state is a consistent state with a default action.
          Thus, detecting the absence of a lookahead is sufficient to
          determine that there is no unexpected or expected token to
@@ -1068,9 +1046,8 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
          token that will not be accepted due to an error action in a
          later state.
     */
-    if (!yyla.empty ())
+    if (yytoken != yyempty_)
       {
-        int yytoken = yyla.type_get ();
         yyarg[yycount++] = yytname_[yytoken];
         int yyn = yypact_[yystate];
         if (!yy_pact_value_is_default_ (yyn))
@@ -1097,24 +1074,22 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
           }
       }
 
-    char const* yyformat = YY_NULLPTR;
+    char const* yyformat = YY_NULL;
     switch (yycount)
       {
 #define YYCASE_(N, S)                         \
         case N:                               \
           yyformat = S;                       \
         break
-      default: // Avoid compiler warnings.
+        YYCASE_(0, YY_("syntax error"));
-        YYCASE_ (0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
-        YYCASE_ (1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-        YYCASE_ (2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-        YYCASE_ (3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-        YYCASE_ (4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-        YYCASE_ (5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
       }
 
-    std::string yyres;
     // Argument number.
     size_t yyi = 0;
     for (char const* yyp = yyformat; *yyp; ++yyp)
@@ -1158,18 +1133,18 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
            i_end = yystack_.end ();
          i != i_end; ++i)
       *yycdebug_ << ' ' << i->state;
-    *yycdebug_ << '\n';
+    *yycdebug_ << std::endl;
   }
 
   // Report on the debug stream that the rule \a yyrule is going to be reduced.
   void
   ]b4_parser_class_name[::yy_reduce_print_ (int yyrule)
   {
-    unsigned yylno = yyrline_[yyrule];
+    unsigned int yylno = yyrline_[yyrule];
     int yynrhs = yyr2_[yyrule];
     // Print the symbols being reduced, and their result.
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
-               << " (line " << yylno << "):\n";
+               << " (line " << yylno << "):" << std::endl;
     // The symbols being reduced.
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
@@ -1177,7 +1152,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
   }
 #endif // ]b4_api_PREFIX[DEBUG
 
-]b4_token_ctor_if([], [b4_yytranslate_define([cc])])[
+]b4_token_ctor_if([], [b4_yytranslate_define])[
 ]b4_namespace_close[
 ]b4_epilogue[]dnl
 b4_output_end()

data/lalr1.java

@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
-# Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2007-2013 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
@@ -84,7 +84,7 @@ m4_define([b4_define_state],[[
 
 b4_output_begin([b4_parser_file_name])
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007-2015, 2018])
+             [2007-2013])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
@@ -453,19 +453,6 @@ b4_define_state])[
     return yyerrstatus_ == 0;
   }
 
-  /** Compute post-reduction state.
-   * @@param yystate   the current state
-   * @@param yysym     the nonterminal to push on the stack
-   */
-  private int yy_lr_goto_state_ (int yystate, int yysym)
-  {
-    int yyr = yypgoto_[yysym - yyntokens_] + yystate;
-    if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate)
-      return yytable_[yyr];
-    else
-      return yydefgoto_[yysym - yyntokens_];
-  }
-
   private int yyaction (int yyn, YYStack yystack, int yylen) ]b4_maybe_throws([b4_throws])[
   {
     ]b4_yystype[ yyval;
@@ -496,7 +483,14 @@ b4_define_state])[
     yylen = 0;
 
     /* Shift the result of the reduction.  */
-    int yystate = yy_lr_goto_state_ (yystack.stateAt (0), yyr1_[yyn]);
+    yyn = yyr1_[yyn];
+    int yystate = yypgoto_[yyn - yyntokens_] + yystack.stateAt (0);
+    if (0 <= yystate && yystate <= yylast_
+        && yycheck_[yystate] == yystack.stateAt (0))
+      yystate = yytable_[yystate];
+    else
+      yystate = yydefgoto_[yyn - yyntokens_];
+
     yystack.push (yystate, yyval]b4_locations_if([, yyloc])[);
     return YYNEWSTATE;
   }

data/local.mk

@@ -1,4 +1,4 @@
-## Copyright (C) 2002, 2005-2015, 2018 Free Software Foundation, Inc.
+## Copyright (C) 2002, 2005-2013 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

data/location.cc

@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018])
+           [2002-2013])
 
 # b4_position_define
 # ------------------
@@ -27,19 +27,20 @@ m4_define([b4_position_define],
   {
   public:]m4_ifdef([b4_location_constructors], [[
     /// Construct a position.
-    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
+    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
-                       unsigned l = ]b4_location_initial_line[u,
+                       unsigned int l = ]b4_location_initial_line[u,
-                       unsigned c = ]b4_location_initial_column[u)
+                       unsigned int c = ]b4_location_initial_column[u)
       : filename (f)
       , line (l)
       , column (c)
-    {}
+    {
+    }
 
 ]])[
     /// Initialization.
-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
+    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL,
-                     unsigned l = ]b4_location_initial_line[u,
+                     unsigned int l = ]b4_location_initial_line[u,
-                     unsigned c = ]b4_location_initial_column[u)
+                     unsigned int c = ]b4_location_initial_column[u)
     {
       filename = fn;
       line = l;
@@ -68,19 +69,21 @@ m4_define([b4_position_define],
     /// File name to which this position refers.
     ]b4_percent_define_get([[filename_type]])[* filename;
     /// Current line number.
-    unsigned line;
+    unsigned int line;
     /// Current column number.
-    unsigned column;
+    unsigned int column;
 
   private:
-    /// Compute max(min, lhs+rhs).
+    /// Compute max(min, lhs+rhs) (provided min <= lhs).
-    static unsigned add_ (unsigned lhs, int rhs, int min)
+    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
     {
-      return static_cast<unsigned>(std::max(min, static_cast<int>(lhs) + rhs));
+      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
+              ? rhs + lhs
+              : min);
     }
   };
 
-  /// Add \a width columns, in place.
+  /// Add and assign a position.
   inline position&
   operator+= (position& res, int width)
   {
@@ -88,21 +91,21 @@ m4_define([b4_position_define],
     return res;
   }
 
-  /// Add \a width columns.
+  /// Add two position objects.
   inline position
   operator+ (position res, int width)
   {
     return res += width;
   }
 
-  /// Subtract \a width columns, in place.
+  /// Add and assign a position.
   inline position&
   operator-= (position& res, int width)
   {
     return res += -width;
   }
 
-  /// Subtract \a width columns.
+  /// Add two position objects.
   inline position
   operator- (position res, int width)
   {
@@ -132,7 +135,7 @@ m4_define([b4_position_define],
    ** \param pos a reference to the position to redirect
    */
   template <typename YYChar>
-  std::basic_ostream<YYChar>&
+  inline std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
@@ -154,27 +157,30 @@ m4_define([b4_location_define],
     location (const position& b, const position& e)
       : begin (b)
       , end (e)
-    {}
+    {
+    }
 
     /// Construct a 0-width location in \a p.
     explicit location (const position& p = position ())
       : begin (p)
       , end (p)
-    {}
+    {
+    }
 
     /// Construct a 0-width location in \a f, \a l, \a c.
     explicit location (]b4_percent_define_get([[filename_type]])[* f,
-                       unsigned l = ]b4_location_initial_line[u,
+                       unsigned int l = ]b4_location_initial_line[u,
-                       unsigned c = ]b4_location_initial_column[u)
+                       unsigned int c = ]b4_location_initial_column[u)
       : begin (f, l, c)
       , end (f, l, c)
-    {}
+    {
+    }
 
 ])[
     /// Initialization.
-    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
+    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
-                     unsigned l = ]b4_location_initial_line[u,
+                     unsigned int l = ]b4_location_initial_line[u,
-                     unsigned c = ]b4_location_initial_column[u)
+                     unsigned int c = ]b4_location_initial_column[u)
     {
       begin.initialize (f, l, c);
       end = begin;
@@ -210,42 +216,36 @@ m4_define([b4_location_define],
     position end;
   };
 
-  /// Join two locations, in place.
+  /// Join two location objects to create a location.
-  inline location& operator+= (location& res, const location& end)
+  inline location operator+ (location res, const location& end)
   {
     res.end = end.end;
     return res;
   }
 
-  /// Join two locations.
+  /// Change end position in place.
-  inline location operator+ (location res, const location& end)
-  {
-    return res += end;
-  }
-
-  /// Add \a width columns to the end position, in place.
   inline location& operator+= (location& res, int width)
   {
     res.columns (width);
     return res;
   }
 
-  /// Add \a width columns to the end position.
+  /// Change end position.
   inline location operator+ (location res, int width)
   {
     return res += width;
   }
 
-  /// Subtract \a width columns to the end position, in place.
+  /// Change end position in place.
   inline location& operator-= (location& res, int width)
   {
     return res += -width;
   }
 
-  /// Subtract \a width columns to the end position.
+  /// Change end position.
-  inline location operator- (location res, int width)
+  inline location operator- (const location& begin, int width)
   {
-    return res -= width;
+    return begin + -width;
   }
 ]b4_percent_define_flag_if([[define_location_comparison]], [[
   /// Compare two location objects.
@@ -269,11 +269,12 @@ m4_define([b4_location_define],
    ** Avoid duplicate information.
    */
   template <typename YYChar>
-  std::basic_ostream<YYChar>&
+  inline std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
-    unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
-    ostr << loc.begin;
+    ostr << loc.begin// << "(" << loc.end << ") "
+;
     if (loc.end.filename
         && (!loc.begin.filename
             || *loc.begin.filename != *loc.end.filename))

data/stack.hh

@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -16,44 +16,39 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018])
+           [2002-2013])
 
 # b4_stack_define
 # ---------------
 m4_define([b4_stack_define],
-[[  /// A stack with random access from its top.
+[[  template <class T, class S = std::vector<T> >
-  template <class T, class S = std::vector<T> >
   class stack
   {
   public:
     // Hide our reversed order.
     typedef typename S::reverse_iterator iterator;
     typedef typename S::const_reverse_iterator const_iterator;
-    typedef typename S::size_type size_type;
 
     stack ()
+      : seq_ ()
     {
-      seq_.reserve (200);
     }
 
-    stack (size_type n)
+    stack (unsigned int n)
       : seq_ (n)
-    {}
+    {
+    }
 
-    /// Random access.
+    inline
-    ///
-    /// Index 0 returns the topmost element.
     T&
-    operator[] (size_type i)
+    operator[] (unsigned int i)
     {
       return seq_[seq_.size () - 1 - i];
     }
 
-    /// Random access.
+    inline
-    ///
-    /// Index 0 returns the topmost element.
     const T&
-    operator[] (size_type i) const
+    operator[] (unsigned int i) const
     {
       return seq_[seq_.size () - 1 - i];
     }
@@ -61,6 +56,7 @@ m4_define([b4_stack_define],
     /// Steal the contents of \a t.
     ///
     /// Close to move-semantics.
+    inline
     void
     push (T& t)
     {
@@ -68,8 +64,9 @@ m4_define([b4_stack_define],
       operator[](0).move (t);
     }
 
+    inline
     void
-    pop (size_type n = 1)
+    pop (unsigned int n = 1)
     {
       for (; n; --n)
         seq_.pop_back ();
@@ -81,18 +78,21 @@ m4_define([b4_stack_define],
       seq_.clear ();
     }
 
-    size_type
+    inline
+    typename S::size_type
     size () const
     {
       return seq_.size ();
     }
 
+    inline
     const_iterator
     begin () const
     {
       return seq_.rbegin ();
     }
 
+    inline
     const_iterator
     end () const
     {
@@ -111,21 +111,22 @@ m4_define([b4_stack_define],
   class slice
   {
   public:
-    typedef typename S::size_type size_type;
+    slice (const S& stack, unsigned int range)
-    slice (const S& stack, size_type range)
       : stack_ (stack)
       , range_ (range)
-    {}
+    {
+    }
 
+    inline
     const T&
-    operator[] (size_type i) const
+    operator [] (unsigned int i) const
     {
       return stack_[range_ - i];
     }
 
   private:
     const S& stack_;
-    size_type range_;
+    unsigned int range_;
   };
 ]])
 

data/variant.hh

@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -27,7 +27,7 @@
 m4_define([b4_symbol_variant],
 [m4_pushdef([b4_dollar_dollar],
             [$2.$3< $][3 > (m4_shift3($@))])dnl
-switch ($1)
+  switch ($1)
     {
 b4_type_foreach([b4_type_action_])[]dnl
       default:
@@ -94,15 +94,14 @@ m4_define([b4_variant_define],
     typedef variant<S> self_type;
 
     /// Empty construction.
-    variant ()
+    variant ()]b4_parse_assert_if([
-      : yybuffer_ ()]b4_parse_assert_if([
+      : yytname_ (YY_NULL)])[
-      , yytypeid_ (YY_NULLPTR)])[
     {}
 
     /// Construct and fill.
     template <typename T>
     variant (const T& t)]b4_parse_assert_if([
-      : yytypeid_ (&typeid (T))])[
+      : yytname_ (typeid (T).name ())])[
     {
       YYASSERT (sizeof (T) <= S);
       new (yyas_<T> ()) T (t);
@@ -111,7 +110,7 @@ m4_define([b4_variant_define],
     /// Destruction, allowed only if empty.
     ~variant ()
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
+      YYASSERT (!yytname_);
     ])[}
 
     /// Instantiate an empty \a T in here.
@@ -119,10 +118,10 @@ m4_define([b4_variant_define],
     T&
     build ()
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
+      YYASSERT (!yytname_);
       YYASSERT (sizeof (T) <= S);
-      yytypeid_ = & typeid (T);])[
+      yytname_ = typeid (T).name ();])[
-      return *new (yyas_<T> ()) T ();
+      return *new (yyas_<T> ()) T;
     }
 
     /// Instantiate a \a T in here from \a t.
@@ -130,9 +129,9 @@ m4_define([b4_variant_define],
     T&
     build (const T& t)
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
+      YYASSERT (!yytname_);
       YYASSERT (sizeof (T) <= S);
-      yytypeid_ = & typeid (T);])[
+      yytname_ = typeid (T).name ();])[
       return *new (yyas_<T> ()) T (t);
     }
 
@@ -141,8 +140,7 @@ m4_define([b4_variant_define],
     T&
     as ()
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
+      YYASSERT (yytname_ == typeid (T).name ());
-      YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);])[
       return *yyas_<T> ();
     }
@@ -152,8 +150,7 @@ m4_define([b4_variant_define],
     const T&
     as () const
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
+      YYASSERT (yytname_ == typeid (T).name ());
-      YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);])[
       return *yyas_<T> ();
     }
@@ -170,8 +167,8 @@ m4_define([b4_variant_define],
     void
     swap (self_type& other)
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
+      YYASSERT (yytname_);
-      YYASSERT (*yytypeid_ == *other.yytypeid_);])[
+      YYASSERT (yytname_ == other.yytname_);])[
       std::swap (as<T> (), other.as<T> ());
     }
 
@@ -181,7 +178,8 @@ m4_define([b4_variant_define],
     template <typename T>
     void
     move (self_type& other)
-    {
+    {]b4_parse_assert_if([
+      YYASSERT (!yytname_);])[
       build<T> ();
       swap<T> (other);
       other.destroy<T> ();
@@ -201,7 +199,7 @@ m4_define([b4_variant_define],
     destroy ()
     {
       as<T> ().~T ();]b4_parse_assert_if([
-      yytypeid_ = YY_NULLPTR;])[
+      yytname_ = YY_NULL;])[
     }
 
   private:
@@ -236,7 +234,7 @@ m4_define([b4_variant_define],
     } yybuffer_;]b4_parse_assert_if([
 
     /// Whether the content is built: if defined, the name of the stored type.
-    const std::type_info *yytypeid_;])[
+    const char *yytname_;])[
   };
 ]])
 
@@ -323,6 +321,7 @@ b4_join(b4_symbol_if([$1], [has_type],
     return symbol_type (b4_join([token::b4_symbol([$1], [id])],
                                 b4_symbol_if([$1], [has_type], [v]),
                                 b4_locations_if([l])));
+
   }
 
 ])])])
@@ -335,7 +334,7 @@ m4_define([b4_basic_symbol_constructor_declare],
 [[
   basic_symbol (]b4_join(
           [typename Base::kind_type t],
-          b4_symbol_if([$1], [has_type], const b4_symbol([$1], [type])[& v]),
+          b4_symbol_if([$1], [has_type], const b4_symbol([$1], [type])[ v]),
           b4_locations_if([const location_type& l]))[);
 ]])
 
@@ -347,10 +346,10 @@ m4_define([b4_basic_symbol_constructor_define],
   template <typename Base>
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
           [typename Base::kind_type t],
-          b4_symbol_if([$1], [has_type], const b4_symbol([$1], [type])[& v]),
+          b4_symbol_if([$1], [has_type], const b4_symbol([$1], [type])[ v]),
           b4_locations_if([const location_type& l]))[)
-    : Base (t)]b4_symbol_if([$1], [has_type], [
+    : Base (t)
-    , value (v)])[]b4_locations_if([
+    , value (]b4_symbol_if([$1], [has_type], [v])[)]b4_locations_if([
     , location (l)])[
   {}
 ]])

data/xslt/bison.xsl

@@ -3,7 +3,7 @@
 <!--
     bison.xsl - common templates for Bison XSLT.
 
-    Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+    Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 

data/xslt/xml2dot.xsl

@@ -3,7 +3,7 @@
 <!--
     xml2dot.xsl - transform Bison XML Report into DOT.
 
-    Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+    Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
@@ -201,8 +201,6 @@
   <xsl:if test="$point = 0">
     <xsl:text> .</xsl:text>
   </xsl:if>
-
-  <!-- RHS -->
   <xsl:for-each select="rhs/symbol|rhs/empty">
     <xsl:apply-templates select="."/>
     <xsl:if test="$point = position()">
@@ -216,9 +214,7 @@
   <xsl:value-of select="."/>
 </xsl:template>
 
-<xsl:template match="empty">
+<xsl:template match="empty"/>
-  <xsl:text> %empty</xsl:text>
-</xsl:template>
 
 <xsl:template match="lookaheads">
   <xsl:text>  [</xsl:text>

data/xslt/xml2text.xsl

@@ -3,7 +3,7 @@
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
 
-    Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+    Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
@@ -350,7 +350,12 @@
     <xsl:if test="position() = $point + 1">
       <xsl:text> .</xsl:text>
     </xsl:if>
-    <xsl:apply-templates select="."/>
+    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
+      <xsl:apply-templates select="."/>
+    </xsl:if>
+    <xsl:if test="$itemset != 'true'">
+      <xsl:apply-templates select="."/>
+    </xsl:if>
     <xsl:if test="position() = last() and position() = $point">
       <xsl:text> .</xsl:text>
     </xsl:if>

data/xslt/xml2xhtml.xsl

@@ -3,7 +3,7 @@
 <!--
     xml2html.xsl - transform Bison XML Report into XHTML.
 
-    Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+    Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
@@ -532,7 +532,12 @@
       <xsl:text> </xsl:text>
       <span class="point">.</span>
     </xsl:if>
-    <xsl:apply-templates select="."/>
+    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
+      <xsl:apply-templates select="."/>
+    </xsl:if>
+    <xsl:if test="$itemset != 'true'">
+      <xsl:apply-templates select="."/>
+    </xsl:if>
     <xsl:if test="position() = last() and position() = $point">
       <xsl:text> </xsl:text>
       <span class="point">.</span>
@@ -558,7 +563,7 @@
 </xsl:template>
 
 <xsl:template match="empty">
-  <xsl:text> %empty</xsl:text>
+  <xsl:text> &#949;</xsl:text>
 </xsl:template>
 
 <xsl:template match="lookaheads">

data/yacc.c

@@ -1,11 +1,11 @@
                                                              -*- C -*-
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software
+# Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation,
-# Foundation, Inc.
+# Inc.
 
 m4_pushdef([b4_copyright_years],
-           [1984, 1989-1990, 2000-2015, 2018])
+           [1984, 1989-1990, 2000-2013])
 
 # 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
@@ -118,7 +118,7 @@ m4_define([b4_int_type],
        b4_ints_in($@,      [0], [65535]), [1], [yytype_uint16],
        b4_ints_in($@, [-32768], [32767]), [1], [yytype_int16],
 
-       m4_eval([0 <= $1]),                [1], [unsigned],
+       m4_eval([0 <= $1]),                [1], [unsigned int],
 
                                                [int])])
 
@@ -377,13 +377,13 @@ typedef signed char yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short yytype_uint16;
+typedef unsigned short int yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short yytype_int16;
+typedef short int yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -395,7 +395,7 @@ typedef short yytype_int16;
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned
+#  define YYSIZE_T unsigned int
 # endif
 #endif
 
@@ -571,7 +571,7 @@ union yyalloc
 #define YYMAXUTOK   ]b4_user_token_number_max[
 
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, without out-of-bounds checking.  */
@@ -719,7 +719,7 @@ do {                                                            \
                    ])[[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,
                    b4_parse_param]))[
 {
-  unsigned long yylno = yyrline[yyrule];
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -827,7 +827,7 @@ yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
       *yycapacity = yyalloc;]m4_if(b4_percent_define_get([[parse.lac.memory-trace]]),
                                    [full], [[
       YYDPRINTF ((stderr, "%srealloc to %lu%s", yydebug_prefix,
-                  (unsigned long) yyalloc, yydebug_suffix));]])[
+                  (unsigned long int) yyalloc, yydebug_suffix));]])[
     }
   return 0;
 }
@@ -1108,11 +1108,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 ]b4_lac_if([[yytype_int16 *yyesa, yytype_int16 **yyes,
                 YYSIZE_T *yyes_capacity, ]])[yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
+  const char *yyformat = YY_NULL;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -1187,7 +1187,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
                   if (! (yysize <= yysize1
                          && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                     return 2;
@@ -1207,7 +1207,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
-    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1272,7 +1271,7 @@ static char yypstate_allocated = 0;]])b4_pull_if([
 
 b4_function_define([[yyparse]], [[int]], b4_parse_param)[
 {
-  return yypull_parse (YY_NULLPTR]m4_ifset([b4_parse_param],
+  return yypull_parse (YY_NULL]m4_ifset([b4_parse_param],
                                   [[, ]b4_args(b4_parse_param)])[);
 }
 
@@ -1314,10 +1313,10 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
 {
   yypstate *yyps;]b4_pure_if([], [[
   if (yypstate_allocated)
-    return YY_NULLPTR;]])[
+    return YY_NULL;]])[
   yyps = (yypstate *) malloc (sizeof *yyps);
   if (!yyps)
-    return YY_NULLPTR;
+    return YY_NULL;
   yyps->yynew = 1;]b4_pure_if([], [[
   yypstate_allocated = 1;]])[
   return yyps;
@@ -1326,19 +1325,16 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
 ]b4_function_define([[yypstate_delete]], [[void]],
                    [[[yypstate *yyps]], [[yyps]]])[
 {
-  if (yyps)
-    {
 #ifndef yyoverflow
-      /* If the stack was reallocated but the parse did not complete, then the
+  /* If the stack was reallocated but the parse did not complete, then the
-         stack still needs to be freed.  */
+     stack still needs to be freed.  */
-      if (!yyps->yynew && yyps->yyss != yyps->yyssa)
+  if (!yyps->yynew && yyps->yyss != yyps->yyssa)
-        YYSTACK_FREE (yyps->yyss);
+    YYSTACK_FREE (yyps->yyss);
 #endif]b4_lac_if([[
-      if (!yyps->yynew && yyps->yyes != yyps->yyesa)
+  if (!yyps->yynew && yyps->yyes != yyps->yyesa)
-        YYSTACK_FREE (yyps->yyes);]])[
+    YYSTACK_FREE (yyps->yyes);]])[
-      free (yyps);]b4_pure_if([], [[
+  free (yyps);]b4_pure_if([], [[
-      yypstate_allocated = 0;]])[
+  yypstate_allocated = 0;]])[
-    }
 }
 ]b4_pure_if([[
 #define ]b4_prefix[nerrs yyps->]b4_prefix[nerrs]])[
@@ -1513,7 +1509,7 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
       yylsp = yyls + yysize - 1;])[
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
@@ -1645,9 +1641,8 @@ yyreduce:
   yyval = yyvsp[1-yylen];
 
 ]b4_locations_if(
-[[  /* Default location. */
+[[  /* Default location.  */
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);]])[
-  yyerror_range[1] = yyloc;]])[
   YY_REDUCE_PRINT (yyn);]b4_lac_if([[
   {
     int yychar_backup = yychar;
@@ -1787,7 +1782,8 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule whose action triggered
+]b4_locations_if([[  yyerror_range[1] = yylsp[1-yylen];
+]])[  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;

djgpp/Makefile.maint

@@ -1,7 +1,7 @@
 # DJGPP Maintainer's Makefile                                    -*-Makefile-*-
 # Requires GNU sed
 
-## Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+## Copyright (C) 2005-2013 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

djgpp/README.in

@@ -1,6 +1,6 @@
 This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
 
-Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2005-2013 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

djgpp/config.bat

@@ -4,7 +4,7 @@ Rem Configure Bison for DJGPP.
 Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line
 Rem format, or else stock DOS/Windows shells will refuse to run it.
 
-Rem Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+Rem Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by

djgpp/config.sed

@@ -2,7 +2,7 @@
 # Sed script for additional DJGPP specific editing
 # of the configure script generated by autoconf 2.62.
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

djgpp/config.site

@@ -3,7 +3,7 @@
 # This is the config.site file for configuring GNU packages
 # which are to be built with DJGPP tools.
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

djgpp/config_h.sed

@@ -1,6 +1,6 @@
 # sed script for DJGPP specific editing of config.hin
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

djgpp/djunpack.bat

@@ -7,7 +7,7 @@ Rem This batch file unpacks the Bison distribution while simultaneously
 Rem renaming some of the files whose names are invalid on DOS or conflict
 Rem with other file names after truncation to DOS 8+3 namespace.
 Rem
-Rem Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+Rem Copyright (C) 2005-2013 Free Software Foundation, Inc.
 Rem
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by

djgpp/local.mk

@@ -1,4 +1,4 @@
-## Copyright (C) 2008-2015, 2018 Free Software Foundation, Inc.
+## Copyright (C) 2008-2013 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

djgpp/subpipe.c

@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 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

djgpp/subpipe.h

@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 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

djgpp/testsuite.sed

@@ -2,7 +2,7 @@
 # Sed script for additional DJGPP specific editing
 # of the testsuite script generated by autoconf 2.61.
 
-# Copyright (C) 2007-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2007-2013 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

doc/.gitignore

@@ -27,4 +27,3 @@
 /stamp-vti
 /version.texi
 /yacc.1
-/gendocs_template_min

doc/local.mk

@@ -1,5 +1,4 @@
-## Copyright (C) 2001-2003, 2005-2015, 2018 Free Software Foundation,
+## Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
-## 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
@@ -86,13 +85,11 @@ doc/refcard.pdf: doc/refcard.tex
 # repeated builds of bison.help.
 
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
-if ! CROSS_COMPILING
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
 	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
 	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
-endif ! CROSS_COMPILING
 
 
 ## ----------- ##
@@ -109,11 +106,7 @@ remove_time_stamp = \
   sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
 
 # Depend on configure to get version number changes.
-if ! CROSS_COMPILING
+$(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
-MAN_DEPS = doc/bison.help doc/bison.x $(top_srcdir)/configure
-endif
-
-$(top_srcdir)/doc/bison.1: $(MAN_DEPS)
 	$(AM_V_GEN)$(HELP2MAN)			\
 	    --include=$(top_srcdir)/doc/bison.x	\
 	    --output=$@.t src/bison$(EXEEXT)
@@ -125,15 +118,13 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS)
 	fi
 	$(AM_V_at)rm -f $@*.t
 
-if ENABLE_YACC
 nodist_man_MANS = doc/yacc.1
-endif
 
 ## ----------------------------- ##
 ## Graphviz examples generation. ##
 ## ----------------------------- ##
 
-CLEANFILES += $(FIGS_GV:.gv=.eps) $(FIGS_GV:.gv=.pdf) $(FIGS_GV:.gv=.png)
+CLEANDIRS += doc/figs
 FIGS_GV =                                               \
   doc/figs/example.gv                                   \
   doc/figs/example-reduce.gv doc/figs/example-shift.gv

doc/refcard.tex

@@ -19,8 +19,7 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001, 2009-2015, 2018 Free Software Foundation,
+% Copyright (c) 1998, 2001, 2009-2013 Free Software Foundation, Inc.
-% Inc.
 %
 % This file is part of Bison.
 %

etc/README

@@ -16,7 +16,7 @@ straightforward use of _build/src/bison would.)
 
 --
 
-Copyright (C) 2006, 2009-2015, 2018 Free Software Foundation, Inc.
+Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 

etc/bench.pl.in

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2006, 2008-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
@@ -738,7 +738,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp,
 void
 yy::parser::error(const yy::parser::location_type& loc, const std::string& msg)
 {
-  std::cerr << loc << ": " << msg << '\n';
+  std::cerr << loc << ": " << msg << std::endl;
 }
 
 int main(int argc, char *argv[])

etc/local.mk

@@ -1,4 +1,4 @@
-## Copyright (C) 2006, 2008-2015, 2018 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2008-2013 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

examples/README

@@ -1,40 +0,0 @@
-This directory contains examples of Bison grammar files.
-
-* mfcalc
-A C example of a multi-function calculator.  Extracted from the
-documentation.
-
-* calc++
-A C++ version of the canonical example for parsers: a calculator.  Also uses
-Flex for the scanner.  Extracted from the documentation.
-
-* variant.yy
-A C++ example that uses variants (they allow to use any C++ type as semantic
-value type) and symbol constructors (they ensure consistency between
-declared token type and effective semantic value).
-
------
-
-Local Variables:
-mode: outline
-fill-column: 76
-End:
-
-Copyright (C) 2018 Free Software Foundation, Inc.
-
-This file is part of Bison, the GNU Compiler Compiler.
-
-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 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# LocalWords:  mfcalc calc parsers yy

examples/calc++/.gitignore

@@ -2,18 +2,18 @@
 /*.tmp
 /.deps
 /calc++
+/calc++-driver.cc
+/calc++-driver.hh
+/calc++-parser.cc
+/calc++-parser.hh
+/calc++-parser.output
+/calc++-parser.stamp
+/calc++-parser.yy
+/calc++-scanner.cc
+/calc++-scanner.ll
 /calc++.cc
 /calc++.exe
 /calc.stamp
-/driver.cc
-/driver.hh
 /location.hh
-/parser.cc
-/parser.hh
-/parser.output
-/parser.stamp
-/parser.yy
 /position.hh
-/scanner.cc
-/scanner.ll
 /stack.hh

examples/calc++/Makefile

@@ -1,27 +0,0 @@
-# This Makefile is designed to be simple and readable.  It does not
-# aim at portability.  It requires GNU Make.
-
-BISON = bison
-CXX = g++
-FLEX = flex
-
-all: calc++
-
-%.cc %.hh: %.yy
-	$(BISON) $(BISONFLAGS) -o $*.cc $<
-
-%.cc: %.ll
-	$(FLEX) $(FLEXFLAGS) -o$@ $<
-
-%.o: %.cc
-	$(CXX) $(CXXFLAGS) -c -o$@ $<
-
-calc++: calc++.o driver.o parser.o scanner.o
-	$(CXX) -o $@ $^
-
-calc++.o: parser.hh
-parser.o: parser.hh
-scanner.o: parser.hh
-
-clean:
-	rm -f calc++ *.o parser.hh parser.cc scanner.cc

examples/calc++/README

@@ -1,51 +0,0 @@
-This directory contains calc++, a simple Bison grammar file in C++.
-
-Please, read the corresponding chapter in the documentation: "A Complete C++
-Example".  It is also available on line (maybe with a different version of
-Bison):
-https://www.gnu.org/software/bison/manual/html_node/A-Complete-C_002b_002b-Example.html
-
-To use it, copy this directory into some work directory, and run `make` to
-compile the executable, and try it.  It is a simple calculator which accepts
-several variable definitions, one per line, and then a single expression to
-evaluate.
-
-The program calc++ expects the file to parse as argument; pass `-` to read
-the standard input (and then hit <Ctrl-d>, control-d, to end your input).
-
-$ ./calc++ -
-one := 1
-two := 2
-three := 3
-(one + two * three) * two * three
-<Ctrl-d>
-42
-
-You may pass `-p` to activate the parser debug traces, and `-s` to activate
-the scanner's.
-
------
-
-Local Variables:
-mode: outline
-fill-column: 76
-End:
-
-Copyright (C) 2018 Free Software Foundation, Inc.
-
-This file is part of Bison, the GNU Compiler Compiler.
-
-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 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# LocalWords:  mfcalc calc parsers yy MERCHANTABILITY

examples/calc++/calc++.test

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

examples/calc++/local.mk

@@ -1,5 +1,4 @@
-# Copyright (C) 2005-2006, 2008-2015, 2018 Free Software Foundation,
+# Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
-# 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
@@ -20,7 +19,7 @@
 
 # Don't depend on $(BISON) otherwise we would rebuild these files
 # in srcdir, including during distcheck, which is forbidden.
-%D%/parser.stamp: $(BISON_IN)
+examples/calc++/calc++-parser.stamp: $(BISON_IN)
 SUFFIXES += .yy .stamp
 .yy.stamp:
 	$(AM_V_YACC)rm -f $@
@@ -28,14 +27,14 @@ SUFFIXES += .yy .stamp
 	$(AM_V_at)$(YACCCOMPILE) -o $*.cc $<
 	$(AM_V_at)mv -f $@.tmp $@
 
-$(calcxx_sources_generated): %D%/parser.stamp
+$(calc_sources_generated): examples/calc++/calc++-parser.stamp
-	@test -f $@ || rm -f %D%/parser.stamp
+	@test -f $@ || rm -f examples/calc++/calc++-parser.stamp
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %D%/parser.stamp
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/calc++/calc++-parser.stamp
-CLEANFILES +=					\
+CLEANFILES +=                                   \
-  $(calcxx_sources_generated)			\
+  $(calc_sources_generated)                     \
-  %D%/parser.output				\
+  examples/calc++/calc++-parser.output          \
-  %D%/parser.stamp				\
+  examples/calc++/calc++-parser.stamp           \
-  %D%/scanner.cc
+  examples/calc++/calc++-scanner.cc
 
 
 ## -------------------- ##
@@ -43,44 +42,35 @@ CLEANFILES +=					\
 ## -------------------- ##
 
 # Avoid using BUILT_SOURCES which is too global.
-$(%C%_calc___OBJECTS): $(calcxx_sources_generated)
+$(examples_calc___calc___OBJECTS): $(calc_sources_generated)
 
-calcxx_sources_extracted =			\
+calc_sources_extracted =                        \
-  %D%/driver.cc					\
+  examples/calc++/calc++-driver.cc              \
-  %D%/driver.hh					\
+  examples/calc++/calc++-driver.hh              \
-  %D%/scanner.ll				\
+  examples/calc++/calc++-scanner.ll             \
-  %D%/calc++.cc
+  examples/calc++/calc++.cc
-calcxx_extracted =                              \
+calc_extracted =                                \
-  $(calcxx_sources_extracted)                   \
+  $(calc_sources_extracted)                     \
-  %D%/parser.yy
+  examples/calc++/calc++-parser.yy
-extracted += $(calcxx_extracted)
+extracted += $(calc_extracted)
-calcxx_sources_generated =                      \
+calc_sources_generated =                        \
-  %D%/parser.cc                                 \
+  examples/calc++/calc++-parser.cc              \
-  %D%/parser.hh                                 \
+  examples/calc++/calc++-parser.hh              \
-  %D%/location.hh                               \
+  examples/calc++/location.hh                   \
-  %D%/position.hh                               \
+  examples/calc++/position.hh                   \
-  %D%/stack.hh
+  examples/calc++/stack.hh
-calcxx_sources =                                \
+calc_sources =                                  \
-  $(calcxx_sources_extracted)                   \
+  $(calc_sources_extracted)                     \
-  $(calcxx_sources_generated)
+  $(calc_sources_generated)
 
-if FLEX_CXX_WORKS
+if BISON_CXX_WORKS
-check_PROGRAMS += %D%/calc++
+check_PROGRAMS += examples/calc++/calc++
-nodist_%C%_calc___SOURCES =                     \
+nodist_examples_calc___calc___SOURCES =         \
-  $(calcxx_sources)
+  $(calc_sources)
 
-%C%_calc___CPPFLAGS = -I$(top_builddir)/%D%
+examples_calc___calc___CPPFLAGS = -I$(top_builddir)/examples/calc++
-%C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
+examples_calc___calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
-dist_TESTS += %D%/calc++.test
+dist_TESTS += examples/calc++/calc++.test
 else
-EXTRA_DIST += %D%/calc++.test
+EXTRA_DIST += examples/calc++/calc++.test
 endif
-
-
-## ------------ ##
-## Installing.  ##
-## ------------ ##
-
-calcxxdir = $(docdir)/examples/calc++
-calcxx_DATA = $(calcxx_extracted)
-dist_calcxx_DATA = %D%/README %D%/Makefile

examples/calc++/y.tab.h

@@ -0,0 +1,6 @@
+// Work around an Automake 1.11.2 bug: it asks for the creation of
+// y.tab.c and y.tab.h and then renames them as calc++-parser.cc and
+// calc++-parser.h, but in the former it does not convert the
+// #include "y.tab.h".  We don't want this to show in the
+// documentation.
+#include "calc++-parser.hh"

examples/extexi

@@ -3,8 +3,8 @@
 
 # This file is part of GNU Bison
 
-# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2015, 2018 Free
+# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2013 Free Software
-# Software Foundation, Inc.
+# 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
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: extexi [OPTION...] input-file.texi ... -- [FILES to extract]
+# Usage: extexi input-file.texi ... -- [FILES to extract]
 
 # Look for @example environments preceded with lines such as:
 #
@@ -35,9 +35,6 @@
 
 use strict;
 
-# Whether we generate synclines.
-my $synclines = 0;
-
 # normalize($block)
 # -----------------
 # Remove Texinfo mark up.
@@ -45,7 +42,7 @@ sub normalize($)
 {
   local ($_) = @_;
 
-  s/^\@(c |comment|dots|end (ignore|group)|ignore|group).*\n//mg;
+  s/^\@(c |comment|dots|end (ignore|group)|ignore|group).*//mg;
   s/\@value\{VERSION\}/$ENV{VERSION}/g;
   s/^\@(error|result)\{\}//mg;
   s/\@([{}@])/$1/g;
@@ -65,21 +62,8 @@ sub message($)
     }
 }
 
-# The list of files we should extract.
+# basename => full file name for files we should extract.
-my @file_wanted;
+my %file_wanted;
-
-# Whether we should extract that file, and then under which path.
-sub file_wanted ($)
-{
-  my ($f) = @_;
-  for my $file (@file_wanted)
-    {
-      # No endswith in Perl 5...
-      return $file if $f eq substr($file, -length($f));
-    }
-  undef
-}
-
 
 sub process ($)
 {
@@ -102,9 +86,9 @@ sub process ($)
         {
           my $f = $1;
           $block = $2 || 1;
-          if (file_wanted($f))
+          if ($file_wanted{$f})
             {
-              $file = file_wanted($f);
+              $file = $file_wanted{$f};
               message(" GEN $file");
             }
           else
@@ -118,14 +102,14 @@ sub process ($)
             {
               # Bison supports synclines, but not Flex.
               $input .= sprintf ("#line %s \"$in\"\n", $. + 1)
-                if $synclines && $file =~ /\.[chy]*$/;
+                if $file =~ /\.[chy]*$/;
+              next;
             }
           elsif (/^\@end (small)?example$/)
             {
               die "no contents: $file"
                 if $input eq "";
 
-              $file{$file}{$block} .= "\n" if defined $file{$file}{$block};
               $file{$file}{$block} .= normalize($input);
               $file = $input = undef;
               ++$block;
@@ -152,17 +136,14 @@ my @input;
 my $seen_dash = 0;
 for my $arg (@ARGV)
 {
-  if ($seen_dash)
+  if ($arg eq '--')
-    {
-      push @file_wanted, $arg;
-    }
-  elsif ($arg eq '--')
     {
       $seen_dash = 1;
     }
-  elsif ($arg eq '--synclines')
+  elsif ($seen_dash)
     {
-      $synclines = 1;
+      use File::Basename;
+      $file_wanted{basename($arg)} = $arg;
     }
   else
     {

examples/local.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2008-2013 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
@@ -13,8 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-dist_noinst_SCRIPTS = %D%/extexi %D%/test
+dist_noinst_SCRIPTS = examples/extexi examples/test
-TEST_LOG_COMPILER = $(top_srcdir)/%D%/test
+TEST_LOG_COMPILER = $(top_srcdir)/examples/test
 
 AM_CXXFLAGS =							\
   $(WARN_CXXFLAGS) $(WARN_CXXFLAGS_TEST) $(WERROR_CXXFLAGS)
@@ -24,36 +24,20 @@ AM_CXXFLAGS =							\
 ## ------------ ##
 
 doc = $(top_srcdir)/doc/bison.texi
-extexi = $(top_srcdir)/%D%/extexi
+extexi = $(top_srcdir)/examples/extexi
-if ENABLE_GCC_WARNINGS
+extract = VERSION="$(VERSION)" $(PERL) -f $(extexi) $(doc) --
-EXTEXIFLAGS = --synclines
-endif
-extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(EXTEXIFLAGS) $(doc) --
 extracted =
-CLEANFILES += $(extracted) %D%/extracted.stamp
+CLEANFILES += $(extracted) examples/extracted.stamp
-%D%/extracted.stamp: $(doc) $(extexi)
+examples/extracted.stamp: $(doc) $(extexi)
 	$(AM_V_GEN)rm -f $@ $@.tmp
 	$(AM_V_at)touch $@.tmp
 	$(AM_V_at)$(extract) $(extracted)
 	$(AM_V_at)mv $@.tmp $@
 
-$(extracted): %D%/extracted.stamp
+$(extracted): examples/extracted.stamp
-	@test -f $@ || rm -f %D%/extracted.stamp
+	@test -f $@ || rm -f examples/extracted.stamp
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %D%/extracted.stamp
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/extracted.stamp
 
-## ---------- ##
+include examples/calc++/local.mk
-## Examples.  ##
+include examples/mfcalc/local.mk
-## ---------- ##
+include examples/rpcalc/local.mk
-
-examplesdir = $(docdir)/examples
-dist_examples_DATA = %D%/README %D%/variant.yy
-
-check_PROGRAMS += %D%/variant
-nodist_%C%_variant_SOURCES = %D%/variant.yy
-%C%_variant_CPPFLAGS = -I$(top_builddir)
-dist_TESTS += %D%/variant.test
-
-
-include %D%/calc++/local.mk
-include %D%/mfcalc/local.mk
-include %D%/rpcalc/local.mk

examples/mfcalc/local.mk

@@ -1,5 +1,4 @@
-# Copyright (C) 2005-2006, 2008-2015, 2018 Free Software Foundation,
+# Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
-# 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
@@ -19,22 +18,19 @@
 ## -------------------- ##
 
 BUILT_SOURCES += $(mfcalc_sources)
-CLEANFILES +=  %D%/mfcalc.[ch] %D%/mfcalc.output
+CLEANFILES +=  examples/mfcalc/mfcalc.[ch] examples/mfcalc/mfcalc.output
 
-mfcalc_extracted = %D%/calc.h %D%/mfcalc.y
+mfcalc_extracted =				\
-mfcalc_sources = $(mfcalc_extracted)
+  examples/mfcalc/calc.h			\
+  examples/mfcalc/mfcalc.y
+mfcalc_sources =				\
+  $(mfcalc_extracted)
 extracted += $(mfcalc_extracted)
 
-check_PROGRAMS += %D%/mfcalc
+check_PROGRAMS += examples/mfcalc/mfcalc
-nodist_%C%_mfcalc_SOURCES = $(mfcalc_sources)
+examples_mfcalc_mfcalc_LDADD = -lm
-%C%_mfcalc_CPPFLAGS = -I$(top_builddir)/%D%
+nodist_examples_mfcalc_mfcalc_SOURCES =		\
-%C%_mfcalc_LDADD = -lm
+  $(mfcalc_sources)
 
-dist_TESTS += %D%/mfcalc.test
+examples_mfcalc_mfcalc_CPPFLAGS = -I$(top_builddir)/examples/mfcalc
-
+dist_TESTS += examples/mfcalc/mfcalc.test
-## ------------ ##
-## Installing.  ##
-## ------------ ##
-
-mfcalcdir = $(docdir)/examples/mfcalc
-mfcalc_DATA = $(mfcalc_extracted)

examples/mfcalc/mfcalc.test

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

examples/rpcalc/.gitignore

@@ -1,5 +1,4 @@
 /calc.h
-/rpcalc
 /rpcalc.c
 /rpcalc.h
 /rpcalc.output

examples/rpcalc/local.mk

@@ -1,5 +1,4 @@
-# Copyright (C) 2005-2006, 2008-2015, 2018 Free Software Foundation,
+# Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
-# 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
@@ -19,22 +18,18 @@
 ## -------------------- ##
 
 BUILT_SOURCES += $(rpcalc_sources)
-CLEANFILES +=  %D%/rpcalc.[ch] %D%/rpcalc.output
+CLEANFILES +=  examples/rpcalc/rpcalc.[ch] examples/rpcalc/rpcalc.output
 
-rpcalc_extracted = %D%/rpcalc.y
+rpcalc_extracted =				\
-rpcalc_sources = $(rpcalc_extracted)
+  examples/rpcalc/rpcalc.y
+rpcalc_sources =				\
+  $(rpcalc_extracted)
 extracted += $(rpcalc_extracted)
 
-check_PROGRAMS += %D%/rpcalc
+check_PROGRAMS += examples/rpcalc/rpcalc
-nodist_%C%_rpcalc_SOURCES = $(rpcalc_sources)
+examples_rpcalc_rpcalc_LDADD = -lm
-%C%_rpcalc_CPPFLAGS = -I$(top_builddir)/%D%
+nodist_examples_rpcalc_rpcalc_SOURCES =		\
-%C%_rpcalc_LDADD = -lm
+  $(rpcalc_sources)
 
-dist_TESTS += %D%/rpcalc.test
+examples_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/rpcalc
-
+dist_TESTS += examples/rpcalc/rpcalc.test
-## ------------ ##
-## Installing.  ##
-## ------------ ##
-
-rpcalcdir = $(docdir)/examples/rpcalc
-rpcalc_DATA = $(rpcalc_extracted)

examples/rpcalc/rpcalc.test

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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

examples/test

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 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
@@ -27,18 +27,7 @@ exit=true
 cwd=`pwd`
 
 # The exercised program.
-for p in $cwd/examples/$me/$me $cwd/examples/$me
+prog=$cwd/examples/$me/$me
-do
-    if test -x "$p"; then
-        prog=$p
-        break
-    fi
-done
-if test x"$prog" = x; then
-    echo "$me: ERROR: cannot find program to exercise"
-    exit 1
-fi
-
 
 # cleanup
 # -------

examples/variant.test

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2018 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-: >input
-run 0 "{I have three numbers for you., 1, 2, 3, And that's all!}"

examples/variant.yy

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2008-2015, 2018 Free Software Foundation, Inc.
+  Copyright (C) 2008-2013 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
@@ -16,7 +16,7 @@
 */
 
 %debug
-%language "c++"
+%skeleton "lalr1.cc"
 %defines
 %define api.token.constructor
 %define api.value.type variant
@@ -25,9 +25,9 @@
 
 %code requires // *.hh
 {
+#include <list>
 #include <string>
-#include <vector>
+typedef std::list<std::string> strings_type;
-typedef std::vector<std::string> strings_type;
 }
 
 %code // *.cc
@@ -43,27 +43,22 @@ typedef std::vector<std::string> strings_type;
     static parser::symbol_type yylex ();
   }
 
-  // Printing a vector of strings.
+  // Printing a list of strings.
-  // Koening look up will look into std, since that's an std::vector.
+  // Koening look up will look into std, since that's an std::list.
   namespace std
   {
     std::ostream&
-    operator<< (std::ostream& o, const strings_type& ss)
+    operator<< (std::ostream& o, const strings_type& s)
     {
-      o << '{';
+      std::copy (s.begin (), s.end (),
-      const char *sep = "";
+                 std::ostream_iterator<strings_type::value_type> (o, "\n"));
-      for (strings_type::const_iterator i = ss.begin(), end = ss.end();
+      return o;
-           i != end; ++i)
-        {
-          o << sep << *i;
-          sep = ", ";
-        }
-      return o << '}';
     }
   }
 
   // Conversion to string.
   template <typename T>
+    inline
     std::string
     string_cast (const T& t)
   {
@@ -75,26 +70,26 @@ typedef std::vector<std::string> strings_type;
 
 %token <::std::string> TEXT;
 %token <int> NUMBER;
-%printer { yyo << '(' << &$$ << ") " << $$; } <*>;
+%printer { yyoutput << $$; } <*>;
 %token END_OF_FILE 0;
 
 %type <::std::string> item;
-%type <::std::vector<std::string>> list;
+%type <::std::list<std::string>> list;
 
 %%
 
 result:
-  list  { std::cout << $1 << '\n'; }
+  list  { std::cout << $1 << std::endl; }
 ;
 
 list:
-  %empty     { /* Generates an empty string list */ }
+  /* nothing */ { /* Generates an empty string list */ }
-| list item  { std::swap ($$, $1); $$.push_back ($2); }
+| list item     { std::swap ($$, $1); $$.push_back ($2); }
 ;
 
 item:
-  TEXT    { std::swap ($$, $1); }
+  TEXT          { std::swap ($$, $1); }
-| NUMBER  { $$ = string_cast ($1); }
+| NUMBER        { $$ = string_cast ($1); }
 ;
 %%
 
@@ -114,7 +109,7 @@ namespace yy
   {
     static int stage = -1;
     ++stage;
-    parser::location_type loc(YY_NULLPTR, stage + 1, stage + 1);
+    parser::location_type loc(0, stage + 1, stage + 1);
     switch (stage)
       {
       case 0:
@@ -134,7 +129,7 @@ namespace yy
   void
   parser::error (const parser::location_type& loc, const std::string& msg)
   {
-    std::cerr << loc << ": " << msg << '\n';
+    std::cerr << loc << ": " << msg << std::endl;
   }
 }
 

lib/.gitignore

@@ -4,7 +4,8 @@
 /*~
 /.deps
 /.dirstamp
-/_Noreturn.h
+/Makefile
+/Makefile.in
 /alignof.h
 /alloca.h
 /alloca.in.h
@@ -14,9 +15,7 @@
 /asnprintf.c
 /basename-lgpl.c
 /basename.c
-/binary-io.c
 /binary-io.h
-/bitrotate.c
 /bitrotate.h
 /c++defs.h
 /c-ctype.c
@@ -29,6 +28,8 @@
 /charset.alias
 /cloexec.c
 /cloexec.h
+/close-hook.c
+/close-hook.h
 /close-stream.c
 /close-stream.h
 /close.c
@@ -36,6 +37,7 @@
 /closeout.h
 /concat-filename.c
 /concat-filename.h
+/config.charset
 /config.h
 /config.in.h
 /configmake.h
@@ -54,6 +56,7 @@
 /exitfail.h
 /fatal-signal.c
 /fatal-signal.h
+/fclose.c
 /fcntl.c
 /fcntl.h
 /fcntl.in.h
@@ -78,27 +81,19 @@
 /fseterr.h
 /fstat.c
 /getdtablesize.c
-/getopt-cdefs.in.h
-/getopt-core.h
-/getopt-ext.h
-/getopt-pfx-core.h
-/getopt-pfx-ext.h
 /getopt.c
 /getopt.h
 /getopt.in.h
 /getopt1.c
 /getopt_int.h
-/getprogname.c
-/getprogname.h
 /gettext.h
 /gnulib.mk
-/hard-locale.c
-/hard-locale.h
 /hash.c
 /hash.h
 /intprops.h
 /inttypes.h
 /inttypes.in.h
+/ioctl.c
 /isnan.c
 /isnand-nolibm.h
 /isnand.c
@@ -108,15 +103,9 @@
 /isnanl.c
 /itold.c
 /ldexpl.c
-/limits.h
-/limits.in.h
 /localcharset.c
 /localcharset.h
-/lstat.c
 /malloc.c
-/malloca.c
-/malloca.h
-/math.c
 /math.h
 /math.in.h
 /mbrtowc.c
@@ -125,11 +114,12 @@
 /mbswidth.h
 /memchr.c
 /memchr.valgrind
-/minmax.h
 /msvc-inval.c
 /msvc-inval.h
 /msvc-nothrow.c
 /msvc-nothrow.h
+/nonblocking.c
+/nonblocking.h
 /obstack.c
 /obstack.h
 /obstack_printf.c
@@ -150,6 +140,7 @@
 /printf.c
 /progname.c
 /progname.h
+/quote.c
 /quote.h
 /quotearg.c
 /quotearg.h
@@ -158,10 +149,11 @@
 /rawmemchr.valgrind
 /realloc.c
 /ref-add.sed
+/ref-add.sin
 /ref-del.sed
+/ref-del.sin
 /sched.h
 /sched.in.h
-/sig-handler.c
 /sig-handler.h
 /sigaction.c
 /signal.h
@@ -190,8 +182,6 @@
 /spawnp.c
 /sprintf.c
 /stamp-h1
-/stat-w32.c
-/stat-w32.h
 /stat.c
 /stdbool.h
 /stdbool.in.h
@@ -202,6 +192,7 @@
 /stdio--.h
 /stdio-impl.h
 /stdio-safer.h
+/stdio-write.c
 /stdio.h
 /stdio.in.h
 /stdlib.h
@@ -220,19 +211,24 @@
 /stripslash.c
 /strndup.c
 /strnlen.c
+/strtol.c
+/strtoul.c
 /strverscmp.c
 /sys
+/sys_ioctl.h
 /sys_ioctl.in.h
+/sys_socket.h
 /sys_socket.in.h
+/sys_stat.h
 /sys_stat.in.h
 /sys_types.in.h
+/sys_wait.h
 /sys_wait.in.h
 /sysexits.in.h
 /time.h
 /time.in.h
 /unistd--.h
 /unistd-safer.h
-/unistd.c
 /unistd.h
 /unistd.in.h
 /unitypes.h
@@ -240,7 +236,6 @@
 /uniwidth
 /uniwidth.h
 /uniwidth.in.h
-/unlink.c
 /unlocked-io.h
 /unsetenv.c
 /vasnprintf.c
@@ -249,6 +244,7 @@
 /vfprintf.c
 /vsnprintf.c
 /vsprintf.c
+/w32sock.h
 /w32spawn.h
 /wait-process.c
 /wait-process.h
@@ -256,7 +252,6 @@
 /warn-on-use.h
 /wchar.h
 /wchar.in.h
-/wctype-h.c
 /wctype.h
 /wctype.in.h
 /wcwidth.c
@@ -267,9 +262,13 @@
 /xmalloc.c
 /xmemdup0.c
 /xmemdup0.h
-/xsize.c
 /xsize.h
 /xstrndup.c
 /xstrndup.h
-/stat-time.c
+/binary-io.c
-/stat-time.h
+/xsize.c
+/bitrotate.c
+/math.c
+/sig-handler.c
+/unistd.c
+/wctype-h.c

lib/abitset.c

@@ -1,7 +1,7 @@
 /* Array bitsets.
 
-   Copyright (C) 2002-2003, 2006, 2009-2015, 2018 Free Software
+   Copyright (C) 2002-2003, 2006, 2009-2013 Free Software Foundation,
-   Foundation, Inc.
+   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -146,7 +146,7 @@ abitset_list_reverse (bitset src, bitset_bindex *list,
   bitset_bindex rbitno;
   bitset_bindex count;
   bitset_windex windex;
-  unsigned bitcnt;
+  unsigned int bitcnt;
   bitset_bindex bitoff;
   bitset_word *srcp = ABITSET_WORDS (src);
   bitset_bindex n_bits = BITSET_SIZE_ (src);
@@ -302,7 +302,7 @@ abitset_list (bitset src, bitset_bindex *list,
 static inline void
 abitset_unused_clear (bitset dst)
 {
-  unsigned last_bit;
+  unsigned int last_bit;
 
   last_bit = BITSET_SIZE_ (dst) % BITSET_WORD_BITS;
   if (last_bit)

lib/abitset.h

@@ -1,7 +1,6 @@
 /* Functions to support abitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

lib/bbitset.h

@@ -1,7 +1,7 @@
 /* Base bitset stuff.
 
-   Copyright (C) 2002-2004, 2006, 2009-2015, 2018 Free Software
+   Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation,
-   Foundation, Inc.
+   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -50,8 +50,8 @@ extern const char * const bitset_type_names[];
 enum bitset_alloc_type {BITSET_MALLOC, BITSET_OBALLOC};
 
 /* Data type used to store a word of bits.  */
-typedef unsigned long bitset_word;
+typedef unsigned long int bitset_word;
-#define BITSET_WORD_BITS ((unsigned) (CHAR_BIT * sizeof (bitset_word)))
+#define BITSET_WORD_BITS ((unsigned int) (CHAR_BIT * sizeof (bitset_word)))
 
 /* Bit index.  In theory we might need a type wider than size_t, but
    in practice we lose at most a factor of CHAR_BIT by going with

lib/bitset.c

@@ -1,7 +1,6 @@
 /* General bitsets.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -101,7 +100,7 @@ bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
    specified by ATTR.  For variable size bitsets, N_BITS is only a
    hint and may be zero.  */
 enum bitset_type
-bitset_type_choose (bitset_bindex n_bits ATTRIBUTE_UNUSED, unsigned attr)
+bitset_type_choose (bitset_bindex n_bits ATTRIBUTE_UNUSED, unsigned int attr)
 {
   /* Check attributes.  */
   if (attr & BITSET_FIXED && attr & BITSET_VARIABLE)
@@ -169,7 +168,7 @@ bitset_obstack_alloc (struct obstack *bobstack,
 /* Create a bitset of N_BITS and with attribute hints specified by
    ATTR.  */
 bitset
-bitset_create (bitset_bindex n_bits, unsigned attr)
+bitset_create (bitset_bindex n_bits, unsigned int attr)
 {
   enum bitset_type type;
 
@@ -291,13 +290,13 @@ bitset_only_set_p (bitset src, bitset_bindex bitno)
 static void
 bitset_print (FILE *file, bitset bset, bool verbose)
 {
-  unsigned pos;
+  unsigned int pos;
   bitset_bindex i;
   bitset_iterator iter;
 
   if (verbose)
     fprintf (file, "n_bits = %lu, set = {",
-             (unsigned long) bitset_size (bset));
+             (unsigned long int) bitset_size (bset));
 
   pos = 30;
   BITSET_FOR_EACH (iter, bset, i, 0)
@@ -308,7 +307,7 @@ bitset_print (FILE *file, bitset bset, bool verbose)
         pos = 0;
       }
 
-    fprintf (file, "%lu ", (unsigned long) i);
+    fprintf (file, "%lu ", (unsigned long int) i);
     pos += 1 + (i >= 10) + (i >= 100);
   };
 

lib/bitset.h

@@ -1,7 +1,6 @@
 /* Generic bitsets.
 
-   Copyright (C) 2002-2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -40,7 +39,7 @@ enum bitset_attr {BITSET_FIXED = 1,    /* Bitset size fixed.  */
                   BITSET_FRUGAL = 16,  /* Prefer most compact.  */
                   BITSET_GREEDY = 32}; /* Prefer fastest at memory expense.  */
 
-typedef unsigned bitset_attrs;
+typedef unsigned int bitset_attrs;
 
 /* The contents of the union should be considered to be private.
    While I would like to make this union opaque, it needs to be
@@ -310,7 +309,7 @@ extern void bitset_dump (FILE *, bitset);
 
    BITSET_FOR_EACH (iter, src, i, 0)
    {
-      printf ("%lu ", (unsigned long) i);
+      printf ("%lu ", (unsigned long int) i);
    };
 */
 #define BITSET_FOR_EACH(ITER, BSET, INDEX, MIN)                               \
@@ -332,7 +331,7 @@ extern void bitset_dump (FILE *, bitset);
 
    BITSET_FOR_EACH_REVERSE (iter, src, i, 0)
    {
-      printf ("%lu ", (unsigned long) i);
+      printf ("%lu ", (unsigned long int) i);
    };
 */
 #define BITSET_FOR_EACH_REVERSE(ITER, BSET, INDEX, MIN)                       \

lib/bitset_stats.c

@@ -1,7 +1,6 @@
 /* Bitset statistics.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -77,23 +76,23 @@
 
 struct bitset_type_info_struct
 {
-  unsigned allocs;
+  unsigned int allocs;
-  unsigned frees;
+  unsigned int frees;
-  unsigned lists;
+  unsigned int lists;
-  unsigned sets;
+  unsigned int sets;
-  unsigned cache_sets;
+  unsigned int cache_sets;
-  unsigned resets;
+  unsigned int resets;
-  unsigned cache_resets;
+  unsigned int cache_resets;
-  unsigned tests;
+  unsigned int tests;
-  unsigned cache_tests;
+  unsigned int cache_tests;
-  unsigned list_counts[BITSET_LOG_COUNT_BINS];
+  unsigned int list_counts[BITSET_LOG_COUNT_BINS];
-  unsigned list_sizes[BITSET_LOG_SIZE_BINS];
+  unsigned int list_sizes[BITSET_LOG_SIZE_BINS];
-  unsigned list_density[BITSET_DENSITY_BINS];
+  unsigned int list_density[BITSET_DENSITY_BINS];
 };
 
 struct bitset_stats_info_struct
 {
-  unsigned runs;
+  unsigned int runs;
   struct bitset_type_info_struct types[BITSET_TYPE_NUM];
 };
 
@@ -106,10 +105,10 @@ bool bitset_stats_enabled = false;
 /* Print a percentage histogram with message MSG to FILE.  */
 static void
 bitset_percent_histogram_print (FILE *file, const char *name, const char *msg,
-                                unsigned n_bins, unsigned *bins)
+                                unsigned int n_bins, unsigned int *bins)
 {
-  unsigned i;
+  unsigned int i;
-  unsigned total;
+  unsigned int total;
 
   total = 0;
   for (i = 0; i < n_bins; i++)
@@ -130,11 +129,11 @@ bitset_percent_histogram_print (FILE *file, const char *name, const char *msg,
 /* Print a log histogram with message MSG to FILE.  */
 static void
 bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
-                            unsigned n_bins, unsigned *bins)
+                            unsigned int n_bins, unsigned int *bins)
 {
-  unsigned i;
+  unsigned int i;
-  unsigned total;
+  unsigned int total;
-  unsigned max_width;
+  unsigned int max_width;
 
   total = 0;
   for (i = 0; i < n_bins; i++)
@@ -149,7 +148,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
   n_bins = i;
 
   /* 2 * ceil (log10 (2) * (N - 1)) + 1.  */
-  max_width = 2 * (unsigned) (0.30103 * (n_bins - 1) + 0.9999) + 1;
+  max_width = 2 * (unsigned int) (0.30103 * (n_bins - 1) + 0.9999) + 1;
 
   fprintf (file, "%s %s", name, msg);
   for (i = 0; i < 2; i++)
@@ -158,7 +157,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg,
 
   for (; i < n_bins; i++)
     fprintf (file, "%*lu-%lu\t%8u (%5.1f%%)\n",
-             max_width - ((unsigned) (0.30103 * (i) + 0.9999) + 1),
+             max_width - ((unsigned int) (0.30103 * (i) + 0.9999) + 1),
              1UL << (i - 1),
              (1UL << i) - 1,
              bins[i],

lib/bitset_stats.h

@@ -1,7 +1,6 @@
 /* Functions to support bitset statistics.
 
-   Copyright (C) 2002-2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

lib/bitsetv-print.c

@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2001-2002, 2004, 2006, 2009-2015, 2018 Free Software
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2013 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -54,7 +54,7 @@ bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
   /* Contents. */
   for (i = 0; bset[i]; ++i)
     {
-      fprintf (out, "%2lu|", (unsigned long) i);
+      fprintf (out, "%2lu|", (unsigned long int) i);
       for (j = 0; j < hsize; ++j)
         fputs (bitset_test (bset[i], j) ? "1" : " ", out);
       fputs ("|\n", out);

lib/bitsetv-print.h

@@ -1,7 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Akim Demaille (akim@freefriends.org).
 

lib/bitsetv.c

@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2001-2002, 2004-2006, 2009-2015, 2018 Free Software
+   Copyright (C) 2001-2002, 2004-2006, 2009-2013 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ bitsetv_alloc (bitset_bindex n_vecs, bitset_bindex n_bits,
 /* Create a vector of N_VECS bitsets, each of N_BITS, and with
    attribute hints specified by ATTR.  */
 bitset *
-bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned attr)
+bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned int attr)
 {
   enum bitset_type type;
 
@@ -146,7 +146,7 @@ bitsetv_dump (FILE *file, char const *title, char const *subtitle,
   fprintf (file, "%s\n", title);
   for (i = 0; bsetv[i]; i++)
     {
-      fprintf (file, "%s %lu\n", subtitle, (unsigned long) i);
+      fprintf (file, "%s %lu\n", subtitle, (unsigned long int) i);
       bitset_dump (file, bsetv[i]);
     }
 
@@ -161,7 +161,7 @@ debug_bitsetv (bitsetv bsetv)
 
   for (i = 0; bsetv[i]; i++)
     {
-      fprintf (stderr, "%lu: ", (unsigned long) i);
+      fprintf (stderr, "%lu: ", (unsigned long int) i);
       debug_bitset (bsetv[i]);
     }
 

lib/bitsetv.h

@@ -1,7 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -31,7 +30,7 @@ extern bitsetv bitsetv_alloc (bitset_bindex, bitset_bindex, enum bitset_type);
 
 /* Create a vector of N_VECS bitsets, each of N_BITS, and with
    attribute hints specified by ATTR.  */
-extern bitsetv bitsetv_create (bitset_bindex, bitset_bindex, unsigned);
+extern bitsetv bitsetv_create (bitset_bindex, bitset_bindex, unsigned int);
 
 /* Free vector of bitsets.  */
 extern void bitsetv_free (bitsetv);

lib/ebitset.c

@@ -1,7 +1,6 @@
 /* Functions to support expandable bitsets.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -52,7 +51,7 @@
 
 /* Number of bits stored in each element.  */
 #define EBITSET_ELT_BITS \
-  ((unsigned) (EBITSET_ELT_WORDS * BITSET_WORD_BITS))
+  ((unsigned int) (EBITSET_ELT_WORDS * BITSET_WORD_BITS))
 
 /* Ebitset element.  We use an array of bits.  */
 typedef struct ebitset_elt_struct
@@ -433,7 +432,7 @@ ebitset_equal_p (bitset dst, bitset src)
 
   for (j = 0; j < EBITSET_SIZE (src); j++)
     {
-      unsigned i;
+      unsigned int i;
       ebitset_elt *selt = selts[j];
       ebitset_elt *delt = delts[j];
 
@@ -570,7 +569,7 @@ ebitset_list_reverse (bitset bset, bitset_bindex *list,
   bitset_bindex n_bits;
   bitset_bindex bitno;
   bitset_bindex rbitno;
-  unsigned bcount;
+  unsigned int bcount;
   bitset_bindex boffset;
   bitset_windex windex;
   bitset_windex eindex;
@@ -836,7 +835,7 @@ ebitset_list (bitset bset, bitset_bindex *list,
 static inline void
 ebitset_unused_clear (bitset dst)
 {
-  unsigned last_bit;
+  unsigned int last_bit;
   bitset_bindex n_bits;
 
   n_bits = BITSET_NBITS_ (dst);
@@ -923,7 +922,7 @@ ebitset_empty_p (bitset dst)
 static void
 ebitset_not (bitset dst, bitset src)
 {
-  unsigned i;
+  unsigned int i;
   ebitset_elt *selt;
   ebitset_elt *delt;
   bitset_windex j;
@@ -965,7 +964,7 @@ ebitset_subset_p (bitset dst, bitset src)
 
   for (j = 0; j < ssize; j++)
     {
-      unsigned i;
+      unsigned int i;
       ebitset_elt *selt;
       ebitset_elt *delt;
 
@@ -1007,7 +1006,7 @@ ebitset_disjoint_p (bitset dst, bitset src)
 
   for (j = 0; j < ssize; j++)
     {
-      unsigned i;
+      unsigned int i;
       ebitset_elt *selt;
       ebitset_elt *delt;
 
@@ -1040,7 +1039,7 @@ ebitset_op3_cmp (bitset dst, bitset src1, bitset src2, enum bitset_ops op)
   bitset_word *srcp2;
   bitset_word *dstp;
   bool changed = false;
-  unsigned i;
+  unsigned int i;
   bitset_windex j;
 
   ebitset_resize (dst, max (BITSET_NBITS_ (src1), BITSET_NBITS_ (src2)));

lib/ebitset.h

@@ -1,7 +1,6 @@
 /* Functions to support ebitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

lib/get-errno.c

@@ -1,7 +1,6 @@
 /* get-errno.c - get and set errno.
 
-   Copyright (C) 2002, 2006, 2009-2015, 2018 Free Software Foundation,
+   Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc.
-   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

lib/get-errno.h

@@ -1,6 +1,6 @@
 /* get-errno.h - get and set errno.
 
-   Copyright (C) 2002, 2009-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2013 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