Imported Upstream version 20220109

diff --git a/CHANGES b/CHANGES
index 817e4b5..ebaaf41 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,42 @@
+2022-01-09  Thomas E. Dickey  <dickey@invisible-island.net>
+
+       * package/debian/changelog, package/debian/watch, package/debian/control:
+       update to use oldstable-compatible rules/config, for testing version upgrade
+
+       * package/byacc.spec, package/mingw-byacc.spec:
+       use rpmlint, etc., to "update" these to follow Redhat7 and later.
+       due to incompatbilities in that route, this package will not build with #6.
+
+       * reader.c, output.c:
+       change a few malloc's to calloc's so clang analyzer can see initialized data
+
+       * closure.c:
+       modify address computation in closure.c to avoid undefined behavior on
+       machines which do not support large offsets (analysis/patch by Jessica Clarke,
+       cf: 2014-09-17)
+
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
+       bump
+
+2022-01-08  Thomas E. Dickey  <dickey@invisible-island.net>
+
+       * package/debian/copyright, package/debian/rules:
+       update to use oldstable-compatible rules/config, for testing version upgrade
+
+2022-01-02  Thomas E. Dickey  <dickey@invisible-island.net>
+
+       * package/debian/control: minor fixes adapted from btyacc package
+
+       * package/debian/byacc.docs, package/debian/byacc2.prerm,
+         package/debian/byacc2.postinst, package/debian/byacc.postinst,
+         package/debian/byacc.prerm:
+       RCS_BASE
+
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
+       bump
+
 2022-01-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
        * test/run_test.sh:
@@ -35,7 +74,9 @@
        * package/byacc.spec, package/debian/control, package/debian/rules:
        rename "btyacc" to "byacc2" to co-exist with traditional "btyacc" package
 
-       * package/debian/copyright, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * package/debian/copyright, VERSION, package/byacc.spec,
+         package/debian/changelog, package/mingw-byacc.spec,
+         package/pkgsrc/Makefile:
        bump
 
 2021-12-24  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -44,9 +85,12 @@
 
        * package/debian/control: updates for Debian standard
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
+       * package/debian/byacc2.docs: RCS_BASE
+
        * package/debian/docs, package/debian/copyright, package/debian/control:
        errata from Debian package
 
@@ -226,14 +270,60 @@
 
        * main.c: account for a memory-leak
 
-       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c, btyaccpar.c, yaccpar.c:
+       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c,
+         test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c,
+         test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c,
+         test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c,
+         test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/defines1.calc.c, test/yacc/defines2.calc.c,
+         test/yacc/defines3.calc.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c,
+         test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c,
+         yaccpar.c:
        regen
 
        * btyaccpar.skel, yaccpar.skel:
        revert change to initialization of yystate, which confuses gcc, making a
        different warning
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-08-04  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -260,7 +350,13 @@
 
        * main.c, yacc.1: add "-h" option
 
-       * test/btyacc/no_b_opt.error, test/btyacc/no_output2.error, test/btyacc/no_p_opt.error, test/btyacc/big_b.error, test/btyacc/big_l.error, test/btyacc/help.error, test/btyacc/nostdin.error, test/yacc/big_b.error, test/yacc/big_l.error, test/yacc/help.error, test/yacc/no_b_opt.error, test/yacc/no_output2.error, test/yacc/no_p_opt.error, test/yacc/nostdin.error:
+       * test/btyacc/no_b_opt.error, test/btyacc/no_output2.error,
+         test/btyacc/no_p_opt.error, test/btyacc/big_b.error,
+         test/btyacc/big_l.error, test/btyacc/help.error,
+         test/btyacc/nostdin.error, test/yacc/big_b.error,
+         test/yacc/big_l.error, test/yacc/help.error, test/yacc/no_b_opt.error,
+         test/yacc/no_output2.error, test/yacc/no_p_opt.error,
+         test/yacc/nostdin.error:
        regen
 
        * main.c:
@@ -271,18 +367,36 @@
        From: Boris Kolpackov <boris@codesynthesis.com>
        Subject: Re: [PATCH] support bison's --defines and --output options in byacc
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-08-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/inherit2.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c:
+       * test/btyacc/inherit2.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c:
        regen
 
        * output.c:
        fix a misplaced #line, which was after a generated line in the code-file
 
-       * test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c:
+       * test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/expr.oxout.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c,
+         test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c,
+         test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/defines1.calc.c,
+         test/yacc/defines2.calc.c, test/yacc/defines3.calc.c,
+         test/yacc/stdin2.calc.c:
        regen
 
        * output.c:
@@ -290,7 +404,28 @@
        the "#line" directives added by Roland Illig's change, making them show
        the actual line-numbers in the code-file.
 
-       * test/btyacc/pure_calc.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c:
+       * test/btyacc/pure_calc.tab.c, test/btyacc/quote_calc-s.tab.c,
+         test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c,
+         test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/defines1.calc.c,
+         test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/stdin2.calc.c:
        regen
 
        * reader.c:
@@ -313,7 +448,8 @@
        make that into a macro, and add a begin_case() to more/less match (the
        #line's are not together in some btyacc cases...)
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-07-14  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -401,7 +537,51 @@
 
        * aclocal.m4: resync with my-autoconf
 
-       * test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, yaccpar.c:
+       * test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c,
+         test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c,
+         btyaccpar.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c,
+         test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/defines1.calc.c, test/yacc/defines2.calc.c,
+         test/yacc/defines3.calc.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/rename_debug.c,
+         yaccpar.c:
        regen
 
        * btyaccpar.skel, yaccpar.skel: cancel unused assignments
@@ -418,7 +598,8 @@
 
 2021-06-19  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-06-13  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -622,7 +803,54 @@
 
 2021-05-20  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c, test/btyacc/code_error.code.c, test/btyacc/code_error.tab.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c:
+       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c,
+         test/btyacc/code_error.code.c, test/btyacc/code_error.tab.c,
+         test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c,
+         test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c,
+         test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c,
+         test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c,
+         test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c,
+         test/yacc/code_error.code.c, test/yacc/code_error.tab.c,
+         test/yacc/defines1.calc.c, test/yacc/defines2.calc.c,
+         test/yacc/defines3.calc.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c,
+         test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c,
+         test/yacc/varsyntax_calc1.tab.c:
        regen
 
        * mkpar.c, reader.c: change printf format to allow for long-YYINT
@@ -644,7 +872,8 @@
 
        * configure: regen
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-05-01  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -725,7 +954,23 @@
 
        * yacc.1: use italics in a few places where bold was inappropriate
 
-       * test/btyacc/varsyntax_calc1.tab.c, test/btyacc/varsyntax_calc1.tab.h, test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h, test/btyacc/inherit1.tab.c, test/btyacc/inherit1.tab.h, test/btyacc/inherit2.tab.c, test/btyacc/inherit2.tab.h, test/btyacc/ok_syntax1.tab.c, test/btyacc/ok_syntax1.tab.h, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit3.tab.h, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit4.tab.h, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_calc1.tab.h, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_demo.tab.h, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy1.tab.h, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy2.tab.h, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/calc1.tab.c, test/btyacc/calc1.tab.h, test/yacc/varsyntax_calc1.tab.c, test/yacc/varsyntax_calc1.tab.h, test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h, test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h, test/yacc/calc1.tab.c, test/yacc/calc1.tab.h:
+       * test/btyacc/varsyntax_calc1.tab.c, test/btyacc/varsyntax_calc1.tab.h,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit1.tab.h,
+         test/btyacc/inherit2.tab.c, test/btyacc/inherit2.tab.h,
+         test/btyacc/ok_syntax1.tab.c, test/btyacc/ok_syntax1.tab.h,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit3.tab.h,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit4.tab.h,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_calc1.tab.h,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_demo.tab.h,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy1.tab.h,
+         test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy2.tab.h,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy3.tab.h,
+         test/btyacc/calc1.tab.c, test/btyacc/calc1.tab.h,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/varsyntax_calc1.tab.h,
+         test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h,
+         test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h,
+         test/yacc/calc1.tab.h:
        regen
 
        * reader.c:
@@ -742,7 +987,8 @@
 
        * package/byacc.spec, package/debian/rules: use stdnoreturn
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2021-03-20  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -791,7 +1037,9 @@
 
 2021-01-09  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * package/debian/copyright, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * package/debian/copyright, VERSION, package/byacc.spec,
+         package/debian/changelog, package/mingw-byacc.spec,
+         package/pkgsrc/Makefile:
        bump
 
 2021-01-07  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1005,7 +1253,78 @@
 
        * defs.h: update to 2.0
 
-       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c, test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax27.tab.c, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c:
+       * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c,
+         test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax13.tab.c,
+         test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c,
+         test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c,
+         test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c,
+         test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c,
+         test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c,
+         test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c,
+         test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c,
+         test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c,
+         test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c,
+         test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c,
+         test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c,
+         test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c,
+         test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c,
+         test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/defines1.calc.c, test/yacc/defines2.calc.c,
+         test/yacc/defines3.calc.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c,
+         test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c,
+         test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c,
+         test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c,
+         test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c,
+         test/yacc/err_syntax26.tab.c, test/yacc/err_syntax27.tab.c,
+         test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c,
+         test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c,
+         test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c,
+         test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c,
+         test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c,
+         test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/rename_debug.c, test/yacc/stdin1.calc.c,
+         test/yacc/varsyntax_calc1.tab.c:
        update to version 2.0
 
        * reader.c:
@@ -1027,7 +1346,8 @@
        * reader.c: cppcheck -- scope reduction
        cppcheck -- eliminate bogus returns after no-return functions
 
-       * verbose.c, output.c, mkpar.c, main.c, warshall.c, lr0.c, lalr.c, graph.c, closure.c:
+       * verbose.c, output.c, mkpar.c, main.c, warshall.c, lr0.c, lalr.c,
+         closure.c:
        cppcheck -- scope reduction
 
        * package/debian/compat: quiet compatibility-warning
@@ -1041,7 +1361,8 @@
        * aclocal.m4:
        resync with my-autoconf, for compiler-warning fixes with macOS
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2020-09-07  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1069,7 +1390,8 @@
 
        * package/debian/copyright: bump
 
-       * test/yacc/grammar.tab.c, test/btyacc/grammar.tab.c, test/grammar.y, reader.c:
+       * test/yacc/grammar.tab.c, test/btyacc/grammar.tab.c, test/grammar.y,
+         reader.c:
        typo found with codespell
 
        * yacc.1: fixes noted in the original report, overlooked in followup
@@ -1080,7 +1402,8 @@
 
 2020-03-30  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2020-03-10  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1107,19 +1430,44 @@
        * test/run_make.sh:
        suppress bison's -Wyacc warning, which is not useful.
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2019-11-19  Thomas E. Dickey  <dickey@invisible-island.net>
 
        * yacc.1: new version of manpage
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * yacc.1: document %code
 
-       * test/btyacc/calc_code_all.error, test/btyacc/calc_code_all.output, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_all.tab.h, test/btyacc/calc_code_default.error, test/btyacc/calc_code_default.output, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_default.tab.h, test/btyacc/calc_code_imports.error, test/btyacc/calc_code_imports.output, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_imports.tab.h, test/btyacc/calc_code_provides.error, test/btyacc/calc_code_provides.output, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_provides.tab.h, test/btyacc/calc_code_requires.error, test/btyacc/calc_code_requires.output, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_requires.tab.h, test/btyacc/calc_code_top.error, test/btyacc/calc_code_top.output, test/btyacc/calc_code_top.tab.c, test/btyacc/calc_code_top.tab.h, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_all.tab.h, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_provides.tab.h, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_requires.tab.h, test/yacc/calc_code_top.tab.c:
+       * test/btyacc/calc_code_all.error, test/btyacc/calc_code_all.output,
+         test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_all.tab.h,
+         test/btyacc/calc_code_default.error,
+         test/btyacc/calc_code_default.output,
+         test/btyacc/calc_code_default.tab.c,
+         test/btyacc/calc_code_default.tab.h,
+         test/btyacc/calc_code_imports.error,
+         test/btyacc/calc_code_imports.output,
+         test/btyacc/calc_code_imports.tab.c,
+         test/btyacc/calc_code_imports.tab.h,
+         test/btyacc/calc_code_provides.error,
+         test/btyacc/calc_code_provides.output,
+         test/btyacc/calc_code_provides.tab.c,
+         test/btyacc/calc_code_provides.tab.h,
+         test/btyacc/calc_code_requires.error,
+         test/btyacc/calc_code_requires.output,
+         test/btyacc/calc_code_requires.tab.c,
+         test/btyacc/calc_code_requires.tab.h, test/btyacc/calc_code_top.error,
+         test/btyacc/calc_code_top.output, test/btyacc/calc_code_top.tab.c,
+         test/btyacc/calc_code_top.tab.h, test/yacc/calc_code_all.tab.c,
+         test/yacc/calc_code_all.tab.h, test/yacc/calc_code_default.tab.c,
+         test/yacc/calc_code_provides.tab.c,
+         test/yacc/calc_code_provides.tab.h, test/yacc/calc_code_requires.tab.c,
+         test/yacc/calc_code_top.tab.c:
        RCS_BASE
 
        * output.c:
@@ -1137,12 +1485,22 @@
 
        * mstring.c, defs.h: add msrenew()
 
-       * test/yacc/calc_code_all.error, test/yacc/calc_code_all.output, test/yacc/calc_code_default.error, test/yacc/calc_code_default.output, test/yacc/calc_code_default.tab.h, test/yacc/calc_code_imports.error, test/yacc/calc_code_imports.output, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_imports.tab.h, test/yacc/calc_code_provides.error, test/yacc/calc_code_provides.output, test/yacc/calc_code_requires.error, test/yacc/calc_code_requires.output, test/yacc/calc_code_top.error, test/yacc/calc_code_top.output, test/yacc/calc_code_top.tab.h:
+       * test/yacc/calc_code_all.error, test/yacc/calc_code_all.output,
+         test/yacc/calc_code_default.error, test/yacc/calc_code_default.output,
+         test/yacc/calc_code_default.tab.h, test/yacc/calc_code_imports.error,
+         test/yacc/calc_code_imports.output, test/yacc/calc_code_imports.tab.c,
+         test/yacc/calc_code_imports.tab.h, test/yacc/calc_code_provides.error,
+         test/yacc/calc_code_provides.output,
+         test/yacc/calc_code_requires.error,
+         test/yacc/calc_code_requires.output, test/yacc/calc_code_top.error,
+         test/yacc/calc_code_top.tab.h:
        RCS_BASE
 
 2019-11-18  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/calc_code_imports.y, test/calc_code_all.y, test/calc_code_default.y, test/calc_code_top.y, test/calc_code_provides.y, test/calc_code_requires.y:
+       * test/calc_code_imports.y, test/calc_code_all.y,
+         test/calc_code_default.y, test/calc_code_top.y,
+         test/calc_code_requires.y:
        RCS_BASE
 
 2019-11-04  Michael.Forney
@@ -1180,7 +1538,10 @@
 
 2019-11-03  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/help.error, test/btyacc/no_b_opt.error, test/btyacc/no_output2.error, test/btyacc/no_p_opt.error, test/yacc/help.error, test/yacc/no_b_opt.error, test/yacc/no_output2.error, test/yacc/no_p_opt.error:
+       * test/btyacc/help.error, test/btyacc/no_b_opt.error,
+         test/btyacc/no_output2.error, test/btyacc/no_p_opt.error,
+         test/yacc/help.error, test/yacc/no_b_opt.error,
+         test/yacc/no_p_opt.error:
        regen
 
        * test/run_test.sh:
@@ -1207,7 +1568,8 @@
        resync with my-autoconf adds a fix which accommodates a difference in
        warning options between gcc/clang when --enable-warnings is not set.
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2019-09-11  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1216,7 +1578,13 @@
 
 2019-06-17  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/big_b.error, test/btyacc/big_l.error, test/btyacc/help.error, test/btyacc/no_b_opt.error, test/btyacc/no_output2.error, test/btyacc/no_p_opt.error, test/btyacc/nostdin.error, test/yacc/big_b.error, test/yacc/big_l.error, test/yacc/help.error, test/yacc/no_b_opt.error, test/yacc/no_output2.error, test/yacc/no_p_opt.error, test/yacc/nostdin.error:
+       * test/btyacc/big_b.error, test/btyacc/big_l.error,
+         test/btyacc/help.error, test/btyacc/no_b_opt.error,
+         test/btyacc/no_output2.error, test/btyacc/no_p_opt.error,
+         test/btyacc/nostdin.error, test/yacc/big_b.error,
+         test/yacc/big_l.error, test/yacc/help.error, test/yacc/no_b_opt.error,
+         test/yacc/no_output2.error, test/yacc/no_p_opt.error,
+         test/yacc/nostdin.error:
        regen
 
        * test/run_test.sh: test "-H" rather than "-D"
@@ -1226,21 +1594,28 @@
        * main.c, yacc.1:
        change "-D" option to "-H" (discussion with Ethan Sommer)
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
-       * test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c:
+       * test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c,
+         test/btyacc/defines3.calc.c:
        RCS_BASE
 
        * test/run_test.sh: in test_defines, save the ".c" file too
 
-       * test/yacc/defines3.calc.c, test/yacc/defines2.calc.c, test/yacc/defines1.calc.c:
+       * test/yacc/defines3.calc.c, test/yacc/defines2.calc.c,
+         test/yacc/defines1.calc.c:
        RCS_BASE
 
        * test/run_test.sh:
        output of test_defines should be a header ".h", not ".c"
 
-       * test/btyacc/defines1.calc.h, test/btyacc/defines1.error, test/btyacc/defines1.output, test/btyacc/defines2.calc.h, test/btyacc/defines2.error, test/btyacc/defines2.output, test/btyacc/defines3.calc.h, test/btyacc/defines3.error, test/btyacc/defines3.output:
+       * test/btyacc/defines1.calc.h, test/btyacc/defines1.error,
+         test/btyacc/defines1.output, test/btyacc/defines2.calc.h,
+         test/btyacc/defines2.error, test/btyacc/defines2.output,
+         test/btyacc/defines3.calc.h, test/btyacc/defines3.error,
+         test/btyacc/defines3.output:
        RCS_BASE
 
        * main.c: however, a subsequent -d cancels -D
@@ -1249,27 +1624,72 @@
 
        * main.c: -D option implies -d
 
-       * test/yacc/defines1.error, test/yacc/defines1.output, test/yacc/defines2.calc.h, test/yacc/defines2.error, test/yacc/defines2.output, test/yacc/defines3.error, test/yacc/defines3.output:
+       * test/yacc/defines1.error, test/yacc/defines1.output,
+         test/yacc/defines2.calc.h, test/yacc/defines2.error,
+         test/yacc/defines2.output, test/yacc/defines3.error,
+         test/yacc/defines3.output:
        RCS_BASE
 
        * yacc.1: align macro definitions with my other manpages
 
        * test/run_test.sh: add test for -D after -d or -b options
 
-       * test/btyacc/stdin1.calc.c, test/btyacc/stdin1.error, test/btyacc/stdin1.output, test/btyacc/stdin2.calc.c, test/btyacc/stdin2.error, test/btyacc/stdin2.output:
+       * test/btyacc/stdin1.calc.c, test/btyacc/stdin1.error,
+         test/btyacc/stdin1.output, test/btyacc/stdin2.calc.c,
+         test/btyacc/stdin2.output:
        RCS_BASE
 
-       * test/btyacc/big_b.error, test/btyacc/big_b.output, test/btyacc/big_l.error, test/btyacc/big_l.output, test/btyacc/help.error, test/btyacc/help.output, test/btyacc/no_b_opt.error, test/btyacc/no_b_opt.output, test/btyacc/no_b_opt1.error, test/btyacc/no_b_opt1.output, test/btyacc/no_code_c.error, test/btyacc/no_code_c.output, test/btyacc/no_defines.error, test/btyacc/no_defines.output, test/btyacc/no_graph.error, test/btyacc/no_graph.output, test/btyacc/no_include.error, test/btyacc/no_include.output, test/btyacc/no_opts.error, test/btyacc/no_opts.output, test/btyacc/no_output.error, test/btyacc/no_output.output, test/btyacc/no_output1.error, test/btyacc/no_output1.output, test/btyacc/no_output2.error, test/btyacc/no_output2.output, test/btyacc/no_p_opt.error, test/btyacc/no_p_opt.output, test/btyacc/no_p_opt1.error, test/btyacc/no_p_opt1.output, test/btyacc/no_verbose.error, test/btyacc/no_verbose.output, test/btyacc/nostdin.error, test/btyacc/nostdin.output, test/yacc/big_b.error, test/yacc/big_b.output, test/yacc/big_l.error, test/yacc/big_l.output, test/yacc/help.error, test/yacc/help.output, test/yacc/no_b_opt.error, test/yacc/no_b_opt.output, test/yacc/no_b_opt1.error, test/yacc/no_b_opt1.output, test/yacc/no_code_c.error, test/yacc/no_code_c.output, test/yacc/no_defines.error, test/yacc/no_defines.output, test/yacc/no_graph.error, test/yacc/no_graph.output, test/yacc/no_include.error, test/yacc/no_include.output, test/yacc/no_opts.error, test/yacc/no_opts.output, test/yacc/no_output.error, test/yacc/no_output.output, test/yacc/no_output1.error, test/yacc/no_output1.output, test/yacc/no_output2.error, test/yacc/no_output2.output, test/yacc/no_p_opt.error, test/yacc/no_p_opt.output, test/yacc/no_p_opt1.error, test/yacc/no_p_opt1.output, test/yacc/no_verbose.error, test/yacc/no_verbose.output, test/yacc/nostdin.error, test/yacc/nostdin.output:
+       * test/btyacc/big_b.error, test/btyacc/big_b.output,
+         test/btyacc/big_l.error, test/btyacc/big_l.output,
+         test/btyacc/help.error, test/btyacc/help.output,
+         test/btyacc/no_b_opt.error, test/btyacc/no_b_opt.output,
+         test/btyacc/no_b_opt1.error, test/btyacc/no_b_opt1.output,
+         test/btyacc/no_code_c.error, test/btyacc/no_code_c.output,
+         test/btyacc/no_defines.error, test/btyacc/no_defines.output,
+         test/btyacc/no_graph.error, test/btyacc/no_graph.output,
+         test/btyacc/no_include.error, test/btyacc/no_include.output,
+         test/btyacc/no_opts.error, test/btyacc/no_opts.output,
+         test/btyacc/no_output.error, test/btyacc/no_output.output,
+         test/btyacc/no_output1.error, test/btyacc/no_output1.output,
+         test/btyacc/no_output2.error, test/btyacc/no_output2.output,
+         test/btyacc/no_p_opt.error, test/btyacc/no_p_opt.output,
+         test/btyacc/no_p_opt1.error, test/btyacc/no_p_opt1.output,
+         test/btyacc/no_verbose.error, test/btyacc/no_verbose.output,
+         test/btyacc/nostdin.error, test/btyacc/nostdin.output,
+         test/yacc/big_b.error, test/yacc/big_b.output, test/yacc/big_l.error,
+         test/yacc/big_l.output, test/yacc/help.error, test/yacc/help.output,
+         test/yacc/no_b_opt.error, test/yacc/no_b_opt.output,
+         test/yacc/no_b_opt1.error, test/yacc/no_b_opt1.output,
+         test/yacc/no_code_c.error, test/yacc/no_code_c.output,
+         test/yacc/no_defines.error, test/yacc/no_defines.output,
+         test/yacc/no_graph.error, test/yacc/no_graph.output,
+         test/yacc/no_include.error, test/yacc/no_include.output,
+         test/yacc/no_opts.error, test/yacc/no_opts.output,
+         test/yacc/no_output.error, test/yacc/no_output.output,
+         test/yacc/no_output1.error, test/yacc/no_output1.output,
+         test/yacc/no_output2.error, test/yacc/no_output2.output,
+         test/yacc/no_p_opt.error, test/yacc/no_p_opt.output,
+         test/yacc/no_p_opt1.error, test/yacc/no_p_opt1.output,
+         test/yacc/no_verbose.error, test/yacc/no_verbose.output,
+         test/yacc/nostdin.output:
        regen
 
        * test/run_test.sh:
        add a test for stdin "-" vs end-options "--", and correct a redirection
        of stderr in test_flags
 
-       * test/yacc/stdin2.output, test/yacc/stdin2.calc.c, test/yacc/stdin1.calc.c, test/yacc/stdin1.error, test/yacc/stdin1.output, test/yacc/stdin2.error:
+       * test/yacc/stdin2.output, test/yacc/stdin2.calc.c,
+         test/yacc/stdin1.calc.c, test/yacc/stdin1.error,
+         test/yacc/stdin2.error:
        RCS_BASE
 
-       * test/btyacc/big_b.output, test/btyacc/big_l.output, test/btyacc/help.output, test/btyacc/no_b_opt.output, test/btyacc/no_output2.output, test/btyacc/no_p_opt.output, test/btyacc/nostdin.output, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+       * test/btyacc/big_b.output, test/btyacc/big_l.output,
+         test/btyacc/help.output, test/btyacc/no_b_opt.output,
+         test/btyacc/no_output2.output, test/btyacc/no_p_opt.output,
+         test/btyacc/nostdin.output, test/yacc/big_b.output,
+         test/yacc/big_l.output, test/yacc/help.output,
+         test/yacc/no_b_opt.output, test/yacc/no_output2.output,
+         test/yacc/nostdin.output:
        regen
 
        * main.c: add -D option, to specify filename vs y.tab.h for -d
@@ -1307,7 +1727,8 @@
                use CF_APPEND_TEXT
                add/use CF_POSIX_VISIBLE
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2019-06-10  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1322,10 +1743,29 @@
 
        * yacc.1: minor typographical fixes
 
-       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/rename_debug.c, btyaccpar.c:
+       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c,
+         test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c,
+         test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c,
+         test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c,
+         test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c,
+         btyaccpar.c:
        regen
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2018-06-09  Tom.Shields
@@ -1343,7 +1783,8 @@
 
        * package/byacc.spec: add btyacc package
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * package/debian/control: add a package for btyacc
@@ -1352,7 +1793,26 @@
 
 2018-05-24  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, btyaccpar.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/rename_debug.c:
+       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/code_error.code.c,
+         test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c,
+         test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/ok_syntax1.tab.c, btyaccpar.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/rename_debug.c:
        regen
 
        * btyaccpar.skel: fix typo
@@ -1379,7 +1839,8 @@
 
        * test/btyacc/rename_debug.i, test/yacc/rename_debug.i: regen
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2018-05-09  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1388,10 +1849,30 @@
 
        * aclocal.m4: resync with my-autoconf
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
-       * test/btyacc/rename_debug.i, btyaccpar.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/varsyntax_calc1.tab.c:
+       * test/btyacc/rename_debug.i, btyaccpar.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c:
        regen
 
        * btyaccpar.skel: apply Guy Harris' changes here as well
@@ -1416,10 +1897,26 @@
        * output.c:
        provide yylex() declaration for simple case (request by "Mutiny")
 
-       * test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c, test/yacc/rename_debug.i, yaccpar.c:
+       * test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c,
+         yaccpar.c:
        regen
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/debian/copyright, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/debian/copyright, package/mingw-byacc.spec,
+         package/pkgsrc/Makefile:
        bump
 
 2018-05-06  Guy.Harris
@@ -1476,7 +1973,8 @@
        * reader.c, output.c, defs.h:
        guard against sign-extension in ctype-macros
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * reader.c: check for numeric overflow in get_number()
@@ -1487,10 +1985,34 @@
 
 2017-04-30  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c, btyaccpar.skel:
+       * test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c,
+         test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c,
+         test/btyacc/pure_error.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c,
+         btyaccpar.skel:
        fix another uninitialized variable warning in "make check_make" for btyacc
 
-       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/calc3.tab.c, btyaccpar.c, btyaccpar.skel, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/calc3.tab.c, yaccpar.c, defs.h, yaccpar.skel, output.c:
+       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/calc3.tab.c, btyaccpar.c, btyaccpar.skel,
+         test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/calc3.tab.c, yaccpar.c, defs.h,
+         output.c:
        fix some compiler warnings for "make check_make" by adding section init_vars,
        which initializes the body_vars for pure-parser configuration.
 
@@ -1506,7 +2028,8 @@
 
 2017-04-30  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2017-04-29  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1521,7 +2044,10 @@
 
 2017-02-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/expr.oxout.error, test/btyacc/expr.oxout.output, test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h, test/yacc/expr.oxout.error, test/yacc/expr.oxout.output, test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h:
+       * test/btyacc/expr.oxout.error, test/btyacc/expr.oxout.output,
+         test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h,
+         test/yacc/expr.oxout.error, test/yacc/expr.oxout.output,
+         test/yacc/expr.oxout.tab.h:
        RCS_BASE
 
        * package/debian/copyright: update copyright
@@ -1542,7 +2068,8 @@
 
 2017-02-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2016-12-31  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1551,7 +2078,25 @@
 
 2016-12-02  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/quote_calc4-s.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, btyaccpar.c:
+       * test/btyacc/quote_calc4-s.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         btyaccpar.c:
        regen
 
        * btyaccpar.skel: changes from NetBSD
@@ -1570,7 +2115,8 @@
        + the first parameter to YYERROR_DECL() is a pointer
        + struct YYLTYPE now has a "source" field
 
-       * test/btyacc/btyacc_demo.tab.h, test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c, test/btyacc/err_inherit4.tab.h:
+       * test/btyacc/btyacc_demo.tab.h, test/btyacc/code_calc.tab.c,
+         test/btyacc/err_inherit4.tab.h:
        regen
 
        * btyaccpar.c, btyaccpar.skel, reader.c: changes from NetBSD
@@ -1659,7 +2205,8 @@
        + use _GNU_SOURCE for cygwin headers
        + build-fixes for OS/2
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2016-11-20  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1678,7 +2225,8 @@
                preprocessor options.
        CF_PROG_LINT - add cpplint to programs to use; drop ad hoc tdlint and alint.
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * lalr.c: indented
@@ -1693,7 +2241,38 @@
 
        * reader.c: fix two compiler warnings
 
-       * test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/rename_debug.c, btyaccpar.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c, yaccpar.c:
+       * test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/rename_debug.c, btyaccpar.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax20.tab.c,
+         test/yacc/error.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         yaccpar.c:
        regen
 
 2016-06-06  Tom.Shields
@@ -1704,12 +2283,63 @@
 
 2016-06-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax24.error, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_calc.tab.h, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/rename_debug.c, yaccpar.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.error, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.output, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.error, test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c, test/btyacc/code_calc.tab.h, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.output, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c:
+       * test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c,
+         test/yacc/err_syntax24.error, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c,
+         test/yacc/code_calc.tab.h, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         test/yacc/rename_debug.c, yaccpar.c, test/btyacc/quote_calc-s.tab.c,
+         test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c,
+         test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c,
+         test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c,
+         test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c,
+         test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c,
+         test/btyacc/err_syntax24.error, test/btyacc/err_syntax24.tab.c,
+         test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c,
+         test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c,
+         test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c,
+         test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c,
+         test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c,
+         test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c,
+         test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.output,
+         test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.error,
+         test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_calc.tab.c, test/btyacc/code_calc.tab.h,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit3.output, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         btyaccpar.c:
        regen
 
 2016-06-01  Tom.Shields
 
-       * btyaccpar.skel, defs.h, error.c, output.c, reader.c, test/code_calc.y, test/err_inherit4.y, test/run_make.sh, yaccpar.skel:
+       * btyaccpar.skel, defs.h, error.c, output.c, reader.c, test/code_calc.y,
+         yaccpar.skel:
        fixes for issues in btyacc (report by Francis Andre):
 
        + correction to the placement of the #line directive for a %union specification
@@ -1744,7 +2374,8 @@
 
 2016-06-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2016-03-24  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1765,7 +2396,8 @@
        * aclocal.m4:
        update CF_WITH_MAN2HTML to use configured shell rather than /bin/sh
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2016-01-25  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1776,7 +2408,8 @@
 
        * lr0.c: fix a duplicate-free in the leak-checking
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * reader.c:
@@ -1791,7 +2424,9 @@
 
        * configure: regen
 
-       * package/pkgsrc/Makefile, package/mingw-byacc.spec, package/debian/copyright, package/debian/changelog, package/byacc.spec, VERSION:
+       * package/pkgsrc/Makefile, package/mingw-byacc.spec,
+         package/debian/copyright, package/debian/changelog,
+         package/byacc.spec, VERSION:
        bump
 
        * aclocal.m4: resync with my-autoconf
@@ -1811,7 +2446,8 @@
 
        * lr0.c: coverity #39181: memory leak
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
 2014-11-13  Jouk.Jansen
@@ -1834,7 +2470,8 @@
        * package/debian/source/format:
        change to native format to work around regression in Debian packaging.
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * configure: regen
@@ -1871,18 +2508,49 @@
        is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
        bison.
 
-       * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+       * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c,
+         test/btyacc/btyacc_destroy3.tab.c:
        regen
 
        * output.c:
        use puts_param_types/puts_param_names to output lex_param data.
 
-       * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+       * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c,
+         test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/rename_debug.c:
        regen
 
        * btyaccpar.c: add casts, change types to fix strict compiler warnings
 
-       * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+       * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c,
+         test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c,
+         test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c,
+         test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c,
+         test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c,
+         test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c,
+         test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c,
+         test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c,
+         test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c,
+         test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c,
+         test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c,
+         test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c,
+         test/btyacc/err_syntax16.tab.c:
        regen
 
        * output.c: gcc-warning
@@ -1900,7 +2568,9 @@
        * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
        fix "make check_make"
 
-       * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+       * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c,
+         test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c,
+         test/btyacc/btyacc_destroy2.tab.c:
        regen
 
        * reader.c:
@@ -1913,7 +2583,8 @@
        correcting the output of the comma-separated names (only the last name
        was output).
 
-       * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c:
+       * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c,
+         test/btyacc/calc3.tab.c:
        regen
 
        * reader.c:
@@ -1930,7 +2601,8 @@
 
        * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * reader.c:
@@ -1938,12 +2610,20 @@
        recent bison, as well as honoring bison's undocumented feature to accept the
        parameters as a comma-separated list.
 
-       * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error, test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output, test/btyacc/btyacc_destroy2.tab.h:
+       * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c,
+         test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error,
+         test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h,
+         test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output,
+         test/btyacc/btyacc_destroy2.tab.h:
        RCS_BASE
 
 2014-10-03  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output, test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, test/btyacc_destroy1.y, test/btyacc_destroy2.y:
+       * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output,
+         test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h,
+         test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output,
+         test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y,
+         test/btyacc_destroy2.y:
        RCS_BASE
 
 2014-10-02  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -1968,14 +2648,16 @@
 
        * aclocal.m4: modified to support port to Minix3.2
 
-       * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec:
+       * package/pkgsrc/Makefile, VERSION, package/byacc.spec,
+         package/mingw-byacc.spec:
        bump
 
 2014-07-15  Thomas E. Dickey  <dickey@invisible-island.net>
 
        * aclocal.m4: resync with my-autoconf (no change to configure script)
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * test/run_test.sh:
@@ -1989,12 +2671,46 @@
                b) escape "." character in left side of sed expression for $YACC
                c) ensure that $ifBTYACC has a value
 
-       * test/btyacc/big_b.output, test/btyacc/big_l.output, test/btyacc/help.output, test/btyacc/no_b_opt.output, test/btyacc/no_output2.output, test/btyacc/no_p_opt.output, test/btyacc/nostdin.output:
+       * test/btyacc/big_b.output, test/btyacc/big_l.output,
+         test/btyacc/help.output, test/btyacc/no_b_opt.output,
+         test/btyacc/no_output2.output, test/btyacc/no_p_opt.output,
+         test/btyacc/nostdin.output:
        regen (reminder by Garrett Cooper)
 
 2014-07-14  Garrett.Cooper
 
-       * test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error, test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error, test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error, test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error, test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error, test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error, test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error, test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error, test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error, test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error, test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error, test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error, test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error, test/btyacc/err_syntax8.error, test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error, test/yacc/err_syntax1.error, test/yacc/err_syntax10.error, test/yacc/err_syntax11.error, test/yacc/err_syntax12.error, test/yacc/err_syntax13.error, test/yacc/err_syntax14.error, test/yacc/err_syntax15.error, test/yacc/err_syntax16.error, test/yacc/err_syntax17.error, test/yacc/err_syntax18.error, test/yacc/err_syntax19.error, test/yacc/err_syntax2.error, test/yacc/err_syntax21.error, test/yacc/err_syntax22.error, test/yacc/err_syntax23.error, test/yacc/err_syntax24.error, test/yacc/err_syntax25.error, test/yacc/err_syntax26.error, test/yacc/err_syntax27.error, test/yacc/err_syntax3.error, test/yacc/err_syntax4.error, test/yacc/err_syntax5.error, test/yacc/err_syntax6.error, test/yacc/err_syntax7.error, test/yacc/err_syntax7a.error, test/yacc/err_syntax7b.error, test/yacc/err_syntax8.error, test/yacc/err_syntax8a.error, test/yacc/err_syntax9.error:
+       * test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error,
+         test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error,
+         test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error,
+         test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error,
+         test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error,
+         test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error,
+         test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error,
+         test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error,
+         test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error,
+         test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error,
+         test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error,
+         test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error,
+         test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error,
+         test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error,
+         test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error,
+         test/btyacc/err_syntax7b.error, test/btyacc/err_syntax8.error,
+         test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error,
+         test/yacc/err_syntax1.error, test/yacc/err_syntax10.error,
+         test/yacc/err_syntax11.error, test/yacc/err_syntax12.error,
+         test/yacc/err_syntax13.error, test/yacc/err_syntax14.error,
+         test/yacc/err_syntax15.error, test/yacc/err_syntax16.error,
+         test/yacc/err_syntax17.error, test/yacc/err_syntax18.error,
+         test/yacc/err_syntax19.error, test/yacc/err_syntax2.error,
+         test/yacc/err_syntax21.error, test/yacc/err_syntax22.error,
+         test/yacc/err_syntax23.error, test/yacc/err_syntax24.error,
+         test/yacc/err_syntax25.error, test/yacc/err_syntax26.error,
+         test/yacc/err_syntax27.error, test/yacc/err_syntax3.error,
+         test/yacc/err_syntax4.error, test/yacc/err_syntax5.error,
+         test/yacc/err_syntax6.error, test/yacc/err_syntax7.error,
+         test/yacc/err_syntax7a.error, test/yacc/err_syntax7b.error,
+         test/yacc/err_syntax8.error, test/yacc/err_syntax8a.error,
+         test/yacc/err_syntax9.error:
        regen
 
 2014-05-27  Tom.Shields
@@ -2003,7 +2719,10 @@
 
 2014-05-27  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * VERSION, package/byacc.spec, package/debian/changelog, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output,
+         test/yacc/no_b_opt.output, test/yacc/no_output2.output,
+         test/yacc/nostdin.output:
        bump
 
 2014-04-22  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -2036,7 +2755,8 @@
 
 2014-04-22  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec:
+       * package/pkgsrc/Makefile, VERSION, package/byacc.spec,
+         package/mingw-byacc.spec:
        bump
 
 2014-04-19  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -2055,7 +2775,22 @@
 
        * reader.c: fix const-cast warnings
 
-       * test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/code_error.tab.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/error.tab.c, test/btyacc/rename_debug.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.tab.c, output.c:
+       * test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c,
+         test/btyacc/pure_error.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/code_error.tab.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/rename_debug.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         output.c:
        fix a few clang --analyze warnings; one was a case where output_ctable emitted
        an empty table (which should be an error).
 
@@ -2065,26 +2800,44 @@
 
        * package/debian/changelog: reason for release
 
-       * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+       * VERSION, package/byacc.spec, package/debian/changelog,
+         package/pkgsrc/Makefile:
        bump
 
        * makefile.in: use $LINT_OPTS from environment via configure script
 
-       * test/btyacc/ok_syntax1.output, test/btyacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.c, test/ok_syntax1.y, test/yacc/ok_syntax1.output:
+       * test/btyacc/ok_syntax1.output, test/btyacc/ok_syntax1.tab.c,
+         test/yacc/ok_syntax1.tab.c, test/ok_syntax1.y,
+         test/yacc/ok_syntax1.output:
        tweaks to make generated files from ok_syntax1.y compile with check_make rule
 
-       * test/btyacc/rename_debug.c, test/btyacc/rename_debug.error, test/btyacc/rename_debug.h, test/btyacc/rename_debug.i, test/btyacc/rename_debug.output, test/yacc/rename_debug.c:
+       * test/btyacc/rename_debug.c, test/btyacc/rename_debug.error,
+         test/btyacc/rename_debug.h, test/btyacc/rename_debug.i,
+         test/yacc/rename_debug.c:
        reference output for testing
 
        * test/run_test.sh:
        retain the renaming done for code_debug.y so that check_make will work.
 
-       * test/yacc/rename_debug.error, test/yacc/rename_debug.h, test/yacc/rename_debug.i, test/yacc/rename_debug.output:
+       * test/yacc/rename_debug.error, test/yacc/rename_debug.h,
+         test/yacc/rename_debug.output:
        reference output for testing
 
        * test/btyacc/ok_syntax1.error: RCS_BASE
 
-       * test/yacc/quote_calc4-s.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, yaccpar.c:
+       * test/yacc/quote_calc4-s.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/code_error.code.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         yaccpar.c:
        regen
 
        * yacc.1:
@@ -2092,21 +2845,90 @@
 
 2014-04-08  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/yacc/ok_syntax1.output, test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h, test/btyacc/ok_syntax1.output, test/btyacc/ok_syntax1.tab.c, test/btyacc/ok_syntax1.tab.h:
+       * test/yacc/ok_syntax1.output, test/yacc/ok_syntax1.tab.c,
+         test/yacc/ok_syntax1.tab.h, test/btyacc/ok_syntax1.output,
+         test/btyacc/ok_syntax1.tab.h:
        reference output for testing
 
        * test/ok_syntax1.y: RCS_BASE
 
        * test/yacc/ok_syntax1.error: reference output for testing
 
-       * test/yacc/big_b.error, test/yacc/big_b.output, test/yacc/big_l.error, test/yacc/big_l.output, test/btyacc/big_b.error, test/btyacc/big_b.output, test/btyacc/big_l.error, test/btyacc/big_l.output, test/run_test.sh:
+       * test/yacc/big_b.error, test/yacc/big_b.output, test/yacc/big_l.error,
+         test/yacc/big_l.output, test/btyacc/big_b.error,
+         test/btyacc/big_b.output, test/btyacc/big_l.error,
+         test/run_test.sh:
        exercise -L/-B options
 
-       * test/yacc/code_debug.c, test/btyacc/code_debug.c, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c, test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax27.tab.c, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/run_test.sh, test/yacc/no_b_opt1.output:
+       * test/yacc/code_debug.c, test/btyacc/code_debug.c,
+         test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c,
+         test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c,
+         test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c,
+         test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c,
+         test/yacc/err_syntax26.tab.c, test/yacc/err_syntax27.tab.c,
+         test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c,
+         test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c,
+         test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c,
+         test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c,
+         test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c,
+         test/yacc/error.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax1.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax13.tab.c,
+         test/yacc/err_syntax14.tab.c, test/btyacc/err_syntax13.tab.c,
+         test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c,
+         test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c,
+         test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c,
+         test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c,
+         test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c,
+         test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c,
+         test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c,
+         test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c,
+         test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c,
+         test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c,
+         test/btyacc/err_syntax9.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_error.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/pure_calc.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c,
+         test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c,
+         test/btyacc/code_calc.code.c, test/run_test.sh,
+         test/yacc/no_b_opt1.output:
        use a better renaming of the YYPATCH definition (none of the test-cases rely
        upon it, but redefinition in the "make check_make" rule is a problem).
 
-       * test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/varsyntax_calc1.tab.c:
+       * test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c,
+         test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax25.tab.c,
+         test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c,
+         test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c,
+         test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c,
+         test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c,
+         test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c,
+         test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c:
        undid temporary reordering in reader() by Tom Shields to align with byacc outputs
 
        * test/run_test.sh: remove a repeated test-case
@@ -2117,20 +2939,51 @@
 
        * test/run_test.sh: tidy
 
-       * test/yacc/help.error, test/yacc/help.output, test/yacc/no_b_opt.error, test/yacc/no_b_opt.output, test/yacc/no_b_opt1.error, test/yacc/no_b_opt1.output, test/yacc/no_code_c.error, test/yacc/no_code_c.output, test/yacc/no_defines.error, test/yacc/no_defines.output, test/yacc/no_graph.error, test/yacc/no_graph.output, test/yacc/no_include.error, test/yacc/no_include.output, test/yacc/no_opts.error, test/yacc/no_opts.output, test/yacc/no_output.error, test/yacc/no_output.output, test/yacc/no_output1.error, test/yacc/no_output1.output, test/yacc/no_output2.error, test/yacc/no_output2.output, test/yacc/no_p_opt.error, test/yacc/no_p_opt.output, test/yacc/no_p_opt1.error, test/yacc/no_p_opt1.output, test/yacc/no_verbose.error, test/yacc/no_verbose.output, test/yacc/nostdin.error, test/yacc/nostdin.output, test/yacc/test-no_b_opt1.output:
+       * test/yacc/help.error, test/yacc/help.output, test/yacc/no_b_opt.error,
+         test/yacc/no_b_opt.output, test/yacc/no_b_opt1.error,
+         test/yacc/no_b_opt1.output, test/yacc/no_code_c.error,
+         test/yacc/no_code_c.output, test/yacc/no_defines.error,
+         test/yacc/no_defines.output, test/yacc/no_graph.error,
+         test/yacc/no_graph.output, test/yacc/no_include.error,
+         test/yacc/no_include.output, test/yacc/no_opts.error,
+         test/yacc/no_opts.output, test/yacc/no_output.error,
+         test/yacc/no_output.output, test/yacc/no_output1.error,
+         test/yacc/no_output1.output, test/yacc/no_output2.error,
+         test/yacc/no_output2.output, test/yacc/no_p_opt.error,
+         test/yacc/no_p_opt.output, test/yacc/no_p_opt1.error,
+         test/yacc/no_p_opt1.output, test/yacc/no_verbose.error,
+         test/yacc/no_verbose.output, test/yacc/nostdin.error,
+         test/yacc/test-no_b_opt1.output:
        reference output for testing
 
        * test/run_test.sh:
        add special checks for flags which depend on writable/existing files
 
-       * test/btyacc/no_b_opt1.output, test/btyacc/no_p_opt1.output, test/btyacc/no_b_opt.error, test/btyacc/no_b_opt.output, test/btyacc/no_b_opt1.error, test/btyacc/no_code_c.output, test/btyacc/no_p_opt.error, test/btyacc/no_p_opt.output, test/btyacc/no_p_opt1.error, test/btyacc/no_output2.output, test/btyacc/no_code_c.error, test/btyacc/no_output2.error, test/btyacc/no_include.error, test/btyacc/no_include.output, test/btyacc/no_defines.output, test/btyacc/no_defines.error, test/btyacc/no_verbose.output, test/btyacc/no_graph.output, test/btyacc/no_graph.error, test/btyacc/no_opts.error, test/btyacc/no_opts.output, test/btyacc/no_verbose.error, test/btyacc/nostdin.error, test/btyacc/nostdin.output, test/btyacc/no_output.error, test/btyacc/no_output.output, test/btyacc/no_output1.error, test/btyacc/no_output1.output:
+       * test/btyacc/no_b_opt1.output, test/btyacc/no_p_opt1.output,
+         test/btyacc/no_b_opt.error, test/btyacc/no_b_opt.output,
+         test/btyacc/no_b_opt1.error, test/btyacc/no_code_c.output,
+         test/btyacc/no_p_opt.error, test/btyacc/no_p_opt.output,
+         test/btyacc/no_p_opt1.error, test/btyacc/no_output2.output,
+         test/btyacc/no_code_c.error, test/btyacc/no_output2.error,
+         test/btyacc/no_include.error, test/btyacc/no_include.output,
+         test/btyacc/no_defines.output, test/btyacc/no_defines.error,
+         test/btyacc/no_verbose.output, test/btyacc/no_graph.output,
+         test/btyacc/no_graph.error, test/btyacc/no_opts.error,
+         test/btyacc/no_opts.output, test/btyacc/no_verbose.error,
+         test/btyacc/nostdin.error, test/btyacc/nostdin.output,
+         test/btyacc/no_output.error, test/btyacc/no_output.output,
+         test/btyacc/no_output1.output:
        reference output for testing
 
        * main.c:
        change CREATE_FILE_NAMES() to use local function rather than inline code,
        to simplify coverage analysis.
 
-       * test/btyacc/err_syntax27.error, test/btyacc/err_syntax27.output, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax27.tab.h, test/btyacc/help.error, test/btyacc/help.output, test/yacc/err_syntax27.error, test/yacc/err_syntax27.output, test/yacc/err_syntax27.tab.c, test/yacc/err_syntax27.tab.h:
+       * test/btyacc/err_syntax27.error, test/btyacc/err_syntax27.output,
+         test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax27.tab.h,
+         test/btyacc/help.error, test/btyacc/help.output,
+         test/yacc/err_syntax27.error, test/yacc/err_syntax27.output,
+         test/yacc/err_syntax27.tab.h:
        reference output for testing
 
        * test/err_syntax27.y: testcase for missing_brace()
@@ -2141,7 +2994,54 @@
 
        * yaccpar.skel: use YYINT's to replace short's as in btyaccpar.skel
 
-       * test/btyacc/code_debug.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_debug.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, output.c, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax21.tab.c, test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c, test/run_test.sh:
+       * test/btyacc/code_debug.c, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c,
+         test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c,
+         test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c,
+         test/btyacc/err_syntax24.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax10.tab.c,
+         test/btyacc/err_syntax11.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.code.c,
+         test/yacc/code_debug.c, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, output.c,
+         test/yacc/err_syntax1.tab.c, test/yacc/err_syntax13.tab.c,
+         test/yacc/err_syntax14.tab.c, test/yacc/err_syntax15.tab.c,
+         test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c,
+         test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c,
+         test/yacc/err_syntax21.tab.c, test/yacc/err_syntax22.tab.c,
+         test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c,
+         test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c,
+         test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c,
+         test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c,
+         test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c,
+         test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c,
+         test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c,
+         test/run_test.sh:
        2010/11/26 simplification of output.c using putc_code() and putl_code()
        omitted an adjustment of the #line value used for code-file.  Fix that.
        Also, amend 2005/05/04 change to run_test.sh to retain a dummy line for
@@ -2155,7 +3055,9 @@
 
        * lr0.c, output.c: fix for valgrind
 
-       * test/btyacc/code_debug.c, test/btyacc/code_debug.error, test/btyacc/code_debug.h, test/btyacc/code_debug.i, test/btyacc/code_debug.output:
+       * test/btyacc/code_debug.c, test/btyacc/code_debug.error,
+         test/btyacc/code_debug.h, test/btyacc/code_debug.i,
+         test/btyacc/code_debug.output:
        RCS_BASE
 
        * test/yacc/code_debug.c, test/yacc/code_debug.h:
@@ -2169,7 +3071,8 @@
 
        * test/run_test.sh: exercise the "-o" option
 
-       * test/yacc/code_debug.error, test/yacc/code_debug.h, test/yacc/code_debug.output:
+       * test/yacc/code_debug.error, test/yacc/code_debug.h,
+         test/yacc/code_debug.output:
        reference output for testing
 
        * output.c: don't call exit() without giving a chance to cleanup.
@@ -2220,27 +3123,92 @@
 
        * test/run_make.sh: improve cleanup after error recovery
 
-       * test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, output.c, skeleton.c, defs.h:
+       * test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.code.c,
+         test/yacc/code_error.code.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         defs.h:
        use improvement from Tom Shield's btyacc changes, getting rid of special cases for generating two yyerror calls in skeleton
 
        * output.c: simplify output_yyerror_decl()
 
-       * test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.tab.c, test/yacc/code_error.tab.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, output.c:
+       * test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.tab.c,
+         test/yacc/code_error.tab.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c,
+         output.c:
        add second "const" to string-table declarations, from Tom Shield's btyacc changes
 
-       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c:
+       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax18.tab.c:
        discard unnecessary call on write_code_lineno() from Tom Shield's changes
 
-       * test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, output.c:
+       * test/yacc/error.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c,
+         test/yacc/code_error.code.c, test/yacc/code_error.tab.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         output.c:
        use YYINT typedef from Tom Shield's btyacc changes to replace explicit "short"
 
        * test/yacc/code_calc.code.c, test/yacc/code_error.code.c, output.c:
        use fix from Tom Shield's btyacc changes: remove redundant extern-declaration for YYPARSE_DECL()
 
-       * test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c:
+       * test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c,
+         test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c,
+         test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c,
+         test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c,
+         test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c,
+         test/btyacc/err_syntax12.tab.c:
        discard unnecessary call on write_code_lineno() from Tom Shield's changes
 
-       * output.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.tab.c:
+       * output.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/code_error.tab.c:
        use fix from Tom Shield's btyacc changes: prefix-definitions went to the
        output (.tab.c) file in a case where they should have gone to the code
        (.code.c) file.  Remove now-redundant call to output_prefix().
@@ -2254,21 +3222,79 @@
 
 2014-04-05  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c:
+       * test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/error.tab.c:
        discard a change which merged CountLines() with explicit comparisons against
        code_file because that adds extra to the #line values
 
-       * test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/calc.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/error.tab.c, output.c:
+       * test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c,
+         test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_error.code.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax11.tab.c,
+         test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c,
+         output.c:
        add Tom Shield's change to allow definition of YYSTYPE_IS_DECLARED symbol to
        override fallback typedef for YYSTYPE when that symbol is undefined
 
-       * test/btyacc/error.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c:
+       * test/btyacc/error.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/calc.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax18.tab.c:
        minor tweak to coding style - use parenthesis for "defined" operator's parameter
 
-       * test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c:
+       * test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/error.tab.c, test/btyacc/grammar.tab.c,
+         test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c,
+         test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c,
+         test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c,
+         test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c,
+         test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c,
+         test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c,
+         test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c,
+         test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c,
+         test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c,
+         test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
+         test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_syntax10.tab.c:
        regen to make YYMAXTOKEN and YYUNDFTOKEN adjacent
 
-       * test/yacc/err_syntax20.tab.c, test/yacc/grammar.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c:
+       * test/yacc/err_syntax20.tab.c, test/yacc/grammar.tab.c,
+         test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c,
+         test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c,
+         test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c,
+         test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c,
+         test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c,
+         test/yacc/code_error.code.c, test/yacc/code_error.tab.c,
+         test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax12.tab.c:
        regen after adding the YYUNDFTOKEN symbol
 
        * output.c:
@@ -2314,7 +3340,30 @@
 
        * test/yacc/calc2.tab.c, test/yacc/calc3.tab.c: regen
 
-       * test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c, test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, skeleton.c:
+       * test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c,
+         test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c,
+         test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c,
+         test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.code.c,
+         test/yacc/code_error.code.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c,
+         test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c,
+         test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c,
+         test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c,
+         test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c,
+         test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c,
+         test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c,
+         skeleton.c:
        incorporate YYENOMEM and YYEOF symbols from btyacc
 
        * output.c: merge chunk from btyacc changes for header-guards
@@ -2346,7 +3395,22 @@
 
        * defs.h: typedef __compar_fn_t is unnecessary
 
-       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c:
+       * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c,
+         test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c,
+         test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c,
+         test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c,
+         test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c,
+         test/btyacc/code_error.code.c, test/btyacc/empty.tab.c,
+         test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax18.tab.c:
        omit the GCC_UNUSED, as noted by Tom Shields not really essential
 
 2014-04-01  Tom.Shields
@@ -2370,12 +3434,44 @@
        * test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c:
        omit the GCC_UNUSED, as noted by Tom Shields not really essential
 
-       * test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c:
+       * test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c,
+         test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c,
+         test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax14.tab.c,
+         test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c,
+         test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax20.tab.c,
+         test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c,
+         test/btyacc/err_syntax24.tab.c:
        regen
 
 2014-03-29  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c, skeleton.c:
+       * test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c,
+         test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c,
+         test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c,
+         test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c,
+         test/yacc/err_syntax6.tab.c, test/yacc/err_syntax7.tab.c,
+         test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7b.tab.c,
+         test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8a.tab.c,
+         test/yacc/err_syntax9.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c,
+         test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.code.c,
+         test/yacc/code_error.code.c, test/yacc/empty.tab.c,
+         test/yacc/err_syntax1.tab.c, test/yacc/err_syntax10.tab.c,
+         test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c,
+         test/yacc/err_syntax13.tab.c, test/yacc/err_syntax14.tab.c,
+         test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c,
+         test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c,
+         test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c,
+         skeleton.c:
        comment-out yysccsid in the banner because it produces unnecessary compiler
        warnings.  The suggested alternative (using #pragma ident) in the preceding
        comment is also obsolete; remove that comment (request by Gleb Smirnoff).
@@ -2385,7 +3481,26 @@
 
 2014-03-28  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/yacc/varsyntax_calc1.error, test/yacc/varsyntax_calc1.output, test/yacc/varsyntax_calc1.tab.c, test/yacc/varsyntax_calc1.tab.h, test/yacc/err_inherit3.error, test/yacc/err_inherit3.output, test/yacc/err_inherit3.tab.c, test/yacc/err_inherit3.tab.h, test/yacc/err_inherit4.error, test/yacc/err_inherit4.output, test/yacc/err_inherit4.tab.c, test/yacc/err_inherit4.tab.h, test/yacc/err_inherit5.error, test/yacc/err_inherit5.output, test/yacc/err_inherit5.tab.c, test/yacc/err_inherit5.tab.h, test/yacc/inherit0.error, test/yacc/inherit0.output, test/yacc/inherit0.tab.c, test/yacc/inherit0.tab.h, test/yacc/inherit1.error, test/yacc/inherit1.output, test/yacc/inherit1.tab.c, test/yacc/inherit1.tab.h, test/yacc/inherit2.error, test/yacc/inherit2.output, test/yacc/inherit2.tab.c, test/yacc/inherit2.tab.h, test/yacc/empty.error, test/yacc/empty.output, test/yacc/empty.tab.c, test/yacc/empty.tab.h, test/yacc/err_inherit1.error, test/yacc/err_inherit1.output, test/yacc/err_inherit1.tab.c, test/yacc/err_inherit1.tab.h, test/yacc/err_inherit2.error, test/yacc/err_inherit2.output, test/yacc/err_inherit2.tab.c, test/yacc/err_inherit2.tab.h:
+       * test/yacc/varsyntax_calc1.error, test/yacc/varsyntax_calc1.output,
+         test/yacc/varsyntax_calc1.tab.c, test/yacc/varsyntax_calc1.tab.h,
+         test/yacc/err_inherit3.error, test/yacc/err_inherit3.output,
+         test/yacc/err_inherit3.tab.c, test/yacc/err_inherit3.tab.h,
+         test/yacc/err_inherit4.error, test/yacc/err_inherit4.output,
+         test/yacc/err_inherit4.tab.c, test/yacc/err_inherit4.tab.h,
+         test/yacc/err_inherit5.error, test/yacc/err_inherit5.output,
+         test/yacc/err_inherit5.tab.c, test/yacc/err_inherit5.tab.h,
+         test/yacc/inherit0.error, test/yacc/inherit0.output,
+         test/yacc/inherit0.tab.c, test/yacc/inherit0.tab.h,
+         test/yacc/inherit1.error, test/yacc/inherit1.output,
+         test/yacc/inherit1.tab.c, test/yacc/inherit1.tab.h,
+         test/yacc/inherit2.error, test/yacc/inherit2.output,
+         test/yacc/inherit2.tab.c, test/yacc/inherit2.tab.h,
+         test/yacc/empty.error, test/yacc/empty.output, test/yacc/empty.tab.c,
+         test/yacc/empty.tab.h, test/yacc/err_inherit1.error,
+         test/yacc/err_inherit1.output, test/yacc/err_inherit1.tab.c,
+         test/yacc/err_inherit1.tab.h, test/yacc/err_inherit2.error,
+         test/yacc/err_inherit2.output, test/yacc/err_inherit2.tab.c,
+         test/yacc/err_inherit2.tab.h:
        reference output for testing
 
        * test/run_lint.sh, test/run_make.sh, test/run_test.sh:
@@ -2393,7 +3508,23 @@
 
 2014-03-28  Tom.Shields
 
-       * test/btyacc/btyacc_demo.tab.c, test/btyacc/err_inherit3.error, test/btyacc/err_inherit3.output, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit3.tab.h, test/btyacc/err_inherit2.error, test/btyacc/err_inherit2.output, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit2.tab.h, test/btyacc/err_inherit4.error, test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit4.tab.h, test/btyacc/err_inherit5.error, test/btyacc/err_inherit5.output, test/btyacc/err_inherit5.tab.c, test/btyacc/err_inherit5.tab.h, test/btyacc/inherit0.error, test/btyacc/inherit0.output, test/btyacc/inherit0.tab.c, test/btyacc/inherit0.tab.h, test/btyacc/inherit1.error, test/btyacc/inherit1.output, test/btyacc/inherit1.tab.c, test/btyacc/inherit1.tab.h, test/btyacc/inherit2.error, test/btyacc/inherit2.output, test/btyacc/inherit2.tab.c, test/btyacc/inherit2.tab.h, test/btyacc/calc.error, test/btyacc/err_inherit1.error, test/btyacc/err_inherit1.output, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit1.tab.h:
+       * test/btyacc/btyacc_demo.tab.c, test/btyacc/err_inherit3.error,
+         test/btyacc/err_inherit3.output, test/btyacc/err_inherit3.tab.c,
+         test/btyacc/err_inherit3.tab.h, test/btyacc/err_inherit2.error,
+         test/btyacc/err_inherit2.output, test/btyacc/err_inherit2.tab.c,
+         test/btyacc/err_inherit2.tab.h, test/btyacc/err_inherit4.error,
+         test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c,
+         test/btyacc/err_inherit4.tab.h, test/btyacc/err_inherit5.error,
+         test/btyacc/err_inherit5.output, test/btyacc/err_inherit5.tab.c,
+         test/btyacc/err_inherit5.tab.h, test/btyacc/inherit0.error,
+         test/btyacc/inherit0.output, test/btyacc/inherit0.tab.c,
+         test/btyacc/inherit0.tab.h, test/btyacc/inherit1.error,
+         test/btyacc/inherit1.output, test/btyacc/inherit1.tab.c,
+         test/btyacc/inherit1.tab.h, test/btyacc/inherit2.error,
+         test/btyacc/inherit2.output, test/btyacc/inherit2.tab.c,
+         test/btyacc/inherit2.tab.h, test/btyacc/calc.error,
+         test/btyacc/err_inherit1.error, test/btyacc/err_inherit1.output,
+         test/btyacc/err_inherit1.tab.h:
        reference output for testing
 
        * defs.h: new functions/variables for btyacc
@@ -2403,7 +3534,8 @@
 
 2014-03-27  Tom.Shields
 
-       * test/err_inherit5.y, test/err_inherit4.y, test/err_inherit3.y, test/err_inherit2.y, test/err_inherit1.y, test/inherit2.y:
+       * test/err_inherit5.y, test/err_inherit4.y, test/err_inherit3.y,
+         test/inherit2.y:
        testcase for btyacc
 
 2014-03-25  Tom.Shields
@@ -2434,8 +3566,6 @@
 
 2014-03-25  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/btyacc/RCS, test/yacc/RCS: PERMIT FILE
-
        * config_h.in: updated with autoheader-252
 
 2014-03-25  Tom.Shields
@@ -2444,7 +3574,58 @@
 
 2014-03-24  Tom.Shields
 
-       * test/btyacc/err_syntax1.output, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax1.tab.h, test/btyacc/err_syntax10.error, test/btyacc/err_syntax10.output, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax10.tab.h, test/btyacc/err_syntax11.error, test/btyacc/err_syntax11.output, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax11.tab.h, test/btyacc/err_syntax12.error, test/btyacc/err_syntax12.output, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax12.tab.h, test/btyacc/err_syntax13.error, test/btyacc/err_syntax13.output, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax13.tab.h, test/btyacc/err_syntax14.error, test/btyacc/err_syntax14.output, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax14.tab.h, test/btyacc/err_syntax15.error, test/btyacc/err_syntax15.output, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax15.tab.h, test/btyacc/err_syntax16.error, test/btyacc/err_syntax16.output, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax16.tab.h, test/btyacc/err_syntax17.error, test/btyacc/err_syntax17.output, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax17.tab.h, test/btyacc/err_syntax18.error, test/btyacc/err_syntax18.output, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax18.tab.h, test/btyacc/err_syntax19.error, test/btyacc/err_syntax19.output, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax19.tab.h, test/btyacc/err_syntax2.output, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax2.tab.h, test/btyacc/err_syntax20.error, test/btyacc/err_syntax20.output, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax20.tab.h, test/btyacc/err_syntax21.error, test/btyacc/err_syntax21.output, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax21.tab.h, test/btyacc/err_syntax22.error, test/btyacc/err_syntax22.output, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax22.tab.h, test/btyacc/err_syntax23.error, test/btyacc/err_syntax23.output, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax23.tab.h, test/btyacc/err_syntax24.error, test/btyacc/err_syntax24.output, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax24.tab.h, test/btyacc/err_syntax25.error, test/btyacc/err_syntax25.output, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax25.tab.h, test/btyacc/err_syntax26.error, test/btyacc/err_syntax26.output, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax26.tab.h, test/btyacc/err_syntax3.output, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax3.tab.h, test/btyacc/err_syntax4.output, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax4.tab.h, test/btyacc/err_syntax5.output, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax5.tab.h, test/btyacc/err_syntax6.output, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax6.tab.h, test/btyacc/err_syntax7.output, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7.tab.h, test/btyacc/err_syntax7a.output, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7a.tab.h, test/btyacc/err_syntax7b.output, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax7b.tab.h, test/btyacc/err_syntax8.output, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8.tab.h, test/btyacc/err_syntax8a.output, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax8a.tab.h, test/btyacc/err_syntax9.output, test/btyacc/err_syntax9.tab.c, test/btyacc/err_syntax9.tab.h:
+       * test/btyacc/err_syntax1.output, test/btyacc/err_syntax1.tab.c,
+         test/btyacc/err_syntax1.tab.h, test/btyacc/err_syntax10.error,
+         test/btyacc/err_syntax10.output, test/btyacc/err_syntax10.tab.c,
+         test/btyacc/err_syntax10.tab.h, test/btyacc/err_syntax11.error,
+         test/btyacc/err_syntax11.output, test/btyacc/err_syntax11.tab.c,
+         test/btyacc/err_syntax11.tab.h, test/btyacc/err_syntax12.error,
+         test/btyacc/err_syntax12.output, test/btyacc/err_syntax12.tab.c,
+         test/btyacc/err_syntax12.tab.h, test/btyacc/err_syntax13.error,
+         test/btyacc/err_syntax13.output, test/btyacc/err_syntax13.tab.c,
+         test/btyacc/err_syntax13.tab.h, test/btyacc/err_syntax14.error,
+         test/btyacc/err_syntax14.output, test/btyacc/err_syntax14.tab.c,
+         test/btyacc/err_syntax14.tab.h, test/btyacc/err_syntax15.error,
+         test/btyacc/err_syntax15.output, test/btyacc/err_syntax15.tab.c,
+         test/btyacc/err_syntax15.tab.h, test/btyacc/err_syntax16.error,
+         test/btyacc/err_syntax16.output, test/btyacc/err_syntax16.tab.c,
+         test/btyacc/err_syntax16.tab.h, test/btyacc/err_syntax17.error,
+         test/btyacc/err_syntax17.output, test/btyacc/err_syntax17.tab.c,
+         test/btyacc/err_syntax17.tab.h, test/btyacc/err_syntax18.error,
+         test/btyacc/err_syntax18.output, test/btyacc/err_syntax18.tab.c,
+         test/btyacc/err_syntax18.tab.h, test/btyacc/err_syntax19.error,
+         test/btyacc/err_syntax19.output, test/btyacc/err_syntax19.tab.c,
+         test/btyacc/err_syntax19.tab.h, test/btyacc/err_syntax2.output,
+         test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax2.tab.h,
+         test/btyacc/err_syntax20.error, test/btyacc/err_syntax20.output,
+         test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax20.tab.h,
+         test/btyacc/err_syntax21.error, test/btyacc/err_syntax21.output,
+         test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax21.tab.h,
+         test/btyacc/err_syntax22.error, test/btyacc/err_syntax22.output,
+         test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax22.tab.h,
+         test/btyacc/err_syntax23.error, test/btyacc/err_syntax23.output,
+         test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax23.tab.h,
+         test/btyacc/err_syntax24.error, test/btyacc/err_syntax24.output,
+         test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax24.tab.h,
+         test/btyacc/err_syntax25.error, test/btyacc/err_syntax25.output,
+         test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax25.tab.h,
+         test/btyacc/err_syntax26.error, test/btyacc/err_syntax26.output,
+         test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax26.tab.h,
+         test/btyacc/err_syntax3.output, test/btyacc/err_syntax3.tab.c,
+         test/btyacc/err_syntax3.tab.h, test/btyacc/err_syntax4.output,
+         test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax4.tab.h,
+         test/btyacc/err_syntax5.output, test/btyacc/err_syntax5.tab.c,
+         test/btyacc/err_syntax5.tab.h, test/btyacc/err_syntax6.output,
+         test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax6.tab.h,
+         test/btyacc/err_syntax7.output, test/btyacc/err_syntax7.tab.c,
+         test/btyacc/err_syntax7.tab.h, test/btyacc/err_syntax7a.output,
+         test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7a.tab.h,
+         test/btyacc/err_syntax7b.output, test/btyacc/err_syntax7b.tab.c,
+         test/btyacc/err_syntax7b.tab.h, test/btyacc/err_syntax8.output,
+         test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8.tab.h,
+         test/btyacc/err_syntax8a.output, test/btyacc/err_syntax8a.tab.c,
+         test/btyacc/err_syntax8a.tab.h, test/btyacc/err_syntax9.output,
+         test/btyacc/err_syntax9.tab.h:
        reference output for testing
 
 2014-03-24  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -2455,36 +3636,65 @@
 
        * test/btyacc_demo.y: testcase for btyacc
 
-       * test/btyacc/varsyntax_calc1.error, test/btyacc/varsyntax_calc1.output, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/varsyntax_calc1.tab.h:
+       * test/btyacc/varsyntax_calc1.error, test/btyacc/varsyntax_calc1.output,
+         test/btyacc/varsyntax_calc1.tab.h:
        reference output for testing
 
        * test/varsyntax_calc1.y, test/btyacc_calc1.y: testcase for btyacc
 
 2014-03-23  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/err_syntax26.error, test/err_syntax26.output, test/err_syntax26.tab.c, test/err_syntax26.tab.h, test/yacc/err_syntax26.error, test/yacc/err_syntax26.output, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax26.tab.h:
+       * test/err_syntax26.error, test/err_syntax26.output,
+         test/err_syntax26.tab.c, test/err_syntax26.tab.h,
+         test/yacc/err_syntax26.error, test/yacc/err_syntax26.output,
+         test/yacc/err_syntax26.tab.h:
        reference output for testing
 
        * test/err_syntax26.y: testcase for missing_brace()
 
-       * test/err_syntax25.error, test/err_syntax25.output, test/err_syntax25.tab.c, test/err_syntax25.tab.h, test/yacc/err_syntax25.error, test/yacc/err_syntax25.output, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax25.tab.h:
+       * test/err_syntax25.error, test/err_syntax25.output,
+         test/err_syntax25.tab.c, test/err_syntax25.tab.h,
+         test/yacc/err_syntax25.error, test/yacc/err_syntax25.output,
+         test/yacc/err_syntax25.tab.h:
        reference output for testing
 
        * test/err_syntax25.y: testcase for over_unionized()
 
-       * test/err_syntax24.error, test/err_syntax24.output, test/err_syntax24.tab.c, test/err_syntax24.tab.h, test/yacc/err_syntax24.error, test/yacc/err_syntax24.output, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax24.tab.h:
+       * test/err_syntax24.error, test/err_syntax24.output,
+         test/err_syntax24.tab.c, test/err_syntax24.tab.h,
+         test/yacc/err_syntax24.error, test/yacc/err_syntax24.output,
+         test/yacc/err_syntax24.tab.h:
        reference output for testing
 
        * test/err_syntax24.y: testcase for default_action_warning()
 
 2014-03-23  Tom.Shields
 
-       * test/btyacc/quote_calc3-s.error, test/btyacc/quote_calc4-s.error, test/btyacc/quote_calc4.error, test/btyacc/grammar.dot, test/btyacc/grammar.error, test/btyacc/pure_calc.error, test/btyacc/pure_error.error, test/btyacc/quote_calc-s.error, test/btyacc/quote_calc.error, test/btyacc/quote_calc2-s.error, test/btyacc/quote_calc2.error, test/btyacc/quote_calc3.error, test/btyacc/err_syntax2.error, test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error, test/btyacc/err_syntax8.error, test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error, test/btyacc/error.error, test/btyacc/calc1.error, test/btyacc/calc2.error, test/btyacc/calc3.error, test/btyacc/code_calc.error, test/btyacc/code_error.error, test/btyacc/empty.error, test/btyacc/err_syntax1.error, test/btyacc/btyacc_calc1.error, test/btyacc/btyacc_demo.error:
+       * test/btyacc/quote_calc3-s.error, test/btyacc/quote_calc4-s.error,
+         test/btyacc/quote_calc4.error, test/btyacc/grammar.dot,
+         test/btyacc/grammar.error, test/btyacc/pure_calc.error,
+         test/btyacc/pure_error.error, test/btyacc/quote_calc-s.error,
+         test/btyacc/quote_calc.error, test/btyacc/quote_calc2-s.error,
+         test/btyacc/quote_calc2.error, test/btyacc/quote_calc3.error,
+         test/btyacc/err_syntax2.error, test/btyacc/err_syntax3.error,
+         test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error,
+         test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error,
+         test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error,
+         test/btyacc/err_syntax8.error, test/btyacc/err_syntax8a.error,
+         test/btyacc/err_syntax9.error, test/btyacc/error.error,
+         test/btyacc/calc1.error, test/btyacc/calc2.error,
+         test/btyacc/calc3.error, test/btyacc/code_calc.error,
+         test/btyacc/code_error.error, test/btyacc/empty.error,
+         test/btyacc/err_syntax1.error, test/btyacc/btyacc_calc1.error,
+         test/btyacc/btyacc_demo.error:
        reference output for testing
 
 2014-03-23  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/err_syntax23.error, test/err_syntax23.output, test/err_syntax23.tab.c, test/err_syntax23.tab.h, test/yacc/err_syntax23.error, test/yacc/err_syntax23.output, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax23.tab.h:
+       * test/err_syntax23.error, test/err_syntax23.output,
+         test/err_syntax23.tab.c, test/err_syntax23.tab.h,
+         test/yacc/err_syntax23.error, test/yacc/err_syntax23.output,
+         test/yacc/err_syntax23.tab.h:
        reference output for testing
 
        * test/err_syntax23.y: testcase for untyped_lhs()
@@ -2496,110 +3706,186 @@
 
 2014-03-23  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/err_syntax22.error, test/err_syntax22.output, test/err_syntax22.tab.c, test/err_syntax22.tab.h, test/yacc/err_syntax22.error, test/yacc/err_syntax22.output, test/yacc/err_syntax22.tab.c, test/yacc/err_syntax22.tab.h:
+       * test/err_syntax22.error, test/err_syntax22.output,
+         test/err_syntax22.tab.c, test/err_syntax22.tab.h,
+         test/yacc/err_syntax22.error, test/yacc/err_syntax22.output,
+         test/yacc/err_syntax22.tab.h:
        reference output for testing
 
        * test/err_syntax22.y: testcase for untyped_rhs()
 
-       * test/err_syntax21.error, test/err_syntax21.output, test/err_syntax21.tab.c, test/err_syntax21.tab.h, test/yacc/err_syntax21.error, test/yacc/err_syntax21.output, test/yacc/err_syntax21.tab.c, test/yacc/err_syntax21.tab.h, test/err_syntax20.error, test/err_syntax20.output, test/err_syntax20.tab.c, test/err_syntax20.tab.h, test/yacc/err_syntax20.error, test/yacc/err_syntax20.output, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax20.tab.h:
+       * test/err_syntax21.error, test/err_syntax21.output,
+         test/err_syntax21.tab.c, test/err_syntax21.tab.h,
+         test/yacc/err_syntax21.error, test/yacc/err_syntax21.output,
+         test/yacc/err_syntax21.tab.c, test/yacc/err_syntax21.tab.h,
+         test/err_syntax20.error, test/err_syntax20.output,
+         test/err_syntax20.tab.c, test/err_syntax20.tab.h,
+         test/yacc/err_syntax20.error, test/yacc/err_syntax20.output,
+         test/yacc/err_syntax20.tab.h:
        reference output for testing
 
        * test/err_syntax20.y: testcase for undefined_symbol_warning()
 
        * test/err_syntax21.y: testcase for unknown_rhs()
 
-       * test/err_syntax19.error, test/err_syntax19.output, test/err_syntax19.tab.c, test/err_syntax19.tab.h, test/yacc/err_syntax19.error, test/yacc/err_syntax19.output, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax19.tab.h:
+       * test/err_syntax19.error, test/err_syntax19.output,
+         test/err_syntax19.tab.c, test/err_syntax19.tab.h,
+         test/yacc/err_syntax19.error, test/yacc/err_syntax19.output,
+         test/yacc/err_syntax19.tab.h:
        reference output for testing
 
        * test/err_syntax19.y: testcase for dollar_error()
 
-       * test/err_syntax18.error, test/err_syntax18.output, test/err_syntax18.tab.c, test/err_syntax18.tab.h, test/yacc/err_syntax18.error, test/yacc/err_syntax18.output, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax18.tab.h:
+       * test/err_syntax18.error, test/err_syntax18.output,
+         test/err_syntax18.tab.c, test/err_syntax18.tab.h,
+         test/yacc/err_syntax18.error, test/yacc/err_syntax18.output,
+         test/yacc/err_syntax18.tab.h:
        reference output for testing
 
        * test/err_syntax18.y: testcase for dollar_warning()
 
-       * test/err_syntax17.error, test/err_syntax17.output, test/err_syntax17.tab.c, test/err_syntax17.tab.h, test/yacc/err_syntax17.error, test/yacc/err_syntax17.output, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax17.tab.h:
+       * test/err_syntax17.error, test/err_syntax17.output,
+         test/err_syntax17.tab.c, test/err_syntax17.tab.h,
+         test/yacc/err_syntax17.error, test/yacc/err_syntax17.output,
+         test/yacc/err_syntax17.tab.h:
        reference output for testing
 
        * test/err_syntax17.y: testcase for unterminated_action()
 
 2014-03-22  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/err_syntax16.error, test/err_syntax16.output, test/err_syntax16.tab.c, test/err_syntax16.tab.h, test/yacc/err_syntax16.error, test/yacc/err_syntax16.output, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax16.tab.h:
+       * test/err_syntax16.error, test/err_syntax16.output,
+         test/err_syntax16.tab.c, test/err_syntax16.tab.h,
+         test/yacc/err_syntax16.error, test/yacc/err_syntax16.output,
+         test/yacc/err_syntax16.tab.h:
        reference output for testing
 
        * test/err_syntax16.y: testcase for terminal_lhs()
 
-       * test/err_syntax15.error, test/err_syntax15.output, test/err_syntax15.tab.c, test/err_syntax15.tab.h, test/yacc/err_syntax15.error, test/yacc/err_syntax15.output, test/yacc/err_syntax15.tab.c, test/yacc/err_syntax15.tab.h:
+       * test/err_syntax15.error, test/err_syntax15.output,
+         test/err_syntax15.tab.c, test/err_syntax15.tab.h,
+         test/yacc/err_syntax15.error, test/yacc/err_syntax15.output,
+         test/yacc/err_syntax15.tab.h:
        reference output for testing
 
        * test/err_syntax15.y: testcase for no_grammar()
 
-       * test/err_syntax14.error, test/err_syntax14.output, test/err_syntax14.tab.c, test/err_syntax14.tab.h, test/yacc/err_syntax14.error, test/yacc/err_syntax14.output, test/yacc/err_syntax14.tab.c, test/yacc/err_syntax14.tab.h:
+       * test/err_syntax14.error, test/err_syntax14.output,
+         test/err_syntax14.tab.c, test/err_syntax14.tab.h,
+         test/yacc/err_syntax14.error, test/yacc/err_syntax14.output,
+         test/yacc/err_syntax14.tab.h:
        reference output for testing
 
        * test/err_syntax14.y:
        testcase for restarted_warning() and undefined_goal()
 
-       * test/err_syntax13.error, test/err_syntax13.output, test/err_syntax13.tab.c, test/err_syntax13.tab.h, test/yacc/err_syntax13.error, test/yacc/err_syntax13.output, test/yacc/err_syntax13.tab.c, test/yacc/err_syntax13.tab.h:
+       * test/err_syntax13.error, test/err_syntax13.output,
+         test/err_syntax13.tab.c, test/err_syntax13.tab.h,
+         test/yacc/err_syntax13.error, test/yacc/err_syntax13.output,
+         test/yacc/err_syntax13.tab.h:
        reference output for testing
 
        * test/err_syntax13.y: testcase for terminal_start()
 
-       * test/err_syntax12.error, test/err_syntax12.output, test/err_syntax12.tab.c, test/err_syntax12.tab.h, test/yacc/err_syntax12.error, test/yacc/err_syntax12.output, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax12.tab.h:
+       * test/err_syntax12.error, test/err_syntax12.output,
+         test/err_syntax12.tab.c, test/err_syntax12.tab.h,
+         test/yacc/err_syntax12.error, test/yacc/err_syntax12.output,
+         test/yacc/err_syntax12.tab.h:
        reference output for testing
 
        * test/err_syntax12.y: testcase for revalued_warning()
 
-       * test/err_syntax11.error, test/err_syntax11.output, test/err_syntax11.tab.c, test/err_syntax11.tab.h, test/yacc/err_syntax11.error, test/yacc/err_syntax11.output, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax11.tab.h:
+       * test/err_syntax11.error, test/err_syntax11.output,
+         test/err_syntax11.tab.c, test/err_syntax11.tab.h,
+         test/yacc/err_syntax11.error, test/yacc/err_syntax11.output,
+         test/yacc/err_syntax11.tab.h:
        reference output for testing
 
        * test/err_syntax11.y: testcase for reprec_warning()
 
-       * test/err_syntax10.error, test/err_syntax10.output, test/err_syntax10.tab.c, test/err_syntax10.tab.h, test/yacc/err_syntax10.error, test/yacc/err_syntax10.output, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax10.tab.h:
+       * test/err_syntax10.error, test/err_syntax10.output,
+         test/err_syntax10.tab.c, test/err_syntax10.tab.h,
+         test/yacc/err_syntax10.error, test/yacc/err_syntax10.output,
+         test/yacc/err_syntax10.tab.h:
        reference output for testing
 
        * test/err_syntax10.y: testcase for retyped_warning()
 
 2014-03-21  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/err_syntax9.error, test/err_syntax9.output, test/err_syntax9.tab.c, test/err_syntax9.tab.h, test/yacc/err_syntax9.error, test/yacc/err_syntax9.output, test/yacc/err_syntax9.tab.c, test/yacc/err_syntax9.tab.h:
+       * test/err_syntax9.error, test/err_syntax9.output,
+         test/err_syntax9.tab.c, test/err_syntax9.tab.h,
+         test/yacc/err_syntax9.error, test/yacc/err_syntax9.output,
+         test/yacc/err_syntax9.tab.h:
        reference output for testing
 
        * test/err_syntax9.y: testcase for tokenized_start()
 
-       * test/err_syntax8.error, test/err_syntax8.output, test/err_syntax8.tab.c, test/err_syntax8.tab.h, test/err_syntax8a.error, test/err_syntax8a.output, test/err_syntax8a.tab.c, test/err_syntax8a.tab.h, test/yacc/err_syntax8.error, test/yacc/err_syntax8.output, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8.tab.h, test/yacc/err_syntax8a.error, test/yacc/err_syntax8a.output, test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax8a.tab.h:
+       * test/err_syntax8.error, test/err_syntax8.output,
+         test/err_syntax8.tab.c, test/err_syntax8.tab.h,
+         test/err_syntax8a.error, test/err_syntax8a.output,
+         test/err_syntax8a.tab.c, test/err_syntax8a.tab.h,
+         test/yacc/err_syntax8.error, test/yacc/err_syntax8.output,
+         test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8.tab.h,
+         test/yacc/err_syntax8a.error, test/yacc/err_syntax8a.output,
+         test/yacc/err_syntax8a.tab.h:
        reference output for testing
 
        * test/err_syntax8a.y, test/err_syntax8.y: testcase for used_reserved()
 
-       * test/err_syntax7.error, test/err_syntax7.output, test/err_syntax7.tab.c, test/err_syntax7.tab.h, test/err_syntax7a.error, test/err_syntax7a.output, test/err_syntax7a.tab.c, test/err_syntax7a.tab.h, test/err_syntax7b.error, test/err_syntax7b.output, test/err_syntax7b.tab.c, test/err_syntax7b.tab.h, test/yacc/err_syntax7.error, test/yacc/err_syntax7.output, test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7.tab.h, test/yacc/err_syntax7a.error, test/yacc/err_syntax7a.output, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7a.tab.h, test/yacc/err_syntax7b.error, test/yacc/err_syntax7b.output, test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax7b.tab.h:
+       * test/err_syntax7.error, test/err_syntax7.output,
+         test/err_syntax7.tab.c, test/err_syntax7.tab.h,
+         test/err_syntax7a.error, test/err_syntax7a.output,
+         test/err_syntax7a.tab.c, test/err_syntax7a.tab.h,
+         test/err_syntax7b.error, test/err_syntax7b.output,
+         test/err_syntax7b.tab.c, test/err_syntax7b.tab.h,
+         test/yacc/err_syntax7.error, test/yacc/err_syntax7.output,
+         test/yacc/err_syntax7.tab.c, test/yacc/err_syntax7.tab.h,
+         test/yacc/err_syntax7a.error, test/yacc/err_syntax7a.output,
+         test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7a.tab.h,
+         test/yacc/err_syntax7b.error, test/yacc/err_syntax7b.output,
+         test/yacc/err_syntax7b.tab.h:
        reference output for testing
 
        * test/err_syntax7b.y, test/err_syntax7a.y, test/err_syntax7.y:
        testcase for illegal_character()
 
-       * test/err_syntax6.error, test/err_syntax6.output, test/err_syntax6.tab.c, test/err_syntax6.tab.h, test/yacc/err_syntax6.error, test/yacc/err_syntax6.output, test/yacc/err_syntax6.tab.c, test/yacc/err_syntax6.tab.h:
+       * test/err_syntax6.error, test/err_syntax6.output,
+         test/err_syntax6.tab.c, test/err_syntax6.tab.h,
+         test/yacc/err_syntax6.error, test/yacc/err_syntax6.output,
+         test/yacc/err_syntax6.tab.h:
        reference output for testing
 
        * test/err_syntax6.y: testcase for illegal_tag()
 
-       * test/err_syntax5.error, test/err_syntax5.output, test/err_syntax5.tab.c, test/err_syntax5.tab.h, test/yacc/err_syntax5.error, test/yacc/err_syntax5.output, test/yacc/err_syntax5.tab.c, test/yacc/err_syntax5.tab.h:
+       * test/err_syntax5.error, test/err_syntax5.output,
+         test/err_syntax5.tab.c, test/err_syntax5.tab.h,
+         test/yacc/err_syntax5.error, test/yacc/err_syntax5.output,
+         test/yacc/err_syntax5.tab.h:
        reference output for testing
 
        * test/err_syntax5.y: testcase for unterminated_union()
 
-       * test/err_syntax4.error, test/err_syntax4.output, test/err_syntax4.tab.c, test/err_syntax4.tab.h, test/yacc/err_syntax4.error, test/yacc/err_syntax4.output, test/yacc/err_syntax4.tab.c, test/yacc/err_syntax4.tab.h:
+       * test/err_syntax4.error, test/err_syntax4.output,
+         test/err_syntax4.tab.c, test/err_syntax4.tab.h,
+         test/yacc/err_syntax4.error, test/yacc/err_syntax4.output,
+         test/yacc/err_syntax4.tab.h:
        reference output for testing
 
        * test/err_syntax4.y: testcase for unterminated_text()
 
-       * test/err_syntax3.error, test/err_syntax3.output, test/err_syntax3.tab.c, test/err_syntax3.tab.h, test/yacc/err_syntax3.error, test/yacc/err_syntax3.output, test/yacc/err_syntax3.tab.c, test/yacc/err_syntax3.tab.h:
+       * test/err_syntax3.error, test/err_syntax3.output,
+         test/err_syntax3.tab.c, test/err_syntax3.tab.h,
+         test/yacc/err_syntax3.error, test/yacc/err_syntax3.output,
+         test/yacc/err_syntax3.tab.h:
        reference output for testing
 
        * test/err_syntax3.y: testcase for unterminated_string()
 
-       * test/err_syntax2.error, test/err_syntax2.output, test/err_syntax2.tab.c, test/err_syntax2.tab.h, test/yacc/err_syntax2.error, test/yacc/err_syntax2.output, test/yacc/err_syntax2.tab.c, test/yacc/err_syntax2.tab.h:
+       * test/err_syntax2.error, test/err_syntax2.output,
+         test/err_syntax2.tab.c, test/err_syntax2.tab.h,
+         test/yacc/err_syntax2.error, test/yacc/err_syntax2.output,
+         test/yacc/err_syntax2.tab.h:
        reference output for testing
 
        * test/err_syntax2.y: testcase for unterminated_comment()
@@ -2610,14 +3896,31 @@
        * test/err_syntax1.y:
        test-case with syntax error (and nonprinting character)
 
-       * test/calc.error, test/calc1.error, test/calc2.error, test/calc3.error, test/code_calc.error, test/code_error.error, test/err_syntax1.error, test/error.error, test/grammar.error, test/pure_calc.error, test/pure_error.error, test/quote_calc-s.error, test/quote_calc.error, test/quote_calc2-s.error, test/quote_calc2.error, test/quote_calc3-s.error, test/quote_calc3.error, test/quote_calc4-s.error, test/quote_calc4.error, test/yacc/calc.error, test/yacc/calc1.error, test/yacc/calc2.error, test/yacc/calc3.error, test/yacc/code_calc.error, test/yacc/code_error.error, test/yacc/error.error, test/yacc/grammar.error, test/yacc/pure_calc.error, test/yacc/pure_error.error, test/yacc/quote_calc-s.error, test/yacc/quote_calc.error, test/yacc/quote_calc2-s.error, test/yacc/quote_calc2.error, test/yacc/quote_calc3-s.error, test/yacc/quote_calc3.error, test/yacc/quote_calc4-s.error, test/yacc/quote_calc4.error:
+       * test/calc.error, test/calc1.error, test/calc2.error, test/calc3.error,
+         test/code_calc.error, test/code_error.error, test/err_syntax1.error,
+         test/error.error, test/grammar.error, test/pure_calc.error,
+         test/pure_error.error, test/quote_calc-s.error, test/quote_calc.error,
+         test/quote_calc2-s.error, test/quote_calc2.error,
+         test/quote_calc3-s.error, test/quote_calc3.error,
+         test/quote_calc4-s.error, test/quote_calc4.error,
+         test/yacc/calc.error, test/yacc/calc1.error, test/yacc/calc2.error,
+         test/yacc/calc3.error, test/yacc/code_calc.error,
+         test/yacc/code_error.error, test/yacc/error.error,
+         test/yacc/grammar.error, test/yacc/pure_calc.error,
+         test/yacc/pure_error.error, test/yacc/quote_calc-s.error,
+         test/yacc/quote_calc.error, test/yacc/quote_calc2-s.error,
+         test/yacc/quote_calc2.error, test/yacc/quote_calc3-s.error,
+         test/yacc/quote_calc3.error, test/yacc/quote_calc4-s.error,
+         test/yacc/quote_calc4.error:
        reference output for testing
 
        * test/run_test.sh:
        save stderr to reference files, to capture shift/reduce messages as well
        as syntax-error messages
 
-       * test/err_syntax1.output, test/err_syntax1.tab.c, test/err_syntax1.tab.h, test/yacc/err_syntax1.output, test/yacc/err_syntax1.tab.c, test/yacc/err_syntax1.tab.h:
+       * test/err_syntax1.output, test/err_syntax1.tab.c,
+         test/err_syntax1.tab.h, test/yacc/err_syntax1.output,
+         test/yacc/err_syntax1.tab.h:
        reference output for testing
 
        * test/run_test.sh: generate a ".dot" file for the grammar file
@@ -2636,13 +3939,43 @@
 
        * NOTES-btyacc-Changes: byacc-btyacc-20140323
 
-       * test/btyacc/btyacc_calc1.output, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_calc1.tab.h:
+       * test/btyacc/btyacc_calc1.output, test/btyacc/btyacc_calc1.tab.c,
+         test/btyacc/btyacc_calc1.tab.h:
        reference output for testing
 
        * test/run_make.sh:
        move test-outputs into subdirectories to keep btyacc/yacc results separate
 
-       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_calc.tab.h, test/btyacc/pure_error.output, test/btyacc/pure_error.tab.c, test/btyacc/pure_error.tab.h, test/btyacc/quote_calc-s.output, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc-s.tab.h, test/btyacc/quote_calc.output, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc.tab.h, test/btyacc/quote_calc2-s.output, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2-s.tab.h, test/btyacc/quote_calc2.output, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc2.tab.h, test/btyacc/quote_calc3-s.output, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3-s.tab.h, test/btyacc/quote_calc3.output, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc3.tab.h, test/btyacc/quote_calc4-s.output, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4-s.tab.h, test/btyacc/quote_calc4.output, test/btyacc/quote_calc4.tab.c, test/btyacc/quote_calc4.tab.h, test/btyacc/calc1.output, test/btyacc/calc1.tab.c, test/btyacc/calc1.tab.h, test/btyacc/calc2.output, test/btyacc/calc2.tab.c, test/btyacc/calc2.tab.h, test/btyacc/calc3.output, test/btyacc/calc3.tab.c, test/btyacc/calc3.tab.h, test/btyacc/code_calc.code.c, test/btyacc/code_calc.output, test/btyacc/code_calc.tab.c, test/btyacc/code_calc.tab.h, test/btyacc/code_error.code.c, test/btyacc/code_error.output, test/btyacc/code_error.tab.c, test/btyacc/code_error.tab.h, test/btyacc/empty.output, test/btyacc/empty.tab.c, test/btyacc/empty.tab.h, test/btyacc/error.output, test/btyacc/error.tab.c, test/btyacc/error.tab.h, test/btyacc/grammar.output, test/btyacc/grammar.tab.c, test/btyacc/grammar.tab.h, test/btyacc/pure_calc.output, test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.h, test/btyacc/calc.output, test/btyacc/calc.tab.c, test/btyacc/calc.tab.h:
+       * test/btyacc/pure_calc.tab.c, test/btyacc/pure_calc.tab.h,
+         test/btyacc/pure_error.output, test/btyacc/pure_error.tab.c,
+         test/btyacc/pure_error.tab.h, test/btyacc/quote_calc-s.output,
+         test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc-s.tab.h,
+         test/btyacc/quote_calc.output, test/btyacc/quote_calc.tab.c,
+         test/btyacc/quote_calc.tab.h, test/btyacc/quote_calc2-s.output,
+         test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2-s.tab.h,
+         test/btyacc/quote_calc2.output, test/btyacc/quote_calc2.tab.c,
+         test/btyacc/quote_calc2.tab.h, test/btyacc/quote_calc3-s.output,
+         test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3-s.tab.h,
+         test/btyacc/quote_calc3.output, test/btyacc/quote_calc3.tab.c,
+         test/btyacc/quote_calc3.tab.h, test/btyacc/quote_calc4-s.output,
+         test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4-s.tab.h,
+         test/btyacc/quote_calc4.output, test/btyacc/quote_calc4.tab.c,
+         test/btyacc/quote_calc4.tab.h, test/btyacc/calc1.output,
+         test/btyacc/calc1.tab.c, test/btyacc/calc1.tab.h,
+         test/btyacc/calc2.output, test/btyacc/calc2.tab.c,
+         test/btyacc/calc2.tab.h, test/btyacc/calc3.output,
+         test/btyacc/calc3.tab.c, test/btyacc/calc3.tab.h,
+         test/btyacc/code_calc.code.c, test/btyacc/code_calc.output,
+         test/btyacc/code_calc.tab.c, test/btyacc/code_calc.tab.h,
+         test/btyacc/code_error.code.c, test/btyacc/code_error.output,
+         test/btyacc/code_error.tab.c, test/btyacc/code_error.tab.h,
+         test/btyacc/empty.output, test/btyacc/empty.tab.c,
+         test/btyacc/empty.tab.h, test/btyacc/error.output,
+         test/btyacc/error.tab.c, test/btyacc/error.tab.h,
+         test/btyacc/grammar.output, test/btyacc/grammar.tab.c,
+         test/btyacc/grammar.tab.h, test/btyacc/pure_calc.output,
+         test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.h,
+         test/btyacc/calc.tab.h:
        reference output for testing
 
        * defs.h:
@@ -2687,10 +4020,26 @@
 
        * VERSION, package/byacc.spec, package/debian/changelog: bump
 
-       * test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c:
+       * test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c,
+         test/yacc/calc3.tab.c, test/yacc/code_calc.code.c,
+         test/yacc/code_calc.tab.c, test/yacc/code_error.code.c,
+         test/yacc/code_error.tab.c, test/yacc/error.tab.c,
+         test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c,
+         test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c,
+         test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c,
+         test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c,
+         test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c,
+         test/yacc/quote_calc4.tab.c:
        reference output for testing
 
-       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_calc.tab.c, test/code_error.code.c, test/code_error.tab.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/code_calc.code.c, test/code_calc.tab.c, test/code_error.code.c,
+         test/code_error.tab.c, test/error.tab.c, test/ftp.tab.c,
+         test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c,
+         test/quote_calc-s.tab.c, test/quote_calc.tab.c,
+         test/quote_calc2-s.tab.c, test/quote_calc2.tab.c,
+         test/quote_calc3-s.tab.c, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.c:
        regen
 
        * output.c, skeleton.c:
@@ -2740,7 +4089,13 @@
 
        * package/mingw-byacc.spec: RCS_BASE
 
-       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/code_calc.code.c, test/code_error.code.c, test/error.tab.c,
+         test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c,
+         test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c,
+         test/quote_calc2-s.tab.c, test/quote_calc2.tab.c,
+         test/quote_calc3-s.tab.c, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.c:
        regen
 
        * skeleton.c:
@@ -2790,7 +4145,13 @@
 
        * test/calc1.y: fix most compiler warnings for "make check_make"
 
-       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+       * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/code_calc.code.c, test/code_error.code.c, test/error.tab.c,
+         test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c,
+         test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c,
+         test/quote_calc2-s.tab.c, test/quote_calc2.tab.c,
+         test/quote_calc3-s.tab.c, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.c:
        regen
 
        * skeleton.c: quiet a gcc conversion-warning in yygrowstack()
@@ -2952,7 +4313,8 @@
 
        * test/pure_error.y, test/pure_calc.y: bison-fixes
 
-       * test/calc2.tab.c, test/calc3.tab.c, test/code_error.code.c, test/ftp.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c:
+       * test/calc2.tab.c, test/calc3.tab.c, test/code_error.code.c,
+         test/pure_error.tab.c:
        regen
 
        * test/code_debug.y: RCS_BASE
@@ -2990,16 +4352,19 @@
 
        * yacc.1: comment on portability
 
-       * test/ftp.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc3-s.tab.c:
+       * test/ftp.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c,
+         test/quote_calc3-s.tab.c:
        regen
 
        * test/ftp.y: modified to help make the files build with bison
        (bison's "-y" option is of no use in providing "yacc" compatibility)
 
-       * test/quote_calc2.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+       * test/quote_calc2.tab.c, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.c:
        regen
 
-       * test/code_calc.y, test/quote_calc2.y, test/quote_calc.y, test/quote_calc4.y, test/quote_calc3.y:
+       * test/code_calc.y, test/quote_calc2.y, test/quote_calc.y,
+         test/quote_calc3.y:
        modified to help make the files build with bison
 
        * test/calc.tab.c: regen
@@ -3020,12 +4385,17 @@
 
        * test/run_test.sh: use $opt2 in filenames of the generated files
 
-       * test/quote_calc2-s.tab.c, test/quote_calc3-s.tab.c, test/quote_calc4-s.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2.tab.c, test/quote_calc3.tab.c, test/quote_calc4.tab.c:
+       * test/quote_calc2-s.tab.c, test/quote_calc3-s.tab.c,
+         test/quote_calc4-s.tab.c, test/quote_calc-s.tab.c,
+         test/quote_calc.tab.c, test/quote_calc2.tab.c, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.c:
        regen
 
 2012-01-14  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/calc2.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/calc.tab.c, test/calc1.tab.c:
+       * test/calc2.tab.c, test/code_calc.code.c, test/code_error.code.c,
+         test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/calc.tab.c,
+         test/calc1.tab.c:
        regen
 
        * output.c: Several changes:
@@ -3046,10 +4416,18 @@
 
        * test/calc3.tab.c: regen
 
-       * test/quote_calc-s.output, test/quote_calc-s.tab.c, test/quote_calc-s.tab.h, test/quote_calc2-s.output, test/quote_calc2-s.tab.c, test/quote_calc2-s.tab.h, test/quote_calc3-s.output, test/quote_calc3-s.tab.c, test/quote_calc3-s.tab.h, test/quote_calc4-s.output, test/quote_calc4-s.tab.c, test/quote_calc4-s.tab.h:
+       * test/quote_calc-s.output, test/quote_calc-s.tab.c,
+         test/quote_calc-s.tab.h, test/quote_calc2-s.output,
+         test/quote_calc2-s.tab.c, test/quote_calc2-s.tab.h,
+         test/quote_calc3-s.output, test/quote_calc3-s.tab.c,
+         test/quote_calc3-s.tab.h, test/quote_calc4-s.output,
+         test/quote_calc4-s.tab.h:
        RCS_BASE
 
-       * test/yacc/quote_calc-s.output, test/yacc/quote_calc-s.tab.h, test/yacc/quote_calc2-s.output, test/yacc/quote_calc2-s.tab.h, test/yacc/quote_calc3-s.output, test/yacc/quote_calc3-s.tab.h, test/yacc/quote_calc4-s.output, test/yacc/quote_calc4-s.tab.h:
+       * test/yacc/quote_calc-s.output, test/yacc/quote_calc-s.tab.h,
+         test/yacc/quote_calc2-s.output, test/yacc/quote_calc2-s.tab.h,
+         test/yacc/quote_calc3-s.output, test/yacc/quote_calc3-s.tab.h,
+         test/yacc/quote_calc4-s.tab.h:
        reference output for testing
 
        * test/run_test.sh: generate/test with "-s" option applied.
@@ -3064,20 +4442,25 @@
 
        * main.c: add -s option to usage message.
 
-       * test/quote_calc3.output, test/quote_calc3.tab.c, test/quote_calc4.output, test/quote_calc4.tab.c, test/quote_calc4.tab.h:
+       * test/quote_calc3.output, test/quote_calc3.tab.c,
+         test/quote_calc4.tab.h:
        RCS_BASE
 
-       * test/yacc/quote_calc3.output, test/yacc/quote_calc4.output, test/yacc/quote_calc4.tab.h:
+       * test/yacc/quote_calc3.output, test/yacc/quote_calc4.output,
+         test/yacc/quote_calc4.tab.h:
        reference output for testing
 
        * test/quote_calc3.y, test/quote_calc.tab.h: RCS_BASE
 
        * test/yacc/quote_calc.tab.h: reference output for testing
 
-       * test/quote_calc.output, test/quote_calc.tab.c, test/quote_calc2.output, test/quote_calc2.tab.c, test/quote_calc2.tab.h, test/quote_calc3.tab.h:
+       * test/quote_calc.output, test/quote_calc.tab.c,
+         test/quote_calc2.output, test/quote_calc2.tab.c,
+         test/quote_calc3.tab.h:
        RCS_BASE
 
-       * test/yacc/quote_calc.output, test/yacc/quote_calc2.output, test/yacc/quote_calc2.tab.h, test/yacc/quote_calc3.tab.h:
+       * test/yacc/quote_calc.output, test/yacc/quote_calc2.output,
+         test/yacc/quote_calc3.tab.h:
        reference output for testing
 
        * test/quote_calc4.y, test/quote_calc.y, test/quote_calc2.y: RCS_BASE
@@ -3116,7 +4499,10 @@
 
        * output.c: fix an interaction between -i and -d
 
-       * test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c:
+       * test/code_error.code.c, test/error.tab.c, test/ftp.tab.c,
+         test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c,
+         test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/code_calc.code.c:
        regen - changes for "-i" option move the global/impure variables near the
        macros that may add a prefix, etc.
 
@@ -3156,7 +4542,10 @@
        * defs.h:
        mark all of the error-functions as non-returning (report by Christos Zoulas)
 
-       * test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c:
+       * test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c,
+         test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/code_calc.code.c, test/code_error.code.c, test/error.tab.c,
+         test/ftp.tab.c:
        regen
 
        * skeleton.c:
@@ -3172,10 +4561,15 @@
 
 2010-12-29  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c:
+       * test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c,
+         test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c,
+         test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c,
+         test/error.tab.c:
        regen
 
-       * test/pure_error.y, test/pure_calc.y, test/ftp.y, test/error.y, test/code_error.y, test/code_calc.y, test/calc.y, test/calc3.y, test/calc2.y, test/calc1.y:
+       * test/pure_error.y, test/pure_calc.y, test/ftp.y, test/error.y,
+         test/code_error.y, test/code_calc.y, test/calc.y, test/calc3.y,
+         test/calc1.y:
        use byacc's YYLEX_DECL/YYERROR_DECL symbols to prototype yylex/yyerror
 
        * skeleton.c:
@@ -3245,7 +4639,10 @@
 
        * yacc.1: comment on -b option vs -r
 
-       * test/calc2.tab.c, test/calc2.y, test/calc3.tab.c, test/calc3.y, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c:
+       * test/calc2.tab.c, test/calc2.y, test/calc3.tab.c, test/calc3.y,
+         test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c,
+         test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c,
+         test/error.tab.c:
        regen
 
        * output.c:
@@ -3253,7 +4650,10 @@
        actual function declaration.  Also add YYERROR_CALL().  The two macros
        simplify maintaining sets of grammars which may/may not be pure.
 
-       * test/calc1.y, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c:
+       * test/calc1.y, test/ftp.tab.c, test/grammar.tab.c,
+         test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c,
+         test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c,
+         test/error.tab.c:
        regen
 
        * output.c: generate yyerror() calls in output.c
@@ -3377,7 +4777,8 @@
        * configure.in:
        use CF_XOPEN_SOURCE check to ensure that strdup is in scope, e.g., for c89
 
-       * test/ftp.tab.c, test/ftp.y, reader.c, symtab.c, verbose.c, lr0.c, main.c, mkpar.c, output.c, defs.h, closure.c:
+       * test/ftp.tab.c, test/ftp.y, reader.c, symtab.c, verbose.c, lr0.c,
+         closure.c:
        fix warnings from clang --analyze
 
 2010-06-08  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -3386,7 +4787,10 @@
 
        * reader.c: gcc warning
 
-       * test/ftp.tab.c, test/ftp.y, test/calc.tab.c, test/code_calc.code.c, test/code_error.code.c, test/code_error.y, test/code_calc.y, test/calc.y, test/pure_error.tab.c, test/error.tab.c, test/error.y, test/pure_error.y, test/pure_calc.tab.c, test/pure_calc.y:
+       * test/ftp.tab.c, test/ftp.y, test/calc.tab.c, test/code_calc.code.c,
+         test/code_error.code.c, test/code_error.y, test/code_calc.y,
+         test/calc.y, test/pure_error.tab.c, test/error.tab.c, test/error.y,
+         test/pure_calc.y:
        modified test-cases to allow them to compile, to validate pure-parser changes.
        updated reference files to match.
 
@@ -3430,10 +4834,12 @@
 
        * test/yacc/code_calc.tab.h: reference output for testing
 
-       * test/pure_calc.output, test/pure_calc.tab.h, test/pure_error.output, test/pure_error.tab.h:
+       * test/pure_calc.output, test/pure_calc.tab.h, test/pure_error.output,
+         test/pure_error.tab.h:
        RCS_BASE
 
-       * test/yacc/pure_calc.output, test/yacc/pure_calc.tab.h, test/yacc/pure_error.output, test/yacc/pure_error.tab.h:
+       * test/yacc/pure_calc.output, test/yacc/pure_calc.tab.h,
+         test/yacc/pure_error.tab.h:
        reference output for testing
 
        * test/code_calc.output, test/code_error.output: RCS_BASE
@@ -3523,9 +4929,6 @@
        * aclocal.m4: add copyright notice, from "my-autoconf" macros
                http://invisible-island.net/autoconf/autoconf.html
 
-       * package/RCS, package/debian/RCS, package/debian/source/RCS, package/pkgsrc/RCS:
-       PERMIT FILE
-
        * aclocal.m4: resync with my-autoconf.  summary of changes:
                a) CF_ADD_CFLAGS, etc., improve quoting of ifelse() parameter
                b) CF_DISABLE_ECHO, change indent-convention for substituted makefile
@@ -3534,7 +4937,10 @@
 
 2010-04-20  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * package/debian/changelog, package/debian/compat, package/debian/control, package/debian/copyright, package/debian/docs, package/debian/postinst, package/debian/prerm, package/debian/rules, package/debian/watch:
+       * package/debian/changelog, package/debian/compat,
+         package/debian/control, package/debian/copyright, package/debian/docs,
+         package/debian/postinst, package/debian/prerm, package/debian/rules,
+         package/debian/watch:
        scripts from Debian package
 
 2010-02-16  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -3603,7 +5009,8 @@
 
        * VERSION: 20091027
 
-       * output.c, mkpar.c, defs.h, lalr.c, closure.c, graph.c, lr0.c, verbose.c, main.c, reader.c:
+       * output.c, mkpar.c, defs.h, lalr.c, closure.c, graph.c, lr0.c,
+         reader.c:
        strict compiler warnings
 
 2009-10-26  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -3655,7 +5062,8 @@
 
 2008-11-24  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * closure.c, defs.h, error.c, graph.c, lalr.c, lr0.c, main.c, mkpar.c, output.c, reader.c, skeleton.c, symtab.c, verbose.c, warshall.c:
+       * closure.c, defs.h, error.c, graph.c, lalr.c, lr0.c, main.c, mkpar.c,
+         warshall.c:
        change indent-style (request by Perry E. Metzger)
 
 2008-08-27  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -3668,7 +5076,8 @@
        * skeleton.c:
        better implementation of YYPARSE_PARAM, using YYPARSE_DECL() macro
 
-       * test/calc.tab.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, skeleton.c:
+       * test/calc.tab.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c,
+         skeleton.c:
        change YYRECOVERING to YYRECOVERING(), for compatibility with other yacc's.
 
        * configure: regen'd
@@ -3699,7 +5108,8 @@
 
 2008-08-26  Thomas E. Dickey  <dickey@invisible-island.net>
 
-       * warshall.c, verbose.c, symtab.c, skeleton.c, reader.c, output.c, mkpar.c, main.c, lr0.c, lalr.c, graph.c, error.c, closure.c:
+       * warshall.c, verbose.c, symtab.c, skeleton.c, reader.c, output.c,
+         closure.c:
        remove 'register' keywords
 
 2008-08-25  Thomas E. Dickey  <dickey@invisible-island.net>
@@ -3886,7 +5296,8 @@
        add macros to define VERSION in terms of the (numeric) YYMAJOR, YYMINOR and
        YYPATCH symbols.
 
-       * lalr.c, lr0.c, mkpar.c, defs.h, closure.c, warshall.c, output.c, verbose.c, graph.c, reader.c, main.c, symtab.c:
+       * lalr.c, lr0.c, mkpar.c, defs.h, closure.c, warshall.c, output.c,
+         symtab.c:
        reduce externs by making static the procedures that are not referenced outside
        the module in which they are defined.
 
@@ -3917,7 +5328,8 @@
        * mkpar.c, defs.h, reader.c:
        add support for "%expect", a bison feature from FreeBSD sources
 
-       * lr0.c, reader.c, main.c, skeleton.c, graph.c, symtab.c, closure.c, mkpar.c, lalr.c, error.c, warshall.c, verbose.c, output.c:
+       * lr0.c, reader.c, main.c, skeleton.c, graph.c, symtab.c, closure.c,
+         output.c:
        indent'd
 
        * configure: regenerated for 2005/5/5
@@ -4049,10 +5461,6 @@
 
        * vmsbuild.com: original version
 
-2000-02-23  Thomas E. Dickey  <dickey@clark.net>
-
-       * test/RCS, RCS: PERMIT FILE
-
 2000-02-14  Thomas E. Dickey  <dickey@clark.net>
 
        * main.c: fix for VMS port - making pathname for temp-file
@@ -4061,7 +5469,8 @@
 
 2000-02-13  Thomas E. Dickey  <dickey@clark.net>
 
-       * defs.h, verbose.c, reader.c, main.c, skeleton.c, warshall.c, symtab.c, closure.c, mkpar.c, lalr.c, lr0.c, output.c, error.c:
+       * defs.h, verbose.c, reader.c, main.c, skeleton.c, warshall.c, symtab.c,
+         error.c:
        ansify
 
 1999-11-30  Thomas E. Dickey  <dickey@clark.net>

diff --git a/MANIFEST b/MANIFEST
index a508cbe..faa2601 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20220101, version t20220101
+MANIFEST for byacc, version t20220109
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 ACKNOWLEDGEMENTS                original version of byacc - 1993
@@ -44,13 +44,15 @@ yaccpar.skel                    data which can be transformed into skeleton.c
 package                         subdirectory
 package/byacc.spec              RPM file for byacc
 package/debian                  subdirectory
+package/debian/byacc.docs       extra docs for byacc package
+package/debian/byacc.postinst   post-install script for byacc package
+package/debian/byacc.prerm      pre-removal script for byacc package
+package/debian/byacc2.docs      extra docs for byacc2 package
+package/debian/byacc2.postinst  post-install script for byacc2 package
+package/debian/byacc2.prerm     pre-removal script for byacc2 package
 package/debian/changelog        scripts from Debian package
-package/debian/compat           scripts from Debian package
 package/debian/control          scripts from Debian package
 package/debian/copyright        scripts from Debian package
-package/debian/docs             scripts from Debian package
-package/debian/postinst         scripts from Debian package
-package/debian/prerm            scripts from Debian package
 package/debian/rules            scripts from Debian package
 package/debian/source           subdirectory
 package/debian/source/format    scripts from Debian package

diff --git a/VERSION b/VERSION
index a20c0b2..f2ea4b2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20220101
+20220109

diff --git a/closure.c b/closure.c
index a1928d6..53a81e4 100644 (file)
--- a/closure.c
+++ b/closure.c
@@ -1,4 +1,4 @@
-/* $Id: closure.c,v 1.13 2020/09/22 20:17:00 tom Exp $ */
+/* $Id: closure.c,v 1.14 2022/01/09 16:22:58 tom Exp $ */
 
 #include "defs.h"
 
@@ -6,7 +6,6 @@ Value_t *itemset;
 Value_t *itemsetend;
 unsigned *ruleset;
 
-static unsigned *first_base;
 static unsigned *first_derives;
 static unsigned *EFF;
 
@@ -66,12 +65,11 @@ set_first_derives(void)
 
     rulesetsize = WORDSIZE(nrules);
     varsetsize = WORDSIZE(nvars);
-    first_base = NEW2(nvars * rulesetsize, unsigned);
-    first_derives = first_base - ntokens * rulesetsize;
+    first_derives = NEW2(nvars * rulesetsize, unsigned);
 
     set_EFF();
 
-    rrow = first_derives + ntokens * rulesetsize;
+    rrow = first_derives;
     for (i = start_symbol; i < nsyms; i++)
     {
        unsigned *vrow = EFF + ((i - ntokens) * varsetsize);
@@ -131,7 +129,7 @@ closure(Value_t *nucleus, int n)
 
        if (ISVAR(symbol))
        {
-           dsp = first_derives + symbol * rulesetsize;
+           dsp = first_derives + (symbol - ntokens) * rulesetsize;
            rsp = ruleset;
            while (rsp < rsend)
                *rsp++ |= *dsp++;
@@ -176,7 +174,7 @@ finalize_closure(void)
 {
     FREE(itemset);
     FREE(ruleset);
-    FREE(first_base);
+    FREE(first_derives);
 }
 
 #ifdef DEBUG
@@ -236,7 +234,7 @@ print_first_derives(void)
     for (i = start_symbol; i < nsyms; i++)
     {
        printf("\n%s derives\n", symbol_name[i]);
-       rp = first_derives + i * WORDSIZE(nrules);
+       rp = first_derives + (i - ntokens) * WORDSIZE(nrules);
        k = BITS_PER_WORD;
        for (j = 0; j <= nrules; k++, j++)
        {

diff --git a/output.c b/output.c
index 97e8bee..cd2f5aa 100644 (file)
--- a/output.c
+++ b/output.c
@@ -1,4 +1,4 @@
-/* $Id: output.c,v 1.99 2021/08/01 23:45:04 tom Exp $ */
+/* $Id: output.c,v 1.100 2022/01/09 18:03:56 tom Exp $ */
 
 #include "defs.h"
 
@@ -377,7 +377,7 @@ output_accessing_symbols(void)
        int i, j;
        int *translate;
 
-       translate = TMALLOC(int, nstates);
+       translate = TCMALLOC(int, nstates);
        NO_SPACE(translate);
 
        for (i = 0; i < nstates; ++i)
@@ -1375,7 +1375,7 @@ output_debug(void)
     fprintf(code_file, "#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? "
            "YYUNDFTOKEN : (a))\n");
 
-    symnam = TMALLOC(const char *, max + 2);
+    symnam = TCMALLOC(const char *, max + 2);
     NO_SPACE(symnam);
 
     /* Note that it is not necessary to initialize the element          */

diff --git a/package/byacc.spec b/package/byacc.spec
index 9cff7ab..2207f93 100644 (file)
--- a/package/byacc.spec
+++ b/package/byacc.spec
@@ -1,17 +1,18 @@
-Summary: byacc - public domain Berkeley LALR Yacc parser generator
-%define AppProgram byacc
-%define AltProgram byacc2
-%define AppVersion 20220101
-%define UseProgram yacc
-# $Id: byacc.spec,v 1.62 2022/01/01 14:59:55 tom Exp $
-Name: %{AppProgram}
-Version: %{AppVersion}
+Summary: public domain Berkeley LALR Yacc parser generator
+
+%global AppVersion 2.0
+%global AppPatched 20220109
+
+%global AltProgram byacc2
+%global UseProgram yacc
+
+# $Id: byacc.spec,v 1.65 2022/01/09 20:03:07 tom Exp $
+Name: byacc
+Version: %{AppVersion}.%{AppPatched}
 Release: 1
 License: Public Domain, MIT
-Group: Applications/Development
-URL: ftp://invisible-island.net/%{AppProgram}
-Source0: %{AppProgram}-%{AppVersion}.tgz
-Packager: Thomas E. Dickey <dickey@invisible-island.net>
+URL: https://invisible-island.net/%{name}/
+Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz
 
 %description
 This package provides a parser generator utility that reads a grammar
@@ -21,7 +22,7 @@ routine written in the C programming language.  It has a public domain
 license which includes the generated C.
 
 %package -n byacc2
-Summary:        Curses library with POSIX thread support.
+Summary: public domain Berkeley LALR Yacc parser generator with backtracking
 
 %description -n byacc2
 This package provides a parser generator utility that reads a grammar
@@ -34,9 +35,9 @@ This package has the backtracking extension.
 
 %prep
 
-%define debug_package %{nil}
+%global debug_package %{nil}
 
-%setup -q -n %{AppProgram}-%{AppVersion}
+%setup -q -n %{name}-%{AppPatched}
 
 %build
 %define my_srcdir ..
@@ -76,7 +77,7 @@ popd
 
 pushd BUILD-byacc
 make install DESTDIR=$RPM_BUILD_ROOT
-( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{AppProgram} %{UseProgram} )
+( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{name} %{UseProgram} )
 popd
 
 pushd BUILD-byacc2
@@ -87,19 +88,24 @@ popd
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%{_prefix}/bin/%{AppProgram}
-%{_prefix}/bin/%{UseProgram}
-%{_mandir}/man1/%{AppProgram}.*
+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
+%license LICENSE
+%{_bindir}/%{name}
+%{_bindir}/%{UseProgram}
+%{_mandir}/man1/%{name}.*
 
 %files -n byacc2
-%defattr(-,root,root)
-%{_prefix}/bin/%{AltProgram}
+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README README.BTYACC
+%license LICENSE
+%{_bindir}/%{AltProgram}
 %{_mandir}/man1/%{AltProgram}.*
 
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Sun Jan 09 2022 Thomas Dickey
+- rpmlint
+
 * Sat Jan 01 2022 Thomas Dickey
 - rename btyacc package to byacc2 to co-exist with traditional btyacc
 

diff --git a/package/debian/byacc.docs b/package/debian/byacc.docs
new file mode 100644 (file)
index 0000000..cbda209
--- /dev/null
+++ b/package/debian/byacc.docs
@@ -0,0 +1,4 @@
+README
+ACKNOWLEDGEMENTS
+NEW_FEATURES
+NOTES

diff --git a/package/debian/postinst b/package/debian/byacc.postinst
similarity index 61%
rename from package/debian/postinst
rename to package/debian/byacc.postinst
index 28bcd08..ca6276d 100644 (file)
--- a/package/debian/postinst
+++ b/package/debian/byacc.postinst
@@ -8,10 +8,6 @@ if [ $1 != "upgrade" ] ; then
                --install /usr/bin/yacc yacc /usr/bin/byacc 80 \
                --slave /usr/share/man/man1/yacc.1.gz yaccman \
                        /usr/share/man/man1/byacc.1.gz
-       update-alternatives \
-               --install /usr/bin/yacc yacc /usr/bin/byacc2 80 \
-               --slave /usr/share/man/man1/yacc.1.gz yaccman \
-                       /usr/share/man/man1/byacc2.1.gz
 fi
 
 #DEBHELPER#

diff --git a/package/debian/prerm b/package/debian/byacc.prerm
similarity index 74%
rename from package/debian/prerm
rename to package/debian/byacc.prerm
index d300dcf..f3889d7 100644 (file)
--- a/package/debian/prerm
+++ b/package/debian/byacc.prerm
@@ -5,7 +5,6 @@ set -e
 
 if [ $1 != "upgrade" ]; then
        update-alternatives --remove yacc /usr/bin/byacc
-       update-alternatives --remove yacc /usr/bin/byacc2
 fi
 
 #DEBHELPER#

diff --git a/package/debian/docs b/package/debian/byacc2.docs
similarity index 100%
rename from package/debian/docs
rename to package/debian/byacc2.docs

diff --git a/package/debian/byacc2.postinst b/package/debian/byacc2.postinst
new file mode 100644 (file)
index 0000000..1a4d7e1
--- /dev/null
+++ b/package/debian/byacc2.postinst
@@ -0,0 +1,15 @@
+#! /bin/sh
+# postinst script for byacc2
+
+set -e
+
+if [ $1 != "upgrade" ] ; then
+       update-alternatives \
+               --install /usr/bin/yacc yacc /usr/bin/byacc2 80 \
+               --slave /usr/share/man/man1/yacc.1.gz yaccman \
+                       /usr/share/man/man1/byacc2.1.gz
+fi
+
+#DEBHELPER#
+
+exit 0

diff --git a/package/debian/byacc2.prerm b/package/debian/byacc2.prerm
new file mode 100644 (file)
index 0000000..eb86dfc
--- /dev/null
+++ b/package/debian/byacc2.prerm
@@ -0,0 +1,12 @@
+#! /bin/sh
+# prerm script for byacc2
+
+set -e
+
+if [ $1 != "upgrade" ]; then
+       update-alternatives --remove yacc /usr/bin/byacc2
+fi
+
+#DEBHELPER#
+
+exit 0

diff --git a/package/debian/changelog b/package/debian/changelog
index bf3dee9..76eb417 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,16 @@
+byacc (1:2.0.20220109) unstable; urgency=low
+
+  * maintenance updates, modify packaging to more closely match distributors.
+    In particular, correct versioning using an epoch.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Jan 2022 10:49:20 -0500
+
+byacc (20220102) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 02 Jan 2022 11:12:56 -0500
+
 byacc (20220101) unstable; urgency=low
 
   * maintenance updates

diff --git a/package/debian/compat b/package/debian/compat
deleted file mode 100644 (file)
index b4de394..0000000
--- a/package/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11

diff --git a/package/debian/control b/package/debian/control
index 46beb2f..40437f6 100644 (file)
--- a/package/debian/control
+++ b/package/debian/control
@@ -1,11 +1,13 @@
 Source: byacc
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
+Uploaders: Thomas E. Dickey <dickey@his.com>
 Section: devel
 Priority: optional
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 11)
+Standards-Version: 4.6.0.1
+Build-Depends: debhelper-compat (= 12),
 Homepage: https://invisible-island.net/byacc/
-Vcs-Git: https://salsa.debian.org/dickey/byacc
+Vcs-Browser: https://salsa.debian.org/debian/byacc
+Vcs-Git: https://salsa.debian.org/debian/byacc.git
 
 Package: byacc
 Provides: yacc
@@ -18,17 +20,21 @@ Description: public domain Berkeley LALR Yacc parser generator
  parsers consist of a set of LALR(1) parsing tables and a driver
  routine written in the C programming language.  It has a public domain
  license which includes the generated C.
+ .
+ Related packages: bison, btyacc, byacc2, antlr
 
 Package: byacc2
 Provides: yacc
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: public domain Berkeley LALR Yacc parser generator
+Description: public domain Berkeley LALR Yacc parser generator, with back-tracking
  This package provides a parser generator utility that reads a grammar
  specification from a file and generates an LR(1) parser for it.  The
  parsers consist of a set of LALR(1) parsing tables and a driver
  routine written in the C programming language.  It has a public domain
  license which includes the generated C.
  .
- This package has the backtracking extension.
+ This package has the backtracking extension, adapted from btyacc.
+ .
+ Related packages: bison, btyacc, byacc, antlr

diff --git a/package/debian/copyright b/package/debian/copyright
index dbbb151..7cc1263 100644 (file)
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -1,42 +1,48 @@
-Upstream source https://invisible-island.net/byacc/byacc.html
-
-Berkeley Yacc is in the public domain; changes made to it by the current
-maintainer are likewise unrestricted.  That applies to most of the files.
-A few files (currently those related to autoconf scripting) have other
-licenses as noted here.
-
-Current byacc upstream maintainer: Thomas Dickey <dickey@invisible-island.net>
-
-Public domain notice and no warranty:
--------------------------------------------------------------------------------
-    Berkeley Yacc is an LALR(1) parser generator.  Berkeley Yacc has been made
-as compatible as possible with AT&T Yacc.  Berkeley Yacc can accept any input
-specification that conforms to the AT&T Yacc documentation.  Specifications
-that take advantage of undocumented features of AT&T Yacc will probably be
-rejected.
-
-    Berkeley Yacc is distributed with no warranty whatever.  The code
-is certain to contain errors.  Neither the author nor any contributor
-takes responsibility for any consequences of its use.
-
-    Berkeley Yacc is in the public domain.  The data structures and algorithms
-used in Berkeley Yacc are all either taken from documents available to the
-general public or are inventions of the author.  Anyone may freely distribute
-source or binary forms of Berkeley Yacc whether unchanged or modified.
-Distributers may charge whatever fees they can obtain for Berkeley Yacc.
-Programs generated by Berkeley Yacc may be distributed freely.
-
-    Please report bugs to
-
-                       robert.corbett@eng.Sun.COM
-
-Include a small example if possible.  Please include the banner string from
-skeleton.c with the bug report.  Do not expect rapid responses.
--------------------------------------------------------------------------------
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: luit
+Upstream-Contact: <dickey@invisible-island.net> (Thomas E. Dickey)
+Source: https://invisible-island.net/byacc/
+
+Files: *
+Copyright:  2001-2021,2022 by Thomas E. Dickey
+License: public-domain
+    Berkeley Yacc is in the public domain; changes made to it by the current
+    maintainer are likewise unrestricted.  That applies to most of the files.
+    A few files (currently those related to autoconf scripting) have other
+    licenses as noted here.
+    .
+    Current byacc upstream maintainer: Thomas Dickey <dickey@invisible-island.net>
+    .
+    Public domain notice and no warranty:
+    -------------------------------------------------------------------------------
+        Berkeley Yacc is an LALR(1) parser generator.  Berkeley Yacc has been made
+    as compatible as possible with AT&T Yacc.  Berkeley Yacc can accept any input
+    specification that conforms to the AT&T Yacc documentation.  Specifications
+    that take advantage of undocumented features of AT&T Yacc will probably be
+    rejected.
+    .
+        Berkeley Yacc is distributed with no warranty whatever.  The code
+    is certain to contain errors.  Neither the author nor any contributor
+    takes responsibility for any consequences of its use.
+    .
+        Berkeley Yacc is in the public domain.  The data structures and algorithms
+    used in Berkeley Yacc are all either taken from documents available to the
+    general public or are inventions of the author.  Anyone may freely distribute
+    source or binary forms of Berkeley Yacc whether unchanged or modified.
+    Distributers may charge whatever fees they can obtain for Berkeley Yacc.
+    Programs generated by Berkeley Yacc may be distributed freely.
+    .
+        Please report bugs to
+    .
+                            robert.corbett@eng.Sun.COM
+    .
+    Include a small example if possible.  Please include the banner string from
+    skeleton.c with the bug report.  Do not expect rapid responses.
+    -------------------------------------------------------------------------------
 
 Files: aclocal.m4
-Licence: other-BSD
 Copyright:  2004-2021,2022 by Thomas E. Dickey
+License: other-BSD
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
@@ -44,10 +50,10 @@ Copyright:  2004-2021,2022 by Thomas E. Dickey
     distribute, distribute with modifications, sublicense, and/or sell
     copies of the Software, and to permit persons to whom the Software is
     furnished to do so, subject to the following conditions:
-    
+    .
     The above copyright notice and this permission notice shall be included
     in all copies or portions of the Software.
-    
+    .
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -55,7 +61,7 @@ Copyright:  2004-2021,2022 by Thomas E. Dickey
     DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
     OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
     THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    
+    .
     Except as contained in this notice, the name(s) of the above copyright
     holders shall not be used in advertising or otherwise to promote the
     sale, use or other dealings in this Software without prior written
@@ -63,42 +69,42 @@ Copyright:  2004-2021,2022 by Thomas E. Dickey
 
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: other-BSD
+License: other-BSD
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
     deal in the Software without restriction, including without limitation the
     rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
     sell copies of the Software, and to permit persons to whom the Software is
     furnished to do so, subject to the following conditions:
-
+    .
     The above copyright notice and this permission notice shall be included in
     all copies or substantial portions of the Software.
-
+    .
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
     X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
     AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
     TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+    .
     Except as contained in this notice, the name of the X Consortium shall not
     be used in advertising or otherwise to promote the sale, use or other deal-
     ings in this Software without prior written authorization from the X Consor-
     tium.
-
+    .
     FSF changes to this file are in the public domain.
-
+    .
     Calling this script install-sh is preferred over install.sh, to prevent
     `make' implicit rules from creating a file called install from it
     when there is no Makefile.
-
+    .
     This script is compatible with the BSD install script, but was written
     from scratch.  It can only install one file at a time, a restriction
     shared with many OS's install programs.
 
 Files: package/debian/*
 Copyright:  2012-2020,2021 Thomas E. Dickey
-Licence: other-BSD
+License: other-BSD
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
     provided that the above copyright notice appear in all copies and that
@@ -107,7 +113,7 @@ Licence: other-BSD
     copyright holder(s) not be used in advertising or publicity pertaining
     to distribution of the software without specific, written prior
     permission.
-
+    .
     THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
     TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
     AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
@@ -116,5 +122,8 @@ Licence: other-BSD
     ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in '/usr/share/common-licenses/GPL-2'
+Files: config.guess config.sub
+Copyright: 1992-2021 Free Software Foundation, Inc.
+License: GPL-3
+    On Debian systems, the complete text of the GNU General
+    Public License can be found in '/usr/share/common-licenses/GPL-3'

diff --git a/package/debian/rules b/package/debian/rules
index acd148e..4c56a9e 100755 (executable)
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.7 2022/01/01 13:01:37 tom Exp $
+# $Id: rules,v 1.8 2022/01/08 19:53:07 tom Exp $
 #
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -11,9 +11,11 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 PACKAGES.arch  = byacc byacc2
 
-CPPFLAGS       := $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS         := $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS                := $(shell dpkg-buildflags --get LDFLAGS)
+QA_FIX         = DEB_BUILD_MAINT_OPTIONS="hardening=+all qa=+bug reproducible=+all"
+
+CPPFLAGS       := $(shell $(QA_FIX) dpkg-buildflags --get CPPFLAGS)
+CFLAGS         := $(shell $(QA_FIX) dpkg-buildflags --get CFLAGS)
+LDFLAGS                := $(shell $(QA_FIX) dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0

diff --git a/package/debian/watch b/package/debian/watch
index 2cc2e15..bf42035 100644 (file)
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,23 @@
-version=3
+version=4
 
-opts=passive ftp://ftp.invisible-island.net/byacc/byacc-(\d+)\.tgz \
- debian  uupdate
+# upstream provides tarballs such as "byacc-20220101.tgz" (originally to
+# keep the filenames compatible with systems where multiple "." are illegal).
+#
+# The version number (2.0) is current since late 2020; before that it was
+# "1.9" for a long time.  Use
+#    byacc -V
+# to see the version number:
+#    byacc - 2.0 20220101
+#
+# The introduction of the back-tracking configuration motivated the change of
+# major/minor numbers; for compatibility the parser skeleton still says "1.9".
+#
+# Patch-dates are always # in yyyymmdd format. 
+
+opts=pgpsigurlmangle=s/.*/$0.asc/,\
+dversionmangle=s/^\d\.\d\.(\d+)/$1/,\
+filenamemangle=s/^.*\/(byacc)-(\d+)\.tgz/$1_2.0.$2.orig.tar.gz/ \
+ https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz
+
+#opts=pgpsigurlmangle=s/.*/$0.asc/
+# https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz

diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec
index b3b95a9..60ad973 100644 (file)
--- a/package/mingw-byacc.spec
+++ b/package/mingw-byacc.spec
@@ -1,16 +1,17 @@
-Summary: byacc - public domain Berkeley LALR Yacc parser generator
-%define AppProgram byacc
-%define AppVersion 20220101
-%define UseProgram yacc
-# $Id: mingw-byacc.spec,v 1.39 2022/01/01 12:06:35 tom Exp $
-Name: %{AppProgram}
-Version: %{AppVersion}
+Summary: public domain Berkeley LALR Yacc parser generator
+
+%global AppVersion 2.0
+%global AppPatched 20220109
+
+%global UseProgram yacc
+
+# $Id: mingw-byacc.spec,v 1.42 2022/01/09 20:03:00 tom Exp $
+Name: byacc
+Version: %{AppVersion}.%{AppPatched}
 Release: 1
 License: Public Domain, MIT
-Group: Applications/Development
-URL: ftp://invisible-island.net/%{AppProgram}
-Source0: %{AppProgram}-%{AppVersion}.tgz
-Packager: Thomas Dickey <dickey@invisible-island.net>
+URL: https://invisible-island.net/%{name}/
+Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz
 
 %description
 This package provides a parser generator utility that reads a grammar
@@ -21,9 +22,9 @@ license which includes the generated C.
 
 %prep
 
-%define debug_package %{nil}
+%global debug_package %{nil}
 
-%setup -q -n %{AppProgram}-%{AppVersion}
+%setup -q -n %{name}-%{AppPatched}
 
 %build
 %configure --verbose \
@@ -39,23 +40,27 @@ make
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-make install                    DESTDIR=$RPM_BUILD_ROOT
-( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{AppProgram} %{UseProgram} )
+make install DESTDIR=$RPM_BUILD_ROOT
+( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{name} %{UseProgram} )
 
-strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
+strip $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%{_prefix}/bin/%{AppProgram}
-%{_prefix}/bin/%{UseProgram}
-%{_mandir}/man1/%{AppProgram}.*
+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
+%license LICENSE
+%{_bindir}/%{name}
+%{_bindir}/%{UseProgram}
+%{_mandir}/man1/%{name}.*
 
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Sun Jan 09 2022 Thomas Dickey
+- rpmlint
+
 * Sun Jul 09 2017 Thomas Dickey
 - use predefined "configure"
 

diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile
index d0051f9..5b753fb 100644 (file)
--- a/package/pkgsrc/Makefile
+++ b/package/pkgsrc/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $
 #
 
-DISTNAME=      byacc-20220101
+DISTNAME=      byacc-20220109
 CATEGORIES=    devel
 MASTER_SITES=  https://invisible-mirror.net/archives/byacc/
 DIST_SUBDIR=   byacc-20220101

diff --git a/reader.c b/reader.c
index 239590e..5e8ca67 100644 (file)
--- a/reader.c
+++ b/reader.c
@@ -1,4 +1,4 @@
-/* $Id: reader.c,v 1.90 2021/08/08 22:11:04 tom Exp $ */
+/* $Id: reader.c,v 1.91 2022/01/09 18:04:58 tom Exp $ */
 
 #include "defs.h"
 
@@ -2162,7 +2162,7 @@ compile_arg(char **theptr, char *yyvaltag)
     {
        int j;
 
-       offsets = TMALLOC(Value_t, maxoffset + 1);
+       offsets = TCMALLOC(Value_t, maxoffset + 1);
        NO_SPACE(offsets);
 
        for (j = 0, i++; i < nitems; i++)
@@ -2273,7 +2273,7 @@ can_elide_arg(char **theptr, char *yyvaltag)
     {
        int j;
 
-       offsets = TMALLOC(Value_t, maxoffset + 1);
+       offsets = TCMALLOC(Value_t, maxoffset + 1);
        NO_SPACE(offsets);
 
        for (j = 0, i++; i < nitems; i++)