D38421.id116714.diff
No OneTemporary
Actions

Size

1008 KB

Referenced Files

None

Subscribers

None

D38421.id116714.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES
	--- a/contrib/byacc/CHANGES
	+++ b/contrib/byacc/CHANGES
	@@ -1,8 +1,1527 @@
	+2023-02-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * configure.in: initialize $ac_includes_default
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/debian/copyright, package/mingw-byacc.spec,
	+ package/pkgsrc/Makefile:
	+ bump
	+
	+2023-01-05 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2022-12-29 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * configure.in:
	+ correct help-message for --disable-btyacc option, and fix the reporting of
	+ the selected option value in the configure script's output (report by Daniel
	+ Weaver)
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2022-12-02 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * aclocal.m4: resync with my-autconf
	+
	+2022-11-06 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * test/run_test.sh: use context diff, to work with AIX
	+
	+ * defs.h:
	+ fprintf_lineno might be passed a null, when reading from stdin - show "(null)"
	+
	+ * makefile.in, test/run_make.sh, test/run_test.sh, test/run_lint.sh:
	+ fgrep-fixes
	+
	+ * yacc.1: mention use of stderr/stdout for usage/debugging
	+
	+ * yacc.1: document %empty
	+
	+ * yacc.1: document %debug
	+
	+ * yacc.1: minor fixes with check-manpage
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2022-10-02 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2022-08-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2022-08-01
	+
	+2022-01-28 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * package/debian/copyright: update, fix typo
	+
	+ * package/debian/rules, package/debian/control:
	+ adapt from current Debian package
	+
	+ * configure: regen
	+
	+ * configure.in:
	+ change default for the backtracking option to match the most-common usage
	+ of byacc
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ update packaging, renaming debian folder back to its original location to
	+ verify that the version-mangling used in the accepted Debian package will work
	+ with the continuous-integration system.
	+
	+2022-01-18 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * package/debian/watch: adapt from current Debian package
	+
	+2022-01-14 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * VERSION, package/byacc.spec, package/detest/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2022-01-09 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * package/detest/changelog: build-script
	+
	+ * package/debian/changelog:
	+ update to use oldstable-compatible rules/config, for testing version upgrade
	+
	+ * package/detest/watch: build-script
	+
	+ * package/debian/watch:
	+ update to use oldstable-compatible rules/config, for testing version upgrade
	+
	+ * package/detest/control: build-script
	+
	+ * 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/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2022-01-08 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * package/detest/copyright, package/detest/rules: build-script
	+
	+ * 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: RCS_BASE
	+
	+ * package/detest/byacc.docs: build-script
	+
	+ * package/debian/byacc2.prerm: RCS_BASE
	+
	+ * package/detest/byacc2.prerm: build-script
	+
	+ * package/debian/byacc2.postinst: RCS_BASE
	+
	+ * package/detest/byacc2.postinst: build-script
	+
	+ * package/debian/byacc.postinst: RCS_BASE
	+
	+ * package/detest/byacc.postinst: build-script
	+
	+ * package/debian/byacc.prerm: RCS_BASE
	+
	+ * package/detest/byacc.prerm: build-script
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2022-01-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * test/run_test.sh:
	+ adjust to ignore NetBSD's difference in getopt warnings.
	+
	+ * package/pkgsrc/Makefile: resync with pkgsrc
	+
	+ * test/yacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.c: regen
	+
	+ * test/expr.oxout.y, test/expr.oxout.h: fix gcc warnings
	+
	+ * test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h: regen
	+
	+ * test/run_make.sh: workaround for compiling the expr.oxout.y files
	+
	+ * test/expr.oxout.y: fix syntax error
	+
	+ * test/btyacc/expr.oxout.tab.c: regen
	+
	+ * test/expr.oxout.h: RCS_BASE
	+
	+ * test/yacc/expr.oxout.tab.c: fix syntax error
	+
	+ * test/btyacc/expr.oxout.tab.c: regen, s/expr.oxout/expr_oxout/g
	+
	+ * test/btyacc/expr.oxout.tab.h: regen
	+
	+ * test/run_test.sh:
	+ filter the default prefix to change "." to "_", so that the generated
	+ files will compile consistently with run_make.sh
	+
	+ * package/debian/control, package/debian/prerm, package/debian/postinst:
	+ add "byacc2" as an alternative for "yacc"
	+
	+ * 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:
	+ bump
	+
	+2021-12-24 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * package/debian/rules: fixes from Debian package for lintian warnings
	+
	+ * package/debian/control: updates for Debian standard
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+ * package/debian/byacc2.docs: RCS_BASE
	+
	+ * package/detest/byacc2.docs: build-script
	+
	+ * package/debian/docs, package/debian/copyright, package/debian/control:
	+ errata from Debian package
	+
	+ * config.sub: 2021-12-24
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.sub: alias aarch64le to aarch64
	+
	+ Apparently, QNX reports aarch64 as aarch64le on little-endian machines.
	+
	+ * config.sub (aarch64le-*): Set cpu to aarch64.
	+ (timestamp): Update.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data (aarch64le-qnx): New test.
	+
	+ Reported-by: Elad Lahav <e2lahav@gmail.com>
	+ Link: https://lists.gnu.org/archive/html/config-patches/2021-12/msg00009.html
	+
	+2021-12-16 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2021-12-13 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-10-27
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.sub: fix typo in timestamp
	+
	+ * config.sub: Fix timestamp.
	+ * doc/config.sub.1: Regenerate.
	+
	+ Reported-by: Jordi Sanfeliu <jordi@fibranet.cat>
	+ Fixes: a013aac61edfa2a03727521508286480010e7bf3
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-11-30 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-11-30
	+ From: Andreas F. Borchert <github@andreas-borchert.de>
	+ config.guess: x86_64-pc-solaris2.11 is not properly recognized
	+
	+ config.guess guesses Solaris 11 to run on a 32-bit platform
	+ despite Solaris 11 no longer supporting any 32-bit platform.
	+
	+ See the following code at lines 434 to 445:
	+
	+ \| SUN_ARCH=i386
	+ \| # If there is a compiler, see if it is configured for 64-bit objects.
	+ \| # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
	+ \| # This test works for both compilers.
	+ \| if test "$CC_FOR_BUILD" != no_compiler_found; then
	+ \| if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
	+ \| (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	+ \| grep IS_64BIT_ARCH >/dev/null
	+ \| then
	+ \| SUN_ARCH=x86_64
	+ \| fi
	+ \| fi
	+
	+ If "cc" is installed, i.e. the Oracle Studio compiler, this one is
	+ chosen for $CC_FOR_BUILD. This compiler, the gcc provided by Oracle
	+ and also gcc bootstrapped from sources on that platform with a default
	+ configuration will by default generate 32-bit binaries -- even on
	+ a 64-bit platform. And __amd64 will not be defined for compilations
	+ targeting a 32-bit platform. This is different from the corresponding
	+ behaviour on GNU/Linux systems where the local platform is targeted by
	+ default.
	+
	+ Thus, as long as you do not add "-m64" or if you have a custom-built
	+ gcc which defaults to 64 bit, you will get 32-bit binaries on Solaris
	+ despite living on a 64-bit platform.
	+
	+ * config.guess (i86pc:SunOS:5.: \|\| i86xen:SunOS:5.:): Adapt the
	+ test by adding the "-m64" flag. This will work properly for Solaris
	+ 10 as well (the last Solaris release that supported x86 32-bit
	+ platforms).
	+ * doc/config.guess.1: Regenerate.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-10-27 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-10-27
	+ From: Jordi Sanfeliu <jordi@fibranet.cat>
	+ Recognize Fiwix
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (137 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (882 tests)
	+ PASS: config.sub idempotency checks (819 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (137 tests)
	+
	+ * config.guess (i86:Fiwix::*): Recognize.
	+ * config.sub (fiwix*): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add a test case for Fiwix.
	+ * testsuite/config-sub.data (i386-fiwix): New test.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+ * config.sub: 2021-20-27
	+ From: Jordi Sanfeliu <jordi@fibranet.cat>
	+ Recognize Fiwix
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (137 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (882 tests)
	+ PASS: config.sub idempotency checks (819 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (137 tests)
	+
	+ * config.guess (i86:Fiwix::*): Recognize.
	+ * config.sub (fiwix*): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add a test case for Fiwix.
	+ * testsuite/config-sub.data (i386-fiwix): New test.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-10-18 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-08-14
	+ From: Kinshuk Dua <kinshukdua@gmail.com>
	+ config.sub: Fix typo in comment
	+
	+ Fixes: 5e531d391852a54e7fab2d8ff55625fca514b305
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-08-14 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-08-14
	+ From: Nick Bowler <nbowler@draconx.ca>
	+ config.sub: work around command assignment bug in some shells
	+
	+ When combining variable assignments with a shell command, some older
	+ shells (notably heirloom-sh and presumably also Solaris 10 /bin/sh)
	+ have a bug which causes the assignment to alter the current execution
	+ environment whenever the command is a shell built-in. For example:
	+
	+ % dash -c 'x=good; x=bad echo >/dev/null; echo $x'
	+ good
	+
	+ % jsh -c 'x=good; x=bad echo >/dev/null; echo $x'
	+ bad
	+
	+ The config.sub script contains a few commands of the form:
	+
	+ IFS=- read ...
	+
	+ which triggers this bug, causing the IFS assignment to persist for the
	+ remainder of the script. This can cause misbehaviour in certain cases,
	+ for example:
	+
	+ % jsh config.sub i386-linux-gnu
	+ config.sub: test: unknown operator gnu
	+
	+ % jsh config.sub i386-gnu/linux
	+ sed: can't read s\|gnu/linux\|gnu\|: No such file or directory
	+ Invalid configuration `i386-gnu/linux': OS `' not recognized
	+
	+ * config.sub: Save and restore IFS explicitly to avoid shell bugs.
	+ * doc/config.sub.1: Regenerate.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-08-08 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * reader.c:
	+ fix memory-leak when replacing $$'s in destructor code (report/testcase
	+ by Boris Kolpackov).
	+
	+ * 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:
	+ 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:
	+ bump
	+
	+2021-08-04 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-08-04
	+ From: Jeremy Soller <jackpot51@gmail.com>
	+ config.sub: add Linux Relibc Target
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (136 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (881 tests)
	+ PASS: config.sub idempotency checks (818 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (136 tests)
	+
	+ * config.sub (relibc*): Recognize.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data (x86_64-linux-relibc): New test.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-08-02 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * main.c, yacc.1: add "-h" option
	+
	+ * yacc.1: fix date
	+
	+ * 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:
	+ map any of bison's long-options which have a corresponding yacc option
	+ into the latter, without depending upon getopt_long().
	+
	+ * main.c: suggested patch:
	+ 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:
	+ 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:
	+ 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:
	+ regen
	+
	+ * output.c:
	+ add a state-machine to output_semantic_actions() to detect and replace
	+ 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:
	+ regen
	+
	+ * reader.c:
	+ adapt a patch by Roland Illig which added #line directives with dummy
	+ filename and line number, because the debug information was incorrect.
	+ The actual fix (see output_semantic_actions) is to emit #line directives
	+ which correspond to the code-file.
	+
	+ * reader.c: simplify an ifdef so I can balance {/}
	+
	+ * output.c: use new macro
	+
	+ * defs.h: add fprintf_lineno macro
	+
	+ * reader.c:
	+ make that a little simpler - but I see that this should be using the
	+ code-file's line-numbering rather than ""
	+
	+ * reader.c:
	+ 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:
	+ bump
	+
	+2021-07-14 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * reader.c: From: Roland Illig <roland.illig@gmx.de>
	+ Subject: small patch for byacc
	+ ...
	+ this splits up "\nbreak;\n" output to put #line directives after first "\n"
	+
	+2021-07-06 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-07-06
	+ From: Stephanos Ioannidis <root@stephanos.io>
	+ config.sub: add Zephyr RTOS support
	+
	+ This adds the Zephyr RTOS targets in preparation for implementing the
	+ Zephyr RTOS-specific toolchain support.
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (136 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (880 tests)
	+ PASS: config.sub idempotency checks (817 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (136 tests)
	+
	+ * config.sub (zephyr*): Recognize.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data: Add testcases for *-zephyr.
	+
	+ Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-07-03 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-07-03
	+ From: Ozkan Sezer <sezero@users.sourceforge.net>
	+ config.sub: disable shellcheck SC2006 / SC2268 warnings
	+
	+ This is in line with the recent config.guess change in commit
	+ 12fcf67c9108f4c4b581eaa302088782f0ee40ea
	+
	+ * config.sub (shellcheck disable): Add SC2006,SC2268.
	+
	+ Suggested-by: Jacob Bachmeyer <jcb@gnu.org>
	+ Signed-off-by: Ozkan Sezer <sezero@users.sourceforge.net>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+ * config.sub: 2021-07-03
	+ From: Ozkan Sezer <sezero@users.sourceforge.net>
	+ config.sub: normalize the quoting in the `echo FOO \| sed ...`
	+
	+ Some cases quote the argument to echo and some do not. At runtime
	+ it probably does not matter because the substituted values will never
	+ contain whitespace, but quoting them all would make shellcheck more
	+ useful.
	+
	+ * config.sub: Consistently quote the argument of echo.
	+ * doc/config.sub.1: Regenerate.
	+
	+ Suggested-by: Jacob Bachmeyer <jcb@gnu.org>
	+ Signed-off-by: Ozkan Sezer <sezero@users.sourceforge.net>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-07-02 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-06-03
	+ From: Ozkan Sezer <sezero@users.sourceforge.net>
	+ config.sub: replace POSIX $( ) with classic ` ` throughout
	+
	+ This is in line with the recent config.guess change in commit
	+ d70c4fa934de164178054c3a60aaa0024ed07c91.
	+
	+ The patch was generated using patch-6.gawk script introduced in that
	+ commit.
	+
	+ * config.sub: Revert POSIX command substitutions to classic form.
	+
	+ Signed-off-by: Ozkan Sezer <sezero@users.sourceforge.net>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-06-19 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * 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:
	+ regen
	+
	+ * btyaccpar.skel, yaccpar.skel: cancel unused assignments
	+
	+ * output.c: gcc warning
	+
	+ * test/run_test.sh, test/run_lint.sh, test/run_make.sh:
	+ shellcheck-warnings
	+
	+2021-06-19 jannick0
	+
	+ * test/run_test.sh: changes suggested at
	+ https://github.com/jannick0/byacc-snapshots/tree/YYINT-fix-20210520
	+
	+2021-06-19 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2021-06-13 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2021-06-04 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-06-03
	+ From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
	+ Recognize arc32
	+
	+ This is the 32-bit variant of ARCv3 ISA (which is not compatible with the
	+ 32-bit ARCv2 ISA)
	+
	+ \| make check
	+ \| cd testsuite && bash config-guess.sh && rm uname
	+ \| PASS: config.guess checks (136 tests)
	+ \| cd testsuite && bash config-sub.sh
	+ \| PASS: config.sub checks (864 tests)
	+ \| PASS: config.sub idempotency checks (801 tests)
	+ \| PASS: config.sub canonicalise each config.guess testcase (136 tests)
	+
	+ * config.guess (arc32:Linux::): Recognize.
	+ * config.sub (arc32): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add a test case for arc32.
	+ * testsuite/config-sub.data (arc32, arc*-elf): Add test cases.
	+
	+ Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+ * config.sub: 2021-06-03 (repaired)
	+ From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
	+ Recognize arc32
	+
	+ This is the 32-bit variant of ARCv3 ISA (which is not compatible with the
	+ 32-bit ARCv2 ISA)
	+
	+ \| make check
	+ \| cd testsuite && bash config-guess.sh && rm uname
	+ \| PASS: config.guess checks (136 tests)
	+ \| cd testsuite && bash config-sub.sh
	+ \| PASS: config.sub checks (864 tests)
	+ \| PASS: config.sub idempotency checks (801 tests)
	+ \| PASS: config.sub canonicalise each config.guess testcase (136 tests)
	+
	+ * config.guess (arc32:Linux::): Recognize.
	+ * config.sub (arc32): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add a test case for arc32.
	+ * testsuite/config-sub.data (arc32, arc*-elf): Add test cases.
	+
	+ Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-05-26 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-05-24
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: manual fixups after previous automatic patch
	+
	+ The tool could not handle command substitutions that span lines, but
	+ fortunately there were only two such substitutions in the script.
	+
	+ The test for which universe is active on Pyramid is rewritten into a
	+ case block because it was the only use of a command substitution as an
	+ argument to the test command, which would require quoting.
	+
	+ * config.guess: Rewrite "if" for Pyramid systems to "case".
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: replace POSIX $( ) with classic ` ` throughout
	+
	+ The previous replacement of backticks with POSIX command substitutions
	+ was ill-considered and illogical: this script recognizes many archaic
	+ machine types that probably never had POSIX shells, therefore it needs
	+ to be able to run successfully under pre-POSIX shells.
	+
	+ This patch was generated using the included GNU Awk program.
	+
	+ * config.guess: Revert POSIX command substitutions to classic form.
	+ * patch-6.gawk: Store the tool that produced the automated patch.
	+
	+2021-05-25 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: manual fixup after previous automated patches
	+
	+ This patch provides the special handling for the GNU system. As these
	+ were two small and unique edits, they were not included in the scripts.
	+
	+ This patch also cleans up other minor issues that must be addressed
	+ before reverting to classic command substitutions and updates
	+ "shellcheck" directives to account for changes in this script and the
	+ change in "shellcheck" towards reporting individual portability issues.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: automatic fixups after previous automated patch
	+
	+ This patch was generated using the following command:
	+
	+ sed -i config.guess \
	+ -e '/="[^"]\+"$-\\|$$/s/="$[^"([:space:])]\+$"/=\1/' \
	+ -e '/="[^"]\+"[[:alnum:]]/s/="\$$[^([:space:])]\+$"/=${\1}/' \
	+ -e \
	+ '/\$(echo[^\|]\+\|/s/$[^[:space:]]$[[:space:]]\|[[:space:]]sed/\1 \| sed/g'
	+
	+ * config.guess: Remove unneeded quotes in other variable assignments,
	+ standardize spacing for "echo ... \| sed" substitutions.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: remove unneeded quotes and factor command substitutions
	+
	+ This is further cleanup and simplifies some constructs that can confuse
	+ Emacs' syntax highlighting while generally reducing required quoting.
	+
	+ This patch was generated using the included GNU Awk program.
	+
	+ * config.guess: Remove unneeded variable quotes and factor out command
	+ substitutions when setting GUESS.
	+ * patch-3.gawk: Store the tool that produced the automated patch.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: manual fixups after previous automatic patch
	+
	+ * config.guess: Adjust a few "leftover" cases that the tool could not
	+ easily recognize and fixes comment indentation in a few other special
	+ cases.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: introduce intermediate variable with uname results
	+
	+ This will allow quoting to be significantly simplified in another
	+ pass through the file.
	+
	+ * config.guess: Introduce GUESS variable to hold results of uname analysis.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Jacob Bachmeyer <jcb@gnu.org>
	+ config.guess: use intermediate variable with uname results
	+
	+ This will allow quoting to be significantly simplified in another
	+ pass through the file.
	+
	+ This patch was generated using the included GNU Awk program.
	+
	+ * config.guess: Use GUESS variable to hold results of uname analysis.
	+ * patch-1.gawk: Store the tool that produced the automated patch.
	+
	+2021-05-24 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.guess: fix shellcheck warning SC2154
	+
	+ While, according to Plan 9 documentation, the environment variable
	+ $cputype is set to the name of the kernel's CPU's architecture,
	+ shellcheck warns that cputype is referenced but not assigned.
	+ Be on the safe side and do not use cputype if it is not defined
	+ or empty.
	+
	+ * config.guess (:Plan9::*): Fix shellcheck warning SC2154.
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.guess: remove redundant quotes in case commands
	+
	+ According to the GNU Autoconf Portable Shell Programming manual,
	+ the Bourne shell does not systematically split variables and back-quoted
	+ expressions, in particular on the right-hand side of assignments and in
	+ the argument of 'case'.
	+
	+ The change is made automatically using the following command:
	+ $ sed -E -i 's/(\<case )"(\$[^"]+)"( in\>)/\1\2\3/' config.guess
	+
	+ * config.guess: Simplify case commands by removing quotes around the
	+ argument.
	+
	+ Suggested-by: Jacob Bachmeyer <jcb@gnu.org>
	+
	+ * config.guess: 2021-05-24 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.guess: simplify exit status workaround on alphaev67-dec-osf5.1
	+
	+ Commit 29865ea8a5622cdd80b7a69a0afa78004b4cd311 introduced an exit trap
	+ reset before exiting to avoid a spurious non-zero exit status on
	+ alphaev67-dec-osf5.1. Simplify that code a bit by moving the exit trap
	+ reset around.
	+
	+ * config.guess (alpha:OSF1::): Reset exit trap earlier.
	+ * doc/config.guess.1: Regenerate.
	+
	+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:
	+ regen
	+
	+ * mkpar.c, reader.c: change printf format to allow for long-YYINT
	+
	+ * lalr.c, lr0.c: change type, fix gcc warnings
	+
	+ * verbose.c: change type, fix gcc warnings
	+ also change printf format, to allow for long YYINT
	+
	+ * output.c: change type, fix gcc warnings
	+ also change printf format, to allow for long-YYINT
	+
	+ * package/debian/rules, package/byacc.spec:
	+ change max-table-size to correspond with switch of YYINT from short to int
	+
	+ * defs.h:
	+ change default for MAXTABLE to INT_MAX, like the FreeBSD port.
	+ that requires changing some types to eliminate type-mismatches.
	+
	+ * configure: regen
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2021-05-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2021-04-30 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-04-30 (repaired)
	+ From: Maciej W. Rozycki <macro@orcam.me.uk>
	+ config.sub: Handle MIPS R3 and R5 ISA levels with CPU names
	+
	+ Complement binutils commit ae52f4830604 ("Add MIPS r3 and r5 support.")
	+ and recognize MIPS CPU patterns for the R3 and R5 ISA levels, used by
	+ GAS to set defaults.
	+
	+ * config.sub (mipsisa32r3, mipsisa32r3el, mipsisa32r5, mipsisa32r5el,
	+ mipsisa64r3, mipsisa64r3el, mipsisa64r5, mipsisa64r5el): Recognize.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data: Add test cases.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-04-21 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2021-04-21 (repaired)
	+ From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
	+ Recognize arc64
	+
	+ This paves way for setting up arc64 software ecosystem.
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (136 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (853 tests)
	+ PASS: config.sub idempotency checks (790 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (136 tests)
	+
	+ * config.guess (arc64:Linux::): Recognize.
	+ * config.sub (arc64): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add a test case for arc64.
	+ * testsuite/config-sub.data (arc64, arc*-elf): Add test cases.
	+
	+ Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-04-16 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-04-16 (repaired)
	+ From: Purple Rain <purplerain@secbsd.org>
	+ config.guess: add SecBSD support
	+
	+ * config.guess (:SecBSD::*): Recognize.
	+ * doc/config.guess.1: Regenerate.
	+ * testsuite/config-guess.data: Add a test case.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+ * config.sub: 2021-04-16 (repaired)
	+ From: Purple Rain <purplerain@secbsd.org>
	+ config.sub: add SecBSD support
	+
	+ * config.sub (secbsd*): Recognize.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data: Add x86_64-secbsd.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-03-28 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * reader.c: ignore bison's "%empty" extension
	+
	+ * reader.c, defs.h:
	+ %debug was a trivial bison "extension", mark it as such
	+
	+ * 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:
	+ regen
	+
	+ * reader.c:
	+ add union tag to YYSTYPE structure for compatibility with a feature which
	+ bison copied from Solaris yacc (request by Ella Stanforth)
	+
	+ * configure: regen
	+
	+ * config_h.in: update for _Noreturn feature
	+
	+ * aclocal.m4: updated to work with autoheader
	+
	+ * defs.h: apply syntax change needed for _Noreturn keyword
	+
	+ * package/byacc.spec, package/debian/rules: use stdnoreturn
	+
	+ * VERSION, package/byacc.spec, package/debian/changelog,
	+ package/mingw-byacc.spec, package/pkgsrc/Makefile:
	+ bump
	+
	+2021-03-20 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * aclocal.m4:
	+ resync with my-autoconf (adds --enable-stdnoreturn option)
	+
	+2021-03-10 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-03-10 (repaired)
	+ From: Idan Horo <idan.horowitz@gmail.com>
	+ config.sub: Add support for SerenityOS
	+
	+ * config.sub (serenity*): Recognize.
	+ * doc/config.sub.1: Regenerate.
	+ * testsuite/config-sub.data: Add i386-serenity.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-01-25 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-01-25 (repaired)
	+ From: Kalamatee <kalamatee@gmail.com>
	+ config.guess: update AROS system detection
	+
	+ * config.guess: Recognize :AROS::*.
	+ * doc/config.guess.1: Regenerate.
	+ * testsuite/config-guess.data: Add test cases.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-01-19 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2021-01-19 (repaired)
	+ From: M. Levinson <mlevins@users.sourceforge.net>
	+ config.guess: fix shell variable quoting bug
	+
	+ * config.guess (:NetBSD::*): Spell out the full sysctl command twice
	+ instead of using a shell variable.
	+ * doc/config.guess.1: Regenerate.
	+
	+ Fixes: 827c77253b396c07306927b2a4b794a3251c48eb
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+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:
	+ bump
	+
	+2021-01-07 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-01-08 (repaired)
	+ From: Peixing Xin <peixing.xin@windriver.com>
	+ config.sub: recognize four-part configuration name for VxWorks
	+
	+ For example:
	+
	+ armv7m-wrs-vxworks-eabihf
	+ armv7-wrs-vxworks-eabihf
	+ i686-wrs-vxworks-simlinux
	+ i686-wrs-vxworks-simwindows
	+ powerpc-wrs-vxworks-spe
	+ x86_64-wrs-vxworks-simlinux
	+ x86_64-wrs-vxworks-simwindows
	+
	+ * config.sub: Recognize four-part configuration name for VxWorks.
	+ * doc/config.guess.1: Regenerate.
	+ * testsuite/config-sub.data: Add test cases.
	+
	+ Co-authored-by: John Ericson <git@JohnEricson.me>
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-01-06 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2021-01-07 (repaired)
	+ From: Alan Modra <amodra@gmail.com>
	+ config.sub: accept OS of eabi* and gnueabi*
	+
	+ Commit 5e531d391852 broke powerpc-eabivle:
	+
	+ $ ./config.sub powerpc-eabivle
	+ Invalid configuration `powerpc-eabivle': OS `eabivle' not recognized
	+
	+ Also powerpc-eabisim and probably some arm configurations.
	+
	+ * config.sub: Accept OS of eabi* and gnueabi*.
	+ * testsuite/config-sub.data: Add powerpc-eabisim and powerpc-eabivle.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2021-01-05 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * configure: regen
	+
	+ * aclocal.m4: resync with my-autoconf
	+
	+2021-01-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2021-01-01 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ Update copyright years
	+
	+ * config.guess: Update copyright years.
	+ * config.sub: Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+
	+2020-12-31 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2020-12-31 (repaired)
	+ From: Kito Cheng <kito.cheng@sifive.com>
	+ Recognize riscv32be and riscv64be
	+
	+ Recently RISC-V community got patches big-endian support for binutils,
	+ and we'd like to accept that, however before accepting that I think it
	+ would be better to upstream config.sub and config.guess change here :)
	+
	+ It's my check result on Ubuntu 18.04:
	+
	+ $ make check
	+ cd testsuite && bash config-guess.sh && rm uname
	+ PASS: config.guess checks (131 tests)
	+ cd testsuite && bash config-sub.sh
	+ PASS: config.sub checks (830 tests)
	+ PASS: config.sub idempotency checks (767 tests)
	+ PASS: config.sub canonicalise each config.guess testcase (131 tests)
	+
	+ * config.guess (riscv32be:Linux::, riscv64be:Linux::): Recognize.
	+ * config.sub (riscv32be, riscv64be): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add test cases for riscv32be, and riscv64be.
	+ * testsuite/config-sub.data (riscv32be, riscv64be): Add test cases.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2020-12-03 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2020-12-22 (repaired)
	+ From: Xiaotian Wu <wuxiaotian@loongson.cn>
	+ Recognize loongarch32, loongarch64, and loongarchx32
	+
	+ * config.guess (loongarch32:Linux::, loongarch64:Linux::,
	+ loongarchx32:Linux::): Recognize.
	+ * config.sub (loongarch32, loongarch64, loongarchx32): Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+ * testsuite/config-guess.data: Add test cases for loongarch32,
	+ loongarch64, and loongarchx32.
	+ * testsuite/config-sub.data (loongarch32, loongarch64, loongarchx32):
	+ Add test cases.
	+
	+ Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
	+
	+2020-12-01 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020-12-02 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ config.sub: recognize thumbv7*
	+
	+ * config.sub (thumbv7*): Recognize.
	+ * testsuite/config-sub.data (thumbv7): New test.
	+
	+ Reported-by: Karl Berry <karl@freefriends.org>
	+ Link: https://lists.gnu.org/archive/html/config-patches/2020-12/msg00001.html
	+
	+2020-11-30 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * install-sh: 2020-11-30
	+
	+2020-11-19 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2020-11-17 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ .gitattributes: specify a custom git merge driver for the ChangeLog file
	+
	+ * config.guess, config.sub: 2020-11-19 (repaired)
	+ From: Dmitry V. Levin <ldv@altlinux.org>
	+ Update URLs of the latest version of config.guess and config.sub scripts
	+
	+ Prefer cgit URLs over gitweb as the former are usually served faster:
	+ $ time -f %e wget -q 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess'
	+ 1.06
	+ $ time -f %e wget -q 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess'
	+ 0.73
	+
	+ * config.guess: Prefer cgit URLs over gitweb.
	+ (timestamp): Update.
	+ * config.sub: Likewise.
	+ * doc/config.guess.1: Regenerate.
	+ * doc/config.sub.1: Likewise.
	+
	+2020-11-06 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2020-11-07 (repaired)
	+ From: Ben Elliston <bje@gnu.org>
	+ Update timestamps.
	+
	+ * config.sub: 2020-10-13 (repaired)
	+ From: Ben Elliston <bje@gnu.org>
	+ * config.sub, config.guess: Replace backtick `..` substitutions
	+ with POSIX $(..) command substitutions throughout.
	+ * Makefile (shellcheck): Don't exclude message SC2006.
	+
	+ * config.guess: 2020-10-22 (repaired)
	+ From: Ben Elliston <bje@gnu.org>
	+ * config.sub, config.guess: Replace backtick `..` substitutions
	+ with POSIX $(..) command substitutions throughout.
	+ * Makefile (shellcheck): Don't exclude message SC2006.
	+
	+2020-10-21 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2020-10-22
	+ From: Rin Okuyama <rin@netbsd.org>
	+ * config.guess (:NetBSD::*): Handle aarch64eb.
	+ * testsuite/config-guess.data: Add test cases.
	+
	+ Signed-off-by: Ben Elliston <bje@gnu.org>
	+
	+2020-10-14 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020-10-13
	+ From: Ben Elliston <bje@gnu.org>
	+ Fix whitespace problem in config.sub.
	+
	+2020-10-13 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020-10-13
	+ From: Ben Elliston <bje@gnu.org>
	+ * config.sub (i*86-pc-os2-emx): Recognise correctly.
	+ * testsuite/config-sub.data: Add OS/2 tests to avoid regressions.
	+
	+2020-09-26 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020-09-08
	+ From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
	+ * config.sub (uclinux-uclibc*): Fix detection.
	+ * testsuite/config-sub.data: Add a test case to avoid regression.
	+
	+ Signed-off-by: Ben Elliston <bje@gnu.org>
	+
	+2020-09-22 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * closure.c, warshall.c:
	+ fix undefined-behavior diagnosed with gcc -fsanitize=undefined (report by
	+ Alexander Richardson)
	+
	+2020-09-20 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2020-09-19
	+ From: Bruno Haible <bruno@clisp.org>
	+ * config.guess: Don't use 'ldd --version' to determine the presence of
	+ musl libc, as this fails on Alpine Linux 3.10.
	+
	+ Signed-off-by: Ben Elliston <bje@gnu.org>
	+
	+2020-09-10 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * LICENSE: RCS_BASE
	+
	+ * reader.c, output.c: cppcheck -- reduce scope
	+
	+ * 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:
	+ update to version 2.0
	+
	+ * reader.c:
	+ improve loop which skips backward through a (possibly nested) sequence of
	+ square-brackets.
	+
	+ * reader.c: simplify a check to quiet a bogus cppcheck-warning
	+
	+ * yacc.1: bump date
	+
	+ * reader.c: add a note about a bogus cppcheck warning
	+
	+ * configure: regen
	+
	+ * configure.in:
	+ always check for gcc attributes, to work around defect in clang's imitation
	+ of this feature
	+
	+ * 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:
	+ cppcheck -- scope reduction
	+
	+ * package/debian/compat: quiet compatibility-warning
	+
	+ * yacc.1: use "ASCII" for dashes which are part of proper names
	+
	+ * configure: regen
	+
	+ * configure.in: switch to --enable-warnings, for consistency
	+
	+ * 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:
	+ bump
	+
	+2020-09-07 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020-09-08
	+ From: Elad Lahav <e2lahav@gmail.com>
	+ * config.sub: Fix regression in QNX recognition.
	+ * testsuite/config-sub.data: Add some test cases.
	+
	+ Signed-off-by: Ben Elliston <bje@gnu.org>
	+
	+2020-08-16 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess, config.sub: 2020-08-17
	+
	+2020-06-28 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.sub: 2020/06/28
	+
	+2020-06-14 Thomas E. Dickey <dickey@invisible-island.net>
	+
	+ * config.guess: 2020/04/26
	+
	2020-03-30 Thomas E. Dickey <dickey@invisible-island.net>

	* 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
	@@ -13,7 +1532,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2020-03-10 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -40,19 +1560,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/mingw-byacc.spec, 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/mingw-byacc.spec, 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_requires.tab.h, test/yacc/calc_code_top.tab.c:
	RCS_BASE

	* output.c:
	@@ -70,12 +1615,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.output, 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_provides.y, test/calc_code_requires.y:
	RCS_BASE

	2019-11-04 Michael.Forney
	@@ -113,7 +1668,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_output2.error, test/yacc/no_p_opt.error:
	regen

	* test/run_test.sh:
	@@ -140,7 +1698,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2019-09-11 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -149,7 +1708,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"
	@@ -159,21 +1724,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/mingw-byacc.spec, 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
	@@ -182,27 +1754,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.error, 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.error, 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/stdin1.output, 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/no_p_opt.output, test/yacc/nostdin.output:
	regen

	* main.c: add -D option, to specify filename vs y.tab.h for -d
	@@ -240,7 +1857,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2019-06-10 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -255,10 +1873,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,
	+ test/btyacc/err_syntax18.tab.c, test/btyacc/rename_debug.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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2018-06-09 Tom.Shields
	@@ -276,7 +1913,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* package/debian/control: add a package for btyacc
	@@ -285,7 +1923,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
	@@ -312,7 +1969,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2018-05-09 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -321,10 +1979,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/mingw-byacc.spec, 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/rename_debug.c, test/btyacc/varsyntax_calc1.tab.c:
	regen

	* btyaccpar.skel: apply Guy Harris' changes here as well
	@@ -349,10 +2027,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,
	+ test/yacc/rename_debug.i, 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
	@@ -409,7 +2103,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* reader.c: check for numeric overflow in get_number()
	@@ -420,10 +2115,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.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,
	+ yaccpar.skel, output.c:
	fix some compiler warnings for "make check_make" by adding section init_vars,
	which initializes the body_vars for pure-parser configuration.

	@@ -439,7 +2158,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2017-04-29 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -454,7 +2174,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.c, test/yacc/expr.oxout.tab.h:
	RCS_BASE

	* package/debian/copyright: update copyright
	@@ -475,7 +2198,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2016-12-31 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -484,7 +2208,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,
	+ test/btyacc/btyacc_destroy3.tab.c, btyaccpar.c:
	regen

	* btyaccpar.skel: changes from NetBSD
	@@ -503,7 +2245,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/code_error.tab.c, test/btyacc/err_inherit4.tab.h:
	regen

	* btyaccpar.c, btyaccpar.skel, reader.c: changes from NetBSD
	@@ -592,7 +2335,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2016-11-20 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -611,7 +2355,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* lalr.c: indented
	@@ -626,7 +2371,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,
	+ test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c, yaccpar.c:
	regen

	2016-06-06 Tom.Shields
	@@ -637,12 +2413,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,
	+ test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.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,
	+ test/err_inherit4.y, test/run_make.sh, yaccpar.skel:
	fixes for issues in btyacc (report by Francis Andre):

	+ correction to the placement of the #line directive for a %union specification
	@@ -677,7 +2504,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2016-03-24 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -698,7 +2526,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2016-01-25 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -709,7 +2538,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* reader.c:
	@@ -724,7 +2554,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
	@@ -744,7 +2576,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	2014-11-13 Jouk.Jansen
	@@ -764,10 +2597,13 @@

	2014-10-06 Thomas E. Dickey <dickey@invisible-island.net>

	+ * package/detest/source/format: build-script
	+
	* 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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* configure: regen
	@@ -804,18 +2640,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/err_syntax20.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_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
	regen

	* output.c: gcc-warning
	@@ -833,7 +2700,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:
	@@ -846,7 +2715,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/calc2.tab.c, test/btyacc/calc3.tab.c:
	regen

	* reader.c:
	@@ -863,7 +2733,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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* reader.c:
	@@ -871,12 +2742,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_destroy1.y, test/btyacc_destroy2.y:
	RCS_BASE

	2014-10-02 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -901,14 +2780,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/debian/changelog, 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/mingw-byacc.spec, package/pkgsrc/Makefile:
	bump

	* test/run_test.sh:
	@@ -922,12 +2803,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
	@@ -936,7 +2851,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/no_p_opt.output, test/yacc/nostdin.output:
	bump

	2014-04-22 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -969,7 +2887,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/debian/changelog, package/mingw-byacc.spec:
	bump

	2014-04-19 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -988,7 +2907,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,
	+ test/btyacc/calc3.tab.c, test/btyacc/code_calc.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).

	@@ -998,26 +2932,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/mingw-byacc.spec, 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/btyacc/rename_debug.output, 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.i, 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,
	+ test/yacc/code_calc.code.c, yaccpar.c:
	regen

	* yacc.1:
	@@ -1025,21 +2977,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.c, 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/btyacc/big_l.output, 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
	@@ -1050,20 +3071,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/nostdin.output, 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.error, 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.c, test/yacc/err_syntax27.tab.h:
	reference output for testing

	* test/err_syntax27.y: testcase for missing_brace()
	@@ -1074,7 +3126,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
	@@ -1088,7 +3187,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:
	@@ -1102,7 +3203,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.
	@@ -1153,27 +3255,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,
	+ output.c, skeleton.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,
	+ test/yacc/grammar.tab.c, test/yacc/pure_calc.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_syntax12.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,
	+ test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.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_syntax11.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_calc.tab.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().
	@@ -1187,21 +3354,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/err_syntax20.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,
	+ test/yacc/error.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_inherit4.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_syntax11.tab.c, test/yacc/err_syntax12.tab.c:
	regen after adding the YYUNDFTOKEN symbol

	* output.c:
	@@ -1247,7 +3472,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,
	+ test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, skeleton.c:
	incorporate YYENOMEM and YYEOF symbols from btyacc

	* output.c: merge chunk from btyacc changes for header-guards
	@@ -1279,7 +3527,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_syntax12.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
	@@ -1303,12 +3566,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_syntax23.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,
	+ test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.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).
	@@ -1318,7 +3613,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:
	@@ -1326,7 +3640,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.c, test/btyacc/err_inherit1.tab.h:
	reference output for testing

	* defs.h: new functions/variables for btyacc
	@@ -1336,7 +3666,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/err_inherit2.y, test/err_inherit1.y, test/inherit2.y:
	testcase for btyacc

	2014-03-25 Tom.Shields
	@@ -1367,8 +3698,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
	@@ -1377,7 +3706,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.c, test/btyacc/err_syntax9.tab.h:
	reference output for testing

	2014-03-24 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -1388,36 +3768,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.c, 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.c, 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.c, 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.c, 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.c, test/yacc/err_syntax23.tab.h:
	reference output for testing

	* test/err_syntax23.y: testcase for untyped_lhs()
	@@ -1429,110 +3838,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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, 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.c, test/yacc/err_syntax2.tab.h:
	reference output for testing

	* test/err_syntax2.y: testcase for unterminated_comment()
	@@ -1543,14 +4028,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.c, test/yacc/err_syntax1.tab.h:
	reference output for testing

	* test/run_test.sh: generate a ".dot" file for the grammar file
	@@ -1569,13 +4071,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.output, test/btyacc/calc.tab.c, test/btyacc/calc.tab.h:
	reference output for testing

	* defs.h:
	@@ -1620,10 +4152,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-s.tab.c, test/quote_calc4.tab.c:
	regen

	* output.c, skeleton.c:
	@@ -1673,7 +4221,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-s.tab.c, test/quote_calc4.tab.c:
	regen

	* skeleton.c:
	@@ -1708,7 +4262,7 @@
	* package/debian/changelog, VERSION, package/byacc.spec: bump

	* aclocal.m4:
	- adapt tweak from Dave Becket to work around long-ago breakage in "new" autoconf.
	+ adapt tweak from Dave Beckett to work around long-ago breakage in "new" autoconf.

	* output.c:
	fix bogus #include if "-i" is given but not "-d" (report by Richard Mitton).
	@@ -1723,7 +4277,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-s.tab.c, test/quote_calc4.tab.c:
	regen

	* skeleton.c: quiet a gcc conversion-warning in yygrowstack()
	@@ -1885,7 +4445,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/ftp.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c:
	regen

	* test/code_debug.y: RCS_BASE
	@@ -1923,16 +4484,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_calc2-s.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-s.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_calc4.y, test/quote_calc3.y:
	modified to help make the files build with bison

	* test/calc.tab.c: regen
	@@ -1953,12 +4517,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:
	@@ -1979,10 +4548,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.c, 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.output, test/yacc/quote_calc4-s.tab.h:
	reference output for testing

	* test/run_test.sh: generate/test with "-s" option applied.
	@@ -1997,20 +4574,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.output, test/quote_calc4.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_calc2.tab.h, 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_calc2.tab.h, test/yacc/quote_calc3.tab.h:
	reference output for testing

	* test/quote_calc4.y, test/quote_calc.y, test/quote_calc2.y: RCS_BASE
	@@ -2049,7 +4631,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.

	@@ -2089,7 +4674,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:
	@@ -2105,10 +4693,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/code_error.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/calc2.y, test/calc1.y:
	use byacc's YYLEX_DECL/YYERROR_DECL symbols to prototype yylex/yyerror

	* skeleton.c:
	@@ -2178,7 +4771,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/code_calc.code.c, test/code_error.code.c, test/error.tab.c:
	regen

	* output.c:
	@@ -2186,7 +4782,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/code_calc.code.c, test/code_error.code.c, test/error.tab.c:
	regen

	* output.c: generate yyerror() calls in output.c
	@@ -2310,7 +4909,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,
	+ main.c, mkpar.c, output.c, defs.h, closure.c:
	fix warnings from clang --analyze

	2010-06-08 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -2319,7 +4919,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_error.y, test/pure_calc.tab.c, test/pure_calc.y:
	modified test-cases to allow them to compile, to validate pure-parser changes.
	updated reference files to match.

	@@ -2363,10 +4966,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.output, test/yacc/pure_error.tab.h:
	reference output for testing

	* test/code_calc.output, test/code_error.output: RCS_BASE
	@@ -2456,9 +5061,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
	@@ -2467,7 +5069,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>
	@@ -2536,7 +5141,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,
	+ verbose.c, main.c, reader.c:
	strict compiler warnings

	2009-10-26 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -2588,7 +5194,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,
	+ output.c, reader.c, skeleton.c, symtab.c, verbose.c, warshall.c:
	change indent-style (request by Perry E. Metzger)

	2008-08-27 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -2601,7 +5208,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
	@@ -2632,7 +5240,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,
	+ mkpar.c, main.c, lr0.c, lalr.c, graph.c, error.c, closure.c:
	remove 'register' keywords

	2008-08-25 Thomas E. Dickey <dickey@invisible-island.net>
	@@ -2819,7 +5428,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,
	+ verbose.c, graph.c, reader.c, main.c, symtab.c:
	reduce externs by making static the procedures that are not referenced outside
	the module in which they are defined.

	@@ -2850,7 +5460,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,
	+ mkpar.c, lalr.c, error.c, warshall.c, verbose.c, output.c:
	indent'd

	* configure: regenerated for 2005/5/5
	@@ -2982,10 +5593,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
	@@ -2994,7 +5601,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,
	+ closure.c, mkpar.c, lalr.c, lr0.c, output.c, error.c:
	ansify

	1999-11-30 Thomas E. Dickey <dickey@clark.net>
	diff --git a/contrib/byacc/MANIFEST b/contrib/byacc/MANIFEST
	--- a/contrib/byacc/MANIFEST
	+++ b/contrib/byacc/MANIFEST
	@@ -1,8 +1,9 @@
	-MANIFEST for byacc-20200330, version t20200330
	+MANIFEST for byacc, version t20230201
	--------------------------------------------------------------------------------
	MANIFEST this file
	ACKNOWLEDGEMENTS original version of byacc - 1993
	AUTHORS nicknames for some contributors (see CHANGES for details)
	+LICENSE summary of byacc's license
	Makefile.old renamed from Makefile
	NEW_FEATURES original version of byacc - 1993
	NOTES original version of byacc - 1993
	@@ -43,13 +44,12 @@
	package subdirectory
	package/byacc.spec RPM file for byacc
	package/debian subdirectory
	+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
	@@ -105,6 +105,30 @@
	test/btyacc/calc3.output reference output for testing
	test/btyacc/calc3.tab.c reference output for testing
	test/btyacc/calc3.tab.h reference output for testing
	+test/btyacc/calc_code_all.error reference output for testing
	+test/btyacc/calc_code_all.output reference output for testing
	+test/btyacc/calc_code_all.tab.c reference output for testing
	+test/btyacc/calc_code_all.tab.h reference output for testing
	+test/btyacc/calc_code_default.error reference output for testing
	+test/btyacc/calc_code_default.output reference output for testing
	+test/btyacc/calc_code_default.tab.c reference output for testing
	+test/btyacc/calc_code_default.tab.h reference output for testing
	+test/btyacc/calc_code_imports.error reference output for testing
	+test/btyacc/calc_code_imports.output reference output for testing
	+test/btyacc/calc_code_imports.tab.c reference output for testing
	+test/btyacc/calc_code_imports.tab.h reference output for testing
	+test/btyacc/calc_code_provides.error reference output for testing
	+test/btyacc/calc_code_provides.output reference output for testing
	+test/btyacc/calc_code_provides.tab.c reference output for testing
	+test/btyacc/calc_code_provides.tab.h reference output for testing
	+test/btyacc/calc_code_requires.error reference output for testing
	+test/btyacc/calc_code_requires.output reference output for testing
	+test/btyacc/calc_code_requires.tab.c reference output for testing
	+test/btyacc/calc_code_requires.tab.h reference output for testing
	+test/btyacc/calc_code_top.error reference output for testing
	+test/btyacc/calc_code_top.output reference output for testing
	+test/btyacc/calc_code_top.tab.c reference output for testing
	+test/btyacc/calc_code_top.tab.h reference output for testing
	test/btyacc/code_calc.code.c reference output for testing
	test/btyacc/code_calc.error reference output for testing
	test/btyacc/code_calc.output reference output for testing
	@@ -115,6 +139,18 @@
	test/btyacc/code_error.output reference output for testing
	test/btyacc/code_error.tab.c reference output for testing
	test/btyacc/code_error.tab.h reference output for testing
	+test/btyacc/defines1.calc.c reference output for testing
	+test/btyacc/defines1.calc.h reference output for testing
	+test/btyacc/defines1.error reference output for testing
	+test/btyacc/defines1.output reference output for testing
	+test/btyacc/defines2.calc.c reference output for testing
	+test/btyacc/defines2.calc.h reference output for testing
	+test/btyacc/defines2.error reference output for testing
	+test/btyacc/defines2.output reference output for testing
	+test/btyacc/defines3.calc.c reference output for testing
	+test/btyacc/defines3.calc.h reference output for testing
	+test/btyacc/defines3.error reference output for testing
	+test/btyacc/defines3.output reference output for testing
	test/btyacc/empty.error reference output for testing
	test/btyacc/empty.output reference output for testing
	test/btyacc/empty.tab.c reference output for testing
	@@ -363,6 +399,12 @@
	test/btyacc/rename_debug.h reference output for testing
	test/btyacc/rename_debug.i reference output for testing
	test/btyacc/rename_debug.output reference output for testing
	+test/btyacc/stdin1.calc.c reference output for testing
	+test/btyacc/stdin1.error reference output for testing
	+test/btyacc/stdin1.output reference output for testing
	+test/btyacc/stdin2.calc.c reference output for testing
	+test/btyacc/stdin2.error reference output for testing
	+test/btyacc/stdin2.output reference output for testing
	test/btyacc/varsyntax_calc1.error reference output for testing
	test/btyacc/varsyntax_calc1.output reference output for testing
	test/btyacc/varsyntax_calc1.tab.c reference output for testing
	@@ -373,11 +415,16 @@
	test/btyacc_destroy1.y btyacc test-case for %parse-param
	test/btyacc_destroy2.y btyacc test-case for %parse-param
	test/btyacc_destroy3.y btyacc test-case for %parse-param
	-test/calc.tab.c c-file for calc.y
	test/calc.y example from VMS freeware version of byacc
	test/calc1.y advanced example from Steve Johnson's paper.
	test/calc2.y test-cases and reference files for %lex-param / %parse-param
	test/calc3.y test-cases and reference files for %lex-param / %parse-param
	+test/calc_code_all.y test-case for "%code" with all recognized keywords
	+test/calc_code_default.y test-case for "%code" with no keyword
	+test/calc_code_imports.y test-case for "%code imports"
	+test/calc_code_provides.y test-case for "%code provides"
	+test/calc_code_requires.y test-case for "%code requires"
	+test/calc_code_top.y test-case for "%code top"
	test/code_calc.y reference input for testing
	test/code_debug.y test-input, for -i, -o, -d options
	test/code_error.y reference input for testing
	@@ -418,6 +465,7 @@
	test/err_syntax8a.y testcase for used_reserved()
	test/err_syntax9.y testcase for tokenized_start()
	test/error.y original version of byacc - 1993
	+test/expr.oxout.h stub for "run_make.sh"
	test/expr.oxout.y test-case for "#line" feature
	test/grammar.y grammar from cproto
	test/inherit0.y testcase for btyacc
	@@ -455,6 +503,30 @@
	test/yacc/calc3.output reference output for testing
	test/yacc/calc3.tab.c reference output for testing
	test/yacc/calc3.tab.h reference output for testing
	+test/yacc/calc_code_all.error reference output for testing
	+test/yacc/calc_code_all.output reference output for testing
	+test/yacc/calc_code_all.tab.c reference output for testing
	+test/yacc/calc_code_all.tab.h reference output for testing
	+test/yacc/calc_code_default.error reference output for testing
	+test/yacc/calc_code_default.output reference output for testing
	+test/yacc/calc_code_default.tab.c reference output for testing
	+test/yacc/calc_code_default.tab.h reference output for testing
	+test/yacc/calc_code_imports.error reference output for testing
	+test/yacc/calc_code_imports.output reference output for testing
	+test/yacc/calc_code_imports.tab.c reference output for testing
	+test/yacc/calc_code_imports.tab.h reference output for testing
	+test/yacc/calc_code_provides.error reference output for testing
	+test/yacc/calc_code_provides.output reference output for testing
	+test/yacc/calc_code_provides.tab.c reference output for testing
	+test/yacc/calc_code_provides.tab.h reference output for testing
	+test/yacc/calc_code_requires.error reference output for testing
	+test/yacc/calc_code_requires.output reference output for testing
	+test/yacc/calc_code_requires.tab.c reference output for testing
	+test/yacc/calc_code_requires.tab.h reference output for testing
	+test/yacc/calc_code_top.error reference output for testing
	+test/yacc/calc_code_top.output reference output for testing
	+test/yacc/calc_code_top.tab.c reference output for testing
	+test/yacc/calc_code_top.tab.h reference output for testing
	test/yacc/code_calc.code.c reference output for testing
	test/yacc/code_calc.error reference output for testing
	test/yacc/code_calc.output reference output for testing
	@@ -465,6 +537,18 @@
	test/yacc/code_error.output reference output for testing
	test/yacc/code_error.tab.c reference output for testing
	test/yacc/code_error.tab.h reference output for testing
	+test/yacc/defines1.calc.c reference output for testing
	+test/yacc/defines1.calc.h reference output for testing
	+test/yacc/defines1.error reference output for testing
	+test/yacc/defines1.output reference output for testing
	+test/yacc/defines2.calc.c reference output for testing
	+test/yacc/defines2.calc.h reference output for testing
	+test/yacc/defines2.error reference output for testing
	+test/yacc/defines2.output reference output for testing
	+test/yacc/defines3.calc.c reference output for testing
	+test/yacc/defines3.calc.h reference output for testing
	+test/yacc/defines3.error reference output for testing
	+test/yacc/defines3.output reference output for testing
	test/yacc/empty.error reference output for testing
	test/yacc/empty.output reference output for testing
	test/yacc/empty.tab.c reference output for testing
	@@ -681,6 +765,12 @@
	test/yacc/rename_debug.h reference output for testing
	test/yacc/rename_debug.i reference output for testing
	test/yacc/rename_debug.output reference output for testing
	+test/yacc/stdin1.calc.c reference output for testing
	+test/yacc/stdin1.error reference output for testing
	+test/yacc/stdin1.output reference output for testing
	+test/yacc/stdin2.calc.c reference output for testing
	+test/yacc/stdin2.error reference output for testing
	+test/yacc/stdin2.output reference output for testing
	test/yacc/varsyntax_calc1.error reference output for testing
	test/yacc/varsyntax_calc1.output reference output for testing
	test/yacc/varsyntax_calc1.tab.c reference output for testing
	diff --git a/contrib/byacc/VERSION b/contrib/byacc/VERSION
	--- a/contrib/byacc/VERSION
	+++ b/contrib/byacc/VERSION
	@@ -1 +1 @@
	-20200330
	+20230201
	diff --git a/contrib/byacc/aclocal.m4 b/contrib/byacc/aclocal.m4
	--- a/contrib/byacc/aclocal.m4
	+++ b/contrib/byacc/aclocal.m4
	@@ -1,7 +1,7 @@
	-dnl $Id: aclocal.m4,v 1.48 2020/03/10 22:53:47 tom Exp $
	+dnl $Id: aclocal.m4,v 1.59 2023/01/05 22:53:11 tom Exp $
	dnl Macros for byacc configure script (Thomas E. Dickey)
	dnl ---------------------------------------------------------------------------
	-dnl Copyright 2004-2019,2020 Thomas E. Dickey
	+dnl Copyright 2004-2022,2023 Thomas E. Dickey
	dnl
	dnl Permission is hereby granted, free of charge, to any person obtaining a
	dnl copy of this software and associated documentation files (the
	@@ -54,10 +54,11 @@
	[ifelse([$8], , ,[$8])],
	[ifelse([$9], , ,[$9])])])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
	+dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15
	dnl -------------
	dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
	-dnl The second parameter if given makes this macro verbose.
	+dnl $1 = flags to add
	+dnl $2 = if given makes this macro verbose.
	dnl
	dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS,
	dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily
	@@ -71,19 +72,19 @@

	for cf_add_cflags in $1
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[[^=]]='\''\"[[^"]]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[[^=]]='\''\"[[^"]]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then
	CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
	continue
	elif test "${cf_tst_cflags}" = "\"'" ; then
	@@ -96,7 +97,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`
	CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
	@@ -114,7 +115,7 @@
	(yes)
	CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[[^"]]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[[^"]]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -140,6 +141,25 @@

	AC_SUBST(EXTRA_CPPFLAGS)

	+])dnl
	+dnl ---------------------------------------------------------------------------
	+dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40
	+dnl ----------------
	+dnl Use CF_ADD_CFLAGS after first checking for potential redefinitions.
	+dnl $1 = flags to add
	+dnl $2 = if given makes this macro verbose.
	+define([CF_APPEND_CFLAGS],
	+[
	+for cf_add_cflags in $1
	+do
	+ case "x$cf_add_cflags" in
	+ (x-[[DU]]*)
	+ CF_REMOVE_CFLAGS($cf_add_cflags,CFLAGS,[$2])
	+ CF_REMOVE_CFLAGS($cf_add_cflags,CPPFLAGS,[$2])
	+ ;;
	+ esac
	+ CF_ADD_CFLAGS([$cf_add_cflags],[$2])
	+done
	])dnl
	dnl ---------------------------------------------------------------------------
	dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
	@@ -158,6 +178,12 @@
	AC_DEFUN([CF_ARG_DISABLE],
	[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
	dnl ---------------------------------------------------------------------------
	+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
	+dnl -------------
	+dnl Allow user to enable a normally-off option.
	+AC_DEFUN([CF_ARG_ENABLE],
	+[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
	+dnl ---------------------------------------------------------------------------
	dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14
	dnl -------------
	dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
	@@ -181,7 +207,46 @@
	])dnl
	])])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
	+dnl CF_C11_NORETURN version: 3 updated: 2021/03/28 11:36:23
	+dnl ---------------
	+AC_DEFUN([CF_C11_NORETURN],
	+[
	+AC_MSG_CHECKING(if you want to use C11 _Noreturn feature)
	+CF_ARG_ENABLE(stdnoreturn,
	+ [ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics],
	+ [enable_stdnoreturn=yes],
	+ [enable_stdnoreturn=no])
	+AC_MSG_RESULT($enable_stdnoreturn)
	+
	+if test $enable_stdnoreturn = yes; then
	+AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn,
	+ [AC_TRY_COMPILE([
	+#include <stdio.h>
	+#include <stdlib.h>
	+#include <stdnoreturn.h>
	+static _Noreturn void giveup(void) { exit(0); }
	+ ],
	+ [if (feof(stdin)) giveup()],
	+ cf_cv_c11_noreturn=yes,
	+ cf_cv_c11_noreturn=no)
	+ ])
	+else
	+ cf_cv_c11_noreturn=no,
	+fi
	+
	+if test "$cf_cv_c11_noreturn" = yes; then
	+ AC_DEFINE(HAVE_STDNORETURN_H, 1,[Define if <stdnoreturn.h> header is available and working])
	+ AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported])
	+ HAVE_STDNORETURN_H=1
	+else
	+ HAVE_STDNORETURN_H=0
	+fi
	+
	+AC_SUBST(HAVE_STDNORETURN_H)
	+AC_SUBST(STDC_NORETURN)
	+])dnl
	+dnl ---------------------------------------------------------------------------
	+dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20
	dnl ---------------
	dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
	dnl into CC. This will not help with broken scripts that wrap the compiler
	@@ -196,7 +261,7 @@
	AC_DEFUN([CF_CC_ENV_FLAGS],
	[
	# This should have been defined by AC_PROG_CC
	-: ${CC:=cc}
	+: "${CC:=cc}"

	AC_MSG_CHECKING(\$CFLAGS variable)
	case "x$CFLAGS" in
	@@ -245,7 +310,7 @@
	esac
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
	+dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15
	dnl --------------
	dnl Check if we're accidentally using a cache from a different machine.
	dnl Derive the system name, as a check for reusing the autoconf cache.
	@@ -259,7 +324,7 @@
	dnl autoconf 2.5x broke compatibility with autoconf 2.13
	AC_DEFUN([CF_CHECK_CACHE],
	[
	-if test -f $srcdir/config.guess \|\| test -f $ac_aux_dir/config.guess ; then
	+if test -f "$srcdir/config.guess" \|\| test -f "$ac_aux_dir/config.guess" ; then
	ifelse([$1],,[AC_CANONICAL_HOST],[$1])
	system_name="$host_os"
	else
	@@ -280,7 +345,7 @@
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
	+dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04
	dnl -----------------
	dnl Check if the given compiler is really clang. clang's C driver defines
	dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
	@@ -299,21 +364,56 @@
	if test "$ifelse([$1],,[$1],GCC)" = yes ; then
	AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
	cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
	- ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
	AC_TRY_COMPILE([],[
	#ifdef __clang__
	#else
	make an error
	#endif
	],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
	-cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
	],[])
	ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
	AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
	fi
	+
	+CLANG_VERSION=none
	+
	+if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
	+ case "$CC" in
	+ (c[[1-9]][[0-9]]\|*/c[[1-9]][[0-9]])
	+ AC_MSG_WARN(replacing broken compiler alias $CC)
	+ CFLAGS="$CFLAGS -std=`echo "$CC" \| sed -e 's%.*/%%'`"
	+ CC=clang
	+ ;;
	+ esac
	+
	+ AC_MSG_CHECKING(version of $CC)
	+ CLANG_VERSION="`$CC --version 2>/dev/null \| sed -e '2,$d' -e 's/^.(CLANG[[^)]]) //' -e 's/^.(Debian[[^)]]) //' -e 's/^[[^0-9.]]//' -e 's/[[^0-9.]].//'`"
	+ test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
	+ AC_MSG_RESULT($CLANG_VERSION)
	+
	+ for cf_clang_opt in \
	+ -Qunused-arguments \
	+ -Wno-error=implicit-function-declaration
	+ do
	+ AC_MSG_CHECKING(if option $cf_clang_opt works)
	+ cf_save_CFLAGS="$CFLAGS"
	+ CFLAGS="$CFLAGS $cf_clang_opt"
	+ AC_TRY_LINK([
	+ #include <stdio.h>],[
	+ printf("hello!\\n");],[
	+ cf_clang_optok=yes],[
	+ cf_clang_optok=no])
	+ AC_MSG_RESULT($cf_clang_optok)
	+ CFLAGS="$cf_save_CFLAGS"
	+ if test "$cf_clang_optok" = yes; then
	+ CF_VERBOSE(adding option $cf_clang_opt)
	+ CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
	+ fi
	+ done
	+fi
	])
	dnl ---------------------------------------------------------------------------
	-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
	+dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
	dnl -----------------
	dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
	dnl character-strings.
	@@ -325,7 +425,7 @@
	dnl string literals would be in readonly memory.
	dnl
	dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
	-dnl let the compiler decide how to represent Xt's strings which were #define'd.
	+dnl let the compiler decide how to represent Xt's strings which were #define'd.
	dnl That does not solve the problem of using the block of Xt's strings which
	dnl are compiled into the library (and is less efficient than one might want).
	dnl
	@@ -343,7 +443,7 @@
	#include <stdlib.h>
	#include <X11/Intrinsic.h>
	],
	-[String foo = malloc(1); (void)foo],[
	+[String foo = malloc(1); free((void*)foo)],[

	AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
	AC_TRY_COMPILE(
	@@ -361,7 +461,7 @@

	CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])

	-case $cf_cv_const_x_string in
	+case "$cf_cv_const_x_string" in
	(no)
	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
	;;
	@@ -373,9 +473,9 @@
	])
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
	+dnl CF_DISABLE_ECHO version: 14 updated: 2021/09/04 06:35:04
	dnl ---------------
	-dnl You can always use "make -n" to see the actual options, but it's hard to
	+dnl You can always use "make -n" to see the actual options, but it is hard to
	dnl pick out/analyze warning messages when the compile-line is long.
	dnl
	dnl Sets:
	@@ -410,7 +510,7 @@
	AC_SUBST(ECHO_CC)
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
	+dnl CF_DISABLE_LEAKS version: 9 updated: 2021/04/03 16:41:50
	dnl ----------------
	dnl Combine no-leak checks with the libraries or tools that are used for the
	dnl checks.
	@@ -423,24 +523,98 @@
	AC_MSG_CHECKING(if you want to perform memory-leak testing)
	AC_ARG_ENABLE(leaks,
	[ --disable-leaks test: free permanent memory, analyze leaks],
	- [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],
	- : ${with_no_leaks:=no})
	+ [enable_leaks=$enableval],
	+ [enable_leaks=yes])
	+dnl with_no_leaks is more readable...
	+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
	AC_MSG_RESULT($with_no_leaks)

	-if test "$with_no_leaks" = yes ; then
	+if test "$enable_leaks" = no ; then
	AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
	AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
	+dnl CF_ENABLE_WARNINGS version: 9 updated: 2021/01/05 19:40:50
	+dnl ------------------
	+dnl Configure-option to enable gcc warnings
	+dnl
	+dnl $1 = extra options to add, if supported
	+dnl $2 = option for checking attributes. By default, this is done when
	+dnl warnings are enabled. For other values:
	+dnl yes: always do this, e.g., to use in generated library-headers
	+dnl no: never do this
	+AC_DEFUN([CF_ENABLE_WARNINGS],[
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+CF_FIX_WARNINGS(CFLAGS)
	+CF_FIX_WARNINGS(CPPFLAGS)
	+CF_FIX_WARNINGS(LDFLAGS)
	+AC_MSG_CHECKING(if you want to turn on gcc warnings)
	+CF_ARG_ENABLE(warnings,
	+ [ --enable-warnings test: turn on gcc compiler warnings],
	+ [enable_warnings=yes],
	+ [enable_warnings=no])
	+AC_MSG_RESULT($enable_warnings)
	+if test "$enable_warnings" = "yes"
	+then
	+ ifelse($2,,[CF_GCC_ATTRIBUTES])
	+ CF_GCC_WARNINGS($1)
	+fi
	+ifelse($2,yes,[CF_GCC_ATTRIBUTES])
	+fi
	+])dnl
	+dnl ---------------------------------------------------------------------------
	+dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
	+dnl ---------------
	+dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc. Any of gcc's
	+dnl "-Werror" flags can interfere with configure-checks. Those go into
	+dnl EXTRA_CFLAGS.
	+dnl
	+dnl $1 = variable name to repair
	+define([CF_FIX_WARNINGS],[
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+ case [$]$1 in
	+ (-Werror=)
	+ cf_temp_flags=
	+ for cf_temp_scan in [$]$1
	+ do
	+ case "x$cf_temp_scan" in
	+ (x-Werror=format*)
	+ CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
	+ ;;
	+ (x-Werror=*)
	+ CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
	+ ;;
	+ (*)
	+ CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
	+ ;;
	+ esac
	+ done
	+ if test "x[$]$1" != "x$cf_temp_flags"
	+ then
	+ CF_VERBOSE(repairing $1: [$]$1)
	+ $1="$cf_temp_flags"
	+ CF_VERBOSE(... fixed [$]$1)
	+ CF_VERBOSE(... extra $EXTRA_CFLAGS)
	+ fi
	+ ;;
	+ esac
	+fi
	+AC_SUBST(EXTRA_CFLAGS)
	+])dnl
	+dnl ---------------------------------------------------------------------------
	+dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25
	dnl -----------------
	dnl Test for availability of useful gcc __attribute__ directives to quiet
	dnl compiler warnings. Though useful, not all are supported -- and contrary
	dnl to documentation, unrecognized directives cause older compilers to barf.
	AC_DEFUN([CF_GCC_ATTRIBUTES],
	-[
	-if test "$GCC" = yes
	+[AC_REQUIRE([AC_PROG_FGREP])dnl
	+AC_REQUIRE([CF_C11_NORETURN])dnl
	+
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	then
	cat > conftest.i <<EOF
	#ifndef GCC_PRINTF
	@@ -459,8 +633,9 @@
	if test "$GCC" = yes
	then
	AC_CHECKING([for $CC __attribute__ directives])
	-cat > conftest.$ac_ext <<EOF
	+cat > "conftest.$ac_ext" <<EOF
	#line __oline__ "${as_me:-configure}"
	+#include <stdio.h>
	#include "confdefs.h"
	#include "conftest.h"
	#include "conftest.i"
	@@ -475,8 +650,8 @@
	#define GCC_SCANFLIKE(fmt,var) /nothing/
	#endif
	extern void wow(char *,...) GCC_SCANFLIKE(1,2);
	-extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
	-extern void foo(void) GCC_NORETURN;
	+extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
	+extern GCC_NORETURN void foo(void);
	int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
	EOF
	cf_printf_attribute=no
	@@ -487,7 +662,7 @@
	cf_directive="__attribute__(($cf_attribute))"
	echo "checking for $CC $cf_directive" 1>&AC_FD_CC

	- case $cf_attribute in
	+ case "$cf_attribute" in
	(printf)
	cf_printf_attribute=yes
	cat >conftest.h <<EOF
	@@ -510,7 +685,7 @@
	if AC_TRY_EVAL(ac_compile); then
	test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
	cat conftest.h >>confdefs.h
	- case $cf_attribute in
	+ case "$cf_attribute" in
	(noreturn)
	AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
	;;
	@@ -537,9 +712,9 @@
	fi
	done
	else
	- fgrep define conftest.i >>confdefs.h
	+ ${FGREP-fgrep} define conftest.i >>confdefs.h
	fi
	-rm -rf conftest*
	+rm -rf ./conftest*
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	@@ -560,7 +735,7 @@
	CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_GCC_WARNINGS version: 37 updated: 2020/01/05 20:04:12
	+dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
	dnl ---------------
	dnl Check if the compiler supports useful warning options. There's a few that
	dnl we don't use, simply because they're too noisy:
	@@ -584,7 +759,7 @@
	[
	AC_REQUIRE([CF_GCC_VERSION])
	if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
	-cat > conftest.$ac_ext <<EOF
	+cat > "conftest.$ac_ext" <<EOF
	#line __oline__ "${as_me:-configure}"
	int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
	EOF
	@@ -603,7 +778,7 @@

	AC_CHECKING([for $CC warning options])
	cf_save_CFLAGS="$CFLAGS"
	- EXTRA_CFLAGS="-Wall"
	+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
	for cf_opt in \
	wd1419 \
	wd1683 \
	@@ -626,7 +801,6 @@
	then
	AC_CHECKING([for $CC warning options])
	cf_save_CFLAGS="$CFLAGS"
	- EXTRA_CFLAGS=
	cf_warn_CONST=""
	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
	cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
	@@ -649,16 +823,16 @@
	CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
	if AC_TRY_EVAL(ac_compile); then
	test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
	- case $cf_opt in
	+ case "$cf_opt" in
	(Winline)
	- case $GCC_VERSION in
	+ case "$GCC_VERSION" in
	([[34]].*)
	CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
	continue;;
	esac
	;;
	(Wpointer-arith)
	- case $GCC_VERSION in
	+ case "$GCC_VERSION" in
	([[12]].*)
	CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
	continue;;
	@@ -670,12 +844,12 @@
	done
	CFLAGS="$cf_save_CFLAGS"
	fi
	-rm -rf conftest*
	+rm -rf ./conftest*

	AC_SUBST(EXTRA_CFLAGS)
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54
	+dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
	dnl ----------------
	dnl Check for getopt's variables which are commonly defined in stdlib.h,
	dnl unistd.h or (nonstandard) in getopt.h
	@@ -688,15 +862,15 @@
	do
	AC_TRY_COMPILE([
	#include <$cf_header>],
	-[int x = optind; char *y = optarg],
	+[int x = optind; char *y = optarg; (void)x; (void)y],
	[cf_cv_getopt_header=$cf_header
	break])
	done
	])
	-if test $cf_cv_getopt_header != none ; then
	+if test "$cf_cv_getopt_header" != none ; then
	AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
	fi
	-if test $cf_cv_getopt_header = getopt.h ; then
	+if test "$cf_cv_getopt_header" = getopt.h ; then
	AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
	fi
	])dnl
	@@ -812,7 +986,7 @@
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
	+dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59
	dnl -----------------
	dnl Check if the given compiler is really the Intel compiler for Linux. It
	dnl tries to imitate gcc, but does not return an error when it finds a mismatch
	@@ -830,7 +1004,7 @@
	ifelse([$2],,INTEL_COMPILER,[$2])=no

	if test "$ifelse([$1],,[$1],GCC)" = yes ; then
	- case $host_os in
	+ case "$host_os" in
	(linux\|gnu)
	AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
	cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
	@@ -850,7 +1024,7 @@
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_MAKE_DOCS version: 4 updated: 2015/07/04 21:43:03
	+dnl CF_MAKE_DOCS version: 5 updated: 2021/01/10 16:05:11
	dnl ------------
	dnl $1 = name(s) to generate rules for
	dnl $2 = suffix of corresponding manpages used as input.
	@@ -879,7 +1053,7 @@
	${GROFF_NOTE} [\$](SHELL) -c "tbl [\$]*.$2 \| groff -man" >[\$]@
	${GROFF_NOTE}
	${GROFF_NOTE}.$2.txt :
	-${GROFF_NOTE} GROFF_NO_SGR=stupid [\$](SHELL) -c "tbl [\$]*.$2 \| nroff -Tascii -man \| col -bx" >[\$]@
	+${GROFF_NOTE} GROFF_NO_SGR=stupid [\$](SHELL) -c "tbl [\$]*.$2 \| nroff -rHY=0 -Tascii -man \| col -bx" >[\$]@

	${MAN2HTML_NOTE}.$2.html :
	${MAN2HTML_NOTE} ./${MAN2HTML_TEMP} [\$]* $2 man >[\$]@
	@@ -952,7 +1126,7 @@
	AC_SUBST(MAKE_LOWER_TAGS)
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
	+dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
	dnl ----------------------
	dnl Check if the file-system supports mixed-case filenames. If we're able to
	dnl create a lowercase name and see it as uppercase, it doesn't support that.
	@@ -960,8 +1134,8 @@
	[
	AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
	if test "$cross_compiling" = yes ; then
	- case $target_alias in
	- (-os2-emx\|-msdosdjgpp\|-cygwin\|-msys\|-mingw\|-uwin)
	+ case "$target_alias" in
	+ (-os2-emx\|-msdosdjgpp\|-cygwin\|-msys\|-mingw\|-uwin\|darwin*)
	cf_cv_mixedcase=no
	;;
	(*)
	@@ -982,7 +1156,7 @@
	test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
	+dnl CF_MKSTEMP version: 12 updated: 2023/01/05 17:53:11
	dnl ----------
	dnl Check for a working mkstemp. This creates two files, checks that they are
	dnl successfully created and distinct (AmigaOS apparently fails on the last).
	@@ -991,16 +1165,10 @@
	unistd.h \
	)
	AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
	-rm -rf conftest*
	+rm -rf ./conftest*
	AC_TRY_RUN([
	-#include <sys/types.h>
	-#ifdef HAVE_UNISTD_H
	-#include <unistd.h>
	-#endif
	-#include <stdlib.h>
	-#include <stdio.h>
	-#include <string.h>
	-#include <sys/stat.h>
	+$ac_includes_default
	+
	int main(void)
	{
	char *tmpl = "conftestXXXXXX";
	@@ -1048,23 +1216,33 @@
	echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
	+dnl CF_NO_LEAKS_OPTION version: 9 updated: 2021/06/13 19:45:41
	dnl ------------------
	dnl see CF_WITH_NO_LEAKS
	+dnl
	+dnl $1 = option/name
	+dnl $2 = help-text
	+dnl $3 = symbol to define if the option is set
	+dnl $4 = additional actions to take if the option is set
	AC_DEFUN([CF_NO_LEAKS_OPTION],[
	AC_MSG_CHECKING(if you want to use $1 for testing)
	AC_ARG_WITH($1,
	[$2],
	- [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
	+ [case "x$withval" in
	+ (x\|xno) ;;
	+ (*)
	+ : "${with_cflags:=-g}"
	+ : "${enable_leaks:=no}"
	+ with_$1=yes
	+ AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
	$4
	])
	- : ${with_cflags:=-g}
	- : ${with_no_leaks:=yes}
	- with_$1=yes],
	+ ;;
	+ esac],
	[with_$1=])
	AC_MSG_RESULT(${with_$1:-no})

	-case .$with_cflags in
	+case ".$with_cflags" in
	(.-g)
	case .$CFLAGS in
	(.-g)
	@@ -1077,7 +1255,7 @@
	esac
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
	+dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
	dnl --------------
	dnl Check the argument to see that it looks like a pathname. Rewrite it if it
	dnl begins with one of the prefix/exec_prefix variables, and then again if the
	@@ -1097,16 +1275,16 @@
	;;
	(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
	;;
	-(.\[$]{prefix}\|.\[$]{dir})
	+(.\[$]\{prefix\}\|.\[$]\{dir\})
	eval $1="[$]$1"
	case ".[$]$1" in
	(.NONE/*)
	- $1=`echo [$]$1 \| sed -e s%NONE%$cf_path_syntax%`
	+ $1=`echo "[$]$1" \| sed -e s%NONE%$cf_path_syntax%`
	;;
	esac
	;;
	(.no\|.NONE/*)
	- $1=`echo [$]$1 \| sed -e s%NONE%$cf_path_syntax%`
	+ $1=`echo "[$]$1" \| sed -e s%NONE%$cf_path_syntax%`
	;;
	(*)
	ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
	@@ -1266,7 +1444,7 @@
	AC_SUBST(NROFF_NOTE)
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
	+dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
	dnl ------------
	AC_DEFUN([CF_PROG_LINT],
	[
	@@ -1277,6 +1455,25 @@
	;;
	esac
	AC_SUBST(LINT_OPTS)
	+AC_SUBST(LINT_LIBS)
	+])dnl
	+dnl ---------------------------------------------------------------------------
	+dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40
	+dnl ----------------
	+dnl Remove a given option from CFLAGS/CPPFLAGS
	+dnl $1 = option to remove
	+dnl $2 = variable to update
	+dnl $3 = nonempty to allow verbose message
	+define([CF_REMOVE_CFLAGS],
	+[
	+cf_tmp_cflag=`echo "x$1" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x[$]$2" \| sed -e 's/^.//' -e 's/[[ ]][[ ]]-/ -/g' -e "s%$cf_tmp_cflag\$=[[^ ]][[^ ]]\$\?%%" -e 's/^[[ ]]//' -e 's%[[ ]][[ ]]-D% -D%g' -e 's%[[ ]][[ ]]*-I% -I%g'`
	+ test "[$]$2" != "$cf_old_cflag" \|\| break
	+ ifelse([$3],,,[CF_VERBOSE(removing old option $1 from $2)])
	+ $2="$cf_old_cflag"
	+done
	])dnl
	dnl ---------------------------------------------------------------------------
	dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
	@@ -1296,34 +1493,20 @@
	-e 's/-[[UD]]'"$3"'$=[[^ ]]*$\?[$]//g'`
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13
	+dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16
	dnl -------------------
	dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
	dnl can define it successfully.
	AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
	- AC_TRY_COMPILE([
	-#include <stdlib.h>
	-#include <string.h>
	-#include <sys/types.h>
	-],[
	-#ifndef _XOPEN_SOURCE
	-make an error
	-#endif],
	+ AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
	[cf_cv_xopen_source=no],
	[cf_save="$CPPFLAGS"
	CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
	- AC_TRY_COMPILE([
	-#include <stdlib.h>
	-#include <string.h>
	-#include <sys/types.h>
	-],[
	-#ifdef _XOPEN_SOURCE
	-make an error
	-#endif],
	- [cf_cv_xopen_source=no],
	- [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
	- CPPFLAGS="$cf_save"
	+ AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
	+ [cf_cv_xopen_source=no],
	+ [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
	+ CPPFLAGS="$cf_save"
	])
	])

	@@ -1331,7 +1514,7 @@
	CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
	CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
	- CF_ADD_CFLAGS($cf_temp_xopen_source)
	+ CF_APPEND_CFLAGS($cf_temp_xopen_source)
	fi
	])
	dnl ---------------------------------------------------------------------------
	@@ -1352,12 +1535,17 @@
	CF_MSG_LOG([$1])
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_WITHOUT_X version: 1 updated: 2020/03/03 18:27:24
	+dnl CF_WITHOUT_X version: 3 updated: 2021/01/13 16:51:52
	dnl ------------
	dnl Use this to cancel the check for X headers/libraries which would be pulled
	dnl in via CF_GCC_WARNINGS.
	define([CF_WITHOUT_X],
	+AC_DEFUN([AC_PATH_XTRA],[])
	+AC_DEFUN([CF_SAVE_XTRA_FLAGS],[])
	+AC_DEFUN([CF_RESTORE_XTRA_FLAGS],[])
	AC_DEFUN([CF_CONST_X_STRING],[echo "skipping X-const check";])dnl
	+AC_SUBST(X_CFLAGS)
	+AC_SUBST(X_LIBS)
	[])dnl
	dnl ---------------------------------------------------------------------------
	dnl CF_WITH_DBMALLOC version: 7 updated: 2010/06/21 17:26:47
	@@ -1390,7 +1578,7 @@
	fi
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_WITH_MAN2HTML version: 8 updated: 2018/06/27 18:44:03
	+dnl CF_WITH_MAN2HTML version: 12 updated: 2021/01/03 18:30:50
	dnl ----------------
	dnl Check for man2html and groff. Prefer man2html over groff, but use groff
	dnl as a fallback. See
	@@ -1403,7 +1591,8 @@
	dnl
	dnl The shell script can be removed later, e.g., using "make distclean".
	AC_DEFUN([CF_WITH_MAN2HTML],[
	-AC_REQUIRE([CF_PROG_GROFF])
	+AC_REQUIRE([CF_PROG_GROFF])dnl
	+AC_REQUIRE([AC_PROG_FGREP])dnl

	case "x${with_man2html}" in
	(xno)
	@@ -1476,6 +1665,7 @@

	CF_EOF

	+NROFF_OPTS=
	if test "x$cf_with_groff" = xyes
	then
	MAN2HTML_NOTE="$GROFF_NOTE"
	@@ -1484,6 +1674,16 @@
	$SHELL -c "$TBL_PATH \${ROOT}.\${TYPE} \| $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}"
	CF_EOF
	else
	+ # disable hyphenation if this is groff
	+ if test "x$GROFF_PATH" != xno
	+ then
	+ AC_MSG_CHECKING(if nroff is really groff)
	+ cf_check_groff="`$NROFF_PATH --version 2>/dev/null \| grep groff`"
	+ test -n "$cf_check_groff" && cf_check_groff=yes
	+ test -n "$cf_check_groff" \|\| cf_check_groff=no
	+ AC_MSG_RESULT($cf_check_groff)
	+ test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
	+ fi
	MAN2HTML_NOTE=""
	CF_PATH_SYNTAX(cf_man2html)
	MAN2HTML_PATH="$cf_man2html"
	@@ -1498,10 +1698,10 @@

	LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out

	- cf_man2html_1st=`fgrep -n MARKER conftest.out \|sed -e 's/^[[^0-9]]://' -e 's/:.//'`
	- cf_man2html_top=`expr $cf_man2html_1st - 2`
	- cf_man2html_bot=`wc -l conftest.out \|sed -e 's/[[^0-9]]//g'`
	- cf_man2html_bot=`expr $cf_man2html_bot - 2 - $cf_man2html_top`
	+ cf_man2html_1st="`${FGREP-fgrep} -n MARKER conftest.out \|sed -e 's/^[[^0-9]]://' -e 's/:.//'`"
	+ cf_man2html_top=`expr "$cf_man2html_1st" - 2`
	+ cf_man2html_bot="`wc -l conftest.out \|sed -e 's/[[^0-9]]//g'`"
	+ cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"`
	cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot"

	AC_MSG_RESULT($cf_man2html_top_bot)
	@@ -1525,7 +1725,7 @@
	done

	LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out
	- cf_man2html_page=`fgrep -n HEAD1 conftest.out \|sed -n '$p' \|sed -e 's/^[[^0-9]]://' -e 's/:.//'`
	+ cf_man2html_page="`${FGREP-fgrep} -n HEAD1 conftest.out \|sed -n '$p' \|sed -e 's/^[[^0-9]]://' -e 's/:.//'`"
	test -z "$cf_man2html_page" && cf_man2html_page=99999
	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999

	@@ -1534,13 +1734,13 @@

	cat >>$MAN2HTML_TEMP <<CF_EOF
	: \${MAN2HTML_PATH=$MAN2HTML_PATH}
	-MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title="\$ROOT$\$TYPE$" -compress -pgsize $cf_man2html_page"
	+MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title=\"\$ROOT(\$TYPE)\" -compress -pgsize $cf_man2html_page"
	case \${TYPE} in
	(ms)
	- $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH -\${MACS} \| \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS
	+ $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH $NROFF_OPTS -\${MACS} \| \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS
	;;
	(*)
	- $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH -\${MACS} \| \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS
	+ $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH $NROFF_OPTS -\${MACS} \| \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS
	;;
	esac
	CF_EOF
	@@ -1561,30 +1761,7 @@
	[USE_VALGRIND])
	])dnl
	dnl ---------------------------------------------------------------------------
	-dnl CF_WITH_WARNINGS version: 5 updated: 2004/07/23 14:40:34
	-dnl ----------------
	-dnl Combine the checks for gcc features into a configure-script option
	-dnl
	-dnl Parameters:
	-dnl $1 - see CF_GCC_WARNINGS
	-AC_DEFUN([CF_WITH_WARNINGS],
	-[
	-if ( test "$GCC" = yes \|\| test "$GXX" = yes )
	-then
	-AC_MSG_CHECKING(if you want to check for gcc warnings)
	-AC_ARG_WITH(warnings,
	- [ --with-warnings test: turn on gcc warnings],
	- [cf_opt_with_warnings=$withval],
	- [cf_opt_with_warnings=no])
	-AC_MSG_RESULT($cf_opt_with_warnings)
	-if test "$cf_opt_with_warnings" != no ; then
	- CF_GCC_ATTRIBUTES
	- CF_GCC_WARNINGS([$1])
	-fi
	-fi
	-])dnl
	-dnl ---------------------------------------------------------------------------
	-dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
	+dnl CF_XOPEN_SOURCE version: 63 updated: 2022/12/29 10:10:26
	dnl ---------------
	dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
	dnl or adapt to the vendor's definitions to get equivalent functionality,
	@@ -1603,7 +1780,7 @@
	cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
	cf_xopen_source=

	-case $host_os in
	+case "$host_os" in
	(aix[[4-7]]*)
	cf_xopen_source="-D_ALL_SOURCE"
	;;
	@@ -1635,7 +1812,7 @@
	cf_xopen_source="-D_SGI_SOURCE"
	cf_XOPEN_SOURCE=
	;;
	-(linux\|uclinux\|gnu\|mint\|kbsd-gnu\|cygwin)
	+(linuxgnu\|linuxgnuabi64\|linuxgnuabin32\|linuxgnueabi\|linuxgnueabihf\|linuxgnux32\|uclinux\|gnu\|mint\|kbsd*-gnu\|cygwin)
	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
	;;
	(minix*)
	@@ -1649,7 +1826,15 @@
	(netbsd*)
	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
	;;
	-(openbsd[[4-9]]*)
	+(openbsd[[6-9]]*)
	+ # OpenBSD 6.x has broken locale support, both compile-time and runtime.
	+ # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
	+ # Abusing the conformance level is a workaround.
	+ AC_MSG_WARN(this system does not provide usable locale support)
	+ cf_xopen_source="-D_BSD_SOURCE"
	+ cf_XOPEN_SOURCE=700
	+ ;;
	+(openbsd[[4-5]]*)
	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
	cf_xopen_source="-D_BSD_SOURCE"
	cf_XOPEN_SOURCE=600
	@@ -1676,12 +1861,20 @@
	;;
	(*)
	CF_TRY_XOPEN_SOURCE
	+ cf_save_xopen_cppflags="$CPPFLAGS"
	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
	+ # Some of these niche implementations use copy/paste, double-check...
	+ if test "$cf_cv_xopen_source" != no ; then
	+ CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
	+ AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
	+ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
	+ CPPFLAGS="$cf_save_xopen_cppflags"])
	+ fi
	;;
	esac

	if test -n "$cf_xopen_source" ; then
	- CF_ADD_CFLAGS($cf_xopen_source,true)
	+ CF_APPEND_CFLAGS($cf_xopen_source,true)
	fi

	dnl In anything but the default case, we may have system-specific setting
	@@ -1696,7 +1889,7 @@
	[cf_XOPEN_SOURCE_set=yes],
	[cf_XOPEN_SOURCE_set=no])
	AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
	- if test $cf_XOPEN_SOURCE_set = yes
	+ if test "$cf_XOPEN_SOURCE_set" = yes
	then
	AC_TRY_COMPILE([#include <stdlib.h>],[
	#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
	@@ -1704,7 +1897,7 @@
	#endif],
	[cf_XOPEN_SOURCE_set_ok=yes],
	[cf_XOPEN_SOURCE_set_ok=no])
	- if test $cf_XOPEN_SOURCE_set_ok = no
	+ if test "$cf_XOPEN_SOURCE_set_ok" = no
	then
	AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
	fi
	@@ -1714,3 +1907,23 @@
	fi
	fi # cf_cv_posix_visible
	])
	+dnl ---------------------------------------------------------------------------
	+dnl CF__XOPEN_SOURCE_BODY version: 1 updated: 2022/09/10 15:17:35
	+dnl ---------------------
	+dnl body of test when test-compiling for _XOPEN_SOURCE check
	+define([CF__XOPEN_SOURCE_BODY],
	+[
	+#ifndef _XOPEN_SOURCE
	+make an error
	+#endif
	+])
	+dnl ---------------------------------------------------------------------------
	+dnl CF__XOPEN_SOURCE_HEAD version: 1 updated: 2022/09/10 15:17:03
	+dnl ---------------------
	+dnl headers to include when test-compiling for _XOPEN_SOURCE check
	+define([CF__XOPEN_SOURCE_HEAD],
	+[
	+#include <stdlib.h>
	+#include <string.h>
	+#include <sys/types.h>
	+])
	diff --git a/contrib/byacc/btyaccpar.c b/contrib/byacc/btyaccpar.c
	--- a/contrib/byacc/btyaccpar.c
	+++ b/contrib/byacc/btyaccpar.c
	@@ -2,7 +2,7 @@
	* @Id: skel2c,v 1.4 2016/06/07 00:26:09 tom Exp @
	*/

	-/* @Id: btyaccpar.skel,v 1.10 2018/05/25 01:03:46 tom Exp @ */
	+/* @Id: btyaccpar.skel,v 1.12 2021/06/19 20:46:31 tom Exp @ */

	#include "defs.h"

	@@ -485,7 +485,7 @@
	"#endif /* YYBTYACC */",
	#endif /* defined(YYBTYACC) */
	" yym = 0;",
	- " yyn = 0;",
	+ " /* yyn is set below */",
	" yynerrs = 0;",
	" yyerrflag = 0;",
	" yychar = YYEMPTY;",
	diff --git a/contrib/byacc/btyaccpar.skel b/contrib/byacc/btyaccpar.skel
	--- a/contrib/byacc/btyaccpar.skel
	+++ b/contrib/byacc/btyaccpar.skel
	@@ -1,4 +1,4 @@
	-/* $Id: btyaccpar.skel,v 1.11 2018/06/10 00:41:06 Tom.Shields Exp $ */
	+/* $Id: btyaccpar.skel,v 1.13 2021/08/08 19:56:28 tom Exp $ */

	#include "defs.h"

	@@ -410,7 +410,7 @@
	yyps->save = 0;
	%%endif
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/closure.c b/contrib/byacc/closure.c
	--- a/contrib/byacc/closure.c
	+++ b/contrib/byacc/closure.c
	@@ -1,4 +1,4 @@
	-/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 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 *itemsetend;
	unsigned *ruleset;

	-static unsigned *first_base;
	static unsigned *first_derives;
	static unsigned *EFF;

	@@ -21,7 +20,6 @@
	{
	unsigned *row;
	int symbol;
	- Value_t *sp;
	int rowsize;
	int i;
	int rule;
	@@ -32,7 +30,7 @@
	row = EFF;
	for (i = start_symbol; i < nsyms; i++)
	{
	- sp = derives[i];
	+ Value_t *sp = derives[i];
	for (rule = sp; rule > 0; rule = ++sp)
	{
	symbol = ritem[rrhs[rule]];
	@@ -56,9 +54,7 @@
	set_first_derives(void)
	{
	unsigned *rrow;
	- unsigned *vrow;
	int j;
	- unsigned k;
	unsigned cword = 0;
	Value_t *rp;

	@@ -69,16 +65,16 @@

	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++)
	{
	- vrow = EFF + ((i - ntokens) * varsetsize);
	- k = BITS_PER_WORD;
	+ unsigned vrow = EFF + ((i - ntokens) varsetsize);
	+ unsigned k = BITS_PER_WORD;
	+
	for (j = start_symbol; j < nsyms; k++, j++)
	{
	if (k >= BITS_PER_WORD)
	@@ -87,7 +83,7 @@
	k = 0;
	}

	- if (cword & (1u << k))
	+ if (cword & (1U << k))
	{
	rp = derives[j];
	while ((rule = *rp++) >= 0)
	@@ -111,7 +107,6 @@
	closure(Value_t *nucleus, int n)
	{
	unsigned ruleno;
	- unsigned word;
	unsigned i;
	Value_t *csp;
	unsigned *dsp;
	@@ -120,7 +115,6 @@

	Value_t *csend;
	unsigned *rsend;
	- int symbol;
	Value_t itemno;

	rulesetsize = WORDSIZE(nrules);
	@@ -131,10 +125,11 @@
	csend = nucleus + n;
	for (csp = nucleus; csp < csend; ++csp)
	{
	- symbol = ritem[*csp];
	+ int symbol = ritem[*csp];
	+
	if (ISVAR(symbol))
	{
	- dsp = first_derives + symbol * rulesetsize;
	+ dsp = first_derives + (symbol - ntokens) * rulesetsize;
	rsp = ruleset;
	while (rsp < rsend)
	rsp++ \|= dsp++;
	@@ -146,12 +141,13 @@
	csp = nucleus;
	for (rsp = ruleset; rsp < rsend; ++rsp)
	{
	- word = *rsp;
	+ unsigned word = *rsp;
	+
	if (word)
	{
	for (i = 0; i < BITS_PER_WORD; ++i)
	{
	- if (word & (1u << i))
	+ if (word & (1U << i))
	{
	itemno = rrhs[ruleno + i];
	while (csp < csend && *csp < itemno)
	@@ -178,7 +174,7 @@
	{
	FREE(itemset);
	FREE(ruleset);
	- FREE(first_base);
	+ FREE(first_derives);
	}

	#ifdef DEBUG
	@@ -238,7 +234,7 @@
	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/contrib/byacc/config.guess b/contrib/byacc/config.guess
	--- a/contrib/byacc/config.guess
	+++ b/contrib/byacc/config.guess
	@@ -1,12 +1,14 @@
	#! /bin/sh
	# Attempt to guess a canonical system name.
	-# Copyright 1992-2019 Free Software Foundation, Inc.
	+# Copyright 1992-2022 Free Software Foundation, Inc.

	-timestamp='2019-12-21'
	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	+
	+timestamp='2022-08-01'

	# This file is free software; you can redistribute it and/or modify it
	# under the terms of the GNU General Public License as published by
	-# the Free Software Foundation; either version 3 of the License, or
	+# the Free Software Foundation, either version 3 of the License, or
	# (at your option) any later version.
	#
	# This program is distributed in the hope that it will be useful, but
	@@ -27,11 +29,19 @@
	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
	#
	# You can get the latest version of this script from:
	-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
	#
	# Please send patches to <config-patches@gnu.org>.


	+# The "shellcheck disable" line above the timestamp inhibits complaints
	+# about features and limitations of the classic Bourne shell that were
	+# superseded or lifted in POSIX. However, this script identifies a wide
	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	+# have a pre-POSIX /bin/sh.
	+
	+
	me=`echo "$0" \| sed -e 's,.*/,,'`

	usage="\
	@@ -50,7 +60,7 @@
	GNU config.guess ($timestamp)

	Originally written by Per Bothner.
	-Copyright 1992-2019 Free Software Foundation, Inc.
	+Copyright 1992-2022 Free Software Foundation, Inc.

	This is free software; see the source for copying conditions. There is NO
	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	@@ -84,6 +94,9 @@
	exit 1
	fi

	+# Just in case it came from the environment.
	+GUESS=
	+
	# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
	# compiler to aid in system detection is discouraged as it requires
	# temporary files to be created and, as you can see below, it is a
	@@ -102,7 +115,7 @@
	# prevent multiple calls if $tmp is already set
	test "$tmp" && return 0
	: "${TMPDIR=/tmp}"
	- # shellcheck disable=SC2039
	+ # shellcheck disable=SC2039,SC3028
	{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } \|\|
	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
	@@ -112,7 +125,7 @@
	,,) echo "int x;" > "$dummy.c"
	for driver in cc gcc c89 c99 ; do
	if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
	- CC_FOR_BUILD="$driver"
	+ CC_FOR_BUILD=$driver
	break
	fi
	done
	@@ -133,14 +146,12 @@

	UNAME_MACHINE=`(uname -m) 2>/dev/null` \|\| UNAME_MACHINE=unknown
	UNAME_RELEASE=`(uname -r) 2>/dev/null` \|\| UNAME_RELEASE=unknown
	-UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	+UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown

	-case "$UNAME_SYSTEM" in
	+case $UNAME_SYSTEM in
	Linux\|GNU\|GNU/*)
	- # If the system lacks a compiler, then just pick glibc.
	- # We could probably try harder.
	- LIBC=gnu
	+ LIBC=unknown

	set_cc_for_build
	cat <<-EOF > "$dummy.c"
	@@ -149,24 +160,37 @@
	LIBC=uclibc
	#elif defined(__dietlibc__)
	LIBC=dietlibc
	- #else
	+ #elif defined(__GLIBC__)
	LIBC=gnu
	+ #else
	+ #include <stdarg.h>
	+ /* First heuristic to detect musl libc. */
	+ #ifdef __DEFINED_va_list
	+ LIBC=musl
	+ #endif
	#endif
	EOF
	- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`"
	+ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`
	+ eval "$cc_set_libc"

	- # If ldd exists, use it to detect musl libc.
	- if command -v ldd >/dev/null && \
	- ldd --version 2>&1 \| grep -q ^musl
	- then
	- LIBC=musl
	+ # Second heuristic to detect musl libc.
	+ if [ "$LIBC" = unknown ] &&
	+ command -v ldd >/dev/null &&
	+ ldd --version 2>&1 \| grep -q ^musl; then
	+ LIBC=musl
	+ fi
	+
	+ # If the system lacks a compiler, then just pick glibc.
	+ # We could probably try harder.
	+ if [ "$LIBC" = unknown ]; then
	+ LIBC=gnu
	fi
	;;
	esac

	# Note: order is significant - the case branches are not exclusive.

	-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
	+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
	:NetBSD::*)
	# NetBSD (nbsd) targets should (where applicable) match one or
	# more of the tuples: --netbsdelf, --netbsdaout,
	@@ -178,12 +202,12 @@
	#
	# Note: NetBSD doesn't particularly care about the vendor
	# portion of the name. We always set it to "unknown".
	- sysctl="sysctl -n hw.machine_arch"
	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null \|\| \
	- "/sbin/$sysctl" 2>/dev/null \|\| \
	- "/usr/sbin/$sysctl" 2>/dev/null \|\| \
	+ /sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
	+ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
	echo unknown)`
	- case "$UNAME_MACHINE_ARCH" in
	+ case $UNAME_MACHINE_ARCH in
	+ aarch64eb) machine=aarch64_be-unknown ;;
	armeb) machine=armeb-unknown ;;
	arm*) machine=arm-unknown ;;
	sh3el) machine=shl-unknown ;;
	@@ -192,13 +216,13 @@
	earmv*)
	arch=`echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
	endian=`echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p'`
	- machine="${arch}${endian}"-unknown
	+ machine=${arch}${endian}-unknown
	;;
	- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
	+ *) machine=$UNAME_MACHINE_ARCH-unknown ;;
	esac
	# The Operating System including object format, if it has switched
	# to ELF recently (or will in the future) and ABI.
	- case "$UNAME_MACHINE_ARCH" in
	+ case $UNAME_MACHINE_ARCH in
	earm*)
	os=netbsdelf
	;;
	@@ -219,7 +243,7 @@
	;;
	esac
	# Determine ABI tags.
	- case "$UNAME_MACHINE_ARCH" in
	+ case $UNAME_MACHINE_ARCH in
	earm*)
	expr='s/^earmv[0-9]/-eabi/;s/eb$//'
	abi=`echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr"`
	@@ -230,7 +254,7 @@
	# thus, need a distinct triplet. However, they do not need
	# kernel version information, so it can be replaced with a
	# suitable tag, in the style of linux-gnu.
	- case "$UNAME_VERSION" in
	+ case $UNAME_VERSION in
	Debian*)
	release='-gnu'
	;;
	@@ -241,51 +265,57 @@
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	# contains redundant information, the shorter form:
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	- echo "$machine-${os}${release}${abi-}"
	- exit ;;
	+ GUESS=$machine-${os}${release}${abi-}
	+ ;;
	:Bitrig::*)
	UNAME_MACHINE_ARCH=`arch \| sed 's/Bitrig.//'`
	- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
	+ ;;
	:OpenBSD::*)
	UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
	- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
	+ ;;
	+ :SecBSD::*)
	+ UNAME_MACHINE_ARCH=`arch \| sed 's/SecBSD.//'`
	+ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
	+ ;;
	:LibertyBSD::*)
	UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
	- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
	+ ;;
	:MidnightBSD::*)
	- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
	+ ;;
	:ekkoBSD::*)
	- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
	+ ;;
	:SolidBSD::*)
	- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
	+ ;;
	:OS108::*)
	- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
	+ ;;
	macppc:MirBSD::)
	- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
	+ ;;
	:MirBSD::*)
	- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
	+ ;;
	:Sortix::*)
	- echo "$UNAME_MACHINE"-unknown-sortix
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-sortix
	+ ;;
	:Twizzler::*)
	- echo "$UNAME_MACHINE"-unknown-twizzler
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-twizzler
	+ ;;
	:Redox::*)
	- echo "$UNAME_MACHINE"-unknown-redox
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-redox
	+ ;;
	mips:OSF1:.)
	- echo mips-dec-osf1
	- exit ;;
	+ GUESS=mips-dec-osf1
	+ ;;
	alpha:OSF1::)
	+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
	+ trap '' 0
	case $UNAME_RELEASE in
	*4.0)
	UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'`
	@@ -299,7 +329,7 @@
	# covers most systems running today. This code pipes the CPU
	# types through head -n 1, so we only detect the type of CPU 0.
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
	- case "$ALPHA_CPU_TYPE" in
	+ case $ALPHA_CPU_TYPE in
	"EV4 (21064)")
	UNAME_MACHINE=alpha ;;
	"EV4.5 (21064)")
	@@ -336,117 +366,121 @@
	# A Tn.n version is a released field test version.
	# A Xn.n version is an unreleased experimental baselevel.
	# 1.2 uses "1.2" for uname -r.
	- echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
	- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
	- exitcode=$?
	- trap '' 0
	- exit $exitcode ;;
	+ OSF_REL=`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	+ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
	+ ;;
	Amiga:UNIX_System_V:4.0:)
	- echo m68k-unknown-sysv4
	- exit ;;
	+ GUESS=m68k-unknown-sysv4
	+ ;;
	:[Aa]miga[Oo][Ss]::*)
	- echo "$UNAME_MACHINE"-unknown-amigaos
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-amigaos
	+ ;;
	:[Mm]orph[Oo][Ss]::*)
	- echo "$UNAME_MACHINE"-unknown-morphos
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-morphos
	+ ;;
	:OS/390::*)
	- echo i370-ibm-openedition
	- exit ;;
	+ GUESS=i370-ibm-openedition
	+ ;;
	:z/VM::*)
	- echo s390-ibm-zvmoe
	- exit ;;
	+ GUESS=s390-ibm-zvmoe
	+ ;;
	:OS400::*)
	- echo powerpc-ibm-os400
	- exit ;;
	+ GUESS=powerpc-ibm-os400
	+ ;;
	arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
	- echo arm-acorn-riscix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=arm-acorn-riscix$UNAME_RELEASE
	+ ;;
	arm:riscos::\|arm:RISCOS::)
	- echo arm-unknown-riscos
	- exit ;;
	+ GUESS=arm-unknown-riscos
	+ ;;
	SR2?01:HI-UX/MPP:: \| SR8000:HI-UX/MPP::)
	- echo hppa1.1-hitachi-hiuxmpp
	- exit ;;
	+ GUESS=hppa1.1-hitachi-hiuxmpp
	+ ;;
	Pyramid:OSx:: \| MIS:OSx:: \| MIS:SMP_DC-OSx::)
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	- if test "`(/bin/universe) 2>/dev/null`" = att ; then
	- echo pyramid-pyramid-sysv3
	- else
	- echo pyramid-pyramid-bsd
	- fi
	- exit ;;
	+ case `(/bin/universe) 2>/dev/null` in
	+ att) GUESS=pyramid-pyramid-sysv3 ;;
	+ *) GUESS=pyramid-pyramid-bsd ;;
	+ esac
	+ ;;
	NILE::*:dcosx)
	- echo pyramid-pyramid-svr4
	- exit ;;
	+ GUESS=pyramid-pyramid-svr4
	+ ;;
	DRS?6000:unix:4.0:6*)
	- echo sparc-icl-nx6
	- exit ;;
	+ GUESS=sparc-icl-nx6
	+ ;;
	DRS?6000:UNIX_SV:4.2:7 \| DRS?6000:isis:4.2:7)
	case `/usr/bin/uname -p` in
	- sparc) echo sparc-icl-nx7; exit ;;
	- esac ;;
	+ sparc) GUESS=sparc-icl-nx7 ;;
	+ esac
	+ ;;
	s390x:SunOS::)
	- echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
	+ ;;
	sun4H:SunOS:5.:)
	- echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=sparc-hal-solaris2$SUN_REL
	+ ;;
	sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
	- echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=sparc-sun-solaris2$SUN_REL
	+ ;;
	i86pc:AuroraUX:5.: \| i86xen:AuroraUX:5.:)
	- echo i386-pc-auroraux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=i386-pc-auroraux$UNAME_RELEASE
	+ ;;
	i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
	set_cc_for_build
	SUN_ARCH=i386
	# If there is a compiler, see if it is configured for 64-bit objects.
	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
	# This test works for both compilers.
	- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
	if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
	- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) \| \
	grep IS_64BIT_ARCH >/dev/null
	then
	SUN_ARCH=x86_64
	fi
	fi
	- echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
	+ ;;
	sun4:SunOS:6:*)
	# According to config.sub, this is the proper way to canonicalize
	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
	# it's likely to be more like Solaris than SunOS4.
	- echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=sparc-sun-solaris3$SUN_REL
	+ ;;
	sun4:SunOS::*)
	- case "`/usr/bin/arch -k`" in
	+ case `/usr/bin/arch -k` in
	Series\|S4)
	UNAME_RELEASE=`uname -v`
	;;
	esac
	# Japanese Language versions have a version number like `4.1.3-JL'.
	- echo sparc-sun-sunos"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/'`
	+ GUESS=sparc-sun-sunos$SUN_REL
	+ ;;
	sun3:SunOS::*)
	- echo m68k-sun-sunos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
	+ ;;
	sun::4.2BSD:*)
	UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
	- case "`/bin/arch`" in
	+ case `/bin/arch` in
	sun3)
	- echo m68k-sun-sunos"$UNAME_RELEASE"
	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
	;;
	sun4)
	- echo sparc-sun-sunos"$UNAME_RELEASE"
	+ GUESS=sparc-sun-sunos$UNAME_RELEASE
	;;
	esac
	- exit ;;
	+ ;;
	aushp:SunOS::)
	- echo sparc-auspex-sunos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sparc-auspex-sunos$UNAME_RELEASE
	+ ;;
	# The situation for MiNT is a little confusing. The machine name
	# can be virtually everything (everything which is not
	# "atarist" or "atariste" at least should have a processor
	@@ -456,41 +490,41 @@
	# MiNT. But MiNT is downward compatible to TOS, so this should
	# be no problem.
	atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
	- echo m68k-atari-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	+ ;;
	atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
	- echo m68k-atari-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	+ ;;
	falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
	- echo m68k-atari-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	+ ;;
	milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
	- echo m68k-milan-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-milan-mint$UNAME_RELEASE
	+ ;;
	hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
	- echo m68k-hades-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-hades-mint$UNAME_RELEASE
	+ ;;
	:MiNT:: \| :mint:: \| :TOS::)
	- echo m68k-unknown-mint"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-unknown-mint$UNAME_RELEASE
	+ ;;
	m68k:machten::)
	- echo m68k-apple-machten"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-apple-machten$UNAME_RELEASE
	+ ;;
	powerpc:machten::)
	- echo powerpc-apple-machten"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=powerpc-apple-machten$UNAME_RELEASE
	+ ;;
	RISC:Mach::*)
	- echo mips-dec-mach_bsd4.3
	- exit ;;
	+ GUESS=mips-dec-mach_bsd4.3
	+ ;;
	RISC:ULTRIX::*)
	- echo mips-dec-ultrix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=mips-dec-ultrix$UNAME_RELEASE
	+ ;;
	VAX:ULTRIX::)
	- echo vax-dec-ultrix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=vax-dec-ultrix$UNAME_RELEASE
	+ ;;
	2020:CLIX:: \| 2430:CLIX::)
	- echo clipper-intergraph-clix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=clipper-intergraph-clix$UNAME_RELEASE
	+ ;;
	mips:::UMIPS \| mips:::RISCos)
	set_cc_for_build
	sed 's/^ //' << EOF > "$dummy.c"
	@@ -518,75 +552,76 @@
	dummyarg=`echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p'` &&
	SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
	{ echo "$SYSTEM_NAME"; exit; }
	- echo mips-mips-riscos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=mips-mips-riscos$UNAME_RELEASE
	+ ;;
	Motorola:PowerMAX_OS::)
	- echo powerpc-motorola-powermax
	- exit ;;
	+ GUESS=powerpc-motorola-powermax
	+ ;;
	Motorola::4.3:PL8-)
	- echo powerpc-harris-powermax
	- exit ;;
	+ GUESS=powerpc-harris-powermax
	+ ;;
	Night_Hawk:::PowerMAX_OS \| Synergy:PowerMAX_OS::)
	- echo powerpc-harris-powermax
	- exit ;;
	+ GUESS=powerpc-harris-powermax
	+ ;;
	Night_Hawk:Power_UNIX::)
	- echo powerpc-harris-powerunix
	- exit ;;
	+ GUESS=powerpc-harris-powerunix
	+ ;;
	m88k:CX/UX:7:)
	- echo m88k-harris-cxux7
	- exit ;;
	+ GUESS=m88k-harris-cxux7
	+ ;;
	m88k::4:R4*)
	- echo m88k-motorola-sysv4
	- exit ;;
	+ GUESS=m88k-motorola-sysv4
	+ ;;
	m88k::3:R3*)
	- echo m88k-motorola-sysv3
	- exit ;;
	+ GUESS=m88k-motorola-sysv3
	+ ;;
	AViiON:dgux::)
	# DG/UX returns AViiON for all architectures
	UNAME_PROCESSOR=`/usr/bin/uname -p`
	- if [ "$UNAME_PROCESSOR" = mc88100 ] \|\| [ "$UNAME_PROCESSOR" = mc88110 ]
	+ if test "$UNAME_PROCESSOR" = mc88100 \|\| test "$UNAME_PROCESSOR" = mc88110
	then
	- if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] \|\| \
	- [ "$TARGET_BINARY_INTERFACE"x = x ]
	+ if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx \|\| \
	+ test "$TARGET_BINARY_INTERFACE"x = x
	then
	- echo m88k-dg-dgux"$UNAME_RELEASE"
	+ GUESS=m88k-dg-dgux$UNAME_RELEASE
	else
	- echo m88k-dg-dguxbcs"$UNAME_RELEASE"
	+ GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
	fi
	else
	- echo i586-dg-dgux"$UNAME_RELEASE"
	+ GUESS=i586-dg-dgux$UNAME_RELEASE
	fi
	- exit ;;
	+ ;;
	M88:DolphinOS::*) # DolphinOS (SVR3)
	- echo m88k-dolphin-sysv3
	- exit ;;
	+ GUESS=m88k-dolphin-sysv3
	+ ;;
	M88::R3:)
	# Delta 88k system running SVR3
	- echo m88k-motorola-sysv3
	- exit ;;
	+ GUESS=m88k-motorola-sysv3
	+ ;;
	XD88:::) # Tektronix XD88 system running UTekV (SVR3)
	- echo m88k-tektronix-sysv3
	- exit ;;
	+ GUESS=m88k-tektronix-sysv3
	+ ;;
	Tek43[0-9][0-9]:UTek::) # Tektronix 4300 system running UTek (BSD)
	- echo m68k-tektronix-bsd
	- exit ;;
	+ GUESS=m68k-tektronix-bsd
	+ ;;
	:IRIX::)
	- echo mips-sgi-irix"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/g'`"
	- exit ;;
	+ IRIX_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/g'`
	+ GUESS=mips-sgi-irix$IRIX_REL
	+ ;;
	????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
	+ GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	+ ;; # Note that: echo "'`uname -s`'" gives 'AIX '
	i86:AIX::*)
	- echo i386-ibm-aix
	- exit ;;
	+ GUESS=i386-ibm-aix
	+ ;;
	ia64:AIX::)
	- if [ -x /usr/bin/oslevel ] ; then
	+ if test -x /usr/bin/oslevel ; then
	IBM_REV=`/usr/bin/oslevel`
	else
	- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
	fi
	- echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
	+ ;;
	*:AIX:2:3)
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
	set_cc_for_build
	@@ -603,16 +638,16 @@
	EOF
	if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
	then
	- echo "$SYSTEM_NAME"
	+ GUESS=$SYSTEM_NAME
	else
	- echo rs6000-ibm-aix3.2.5
	+ GUESS=rs6000-ibm-aix3.2.5
	fi
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
	- echo rs6000-ibm-aix3.2.4
	+ GUESS=rs6000-ibm-aix3.2.4
	else
	- echo rs6000-ibm-aix3.2
	+ GUESS=rs6000-ibm-aix3.2
	fi
	- exit ;;
	+ ;;
	:AIX::[4567])
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
	if /usr/sbin/lsattr -El "$IBM_CPU_ID" \| grep ' POWER' >/dev/null 2>&1; then
	@@ -620,56 +655,56 @@
	else
	IBM_ARCH=powerpc
	fi
	- if [ -x /usr/bin/lslpp ] ; then
	- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \|
	+ if test -x /usr/bin/lslpp ; then
	+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \| \
	awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/`
	else
	- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
	fi
	- echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
	- exit ;;
	+ GUESS=$IBM_ARCH-ibm-aix$IBM_REV
	+ ;;
	:AIX::*)
	- echo rs6000-ibm-aix
	- exit ;;
	+ GUESS=rs6000-ibm-aix
	+ ;;
	ibmrt:4.4BSD:\|romp-ibm:4.4BSD:)
	- echo romp-ibm-bsd4.4
	- exit ;;
	+ GUESS=romp-ibm-bsd4.4
	+ ;;
	ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
	- echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
	- exit ;; # report: romp-ibm BSD 4.3
	+ GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
	+ ;; # report: romp-ibm BSD 4.3
	:BOSX::*)
	- echo rs6000-bull-bosx
	- exit ;;
	+ GUESS=rs6000-bull-bosx
	+ ;;
	DPX/2?00:B.O.S.::)
	- echo m68k-bull-sysv3
	- exit ;;
	+ GUESS=m68k-bull-sysv3
	+ ;;
	9000/[34]??:4.3bsd:1.:)
	- echo m68k-hp-bsd
	- exit ;;
	+ GUESS=m68k-hp-bsd
	+ ;;
	hp300:4.4BSD:: \| 9000/[34]??:4.3bsd:2.:)
	- echo m68k-hp-bsd4.4
	- exit ;;
	+ GUESS=m68k-hp-bsd4.4
	+ ;;
	9000/[34678]??:HP-UX::)
	- HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
	- case "$UNAME_MACHINE" in
	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	+ case $UNAME_MACHINE in
	9000/31?) HP_ARCH=m68000 ;;
	9000/[34]??) HP_ARCH=m68k ;;
	9000/[678][0-9][0-9])
	- if [ -x /usr/bin/getconf ]; then
	+ if test -x /usr/bin/getconf; then
	sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
	sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
	- case "$sc_cpu_version" in
	+ case $sc_cpu_version in
	523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
	528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
	532) # CPU_PA_RISC2_0
	- case "$sc_kernel_bits" in
	+ case $sc_kernel_bits in
	32) HP_ARCH=hppa2.0n ;;
	64) HP_ARCH=hppa2.0w ;;
	'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
	esac ;;
	esac
	fi
	- if [ "$HP_ARCH" = "" ]; then
	+ if test "$HP_ARCH" = ""; then
	set_cc_for_build
	sed 's/^ //' << EOF > "$dummy.c"

	@@ -708,7 +743,7 @@
	test -z "$HP_ARCH" && HP_ARCH=hppa
	fi ;;
	esac
	- if [ "$HP_ARCH" = hppa2.0w ]
	+ if test "$HP_ARCH" = hppa2.0w
	then
	set_cc_for_build

	@@ -729,12 +764,12 @@
	HP_ARCH=hppa64
	fi
	fi
	- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
	- exit ;;
	+ GUESS=$HP_ARCH-hp-hpux$HPUX_REV
	+ ;;
	ia64:HP-UX::)
	- HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
	- echo ia64-hp-hpux"$HPUX_REV"
	- exit ;;
	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	+ GUESS=ia64-hp-hpux$HPUX_REV
	+ ;;
	3050:HI-UX::*)
	set_cc_for_build
	sed 's/^ //' << EOF > "$dummy.c"
	@@ -764,36 +799,36 @@
	EOF
	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
	{ echo "$SYSTEM_NAME"; exit; }
	- echo unknown-hitachi-hiuxwe2
	- exit ;;
	+ GUESS=unknown-hitachi-hiuxwe2
	+ ;;
	9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd::)
	- echo hppa1.1-hp-bsd
	- exit ;;
	+ GUESS=hppa1.1-hp-bsd
	+ ;;
	9000/8??:4.3bsd::)
	- echo hppa1.0-hp-bsd
	- exit ;;
	+ GUESS=hppa1.0-hp-bsd
	+ ;;
	9??:MPE/iX:: \| 3000:MPE/iX::)
	- echo hppa1.0-hp-mpeix
	- exit ;;
	+ GUESS=hppa1.0-hp-mpeix
	+ ;;
	hp7??:OSF1:: \| hp8?[79]:OSF1::)
	- echo hppa1.1-hp-osf
	- exit ;;
	+ GUESS=hppa1.1-hp-osf
	+ ;;
	hp8??:OSF1::)
	- echo hppa1.0-hp-osf
	- exit ;;
	+ GUESS=hppa1.0-hp-osf
	+ ;;
	i86:OSF1::*)
	- if [ -x /usr/sbin/sysversion ] ; then
	- echo "$UNAME_MACHINE"-unknown-osf1mk
	+ if test -x /usr/sbin/sysversion ; then
	+ GUESS=$UNAME_MACHINE-unknown-osf1mk
	else
	- echo "$UNAME_MACHINE"-unknown-osf1
	+ GUESS=$UNAME_MACHINE-unknown-osf1
	fi
	- exit ;;
	+ ;;
	parisc:Lites::)
	- echo hppa1.1-hp-lites
	- exit ;;
	+ GUESS=hppa1.1-hp-lites
	+ ;;
	C1:ConvexOS::* \| convex:ConvexOS:C1:)
	- echo c1-convex-bsd
	- exit ;;
	+ GUESS=c1-convex-bsd
	+ ;;
	C2:ConvexOS::* \| convex:ConvexOS:C2:)
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	@@ -801,17 +836,18 @@
	fi
	exit ;;
	C34:ConvexOS::* \| convex:ConvexOS:C34:)
	- echo c34-convex-bsd
	- exit ;;
	+ GUESS=c34-convex-bsd
	+ ;;
	C38:ConvexOS::* \| convex:ConvexOS:C38:)
	- echo c38-convex-bsd
	- exit ;;
	+ GUESS=c38-convex-bsd
	+ ;;
	C4:ConvexOS::* \| convex:ConvexOS:C4:)
	- echo c4-convex-bsd
	- exit ;;
	+ GUESS=c4-convex-bsd
	+ ;;
	CRAYY-MP:::)
	- echo ymp-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
	- exit ;;
	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	+ GUESS=ymp-cray-unicos$CRAY_REL
	+ ;;
	CRAY[A-Z]90:::)
	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
	\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
	@@ -819,112 +855,127 @@
	-e 's/\.[^.]*$/.X/'
	exit ;;
	CRAYTS:::)
	- echo t90-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
	- exit ;;
	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	+ GUESS=t90-cray-unicos$CRAY_REL
	+ ;;
	CRAYT3E:::)
	- echo alphaev5-cray-unicosmk"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
	- exit ;;
	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
	+ ;;
	CRAYSV1:::)
	- echo sv1-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
	- exit ;;
	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	+ GUESS=sv1-cray-unicos$CRAY_REL
	+ ;;
	:UNICOS/mp::*)
	- echo craynv-cray-unicosmp"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
	- exit ;;
	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	+ GUESS=craynv-cray-unicosmp$CRAY_REL
	+ ;;
	F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
	FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
	FUJITSU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ /_/'`
	- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	- exit ;;
	+ GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	+ ;;
	5000:UNIX_System_V:4.:)
	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
	FUJITSU_REL=`echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
	- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	- exit ;;
	+ GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	+ ;;
	i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
	- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
	+ ;;
	sparc:BSD/OS::*)
	- echo sparc-unknown-bsdi"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sparc-unknown-bsdi$UNAME_RELEASE
	+ ;;
	:BSD/OS::*)
	- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
	+ ;;
	arm:FreeBSD::)
	UNAME_PROCESSOR=`uname -p`
	set_cc_for_build
	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
	\| grep -q __ARM_PCS_VFP
	then
	- echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`"-gnueabi
	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
	else
	- echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`"-gnueabihf
	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
	fi
	- exit ;;
	+ ;;
	:FreeBSD::*)
	UNAME_PROCESSOR=`/usr/bin/uname -p`
	- case "$UNAME_PROCESSOR" in
	+ case $UNAME_PROCESSOR in
	amd64)
	UNAME_PROCESSOR=x86_64 ;;
	i386)
	UNAME_PROCESSOR=i586 ;;
	esac
	- echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
	- exit ;;
	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
	+ ;;
	i:CYGWIN:*)
	- echo "$UNAME_MACHINE"-pc-cygwin
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-cygwin
	+ ;;
	:MINGW64:*)
	- echo "$UNAME_MACHINE"-pc-mingw64
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-mingw64
	+ ;;
	:MINGW:*)
	- echo "$UNAME_MACHINE"-pc-mingw32
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-mingw32
	+ ;;
	:MSYS:*)
	- echo "$UNAME_MACHINE"-pc-msys
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-msys
	+ ;;
	i:PW:*)
	- echo "$UNAME_MACHINE"-pc-pw32
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-pw32
	+ ;;
	+ :SerenityOS::*)
	+ GUESS=$UNAME_MACHINE-pc-serenity
	+ ;;
	:Interix:*)
	- case "$UNAME_MACHINE" in
	+ case $UNAME_MACHINE in
	x86)
	- echo i586-pc-interix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=i586-pc-interix$UNAME_RELEASE
	+ ;;
	authenticamd \| genuineintel \| EM64T)
	- echo x86_64-unknown-interix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=x86_64-unknown-interix$UNAME_RELEASE
	+ ;;
	IA64)
	- echo ia64-unknown-interix"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=ia64-unknown-interix$UNAME_RELEASE
	+ ;;
	esac ;;
	i:UWIN:*)
	- echo "$UNAME_MACHINE"-pc-uwin
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-uwin
	+ ;;
	amd64:CYGWIN::* \| x86_64:CYGWIN::*)
	- echo x86_64-pc-cygwin
	- exit ;;
	+ GUESS=x86_64-pc-cygwin
	+ ;;
	prep:SunOS:5.:*)
	- echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
	- exit ;;
	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	+ GUESS=powerpcle-unknown-solaris2$SUN_REL
	+ ;;
	:GNU::*)
	# the GNU system
	- echo "`echo "$UNAME_MACHINE"\|sed -e 's,[-/].$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"\|sed -e 's,/.$,,'`"
	- exit ;;
	+ GNU_ARCH=`echo "$UNAME_MACHINE" \| sed -e 's,[-/].*$,,'`
	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's,/.*$,,'`
	+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
	+ ;;
	:GNU/::)
	# other systems with GNU libc and userland
	- echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"\|sed -e 's/[-(].//'`-$LIBC"
	- exit ;;
	+ GNU_SYS=`echo "$UNAME_SYSTEM" \| sed 's,^[^/]*/,,' \| tr "[:upper:]" "[:lower:]"`
	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
	+ ;;
	:Minix::*)
	- echo "$UNAME_MACHINE"-unknown-minix
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-minix
	+ ;;
	aarch64:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	aarch64_be:Linux::)
	UNAME_MACHINE=aarch64_be
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	alpha:Linux::)
	case `sed -n '/^cpu model/s/^.: $.$/\1/p' /proc/cpuinfo 2>/dev/null` in
	EV5) UNAME_MACHINE=alphaev5 ;;
	@@ -937,60 +988,63 @@
	esac
	objdump --private-headers /bin/sh \| grep -q ld.so.1
	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	- arc:Linux:: \| arceb:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	+ arc:Linux:: \| arceb:Linux:: \| arc32:Linux:: \| arc64:Linux::)
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	arm:Linux::*)
	set_cc_for_build
	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
	\| grep -q __ARM_EABI__
	then
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	else
	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
	\| grep -q __ARM_PCS_VFP
	then
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
	else
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
	fi
	fi
	- exit ;;
	+ ;;
	avr32:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	cris:Linux::)
	- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	+ ;;
	crisv32:Linux::)
	- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	+ ;;
	e2k:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	frv:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	hexagon:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	i86:Linux::*)
	- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-linux-$LIBC
	+ ;;
	ia64:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	k1om:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	+ loongarch32:Linux:: \| loongarch64:Linux::)
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	m32r:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	m68:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	mips:Linux:: \| mips64:Linux::)
	set_cc_for_build
	IS_GLIBC=0
	@@ -1035,113 +1089,135 @@
	#endif
	#endif
	EOF
	- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI'`"
	+ cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI'`
	+ eval "$cc_set_vars"
	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
	;;
	mips64el:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	openrisc:Linux::*)
	- echo or1k-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=or1k-unknown-linux-$LIBC
	+ ;;
	or32:Linux:: \| or1k:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	padre:Linux::)
	- echo sparc-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=sparc-unknown-linux-$LIBC
	+ ;;
	parisc64:Linux:: \| hppa64:Linux::)
	- echo hppa64-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=hppa64-unknown-linux-$LIBC
	+ ;;
	parisc:Linux:: \| hppa:Linux::)
	# Look for CPU level
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
	- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
	- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
	- *) echo hppa-unknown-linux-"$LIBC" ;;
	+ PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
	+ PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
	+ *) GUESS=hppa-unknown-linux-$LIBC ;;
	esac
	- exit ;;
	+ ;;
	ppc64:Linux::)
	- echo powerpc64-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=powerpc64-unknown-linux-$LIBC
	+ ;;
	ppc:Linux::)
	- echo powerpc-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=powerpc-unknown-linux-$LIBC
	+ ;;
	ppc64le:Linux::)
	- echo powerpc64le-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=powerpc64le-unknown-linux-$LIBC
	+ ;;
	ppcle:Linux::)
	- echo powerpcle-unknown-linux-"$LIBC"
	- exit ;;
	- riscv32:Linux:: \| riscv64:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=powerpcle-unknown-linux-$LIBC
	+ ;;
	+ riscv32:Linux:: \| riscv32be:Linux:: \| riscv64:Linux:: \| riscv64be:Linux::)
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	s390:Linux:: \| s390x:Linux::)
	- echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
	+ ;;
	sh64:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	sh:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	sparc:Linux:: \| sparc64:Linux::)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	tile:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	vax:Linux::)
	- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-dec-linux-$LIBC
	+ ;;
	x86_64:Linux::)
	- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
	- exit ;;
	+ set_cc_for_build
	+ CPU=$UNAME_MACHINE
	+ LIBCABI=$LIBC
	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
	+ ABI=64
	+ sed 's/^ //' << EOF > "$dummy.c"
	+ #ifdef __i386__
	+ ABI=x86
	+ #else
	+ #ifdef __ILP32__
	+ ABI=x32
	+ #endif
	+ #endif
	+EOF
	+ cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^ABI' \| sed 's, ,,g'`
	+ eval "$cc_set_abi"
	+ case $ABI in
	+ x86) CPU=i686 ;;
	+ x32) LIBCABI=${LIBC}x32 ;;
	+ esac
	+ fi
	+ GUESS=$CPU-pc-linux-$LIBCABI
	+ ;;
	xtensa:Linux::*)
	- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	+ ;;
	i86:DYNIX/ptx:4:*)
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	# earlier versions are messed up and put the nodename in both
	# sysname and nodename.
	- echo i386-sequent-sysv4
	- exit ;;
	+ GUESS=i386-sequent-sysv4
	+ ;;
	i86:UNIX_SV:4.2MP:2.)
	# Unixware is an offshoot of SVR4, but it has its own version
	# number series starting with 2...
	# I am not positive that other SVR4 systems won't match this,
	# I just have to hope. -- rms.
	# Use sysv4.2uw... so that sysv4* matches it.
	- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
	+ ;;
	i86:OS/2::*)
	# If we were able to find `uname', then EMX Unix compatibility
	# is probably installed.
	- echo "$UNAME_MACHINE"-pc-os2-emx
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-os2-emx
	+ ;;
	i86:XTS-300::STOP)
	- echo "$UNAME_MACHINE"-unknown-stop
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-stop
	+ ;;
	i86:atheos::*)
	- echo "$UNAME_MACHINE"-unknown-atheos
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-atheos
	+ ;;
	i86:syllable::*)
	- echo "$UNAME_MACHINE"-pc-syllable
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-syllable
	+ ;;
	i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.[02]:*)
	- echo i386-unknown-lynxos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=i386-unknown-lynxos$UNAME_RELEASE
	+ ;;
	i86:DOS::)
	- echo "$UNAME_MACHINE"-pc-msdosdjgpp
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-msdosdjgpp
	+ ;;
	i86::4.:)
	UNAME_REL=`echo "$UNAME_RELEASE" \| sed 's/\/MP$//'`
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
	- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
	+ GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
	else
	- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
	+ GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
	fi
	- exit ;;
	+ ;;
	i86::5:[678]*)
	# UnixWare 7.x, OpenUNIX and OpenServer 6.
	case `/bin/uname -X \| grep "^Machine"` in
	@@ -1149,12 +1225,12 @@
	*Pentium) UNAME_MACHINE=i586 ;;
	Pent\|*Celeron) UNAME_MACHINE=i686 ;;
	esac
	- echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	+ ;;
	i86::3.2:*)
	if test -f /usr/options/cb.name; then
	UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
	- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
	+ GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
	UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
	(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486
	@@ -1164,11 +1240,11 @@
	&& UNAME_MACHINE=i686
	(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
	&& UNAME_MACHINE=i686
	- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
	+ GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
	else
	- echo "$UNAME_MACHINE"-pc-sysv32
	+ GUESS=$UNAME_MACHINE-pc-sysv32
	fi
	- exit ;;
	+ ;;
	pc:::*)
	# Left here for compatibility:
	# uname -m prints for DJGPP always 'pc', but it prints nothing about
	@@ -1176,31 +1252,31 @@
	# Note: whatever this is, it MUST be the same as what config.sub
	# prints for the "djgpp" host, or else GDB configure will decide that
	# this is a cross-build.
	- echo i586-pc-msdosdjgpp
	- exit ;;
	+ GUESS=i586-pc-msdosdjgpp
	+ ;;
	Intel:Mach:3:)
	- echo i386-pc-mach3
	- exit ;;
	+ GUESS=i386-pc-mach3
	+ ;;
	paragon:::*)
	- echo i860-intel-osf1
	- exit ;;
	+ GUESS=i860-intel-osf1
	+ ;;
	i860::4.:*) # i860-SVR4
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	- echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
	+ GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
	else # Add other i860-SVR4 vendors below as they are discovered.
	- echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
	+ GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
	fi
	- exit ;;
	+ ;;
	mini:CTIX:SYS5:*)
	# "miniframe"
	- echo m68010-convergent-sysv
	- exit ;;
	+ GUESS=m68010-convergent-sysv
	+ ;;
	mc68k:UNIX:SYSTEM5:3.51m)
	- echo m68k-convergent-sysv
	- exit ;;
	+ GUESS=m68k-convergent-sysv
	+ ;;
	M680?0:D-NIX:5.3:*)
	- echo m68k-diab-dnix
	- exit ;;
	+ GUESS=m68k-diab-dnix
	+ ;;
	M68::R3V[5678]:)
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
	3[345]??::4.0:3.0 \| 3[34]??A::4.0:3.0 \| 3[34]??,::4.0:3.0 \| 3[34]??/::4.0:3.0 \| 4400::4.0:3.0 \| 4850::4.0:3.0 \| SKA40::4.0:3.0 \| SDS2::4.0:3.0 \| SHG2::4.0:3.0 \| S7501:*:4.0:3.0)
	@@ -1225,113 +1301,119 @@
	/bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
	m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
	- echo m68k-unknown-lynxos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-unknown-lynxos$UNAME_RELEASE
	+ ;;
	mc68030:UNIX_System_V:4.:)
	- echo m68k-atari-sysv4
	- exit ;;
	+ GUESS=m68k-atari-sysv4
	+ ;;
	TSUNAMI:LynxOS:2.:)
	- echo sparc-unknown-lynxos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sparc-unknown-lynxos$UNAME_RELEASE
	+ ;;
	rs6000:LynxOS:2.:)
	- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
	+ ;;
	PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.[02]:)
	- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
	+ ;;
	SM[BE]S:UNIX_SV::)
	- echo mips-dde-sysv"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=mips-dde-sysv$UNAME_RELEASE
	+ ;;
	RM:ReliantUNIX-::)
	- echo mips-sni-sysv4
	- exit ;;
	+ GUESS=mips-sni-sysv4
	+ ;;
	RM:SINIX-::)
	- echo mips-sni-sysv4
	- exit ;;
	+ GUESS=mips-sni-sysv4
	+ ;;
	:SINIX-::)
	if uname -p 2>/dev/null >/dev/null ; then
	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	- echo "$UNAME_MACHINE"-sni-sysv4
	+ GUESS=$UNAME_MACHINE-sni-sysv4
	else
	- echo ns32k-sni-sysv
	+ GUESS=ns32k-sni-sysv
	fi
	- exit ;;
	+ ;;
	PENTIUM::4.0:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
	# says <Richard.M.Bartel@ccMail.Census.GOV>
	- echo i586-unisys-sysv4
	- exit ;;
	+ GUESS=i586-unisys-sysv4
	+ ;;
	:UNIX_System_V:4:FTX*)
	# From Gerald Hewes <hewes@openmarket.com>.
	# How about differentiating between stratus architectures? -djm
	- echo hppa1.1-stratus-sysv4
	- exit ;;
	+ GUESS=hppa1.1-stratus-sysv4
	+ ;;
	:::FTX)
	# From seanf@swdc.stratus.com.
	- echo i860-stratus-sysv4
	- exit ;;
	+ GUESS=i860-stratus-sysv4
	+ ;;
	i86:VOS::*)
	# From Paul.Green@stratus.com.
	- echo "$UNAME_MACHINE"-stratus-vos
	- exit ;;
	+ GUESS=$UNAME_MACHINE-stratus-vos
	+ ;;
	:VOS::*)
	# From Paul.Green@stratus.com.
	- echo hppa1.1-stratus-vos
	- exit ;;
	+ GUESS=hppa1.1-stratus-vos
	+ ;;
	mc68:A/UX::*)
	- echo m68k-apple-aux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=m68k-apple-aux$UNAME_RELEASE
	+ ;;
	news:NEWS-OS:6:*)
	- echo mips-sony-newsos6
	- exit ;;
	+ GUESS=mips-sony-newsos6
	+ ;;
	R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
	- if [ -d /usr/nec ]; then
	- echo mips-nec-sysv"$UNAME_RELEASE"
	+ if test -d /usr/nec; then
	+ GUESS=mips-nec-sysv$UNAME_RELEASE
	else
	- echo mips-unknown-sysv"$UNAME_RELEASE"
	+ GUESS=mips-unknown-sysv$UNAME_RELEASE
	fi
	- exit ;;
	+ ;;
	BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
	- echo powerpc-be-beos
	- exit ;;
	+ GUESS=powerpc-be-beos
	+ ;;
	BeMac:BeOS::) # BeOS running on Mac or Mac clone, PPC only.
	- echo powerpc-apple-beos
	- exit ;;
	+ GUESS=powerpc-apple-beos
	+ ;;
	BePC:BeOS::) # BeOS running on Intel PC compatible.
	- echo i586-pc-beos
	- exit ;;
	+ GUESS=i586-pc-beos
	+ ;;
	BePC:Haiku::) # Haiku running on Intel PC compatible.
	- echo i586-pc-haiku
	- exit ;;
	- x86_64:Haiku::)
	- echo x86_64-unknown-haiku
	- exit ;;
	+ GUESS=i586-pc-haiku
	+ ;;
	+ ppc:Haiku::) # Haiku running on Apple PowerPC
	+ GUESS=powerpc-apple-haiku
	+ ;;
	+ :Haiku::*) # Haiku modern gcc (not bound by BeOS compat)
	+ GUESS=$UNAME_MACHINE-unknown-haiku
	+ ;;
	SX-4:SUPER-UX::)
	- echo sx4-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx4-nec-superux$UNAME_RELEASE
	+ ;;
	SX-5:SUPER-UX::)
	- echo sx5-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx5-nec-superux$UNAME_RELEASE
	+ ;;
	SX-6:SUPER-UX::)
	- echo sx6-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx6-nec-superux$UNAME_RELEASE
	+ ;;
	SX-7:SUPER-UX::)
	- echo sx7-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx7-nec-superux$UNAME_RELEASE
	+ ;;
	SX-8:SUPER-UX::)
	- echo sx8-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx8-nec-superux$UNAME_RELEASE
	+ ;;
	SX-8R:SUPER-UX::)
	- echo sx8r-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sx8r-nec-superux$UNAME_RELEASE
	+ ;;
	SX-ACE:SUPER-UX::)
	- echo sxace-nec-superux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=sxace-nec-superux$UNAME_RELEASE
	+ ;;
	Power:Rhapsody::*)
	- echo powerpc-apple-rhapsody"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
	+ ;;
	:Rhapsody::*)
	- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
	+ ;;
	+ arm64:Darwin::)
	+ GUESS=aarch64-apple-darwin$UNAME_RELEASE
	+ ;;
	:Darwin::*)
	UNAME_PROCESSOR=`uname -p`
	case $UNAME_PROCESSOR in
	@@ -1346,7 +1428,7 @@
	else
	set_cc_for_build
	fi
	- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
	if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
	(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	grep IS_64BIT_ARCH >/dev/null
	@@ -1367,109 +1449,119 @@
	# uname -m returns i386 or x86_64
	UNAME_PROCESSOR=$UNAME_MACHINE
	fi
	- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
	+ ;;
	:procnto:: \| :QNX:[0123456789]:*)
	UNAME_PROCESSOR=`uname -p`
	if test "$UNAME_PROCESSOR" = x86; then
	UNAME_PROCESSOR=i386
	UNAME_MACHINE=pc
	fi
	- echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
	+ ;;
	:QNX::4*)
	- echo i386-pc-qnx
	- exit ;;
	+ GUESS=i386-pc-qnx
	+ ;;
	NEO-:NONSTOP_KERNEL::*)
	- echo neo-tandem-nsk"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=neo-tandem-nsk$UNAME_RELEASE
	+ ;;
	NSE-:NONSTOP_KERNEL::*)
	- echo nse-tandem-nsk"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=nse-tandem-nsk$UNAME_RELEASE
	+ ;;
	NSR-:NONSTOP_KERNEL::*)
	- echo nsr-tandem-nsk"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=nsr-tandem-nsk$UNAME_RELEASE
	+ ;;
	NSV-:NONSTOP_KERNEL::*)
	- echo nsv-tandem-nsk"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=nsv-tandem-nsk$UNAME_RELEASE
	+ ;;
	NSX-:NONSTOP_KERNEL::*)
	- echo nsx-tandem-nsk"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=nsx-tandem-nsk$UNAME_RELEASE
	+ ;;
	:NonStop-UX::*)
	- echo mips-compaq-nonstopux
	- exit ;;
	+ GUESS=mips-compaq-nonstopux
	+ ;;
	BS2000:POSIX::*)
	- echo bs2000-siemens-sysv
	- exit ;;
	+ GUESS=bs2000-siemens-sysv
	+ ;;
	DS/:UNIX_System_V::*)
	- echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
	+ ;;
	:Plan9::*)
	# "uname -m" is not consistent, so use $cputype instead. 386
	# is converted to i386 for consistency with other x86
	# operating systems.
	- # shellcheck disable=SC2154
	- if test "$cputype" = 386; then
	+ if test "${cputype-}" = 386; then
	UNAME_MACHINE=i386
	- else
	- UNAME_MACHINE="$cputype"
	+ elif test "x${cputype-}" != x; then
	+ UNAME_MACHINE=$cputype
	fi
	- echo "$UNAME_MACHINE"-unknown-plan9
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-plan9
	+ ;;
	:TOPS-10::*)
	- echo pdp10-unknown-tops10
	- exit ;;
	+ GUESS=pdp10-unknown-tops10
	+ ;;
	:TENEX::*)
	- echo pdp10-unknown-tenex
	- exit ;;
	+ GUESS=pdp10-unknown-tenex
	+ ;;
	KS10:TOPS-20:: \| KL10:TOPS-20:: \| TYPE4:TOPS-20::)
	- echo pdp10-dec-tops20
	- exit ;;
	+ GUESS=pdp10-dec-tops20
	+ ;;
	XKL-1:TOPS-20:: \| TYPE5:TOPS-20::)
	- echo pdp10-xkl-tops20
	- exit ;;
	+ GUESS=pdp10-xkl-tops20
	+ ;;
	:TOPS-20::*)
	- echo pdp10-unknown-tops20
	- exit ;;
	+ GUESS=pdp10-unknown-tops20
	+ ;;
	:ITS::*)
	- echo pdp10-unknown-its
	- exit ;;
	+ GUESS=pdp10-unknown-its
	+ ;;
	SEI:::SEIUX)
	- echo mips-sei-seiux"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=mips-sei-seiux$UNAME_RELEASE
	+ ;;
	:DragonFly::*)
	- echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
	- exit ;;
	+ DRAGONFLY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
	+ ;;
	:VMS::)
	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	- case "$UNAME_MACHINE" in
	- A*) echo alpha-dec-vms ; exit ;;
	- I*) echo ia64-dec-vms ; exit ;;
	- V*) echo vax-dec-vms ; exit ;;
	+ case $UNAME_MACHINE in
	+ A*) GUESS=alpha-dec-vms ;;
	+ I*) GUESS=ia64-dec-vms ;;
	+ V*) GUESS=vax-dec-vms ;;
	esac ;;
	:XENIX::SysV)
	- echo i386-pc-xenix
	- exit ;;
	+ GUESS=i386-pc-xenix
	+ ;;
	i86:skyos::*)
	- echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`"
	- exit ;;
	+ SKYOS_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`
	+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
	+ ;;
	i86:rdos::*)
	- echo "$UNAME_MACHINE"-pc-rdos
	- exit ;;
	- i86:AROS::*)
	- echo "$UNAME_MACHINE"-pc-aros
	- exit ;;
	+ GUESS=$UNAME_MACHINE-pc-rdos
	+ ;;
	+ i86:Fiwix::*)
	+ GUESS=$UNAME_MACHINE-pc-fiwix
	+ ;;
	+ :AROS::*)
	+ GUESS=$UNAME_MACHINE-unknown-aros
	+ ;;
	x86_64:VMkernel::)
	- echo "$UNAME_MACHINE"-unknown-esx
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-esx
	+ ;;
	amd64:Isilon\ OneFS::)
	- echo x86_64-unknown-onefs
	- exit ;;
	+ GUESS=x86_64-unknown-onefs
	+ ;;
	:Unleashed::*)
	- echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
	- exit ;;
	+ GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
	+ ;;
	esac

	+# Do we have a guess based on uname results?
	+if test "x$GUESS" != x; then
	+ echo "$GUESS"
	+ exit
	+fi
	+
	# No uname command or uname output not recognized.
	set_cc_for_build
	cat > "$dummy.c" <<EOF
	@@ -1601,7 +1693,7 @@
	}
	EOF

	-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
	+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
	{ echo "$SYSTEM_NAME"; exit; }

	# Apollos put the system type in the environment.
	@@ -1609,7 +1701,7 @@

	echo "$0: unable to guess system type" >&2

	-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
	+case $UNAME_MACHINE:$UNAME_SYSTEM in
	mips:Linux \| mips64:Linux)
	# If we got here on MIPS GNU/Linux, output extra information.
	cat >&2 <<EOF
	@@ -1626,9 +1718,17 @@
	operating system you are using. If your script is old, overwrite all
	copies of config.guess and config.sub with the latest versions from:

	- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	+ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
	and
	- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	+ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
	+EOF
	+
	+our_year=`echo $timestamp \| sed 's,-.*,,'`
	+thisyear=`date +%Y`
	+# shellcheck disable=SC2003
	+script_age=`expr "$thisyear" - "$our_year"`
	+if test "$script_age" -lt 3 ; then
	+ cat >&2 <<EOF

	If $0 has already been updated, send the following data and any
	information you think might be pertinent to config-patches@gnu.org to
	@@ -1656,6 +1756,7 @@
	UNAME_SYSTEM = "$UNAME_SYSTEM"
	UNAME_VERSION = "$UNAME_VERSION"
	EOF
	+fi

	exit 1

	diff --git a/contrib/byacc/config.sub b/contrib/byacc/config.sub
	--- a/contrib/byacc/config.sub
	+++ b/contrib/byacc/config.sub
	@@ -1,12 +1,14 @@
	#! /bin/sh
	# Configuration validation subroutine script.
	-# Copyright 1992-2019 Free Software Foundation, Inc.
	+# Copyright 1992-2022 Free Software Foundation, Inc.

	-timestamp='2019-06-30'
	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	+
	+timestamp='2022-08-01'

	# This file is free software; you can redistribute it and/or modify it
	# under the terms of the GNU General Public License as published by
	-# the Free Software Foundation; either version 3 of the License, or
	+# the Free Software Foundation, either version 3 of the License, or
	# (at your option) any later version.
	#
	# This program is distributed in the hope that it will be useful, but
	@@ -33,7 +35,7 @@
	# Otherwise, we print the canonical config type on stdout and succeed.

	# You can get the latest version of this script from:
	-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub

	# This file is supposed to be the same for all GNU packages
	# and recognize all the CPU types, system types and aliases
	@@ -50,6 +52,13 @@
	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
	# It is wrong to echo any other type of specification.

	+# The "shellcheck disable" line above the timestamp inhibits complaints
	+# about features and limitations of the classic Bourne shell that were
	+# superseded or lifted in POSIX. However, this script identifies a wide
	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	+# have a pre-POSIX /bin/sh.
	+
	me=`echo "$0" \| sed -e 's,.*/,,'`

	usage="\
	@@ -67,7 +76,7 @@
	version="\
	GNU config.sub ($timestamp)

	-Copyright 1992-2019 Free Software Foundation, Inc.
	+Copyright 1992-2022 Free Software Foundation, Inc.

	This is free software; see the source for copying conditions. There is NO
	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	@@ -112,9 +121,11 @@

	# Split fields of configuration type
	# shellcheck disable=SC2162
	+saved_IFS=$IFS
	IFS="-" read field1 field2 field3 field4 <<EOF
	$1
	EOF
	+IFS=$saved_IFS

	# Separate into logical components for further validation
	case $1 in
	@@ -124,28 +135,27 @@
	;;
	---)
	basic_machine=$field1-$field2
	- os=$field3-$field4
	+ basic_os=$field3-$field4
	;;
	--*)
	# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
	# parts
	maybe_os=$field2-$field3
	case $maybe_os in
	- nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \
	- \| linux-newlib* \| linux-musl* \| linux-uclibc* \| uclinux-uclibc* \
	+ nto-qnx* \| linux-* \| uclinux-uclibc* \
	\| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \
	\| netbsd-eabi \| kopensolaris-gnu \| cloudabi-eabi \
	\| storm-chaos* \| os2-emx* \| rtmk-nova*)
	basic_machine=$field1
	- os=$maybe_os
	+ basic_os=$maybe_os
	;;
	android-linux)
	basic_machine=$field1-unknown
	- os=linux-android
	+ basic_os=linux-android
	;;
	*)
	basic_machine=$field1-$field2
	- os=$field3
	+ basic_os=$field3
	;;
	esac
	;;
	@@ -154,7 +164,7 @@
	case $field1-$field2 in
	decstation-3100)
	basic_machine=mips-dec
	- os=
	+ basic_os=
	;;
	-)
	# Second component is usually, but not always the OS
	@@ -162,7 +172,11 @@
	# Prevent following clause from handling this valid os
	sunos)
	basic_machine=$field1
	- os=$field2
	+ basic_os=$field2
	+ ;;
	+ zephyr*)
	+ basic_machine=$field1-unknown
	+ basic_os=$field2
	;;
	# Manufacturers
	dec* \| mips* \| sequent* \| encore* \| pc533* \| sgi* \| sony* \
	@@ -175,11 +189,11 @@
	\| microblaze* \| sim \| cisco \
	\| oki \| wec \| wrs \| winbond)
	basic_machine=$field1-$field2
	- os=
	+ basic_os=
	;;
	*)
	basic_machine=$field1
	- os=$field2
	+ basic_os=$field2
	;;
	esac
	;;
	@@ -191,447 +205,451 @@
	case $field1 in
	386bsd)
	basic_machine=i386-pc
	- os=bsd
	+ basic_os=bsd
	;;
	a29khif)
	basic_machine=a29k-amd
	- os=udi
	+ basic_os=udi
	;;
	adobe68k)
	basic_machine=m68010-adobe
	- os=scout
	+ basic_os=scout
	;;
	alliant)
	basic_machine=fx80-alliant
	- os=
	+ basic_os=
	;;
	altos \| altos3068)
	basic_machine=m68k-altos
	- os=
	+ basic_os=
	;;
	am29k)
	basic_machine=a29k-none
	- os=bsd
	+ basic_os=bsd
	;;
	amdahl)
	basic_machine=580-amdahl
	- os=sysv
	+ basic_os=sysv
	;;
	amiga)
	basic_machine=m68k-unknown
	- os=
	+ basic_os=
	;;
	amigaos \| amigados)
	basic_machine=m68k-unknown
	- os=amigaos
	+ basic_os=amigaos
	;;
	amigaunix \| amix)
	basic_machine=m68k-unknown
	- os=sysv4
	+ basic_os=sysv4
	;;
	apollo68)
	basic_machine=m68k-apollo
	- os=sysv
	+ basic_os=sysv
	;;
	apollo68bsd)
	basic_machine=m68k-apollo
	- os=bsd
	+ basic_os=bsd
	;;
	aros)
	basic_machine=i386-pc
	- os=aros
	+ basic_os=aros
	;;
	aux)
	basic_machine=m68k-apple
	- os=aux
	+ basic_os=aux
	;;
	balance)
	basic_machine=ns32k-sequent
	- os=dynix
	+ basic_os=dynix
	;;
	blackfin)
	basic_machine=bfin-unknown
	- os=linux
	+ basic_os=linux
	;;
	cegcc)
	basic_machine=arm-unknown
	- os=cegcc
	+ basic_os=cegcc
	;;
	convex-c1)
	basic_machine=c1-convex
	- os=bsd
	+ basic_os=bsd
	;;
	convex-c2)
	basic_machine=c2-convex
	- os=bsd
	+ basic_os=bsd
	;;
	convex-c32)
	basic_machine=c32-convex
	- os=bsd
	+ basic_os=bsd
	;;
	convex-c34)
	basic_machine=c34-convex
	- os=bsd
	+ basic_os=bsd
	;;
	convex-c38)
	basic_machine=c38-convex
	- os=bsd
	+ basic_os=bsd
	;;
	cray)
	basic_machine=j90-cray
	- os=unicos
	+ basic_os=unicos
	;;
	crds \| unos)
	basic_machine=m68k-crds
	- os=
	+ basic_os=
	;;
	da30)
	basic_machine=m68k-da30
	- os=
	+ basic_os=
	;;
	decstation \| pmax \| pmin \| dec3100 \| decstatn)
	basic_machine=mips-dec
	- os=
	+ basic_os=
	;;
	delta88)
	basic_machine=m88k-motorola
	- os=sysv3
	+ basic_os=sysv3
	;;
	dicos)
	basic_machine=i686-pc
	- os=dicos
	+ basic_os=dicos
	;;
	djgpp)
	basic_machine=i586-pc
	- os=msdosdjgpp
	+ basic_os=msdosdjgpp
	;;
	ebmon29k)
	basic_machine=a29k-amd
	- os=ebmon
	+ basic_os=ebmon
	;;
	es1800 \| OSE68k \| ose68k \| ose \| OSE)
	basic_machine=m68k-ericsson
	- os=ose
	+ basic_os=ose
	;;
	gmicro)
	basic_machine=tron-gmicro
	- os=sysv
	+ basic_os=sysv
	;;
	go32)
	basic_machine=i386-pc
	- os=go32
	+ basic_os=go32
	;;
	h8300hms)
	basic_machine=h8300-hitachi
	- os=hms
	+ basic_os=hms
	;;
	h8300xray)
	basic_machine=h8300-hitachi
	- os=xray
	+ basic_os=xray
	;;
	h8500hms)
	basic_machine=h8500-hitachi
	- os=hms
	+ basic_os=hms
	;;
	harris)
	basic_machine=m88k-harris
	- os=sysv3
	+ basic_os=sysv3
	;;
	hp300 \| hp300hpux)
	basic_machine=m68k-hp
	- os=hpux
	+ basic_os=hpux
	;;
	hp300bsd)
	basic_machine=m68k-hp
	- os=bsd
	+ basic_os=bsd
	;;
	hppaosf)
	basic_machine=hppa1.1-hp
	- os=osf
	+ basic_os=osf
	;;
	hppro)
	basic_machine=hppa1.1-hp
	- os=proelf
	+ basic_os=proelf
	;;
	i386mach)
	basic_machine=i386-mach
	- os=mach
	+ basic_os=mach
	;;
	isi68 \| isi)
	basic_machine=m68k-isi
	- os=sysv
	+ basic_os=sysv
	;;
	m68knommu)
	basic_machine=m68k-unknown
	- os=linux
	+ basic_os=linux
	;;
	magnum \| m3230)
	basic_machine=mips-mips
	- os=sysv
	+ basic_os=sysv
	;;
	merlin)
	basic_machine=ns32k-utek
	- os=sysv
	+ basic_os=sysv
	;;
	mingw64)
	basic_machine=x86_64-pc
	- os=mingw64
	+ basic_os=mingw64
	;;
	mingw32)
	basic_machine=i686-pc
	- os=mingw32
	+ basic_os=mingw32
	;;
	mingw32ce)
	basic_machine=arm-unknown
	- os=mingw32ce
	+ basic_os=mingw32ce
	;;
	monitor)
	basic_machine=m68k-rom68k
	- os=coff
	+ basic_os=coff
	;;
	morphos)
	basic_machine=powerpc-unknown
	- os=morphos
	+ basic_os=morphos
	;;
	moxiebox)
	basic_machine=moxie-unknown
	- os=moxiebox
	+ basic_os=moxiebox
	;;
	msdos)
	basic_machine=i386-pc
	- os=msdos
	+ basic_os=msdos
	;;
	msys)
	basic_machine=i686-pc
	- os=msys
	+ basic_os=msys
	;;
	mvs)
	basic_machine=i370-ibm
	- os=mvs
	+ basic_os=mvs
	;;
	nacl)
	basic_machine=le32-unknown
	- os=nacl
	+ basic_os=nacl
	;;
	ncr3000)
	basic_machine=i486-ncr
	- os=sysv4
	+ basic_os=sysv4
	;;
	netbsd386)
	basic_machine=i386-pc
	- os=netbsd
	+ basic_os=netbsd
	;;
	netwinder)
	basic_machine=armv4l-rebel
	- os=linux
	+ basic_os=linux
	;;
	news \| news700 \| news800 \| news900)
	basic_machine=m68k-sony
	- os=newsos
	+ basic_os=newsos
	;;
	news1000)
	basic_machine=m68030-sony
	- os=newsos
	+ basic_os=newsos
	;;
	necv70)
	basic_machine=v70-nec
	- os=sysv
	+ basic_os=sysv
	;;
	nh3000)
	basic_machine=m68k-harris
	- os=cxux
	+ basic_os=cxux
	;;
	nh[45]000)
	basic_machine=m88k-harris
	- os=cxux
	+ basic_os=cxux
	;;
	nindy960)
	basic_machine=i960-intel
	- os=nindy
	+ basic_os=nindy
	;;
	mon960)
	basic_machine=i960-intel
	- os=mon960
	+ basic_os=mon960
	;;
	nonstopux)
	basic_machine=mips-compaq
	- os=nonstopux
	+ basic_os=nonstopux
	;;
	os400)
	basic_machine=powerpc-ibm
	- os=os400
	+ basic_os=os400
	;;
	OSE68000 \| ose68000)
	basic_machine=m68000-ericsson
	- os=ose
	+ basic_os=ose
	;;
	os68k)
	basic_machine=m68k-none
	- os=os68k
	+ basic_os=os68k
	;;
	paragon)
	basic_machine=i860-intel
	- os=osf
	+ basic_os=osf
	;;
	parisc)
	basic_machine=hppa-unknown
	- os=linux
	+ basic_os=linux
	+ ;;
	+ psp)
	+ basic_machine=mipsallegrexel-sony
	+ basic_os=psp
	;;
	pw32)
	basic_machine=i586-unknown
	- os=pw32
	+ basic_os=pw32
	;;
	rdos \| rdos64)
	basic_machine=x86_64-pc
	- os=rdos
	+ basic_os=rdos
	;;
	rdos32)
	basic_machine=i386-pc
	- os=rdos
	+ basic_os=rdos
	;;
	rom68k)
	basic_machine=m68k-rom68k
	- os=coff
	+ basic_os=coff
	;;
	sa29200)
	basic_machine=a29k-amd
	- os=udi
	+ basic_os=udi
	;;
	sei)
	basic_machine=mips-sei
	- os=seiux
	+ basic_os=seiux
	;;
	sequent)
	basic_machine=i386-sequent
	- os=
	+ basic_os=
	;;
	sps7)
	basic_machine=m68k-bull
	- os=sysv2
	+ basic_os=sysv2
	;;
	st2000)
	basic_machine=m68k-tandem
	- os=
	+ basic_os=
	;;
	stratus)
	basic_machine=i860-stratus
	- os=sysv4
	+ basic_os=sysv4
	;;
	sun2)
	basic_machine=m68000-sun
	- os=
	+ basic_os=
	;;
	sun2os3)
	basic_machine=m68000-sun
	- os=sunos3
	+ basic_os=sunos3
	;;
	sun2os4)
	basic_machine=m68000-sun
	- os=sunos4
	+ basic_os=sunos4
	;;
	sun3)
	basic_machine=m68k-sun
	- os=
	+ basic_os=
	;;
	sun3os3)
	basic_machine=m68k-sun
	- os=sunos3
	+ basic_os=sunos3
	;;
	sun3os4)
	basic_machine=m68k-sun
	- os=sunos4
	+ basic_os=sunos4
	;;
	sun4)
	basic_machine=sparc-sun
	- os=
	+ basic_os=
	;;
	sun4os3)
	basic_machine=sparc-sun
	- os=sunos3
	+ basic_os=sunos3
	;;
	sun4os4)
	basic_machine=sparc-sun
	- os=sunos4
	+ basic_os=sunos4
	;;
	sun4sol2)
	basic_machine=sparc-sun
	- os=solaris2
	+ basic_os=solaris2
	;;
	sun386 \| sun386i \| roadrunner)
	basic_machine=i386-sun
	- os=
	+ basic_os=
	;;
	sv1)
	basic_machine=sv1-cray
	- os=unicos
	+ basic_os=unicos
	;;
	symmetry)
	basic_machine=i386-sequent
	- os=dynix
	+ basic_os=dynix
	;;
	t3e)
	basic_machine=alphaev5-cray
	- os=unicos
	+ basic_os=unicos
	;;
	t90)
	basic_machine=t90-cray
	- os=unicos
	+ basic_os=unicos
	;;
	toad1)
	basic_machine=pdp10-xkl
	- os=tops20
	+ basic_os=tops20
	;;
	tpf)
	basic_machine=s390x-ibm
	- os=tpf
	+ basic_os=tpf
	;;
	udi29k)
	basic_machine=a29k-amd
	- os=udi
	+ basic_os=udi
	;;
	ultra3)
	basic_machine=a29k-nyu
	- os=sym1
	+ basic_os=sym1
	;;
	v810 \| necv810)
	basic_machine=v810-nec
	- os=none
	+ basic_os=none
	;;
	vaxv)
	basic_machine=vax-dec
	- os=sysv
	+ basic_os=sysv
	;;
	vms)
	basic_machine=vax-dec
	- os=vms
	+ basic_os=vms
	;;
	vsta)
	basic_machine=i386-pc
	- os=vsta
	+ basic_os=vsta
	;;
	vxworks960)
	basic_machine=i960-wrs
	- os=vxworks
	+ basic_os=vxworks
	;;
	vxworks68)
	basic_machine=m68k-wrs
	- os=vxworks
	+ basic_os=vxworks
	;;
	vxworks29k)
	basic_machine=a29k-wrs
	- os=vxworks
	+ basic_os=vxworks
	;;
	xbox)
	basic_machine=i686-pc
	- os=mingw32
	+ basic_os=mingw32
	;;
	ymp)
	basic_machine=ymp-cray
	- os=unicos
	+ basic_os=unicos
	;;
	*)
	basic_machine=$1
	- os=
	+ basic_os=
	;;
	esac
	;;
	@@ -683,17 +701,17 @@
	bluegene*)
	cpu=powerpc
	vendor=ibm
	- os=cnk
	+ basic_os=cnk
	;;
	decsystem10* \| dec10*)
	cpu=pdp10
	vendor=dec
	- os=tops10
	+ basic_os=tops10
	;;
	decsystem20* \| dec20*)
	cpu=pdp10
	vendor=dec
	- os=tops20
	+ basic_os=tops20
	;;
	delta \| 3300 \| motorola-3300 \| motorola-delta \
	\| 3300-motorola \| delta-motorola)
	@@ -703,7 +721,7 @@
	dpx2*)
	cpu=m68k
	vendor=bull
	- os=sysv3
	+ basic_os=sysv3
	;;
	encore \| umax \| mmax)
	cpu=ns32k
	@@ -712,7 +730,7 @@
	elxsi)
	cpu=elxsi
	vendor=elxsi
	- os=${os:-bsd}
	+ basic_os=${basic_os:-bsd}
	;;
	fx2800)
	cpu=i860
	@@ -725,7 +743,7 @@
	h3050r* \| hiux*)
	cpu=hppa1.1
	vendor=hitachi
	- os=hiuxwe2
	+ basic_os=hiuxwe2
	;;
	hp3k9[0-9][0-9] \| hp9[0-9][0-9])
	cpu=hppa1.0
	@@ -768,36 +786,36 @@
	i*86v32)
	cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	vendor=pc
	- os=sysv32
	+ basic_os=sysv32
	;;
	i86v4)
	cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	vendor=pc
	- os=sysv4
	+ basic_os=sysv4
	;;
	i*86v)
	cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	vendor=pc
	- os=sysv
	+ basic_os=sysv
	;;
	i*86sol2)
	cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	vendor=pc
	- os=solaris2
	+ basic_os=solaris2
	;;
	j90 \| j90-cray)
	cpu=j90
	vendor=cray
	- os=${os:-unicos}
	+ basic_os=${basic_os:-unicos}
	;;
	iris \| iris4d)
	cpu=mips
	vendor=sgi
	- case $os in
	+ case $basic_os in
	irix*)
	;;
	*)
	- os=irix4
	+ basic_os=irix4
	;;
	esac
	;;
	@@ -808,26 +826,26 @@
	mint \| mint[0-9] \| MiNT \| MiNT[0-9]*)
	cpu=m68k
	vendor=atari
	- os=mint
	+ basic_os=mint
	;;
	news-3600 \| risc-news)
	cpu=mips
	vendor=sony
	- os=newsos
	+ basic_os=newsos
	;;
	next \| m*-next)
	cpu=m68k
	vendor=next
	- case $os in
	+ case $basic_os in
	openstep*)
	;;
	nextstep*)
	;;
	ns2*)
	- os=nextstep2
	+ basic_os=nextstep2
	;;
	*)
	- os=nextstep3
	+ basic_os=nextstep3
	;;
	esac
	;;
	@@ -838,12 +856,12 @@
	op50n-* \| op60c-*)
	cpu=hppa1.1
	vendor=oki
	- os=proelf
	+ basic_os=proelf
	;;
	pa-hitachi)
	cpu=hppa1.1
	vendor=hitachi
	- os=hiuxwe2
	+ basic_os=hiuxwe2
	;;
	pbd)
	cpu=sparc
	@@ -880,12 +898,12 @@
	sde)
	cpu=mipsisa32
	vendor=sde
	- os=${os:-elf}
	+ basic_os=${basic_os:-elf}
	;;
	simso-wrs)
	cpu=sparclite
	vendor=wrs
	- os=vxworks
	+ basic_os=vxworks
	;;
	tower \| tower-32)
	cpu=m68k
	@@ -902,7 +920,7 @@
	w89k-*)
	cpu=hppa1.1
	vendor=winbond
	- os=proelf
	+ basic_os=proelf
	;;
	none)
	cpu=none
	@@ -919,9 +937,11 @@

	-)
	# shellcheck disable=SC2162
	+ saved_IFS=$IFS
	IFS="-" read cpu vendor <<EOF
	$basic_machine
	EOF
	+ IFS=$saved_IFS
	;;
	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	@@ -955,11 +975,11 @@
	# some cases the only manufacturer, in others, it is the most popular.
	craynv-unknown)
	vendor=cray
	- os=${os:-unicosmp}
	+ basic_os=${basic_os:-unicosmp}
	;;
	c90-unknown \| c90-cray)
	vendor=cray
	- os=${os:-unicos}
	+ basic_os=${Basic_os:-unicos}
	;;
	fx80-unknown)
	vendor=alliant
	@@ -1000,10 +1020,15 @@
	;;

	# Here we normalize CPU types with a missing or matching vendor
	+ armh-unknown \| armh-alt)
	+ cpu=armv7l
	+ vendor=alt
	+ basic_os=${basic_os:-linux-gnueabihf}
	+ ;;
	dpx20-unknown \| dpx20-bull)
	cpu=rs6000
	vendor=bull
	- os=${os:-bosx}
	+ basic_os=${basic_os:-bosx}
	;;

	# Here we normalize CPU types irrespective of the vendor
	@@ -1012,7 +1037,7 @@
	;;
	blackfin-*)
	cpu=bfin
	- os=linux
	+ basic_os=linux
	;;
	c54x-*)
	cpu=tic54x
	@@ -1025,7 +1050,7 @@
	;;
	e500v[12]-*)
	cpu=powerpc
	- os=$os"spe"
	+ basic_os=${basic_os}"spe"
	;;
	mips3-)
	cpu=mips64
	@@ -1035,7 +1060,7 @@
	;;
	m68knommu-*)
	cpu=m68k
	- os=linux
	+ basic_os=linux
	;;
	m9s12z-* \| m68hcs12z-* \| hcs12z-* \| s12z-*)
	cpu=s12z
	@@ -1045,7 +1070,7 @@
	;;
	parisc-*)
	cpu=hppa
	- os=linux
	+ basic_os=linux
	;;
	pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
	cpu=i586
	@@ -1101,11 +1126,14 @@
	xscale-* \| xscalee[bl]-*)
	cpu=`echo "$cpu" \| sed 's/^xscale/arm/'`
	;;
	+ arm64-* \| aarch64le-*)
	+ cpu=aarch64
	+ ;;

	# Recognize the canonical CPU Types that limit and/or modify the
	# company names they are paired with.
	cr16-*)
	- os=${os:-elf}
	+ basic_os=${basic_os:-elf}
	;;
	crisv32-* \| etraxfs-)
	cpu=crisv32
	@@ -1116,7 +1144,7 @@
	vendor=axis
	;;
	crx-*)
	- os=${os:-elf}
	+ basic_os=${basic_os:-elf}
	;;
	neo-tandem)
	cpu=neo
	@@ -1138,16 +1166,12 @@
	cpu=nsx
	vendor=tandem
	;;
	- s390-*)
	- cpu=s390
	- vendor=ibm
	- ;;
	- s390x-*)
	- cpu=s390x
	- vendor=ibm
	+ mipsallegrexel-sony)
	+ cpu=mipsallegrexel
	+ vendor=sony
	;;
	tile-)
	- os=${os:-linux-gnu}
	+ basic_os=${basic_os:-linux-gnu}
	;;

	*)
	@@ -1163,8 +1187,8 @@
	\| alphapca5[67] \| alpha64pca5[67] \
	\| am33_2.0 \
	\| amdgcn \
	- \| arc \| arceb \
	- \| arm \| arm[lb]e \| arme[lb] \| armv* \
	+ \| arc \| arceb \| arc32 \| arc64 \
	+ \| arm \| arm[lb]e \| arme[lb] \| armv* \
	\| avr \| avr32 \
	\| asmjs \
	\| ba \
	@@ -1183,6 +1207,7 @@
	\| k1om \
	\| le32 \| le64 \
	\| lm32 \
	+ \| loongarch32 \| loongarch64 \
	\| m32c \| m32r \| m32rle \
	\| m5200 \| m68000 \| m680[012346]0 \| m68360 \| m683?2 \| m68k \
	\| m6811 \| m68hc11 \| m6812 \| m68hc12 \| m68hcs12x \
	@@ -1201,9 +1226,13 @@
	\| mips64vr5900 \| mips64vr5900el \
	\| mipsisa32 \| mipsisa32el \
	\| mipsisa32r2 \| mipsisa32r2el \
	+ \| mipsisa32r3 \| mipsisa32r3el \
	+ \| mipsisa32r5 \| mipsisa32r5el \
	\| mipsisa32r6 \| mipsisa32r6el \
	\| mipsisa64 \| mipsisa64el \
	\| mipsisa64r2 \| mipsisa64r2el \
	+ \| mipsisa64r3 \| mipsisa64r3el \
	+ \| mipsisa64r5 \| mipsisa64r5el \
	\| mipsisa64r6 \| mipsisa64r6el \
	\| mipsisa64sb1 \| mipsisa64sb1el \
	\| mipsisa64sr71k \| mipsisa64sr71kel \
	@@ -1227,8 +1256,9 @@
	\| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| powerpcspe \
	\| pru \
	\| pyramid \
	- \| riscv \| riscv32 \| riscv64 \
	+ \| riscv \| riscv32 \| riscv32be \| riscv64 \| riscv64be \
	\| rl78 \| romp \| rs6000 \| rx \
	+ \| s390 \| s390x \
	\| score \
	\| sh \| shl \
	\| sh[1234] \| sh[24]a \| sh[24]ae[lb] \| sh[23]e \| she[lb] \| sh[lb]e \
	@@ -1238,6 +1268,7 @@
	\| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \| sv1 \| sx* \
	\| spu \
	\| tahoe \
	+ \| thumbv7* \
	\| tic30 \| tic4x \| tic54x \| tic55x \| tic6x \| tic80 \
	\| tron \
	\| ubicom32 \
	@@ -1275,8 +1306,49 @@

	# Decode manufacturer-specific aliases for certain operating systems.

	-if [ x$os != x ]
	+if test x$basic_os != x
	then
	+
	+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
	+# set os.
	+case $basic_os in
	+ gnu/linux*)
	+ kernel=linux
	+ os=`echo "$basic_os" \| sed -e 's\|gnu/linux\|gnu\|'`
	+ ;;
	+ os2-emx)
	+ kernel=os2
	+ os=`echo "$basic_os" \| sed -e 's\|os2-emx\|emx\|'`
	+ ;;
	+ nto-qnx*)
	+ kernel=nto
	+ os=`echo "$basic_os" \| sed -e 's\|nto-qnx\|qnx\|'`
	+ ;;
	+ -)
	+ # shellcheck disable=SC2162
	+ saved_IFS=$IFS
	+ IFS="-" read kernel os <<EOF
	+$basic_os
	+EOF
	+ IFS=$saved_IFS
	+ ;;
	+ # Default OS when just kernel was specified
	+ nto*)
	+ kernel=nto
	+ os=`echo "$basic_os" \| sed -e 's\|nto\|qnx\|'`
	+ ;;
	+ linux*)
	+ kernel=linux
	+ os=`echo "$basic_os" \| sed -e 's\|linux\|gnu\|'`
	+ ;;
	+ *)
	+ kernel=
	+ os=$basic_os
	+ ;;
	+esac
	+
	+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
	+# etc.)
	case $os in
	# First match some system type aliases that might get confused
	# with valid system types.
	@@ -1288,7 +1360,7 @@
	os=cnk
	;;
	solaris1 \| solaris1.*)
	- os=`echo $os \| sed -e 's\|solaris1\|sunos4\|'`
	+ os=`echo "$os" \| sed -e 's\|solaris1\|sunos4\|'`
	;;
	solaris)
	os=solaris2
	@@ -1296,9 +1368,6 @@
	unixware*)
	os=sysv4.2uw
	;;
	- gnu/linux*)
	- os=`echo $os \| sed -e 's\|gnu/linux\|linux-gnu\|'`
	- ;;
	# es1800 is here to avoid being matched by es* (a different OS)
	es1800*)
	os=ose
	@@ -1320,12 +1389,9 @@
	os=sco3.2v4
	;;
	sco3.2.[4-9]*)
	- os=`echo $os \| sed -e 's/sco3.2./sco3.2v/'`
	- ;;
	- sco3.2v[4-9]* \| sco5v6*)
	- # Don't forget version if it is 3.2v4 or newer.
	+ os=`echo "$os" \| sed -e 's/sco3.2./sco3.2v/'`
	;;
	- scout)
	+ scov \| scout)
	# Don't match below
	;;
	sco*)
	@@ -1334,78 +1400,25 @@
	psos*)
	os=psos
	;;
	- # Now accept the basic system types.
	- # The portable systems comes first.
	- # Each alternative MUST end in a * to match a version number.
	- # sysv* is not here because it comes later, after sysvr4.
	- gnu* \| bsd* \| mach* \| minix* \| genix* \| ultrix* \| irix* \
	- \| vms \| esix* \| aix* \| cnk* \| sunos \| sunos[34]*\
	- \| hpux* \| unos* \| osf* \| luna* \| dgux* \| auroraux* \| solaris* \
	- \| sym* \| kopensolaris* \| plan9* \
	- \| amigaos* \| amigados* \| msdos* \| newsos* \| unicos* \| aof* \
	- \| aos* \| aros* \| cloudabi* \| sortix* \| twizzler* \
	- \| nindy* \| vxsim* \| vxworks* \| ebmon* \| hms* \| mvs* \
	- \| clix* \| riscos* \| uniplus* \| iris* \| isc* \| rtu* \| xenix* \
	- \| knetbsd* \| mirbsd* \| netbsd* \
	- \| bitrig* \| openbsd* \| solidbsd* \| libertybsd* \| os108* \
	- \| ekkobsd* \| kfreebsd* \| freebsd* \| riscix* \| lynxos* \
	- \| bosx* \| nextstep* \| cxux* \| aout* \| elf* \| oabi* \
	- \| ptx* \| coff* \| ecoff* \| winnt* \| domain* \| vsta* \
	- \| udi* \| eabi* \| lites* \| ieee* \| go32* \| aux* \| hcos* \
	- \| chorusrdb* \| cegcc* \| glidix* \
	- \| cygwin* \| msys* \| pe* \| moss* \| proelf* \| rtems* \
	- \| midipix* \| mingw32* \| mingw64* \| linux-gnu* \| linux-android* \
	- \| linux-newlib* \| linux-musl* \| linux-uclibc* \
	- \| uxpv* \| beos* \| mpeix* \| udk* \| moxiebox* \
	- \| interix* \| uwin* \| mks* \| rhapsody* \| darwin* \
	- \| openstep* \| oskit* \| conix* \| pw32* \| nonstopux* \
	- \| storm-chaos* \| tops10* \| tenex* \| tops20* \| its* \
	- \| os2* \| vos* \| palmos* \| uclinux* \| nucleus* \
	- \| morphos* \| superux* \| rtmk* \| windiss* \
	- \| powermax* \| dnix* \| nx6 \| nx7 \| sei* \| dragonfly* \
	- \| skyos* \| haiku* \| rdos* \| toppers* \| drops* \| es* \
	- \| onefs* \| tirtos* \| phoenix* \| fuchsia* \| redox* \| bme* \
	- \| midnightbsd* \| amdhsa* \| unleashed* \| emscripten* \| wasi* \
	- \| nsk* \| powerunix)
	- # Remember, each alternative MUST END IN *, to match a version number.
	- ;;
	qnx*)
	- case $cpu in
	- x86 \| i*86)
	- ;;
	- *)
	- os=nto-$os
	- ;;
	- esac
	+ os=qnx
	;;
	hiux*)
	os=hiuxwe2
	;;
	- nto-qnx*)
	- ;;
	- nto*)
	- os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
	- ;;
	- sim \| xray \| os68k* \| v88r* \
	- \| windows* \| osx \| abug \| netware* \| os9* \
	- \| macos* \| mpw* \| magic* \| mmixware* \| mon960* \| lnews*)
	- ;;
	- linux-dietlibc)
	- os=linux-dietlibc
	- ;;
	- linux*)
	- os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
	- ;;
	lynx*178)
	os=lynxos178
	;;
	lynx*5)
	os=lynxos5
	;;
	+ lynxos*)
	+ # don't get caught up in next wildcard
	+ ;;
	lynx*)
	os=lynxos
	;;
	- mac*)
	+ mac[0-9]*)
	os=`echo "$os" \| sed -e 's\|mac\|macos\|'`
	;;
	opened*)
	@@ -1452,7 +1465,7 @@
	;;
	# Preserve the version number of sinix5.
	sinix5.*)
	- os=`echo $os \| sed -e 's\|sinix\|sysv\|'`
	+ os=`echo "$os" \| sed -e 's\|sinix\|sysv\|'`
	;;
	sinix*)
	os=sysv4
	@@ -1475,18 +1488,12 @@
	sysvr4)
	os=sysv4
	;;
	- # This must come after sysvr4.
	- sysv*)
	- ;;
	ose*)
	os=ose
	;;
	mint \| mint[0-9] \| MiNT \| MiNT[0-9])
	os=mint
	;;
	- zvmoe)
	- os=zvmoe
	- ;;
	dicos*)
	os=dicos
	;;
	@@ -1503,19 +1510,11 @@
	;;
	esac
	;;
	- nacl*)
	- ;;
	- ios)
	- ;;
	- none)
	- ;;
	- *-eabi)
	- ;;
	*)
	- echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
	- exit 1
	+ # No normalization, but not necessarily accepted, that comes below.
	;;
	esac
	+
	else

	# Here we handle the default operating systems that come with various machines.
	@@ -1528,6 +1527,7 @@
	# will signal an error saying that MANUFACTURER isn't an operating
	# system, and we'll never get to this point.

	+kernel=
	case $cpu-$vendor in
	score-*)
	os=elf
	@@ -1539,7 +1539,8 @@
	os=riscix1.2
	;;
	arm*-rebel)
	- os=linux
	+ kernel=linux
	+ os=gnu
	;;
	arm*-semi)
	os=aout
	@@ -1705,84 +1706,180 @@
	os=none
	;;
	esac
	+
	fi

	+# Now, validate our (potentially fixed-up) OS.
	+case $os in
	+ # Sometimes we do "kernel-libc", so those need to count as OSes.
	+ musl* \| newlib* \| relibc* \| uclibc*)
	+ ;;
	+ # Likewise for "kernel-abi"
	+ eabi* \| gnueabi*)
	+ ;;
	+ # VxWorks passes extra cpu info in the 4th filed.
	+ simlinux \| simwindows \| spe)
	+ ;;
	+ # Now accept the basic system types.
	+ # The portable systems comes first.
	+ # Each alternative MUST end in a * to match a version number.
	+ gnu* \| android* \| bsd* \| mach* \| minix* \| genix* \| ultrix* \| irix* \
	+ \| vms \| esix* \| aix* \| cnk* \| sunos \| sunos[34]* \
	+ \| hpux* \| unos* \| osf* \| luna* \| dgux* \| auroraux* \| solaris* \
	+ \| sym* \| plan9* \| psp* \| sim* \| xray* \| os68k* \| v88r* \
	+ \| hiux* \| abug \| nacl* \| netware* \| windows* \
	+ \| os9* \| macos* \| osx* \| ios* \
	+ \| mpw* \| magic* \| mmixware* \| mon960* \| lnews* \
	+ \| amigaos* \| amigados* \| msdos* \| newsos* \| unicos* \| aof* \
	+ \| aos* \| aros* \| cloudabi* \| sortix* \| twizzler* \
	+ \| nindy* \| vxsim* \| vxworks* \| ebmon* \| hms* \| mvs* \
	+ \| clix* \| riscos* \| uniplus* \| iris* \| isc* \| rtu* \| xenix* \
	+ \| mirbsd* \| netbsd* \| dicos* \| openedition* \| ose* \
	+ \| bitrig* \| openbsd* \| secbsd* \| solidbsd* \| libertybsd* \| os108* \
	+ \| ekkobsd* \| freebsd* \| riscix* \| lynxos* \| os400* \
	+ \| bosx* \| nextstep* \| cxux* \| aout* \| elf* \| oabi* \
	+ \| ptx* \| coff* \| ecoff* \| winnt* \| domain* \| vsta* \
	+ \| udi* \| lites* \| ieee* \| go32* \| aux* \| hcos* \
	+ \| chorusrdb* \| cegcc* \| glidix* \| serenity* \
	+ \| cygwin* \| msys* \| pe* \| moss* \| proelf* \| rtems* \
	+ \| midipix* \| mingw32* \| mingw64* \| mint* \
	+ \| uxpv* \| beos* \| mpeix* \| udk* \| moxiebox* \
	+ \| interix* \| uwin* \| mks* \| rhapsody* \| darwin* \
	+ \| openstep* \| oskit* \| conix* \| pw32* \| nonstopux* \
	+ \| storm-chaos* \| tops10* \| tenex* \| tops20* \| its* \
	+ \| os2* \| vos* \| palmos* \| uclinux* \| nucleus* \| morphos* \
	+ \| scout* \| superux* \| sysv* \| rtmk* \| tpf* \| windiss* \
	+ \| powermax* \| dnix* \| nx6 \| nx7 \| sei* \| dragonfly* \
	+ \| skyos* \| haiku* \| rdos* \| toppers* \| drops* \| es* \
	+ \| onefs* \| tirtos* \| phoenix* \| fuchsia* \| redox* \| bme* \
	+ \| midnightbsd* \| amdhsa* \| unleashed* \| emscripten* \| wasi* \
	+ \| nsk* \| powerunix* \| genode* \| zvmoe* \| qnx* \| emx* \| zephyr* \
	+ \| fiwix* )
	+ ;;
	+ # This one is extra strict with allowed versions
	+ sco3.2v2 \| sco3.2v[4-9]* \| sco5v6*)
	+ # Don't forget version if it is 3.2v4 or newer.
	+ ;;
	+ none)
	+ ;;
	+ *)
	+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
	+ exit 1
	+ ;;
	+esac
	+
	+# As a final step for OS-related things, validate the OS-kernel combination
	+# (given a valid OS), if there is a kernel.
	+case $kernel-$os in
	+ linux-gnu* \| linux-dietlibc* \| linux-android* \| linux-newlib* \
	+ \| linux-musl* \| linux-relibc* \| linux-uclibc* )
	+ ;;
	+ uclinux-uclibc* )
	+ ;;
	+ -dietlibc* \| -newlib* \| -musl* \| -relibc* \| -uclibc* )
	+ # These are just libc implementations, not actual OSes, and thus
	+ # require a kernel.
	+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
	+ exit 1
	+ ;;
	+ kfreebsd-gnu \| kopensolaris-gnu)
	+ ;;
	+ vxworks-simlinux \| vxworks-simwindows \| vxworks-spe)
	+ ;;
	+ nto-qnx*)
	+ ;;
	+ os2-emx)
	+ ;;
	+ -eabi \| -gnueabi)
	+ ;;
	+ -*)
	+ # Blank kernel with real OS is always fine.
	+ ;;
	+ -)
	+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
	+ exit 1
	+ ;;
	+esac
	+
	# Here we handle the case where we know the os, and the CPU type, but not the
	# manufacturer. We pick the logical manufacturer.
	case $vendor in
	unknown)
	- case $os in
	- riscix*)
	+ case $cpu-$os in
	+ -riscix)
	vendor=acorn
	;;
	- sunos*)
	+ -sunos)
	vendor=sun
	;;
	- cnk\|-aix)
	+ -cnk \| -aix)
	vendor=ibm
	;;
	- beos*)
	+ -beos)
	vendor=be
	;;
	- hpux*)
	+ -hpux)
	vendor=hp
	;;
	- mpeix*)
	+ -mpeix)
	vendor=hp
	;;
	- hiux*)
	+ -hiux)
	vendor=hitachi
	;;
	- unos*)
	+ -unos)
	vendor=crds
	;;
	- dgux*)
	+ -dgux)
	vendor=dg
	;;
	- luna*)
	+ -luna)
	vendor=omron
	;;
	- genix*)
	+ -genix)
	vendor=ns
	;;
	- clix*)
	+ -clix)
	vendor=intergraph
	;;
	- mvs* \| opened*)
	+ -mvs \| -opened)
	+ vendor=ibm
	+ ;;
	+ -os400)
	vendor=ibm
	;;
	- os400*)
	+ s390-* \| s390x-*)
	vendor=ibm
	;;
	- ptx*)
	+ -ptx)
	vendor=sequent
	;;
	- tpf*)
	+ -tpf)
	vendor=ibm
	;;
	- vxsim* \| vxworks* \| windiss*)
	+ -vxsim \| -vxworks \| -windiss)
	vendor=wrs
	;;
	- aux*)
	+ -aux)
	vendor=apple
	;;
	- hms*)
	+ -hms)
	vendor=hitachi
	;;
	- mpw* \| macos*)
	+ -mpw \| -macos)
	vendor=apple
	;;
	- mint \| mint[0-9] \| MiNT \| MiNT[0-9])
	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	vendor=atari
	;;
	- vos*)
	+ -vos)
	vendor=stratus
	;;
	esac
	;;
	esac

	-echo "$cpu-$vendor-$os"
	+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
	exit

	# Local variables:
	diff --git a/contrib/byacc/config_h.in b/contrib/byacc/config_h.in
	--- a/contrib/byacc/config_h.in
	+++ b/contrib/byacc/config_h.in
	@@ -51,6 +51,9 @@
	/* Define if you have the <stdlib.h> header file. */
	#undef HAVE_STDLIB_H

	+/* Define if <stdnoreturn.h> header is available and working */
	+#undef HAVE_STDNORETURN_H
	+
	/* Define if you have the <strings.h> header file. */
	#undef HAVE_STRINGS_H

	@@ -84,6 +87,9 @@
	/* Define if you have the ANSI C header files. */
	#undef STDC_HEADERS

	+/* Define if C11 _Noreturn keyword is supported */
	+#undef STDC_NORETURN
	+
	/* Define to the system name. */
	#undef SYSTEM_NAME

	diff --git a/contrib/byacc/configure b/contrib/byacc/configure
	--- a/contrib/byacc/configure
	+++ b/contrib/byacc/configure
	@@ -1,8 +1,9 @@
	#! /bin/sh
	-# From configure.in Revision: 1.23 .
	+# From configure.in Revision: 1.28 .
	# Guess values for system-dependent variables and create Makefiles.
	-# Generated by Autoconf 2.52.20200111.
	+# Generated by Autoconf 2.52.20230114.
	#
	+# Copyright 2003-2022,2023 Thomas E. Dickey
	# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
	# Free Software Foundation, Inc.
	# This configure script is free software; the Free Software Foundation
	@@ -33,9 +34,9 @@
	as_me=`echo "$0" \|sed 's,.*[\\/],,'`

	if expr a : '$a$' >/dev/null 2>&1; then
	- as_expr=expr
	+ as_expr="expr"
	else
	- as_expr=false
	+ as_expr="false"
	fi

	rm -f conf$$ conf$$.exe conf$$.file
	@@ -50,7 +51,7 @@
	as_ln_s='ln -s'
	fi
	elif ln conf$$.file conf$$ 2>/dev/null; then
	- as_ln_s=ln
	+ as_ln_s='ln'
	else
	as_ln_s='cp -p'
	fi
	@@ -60,9 +61,9 @@

	# Support unset when possible.
	if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
	- as_unset=unset
	+ as_unset="unset"
	else
	- as_unset=false
	+ as_unset="false"
	fi

	# NLS nuisances.
	@@ -97,13 +98,14 @@
	ac_default_prefix=/usr/local
	cross_compiling=no
	subdirs=
	-MFLAGS= MAKEFLAGS=
	+MFLAGS=
	+MAKEFLAGS=
	SHELL=${CONFIG_SHELL-/bin/sh}

	# Maximum number of lines to put in a shell here document.
	# This variable seems obsolete. It should probably be removed, and
	# only ac_max_sed_lines should be used.
	-: ${ac_max_here_lines=38}
	+: "${ac_max_here_lines=38}"

	ac_unique_file="main.c"
	# Factoring default headers for most tests.
	@@ -204,7 +206,7 @@

	# Accept the important Cygnus configure options, so we can diagnose typos.

	- case $ac_option in
	+ case "$ac_option" in

	-bindir \| --bindir \| --bindi \| --bind \| --bin \| --bi)
	ac_prev=bindir ;;
	@@ -245,7 +247,7 @@
	expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
	{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
	{ (exit 1); exit 1; }; }
	- ac_feature=`echo $ac_feature \| sed 's/-/_/g'`
	+ ac_feature=`echo "$ac_feature" \| sed 's/-/_/g'`
	eval "enable_$ac_feature=no" ;;

	-enable-* \| --enable-*)
	@@ -254,8 +256,8 @@
	expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
	{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
	{ (exit 1); exit 1; }; }
	- ac_feature=`echo $ac_feature \| sed 's/-/_/g'`
	- case $ac_option in
	+ ac_feature=`echo "$ac_feature" \| sed 's/-/_/g'`
	+ case "$ac_option" in
	=) ac_optarg=`echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"`;;
	*) ac_optarg=yes ;;
	esac
	@@ -445,8 +447,8 @@
	expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
	{ echo "$as_me: error: invalid package name: $ac_package" >&2
	{ (exit 1); exit 1; }; }
	- ac_package=`echo $ac_package\| sed 's/-/_/g'`
	- case $ac_option in
	+ ac_package=`echo "$ac_package" \| sed 's/-/_/g'`
	+ case "$ac_option" in
	=) ac_optarg=`echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"`;;
	*) ac_optarg=yes ;;
	esac
	@@ -458,7 +460,7 @@
	expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
	{ echo "$as_me: error: invalid package name: $ac_package" >&2
	{ (exit 1); exit 1; }; }
	- ac_package=`echo $ac_package \| sed 's/-/_/g'`
	+ ac_package=`echo "$ac_package" \| sed 's/-/_/g'`
	eval "with_$ac_package=no" ;;

	--x)
	@@ -492,21 +494,21 @@
	{ (exit 1); exit 1; }; }
	ac_optarg=`echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"`
	eval "$ac_envvar='$ac_optarg'"
	- export $ac_envvar ;;
	+ export "$ac_envvar" ;;

	*)
	# FIXME: should be removed in autoconf 3.0.
	echo "$as_me: WARNING: you should use --build, --host, --target" >&2
	expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
	echo "$as_me: WARNING: invalid host type: $ac_option" >&2
	- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
	+ : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}"
	;;

	esac
	done

	if test -n "$ac_prev"; then
	- ac_option=--`echo $ac_prev \| sed 's/_/-/g'`
	+ ac_option=--`echo "$ac_prev" \| sed 's/_/-/g'`
	{ echo "$as_me: error: missing argument to $ac_option" >&2
	{ (exit 1); exit 1; }; }
	fi
	@@ -514,8 +516,8 @@
	# Be sure to have absolute paths.
	for ac_var in exec_prefix prefix
	do
	- eval ac_val=$`echo $ac_var`
	- case $ac_val in
	+ eval ac_val=$`echo "$ac_var"`
	+ case "$ac_val" in
	[\\/$]* \| ?:[\\/]* \| NONE \| '' ) ;;
	*) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
	{ (exit 1); exit 1; }; };;
	@@ -526,8 +528,8 @@
	for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
	localstatedir libdir includedir oldincludedir infodir mandir
	do
	- eval ac_val=$`echo $ac_var`
	- case $ac_val in
	+ eval ac_val=$`echo "$ac_var"`
	+ case "$ac_val" in
	[\\/$]* \| ?:[\\/]* ) ;;
	*) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
	{ (exit 1); exit 1; }; };;
	@@ -564,13 +566,13 @@
	ac_confdir=`echo "$ac_prog" \| sed 's%[\\/][^\\/][^\\/]*$%%'`
	test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
	srcdir=$ac_confdir
	- if test ! -r $srcdir/$ac_unique_file; then
	+ if test ! -r "$srcdir/$ac_unique_file"; then
	srcdir=..
	fi
	else
	ac_srcdir_defaulted=no
	fi
	-if test ! -r $srcdir/$ac_unique_file; then
	+if test ! -r "$srcdir/$ac_unique_file"; then
	if test "$ac_srcdir_defaulted" = yes; then
	{ echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
	{ (exit 1); exit 1; }; }
	@@ -700,9 +702,10 @@
	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

	--with-max-table-size=N set the maximum table size = N (no default)
	- --enable-btyacc turn on support for the btyacc backtracking
	- extension (default: no)
	- --with-warnings test: turn on gcc warnings
	+ --disable-btyacc disable support for the btyacc backtracking
	+ extension (default: enabled)
	+ --enable-warnings test: turn on gcc compiler warnings
	+ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics
	--disable-echo do not display "compiling" commands
	--with-dmalloc test: use Gray Watson's dmalloc library
	--with-dbmalloc test: use Conor Cahill's dbmalloc library
	@@ -729,42 +732,43 @@
	# If there are subdirs, report their specific --help.
	ac_popdir=`pwd`
	for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
	- cd $ac_subdir
	+ cd "$ac_subdir"
	# A "../" for each directory in /$ac_subdir.
	- ac_dots=`echo $ac_subdir \|
	+ ac_dots=`echo "$ac_subdir" \|
	sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`

	- case $srcdir in
	+ case "$srcdir" in
	.) # No --srcdir option. We are building in place.
	- ac_sub_srcdir=$srcdir ;;
	+ ac_sub_srcdir="$srcdir" ;;
	[\\/]* \| ?:[\\/]* ) # Absolute path.
	- ac_sub_srcdir=$srcdir/$ac_subdir ;;
	+ ac_sub_srcdir="$srcdir/$ac_subdir" ;;
	*) # Relative path.
	- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
	+ ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;;
	esac

	# Check for guested configure; otherwise get Cygnus style configure.
	- if test -f $ac_sub_srcdir/configure.gnu; then
	+ if test -f "$ac_sub_srcdir/configure.gnu"; then
	echo
	- $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
	- elif test -f $ac_sub_srcdir/configure; then
	+ $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive
	+ elif test -f "$ac_sub_srcdir/configure"; then
	echo
	- $SHELL $ac_sub_srcdir/configure --help=recursive
	- elif test -f $ac_sub_srcdir/configure.ac \|\|
	- test -f $ac_sub_srcdir/configure.in; then
	+ $SHELL "$ac_sub_srcdir/configure" --help=recursive
	+ elif test -f "$ac_sub_srcdir/configure.ac" \|\|
	+ test -f "$ac_sub_srcdir/configure.in"; then
	echo
	- $ac_configure --help
	+ "$ac_configure" --help
	else
	echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
	fi
	- cd $ac_popdir
	+ cd "$ac_popdir"
	done
	fi

	test -n "$ac_init_help" && exit 0
	-if $ac_init_version; then
	+if "$ac_init_version"; then
	cat <<\EOF

	+Copyright 2003-2022,2023 Thomas E. Dickey
	Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
	Free Software Foundation, Inc.
	This configure script is free software; the Free Software Foundation
	@@ -778,7 +782,7 @@
	running configure, to aid debugging if configure makes a mistake.

	It was created by $as_me, which was
	-generated by GNU Autoconf 2.52.20200111. Invocation command line was
	+generated by GNU Autoconf 2.52.20230114. Invocation command line was

	$ $0 $@

	@@ -825,7 +829,7 @@
	ac_sep=
	for ac_arg
	do
	- case $ac_arg in
	+ case "$ac_arg" in
	-no-create \| --no-create \| --no-creat \| --no-crea \| --no-cre \
	\| --no-cr \| --no-c) ;;
	-no-recursion \| --no-recursion \| --no-recursio \| --no-recursi \
	@@ -882,7 +886,7 @@
	exit $exit_status
	' 0
	for ac_signal in 1 2 13 15; do
	- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
	+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal"
	done
	ac_signal=0

	@@ -902,7 +906,7 @@
	fi
	for ac_site_file in $CONFIG_SITE; do
	if test -r "$ac_site_file"; then
	- { echo "$as_me:905: loading site script $ac_site_file" >&5
	+ { echo "$as_me:909: loading site script $ac_site_file" >&5
	echo "$as_me: loading site script $ac_site_file" >&6;}
	cat "$ac_site_file" >&5
	. "$ac_site_file"
	@@ -913,7 +917,7 @@
	# Some versions of bash will fail to source /dev/null (special
	# files actually), so we avoid doing that.
	if test -f "$cache_file"; then
	- { echo "$as_me:916: loading cache $cache_file" >&5
	+ { echo "$as_me:920: loading cache $cache_file" >&5
	echo "$as_me: loading cache $cache_file" >&6;}
	case $cache_file in
	[\\/]* \| ?:[\\/]* ) . $cache_file;;
	@@ -921,7 +925,7 @@
	esac
	fi
	else
	- { echo "$as_me:924: creating cache $cache_file" >&5
	+ { echo "$as_me:928: creating cache $cache_file" >&5
	echo "$as_me: creating cache $cache_file" >&6;}
	>$cache_file
	fi
	@@ -935,23 +939,23 @@
	eval ac_new_set=\$ac_env_${ac_var}_set
	eval ac_old_val="\$ac_cv_env_${ac_var}_value"
	eval ac_new_val="\$ac_env_${ac_var}_value"
	- case $ac_old_set,$ac_new_set in
	+ case "$ac_old_set,$ac_new_set" in
	set,)
	- { echo "$as_me:940: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
	+ { echo "$as_me:944: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
	echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
	ac_cache_corrupted=: ;;
	,set)
	- { echo "$as_me:944: error: \`$ac_var' was not set in the previous run" >&5
	+ { echo "$as_me:948: error: \`$ac_var' was not set in the previous run" >&5
	echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
	ac_cache_corrupted=: ;;
	,);;
	*)
	if test "x$ac_old_val" != "x$ac_new_val"; then
	- { echo "$as_me:950: error: \`$ac_var' has changed since the previous run:" >&5
	+ { echo "$as_me:954: error: \`$ac_var' has changed since the previous run:" >&5
	echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
	- { echo "$as_me:952: former value: $ac_old_val" >&5
	+ { echo "$as_me:956: former value: $ac_old_val" >&5
	echo "$as_me: former value: $ac_old_val" >&2;}
	- { echo "$as_me:954: current value: $ac_new_val" >&5
	+ { echo "$as_me:958: current value: $ac_new_val" >&5
	echo "$as_me: current value: $ac_new_val" >&2;}
	ac_cache_corrupted=:
	fi;;
	@@ -959,7 +963,7 @@
	# Pass precious variables to config.status. It doesn't matter if
	# we pass some twice (in addition to the command line arguments).
	if test "$ac_new_set" = set; then
	- case $ac_new_val in
	+ case "$ac_new_val" in
	" "\|" "\|[\[\]\~\#\$\^\&\\{\}\\\\|\;\<\>\?\"\']*)
	ac_arg=$ac_var=`echo "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"`
	ac_configure_args="$ac_configure_args '$ac_arg'"
	@@ -969,35 +973,43 @@
	esac
	fi
	done
	-if $ac_cache_corrupted; then
	- { echo "$as_me:973: error: changes in the environment can compromise the build" >&5
	+if "$ac_cache_corrupted"; then
	+ { echo "$as_me:977: error: changes in the environment can compromise the build" >&5
	echo "$as_me: error: changes in the environment can compromise the build" >&2;}
	- { { echo "$as_me:975: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
	+ { { echo "$as_me:979: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
	echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
	{ (exit 1); exit 1; }; }
	fi

	ac_ext=c
	ac_cpp='$CPP $CPPFLAGS'
	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
	+ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	-ac_main_return=return
	+ac_main_return="return"

	case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
	- c,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway
	- ECHO_T=' ' ;;
	- c,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
	- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
	+ c,-n*) ECHO_N=
	+ ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway
	+ ECHO_T=' '
	+ ;;
	+ c,* ) ECHO_N=-n
	+ ECHO_C=
	+ ECHO_T=
	+ ;;
	+ *) ECHO_N=
	+ ECHO_C='\c'
	+ ECHO_T=
	+ ;;
	esac
	echo "#! $SHELL" >conftest.sh
	echo "exit 0" >>conftest.sh
	chmod +x conftest.sh
	-if { (echo "$as_me:996: PATH=\".;.\"; conftest.sh") >&5
	+if { (echo "$as_me:1008: PATH=\".;.\"; conftest.sh") >&5
	(PATH=".;."; conftest.sh) 2>&5
	ac_status=$?
	- echo "$as_me:999: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	+ echo "$as_me:1011: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	ac_path_separator=';'
	else
	ac_path_separator=:
	@@ -1009,22 +1021,22 @@

	ac_aux_dir=
	for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
	- if test -f $ac_dir/install-sh; then
	+ if test -f "$ac_dir/install-sh"; then
	ac_aux_dir=$ac_dir
	ac_install_sh="$ac_aux_dir/install-sh -c"
	break
	- elif test -f $ac_dir/install.sh; then
	+ elif test -f "$ac_dir/install.sh"; then
	ac_aux_dir=$ac_dir
	ac_install_sh="$ac_aux_dir/install.sh -c"
	break
	- elif test -f $ac_dir/shtool; then
	+ elif test -f "$ac_dir/shtool"; then
	ac_aux_dir=$ac_dir
	ac_install_sh="$ac_aux_dir/shtool install -c"
	break
	fi
	done
	if test -z "$ac_aux_dir"; then
	- { { echo "$as_me:1027: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
	+ { { echo "$as_me:1039: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
	echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
	{ (exit 1); exit 1; }; }
	fi
	@@ -1034,11 +1046,11 @@

	# Make sure we can run config.sub.
	$ac_config_sub sun4 >/dev/null 2>&1 \|\|
	- { { echo "$as_me:1037: error: cannot run $ac_config_sub" >&5
	+ { { echo "$as_me:1049: error: cannot run $ac_config_sub" >&5
	echo "$as_me: error: cannot run $ac_config_sub" >&2;}
	{ (exit 1); exit 1; }; }

	-echo "$as_me:1041: checking build system type" >&5
	+echo "$as_me:1053: checking build system type" >&5
	echo $ECHO_N "checking build system type... $ECHO_C" >&6
	if test "${ac_cv_build+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1047,23 +1059,23 @@
	test -z "$ac_cv_build_alias" &&
	ac_cv_build_alias=`$ac_config_guess`
	test -z "$ac_cv_build_alias" &&
	- { { echo "$as_me:1050: error: cannot guess build type; you must specify one" >&5
	+ { { echo "$as_me:1062: error: cannot guess build type; you must specify one" >&5
	echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
	{ (exit 1); exit 1; }; }
	-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` \|\|
	- { { echo "$as_me:1054: error: $ac_config_sub $ac_cv_build_alias failed." >&5
	+ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` \|\|
	+ { { echo "$as_me:1066: error: $ac_config_sub $ac_cv_build_alias failed." >&5
	echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
	{ (exit 1); exit 1; }; }

	fi
	-echo "$as_me:1059: result: $ac_cv_build" >&5
	+echo "$as_me:1071: result: $ac_cv_build" >&5
	echo "${ECHO_T}$ac_cv_build" >&6
	build=$ac_cv_build
	-build_cpu=`echo $ac_cv_build \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	-build_vendor=`echo $ac_cv_build \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	-build_os=`echo $ac_cv_build \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`
	+build_cpu=`echo "$ac_cv_build" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	+build_vendor=`echo "$ac_cv_build" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	+build_os=`echo "$ac_cv_build" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`

	-echo "$as_me:1066: checking host system type" >&5
	+echo "$as_me:1078: checking host system type" >&5
	echo $ECHO_N "checking host system type... $ECHO_C" >&6
	if test "${ac_cv_host+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1071,21 +1083,21 @@
	ac_cv_host_alias=$host_alias
	test -z "$ac_cv_host_alias" &&
	ac_cv_host_alias=$ac_cv_build_alias
	-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` \|\|
	- { { echo "$as_me:1075: error: $ac_config_sub $ac_cv_host_alias failed" >&5
	+ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` \|\|
	+ { { echo "$as_me:1087: error: $ac_config_sub $ac_cv_host_alias failed" >&5
	echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
	{ (exit 1); exit 1; }; }

	fi
	-echo "$as_me:1080: result: $ac_cv_host" >&5
	+echo "$as_me:1092: result: $ac_cv_host" >&5
	echo "${ECHO_T}$ac_cv_host" >&6
	host=$ac_cv_host
	-host_cpu=`echo $ac_cv_host \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	-host_vendor=`echo $ac_cv_host \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	-host_os=`echo $ac_cv_host \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`
	+host_cpu=`echo "$ac_cv_host" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	+host_vendor=`echo "$ac_cv_host" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	+host_os=`echo "$ac_cv_host" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`

	-if test -f $srcdir/config.guess \|\| test -f $ac_aux_dir/config.guess ; then
	- echo "$as_me:1088: checking target system type" >&5
	+if test -f "$srcdir/config.guess" \|\| test -f "$ac_aux_dir/config.guess" ; then
	+ echo "$as_me:1100: checking target system type" >&5
	echo $ECHO_N "checking target system type... $ECHO_C" >&6
	if test "${ac_cv_target+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1093,18 +1105,18 @@
	ac_cv_target_alias=$target_alias
	test "x$ac_cv_target_alias" = "x" &&
	ac_cv_target_alias=$ac_cv_host_alias
	-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` \|\|
	- { { echo "$as_me:1097: error: $ac_config_sub $ac_cv_target_alias failed" >&5
	+ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` \|\|
	+ { { echo "$as_me:1109: error: $ac_config_sub $ac_cv_target_alias failed" >&5
	echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
	{ (exit 1); exit 1; }; }

	fi
	-echo "$as_me:1102: result: $ac_cv_target" >&5
	+echo "$as_me:1114: result: $ac_cv_target" >&5
	echo "${ECHO_T}$ac_cv_target" >&6
	target=$ac_cv_target
	-target_cpu=`echo $ac_cv_target \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	-target_vendor=`echo $ac_cv_target \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	-target_os=`echo $ac_cv_target \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`
	+target_cpu=`echo "$ac_cv_target" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\1/'`
	+target_vendor=`echo "$ac_cv_target" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\2/'`
	+target_os=`echo "$ac_cv_target" \| sed 's/^$[^-]$-$[^-]$-$.*$$/\3/'`

	# The aliases save the names the user supplied, while $host etc.
	# will get canonicalized.
	@@ -1131,13 +1143,13 @@
	fi

	test -z "$system_name" && system_name="$cf_cv_system_name"
	-test -n "$cf_cv_system_name" && echo "$as_me:1134: result: Configuring for $cf_cv_system_name" >&5
	+test -n "$cf_cv_system_name" && echo "$as_me:1146: result: Configuring for $cf_cv_system_name" >&5
	echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6

	if test ".$system_name" != ".$cf_cv_system_name" ; then
	- echo "$as_me:1138: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
	+ echo "$as_me:1150: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
	echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
	- { { echo "$as_me:1140: error: \"Please remove config.cache and try again.\"" >&5
	+ { { echo "$as_me:1152: error: \"Please remove config.cache and try again.\"" >&5
	echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
	{ (exit 1); exit 1; }; }
	fi
	@@ -1157,14 +1169,14 @@

	ac_ext=c
	ac_cpp='$CPP $CPPFLAGS'
	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
	+ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	-ac_main_return=return
	+ac_main_return="return"
	if test -n "$ac_tool_prefix"; then
	# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
	set dummy ${ac_tool_prefix}gcc; ac_word=$2
	-echo "$as_me:1167: checking for $ac_word" >&5
	+echo "$as_me:1179: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1179,7 +1191,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_CC="${ac_tool_prefix}gcc"
	-echo "$as_me:1182: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1194: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1187,10 +1199,10 @@
	fi
	CC=$ac_cv_prog_CC
	if test -n "$CC"; then
	- echo "$as_me:1190: result: $CC" >&5
	+ echo "$as_me:1202: result: $CC" >&5
	echo "${ECHO_T}$CC" >&6
	else
	- echo "$as_me:1193: result: no" >&5
	+ echo "$as_me:1205: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1199,7 +1211,7 @@
	ac_ct_CC=$CC
	# Extract the first word of "gcc", so it can be a program name with args.
	set dummy gcc; ac_word=$2
	-echo "$as_me:1202: checking for $ac_word" >&5
	+echo "$as_me:1214: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1214,7 +1226,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_ac_ct_CC="gcc"
	-echo "$as_me:1217: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1229: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1222,10 +1234,10 @@
	fi
	ac_ct_CC=$ac_cv_prog_ac_ct_CC
	if test -n "$ac_ct_CC"; then
	- echo "$as_me:1225: result: $ac_ct_CC" >&5
	+ echo "$as_me:1237: result: $ac_ct_CC" >&5
	echo "${ECHO_T}$ac_ct_CC" >&6
	else
	- echo "$as_me:1228: result: no" >&5
	+ echo "$as_me:1240: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1238,7 +1250,7 @@
	if test -n "$ac_tool_prefix"; then
	# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
	set dummy ${ac_tool_prefix}cc; ac_word=$2
	-echo "$as_me:1241: checking for $ac_word" >&5
	+echo "$as_me:1253: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1253,7 +1265,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_CC="${ac_tool_prefix}cc"
	-echo "$as_me:1256: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1268: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1261,10 +1273,10 @@
	fi
	CC=$ac_cv_prog_CC
	if test -n "$CC"; then
	- echo "$as_me:1264: result: $CC" >&5
	+ echo "$as_me:1276: result: $CC" >&5
	echo "${ECHO_T}$CC" >&6
	else
	- echo "$as_me:1267: result: no" >&5
	+ echo "$as_me:1279: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1273,7 +1285,7 @@
	ac_ct_CC=$CC
	# Extract the first word of "cc", so it can be a program name with args.
	set dummy cc; ac_word=$2
	-echo "$as_me:1276: checking for $ac_word" >&5
	+echo "$as_me:1288: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1288,7 +1300,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_ac_ct_CC="cc"
	-echo "$as_me:1291: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1303: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1296,10 +1308,10 @@
	fi
	ac_ct_CC=$ac_cv_prog_ac_ct_CC
	if test -n "$ac_ct_CC"; then
	- echo "$as_me:1299: result: $ac_ct_CC" >&5
	+ echo "$as_me:1311: result: $ac_ct_CC" >&5
	echo "${ECHO_T}$ac_ct_CC" >&6
	else
	- echo "$as_me:1302: result: no" >&5
	+ echo "$as_me:1314: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1312,7 +1324,7 @@
	if test -z "$CC"; then
	# Extract the first word of "cc", so it can be a program name with args.
	set dummy cc; ac_word=$2
	-echo "$as_me:1315: checking for $ac_word" >&5
	+echo "$as_me:1327: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1332,11 +1344,11 @@
	continue
	fi
	ac_cv_prog_CC="cc"
	-echo "$as_me:1335: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1347: found $ac_dir/$ac_word" >&5
	break
	done

	-if test $ac_prog_rejected = yes; then
	+if test "$ac_prog_rejected" = yes; then
	# We found a bogon in the path, so make sure we never use it.
	set dummy $ac_cv_prog_CC
	shift
	@@ -1354,10 +1366,10 @@
	fi
	CC=$ac_cv_prog_CC
	if test -n "$CC"; then
	- echo "$as_me:1357: result: $CC" >&5
	+ echo "$as_me:1369: result: $CC" >&5
	echo "${ECHO_T}$CC" >&6
	else
	- echo "$as_me:1360: result: no" >&5
	+ echo "$as_me:1372: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1368,7 +1380,7 @@
	do
	# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
	set dummy $ac_tool_prefix$ac_prog; ac_word=$2
	-echo "$as_me:1371: checking for $ac_word" >&5
	+echo "$as_me:1383: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1383,7 +1395,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
	-echo "$as_me:1386: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1398: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1391,10 +1403,10 @@
	fi
	CC=$ac_cv_prog_CC
	if test -n "$CC"; then
	- echo "$as_me:1394: result: $CC" >&5
	+ echo "$as_me:1406: result: $CC" >&5
	echo "${ECHO_T}$CC" >&6
	else
	- echo "$as_me:1397: result: no" >&5
	+ echo "$as_me:1409: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1407,7 +1419,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:1410: checking for $ac_word" >&5
	+echo "$as_me:1422: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -1422,7 +1434,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_ac_ct_CC="$ac_prog"
	-echo "$as_me:1425: found $ac_dir/$ac_word" >&5
	+echo "$as_me:1437: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -1430,10 +1442,10 @@
	fi
	ac_ct_CC=$ac_cv_prog_ac_ct_CC
	if test -n "$ac_ct_CC"; then
	- echo "$as_me:1433: result: $ac_ct_CC" >&5
	+ echo "$as_me:1445: result: $ac_ct_CC" >&5
	echo "${ECHO_T}$ac_ct_CC" >&6
	else
	- echo "$as_me:1436: result: no" >&5
	+ echo "$as_me:1448: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -1445,32 +1457,32 @@

	fi

	-test -z "$CC" && { { echo "$as_me:1448: error: no acceptable cc found in \$PATH" >&5
	+test -z "$CC" && { { echo "$as_me:1460: error: no acceptable cc found in \$PATH" >&5
	echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
	{ (exit 1); exit 1; }; }

	# Provide some information about the compiler.
	-echo "$as_me:1453:" \
	+echo "$as_me:1465:" \
	"checking for C compiler version" >&5
	-ac_compiler=`set X $ac_compile; echo $2`
	-{ (eval echo "$as_me:1456: \"$ac_compiler --version </dev/null >&5\"") >&5
	+ac_compiler=`set X $ac_compile; echo "$2"`
	+{ (eval echo "$as_me:1468: \"$ac_compiler --version </dev/null >&5\"") >&5
	(eval $ac_compiler --version </dev/null >&5) 2>&5
	ac_status=$?
	- echo "$as_me:1459: \$? = $ac_status" >&5
	- (exit $ac_status); }
	-{ (eval echo "$as_me:1461: \"$ac_compiler -v </dev/null >&5\"") >&5
	+ echo "$as_me:1471: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }
	+{ (eval echo "$as_me:1473: \"$ac_compiler -v </dev/null >&5\"") >&5
	(eval $ac_compiler -v </dev/null >&5) 2>&5
	ac_status=$?
	- echo "$as_me:1464: \$? = $ac_status" >&5
	- (exit $ac_status); }
	-{ (eval echo "$as_me:1466: \"$ac_compiler -V </dev/null >&5\"") >&5
	+ echo "$as_me:1476: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }
	+{ (eval echo "$as_me:1478: \"$ac_compiler -V </dev/null >&5\"") >&5
	(eval $ac_compiler -V </dev/null >&5) 2>&5
	ac_status=$?
	- echo "$as_me:1469: \$? = $ac_status" >&5
	- (exit $ac_status); }
	+ echo "$as_me:1481: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }

	-cat >conftest.$ac_ext <<_ACEOF
	-#line 1473 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1485 "configure"
	#include "confdefs.h"

	int
	@@ -1486,14 +1498,14 @@
	# Try to create an executable without -o first, disregard a.out.
	# It will help us diagnose broken compilers, and finding out an intuition
	# of exeext.
	-echo "$as_me:1489: checking for C compiler default output" >&5
	+echo "$as_me:1501: checking for C compiler default output" >&5
	echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
	-ac_link_default=`echo "$ac_link" \| sed 's/ -o conftest[^ ]//'`
	-if { (eval echo "$as_me:1492: \"$ac_link_default\"") >&5
	+ac_link_default=`echo "$ac_link" \| sed 's/ -o "conftest[^"]"//'`
	+if { (eval echo "$as_me:1504: \"$ac_link_default\"") >&5
	(eval $ac_link_default) 2>&5
	ac_status=$?
	- echo "$as_me:1495: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	+ echo "$as_me:1507: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	# Find the output, starting from the most likely. This scheme is
	# not robust to junk in `.', hence go to wildcards (a.*) only as a last
	# resort.
	@@ -1514,35 +1526,35 @@
	done
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	-{ { echo "$as_me:1518: error: C compiler cannot create executables" >&5
	+cat "conftest.$ac_ext" >&5
	+{ { echo "$as_me:1530: error: C compiler cannot create executables" >&5
	echo "$as_me: error: C compiler cannot create executables" >&2;}
	{ (exit 77); exit 77; }; }
	fi

	ac_exeext=$ac_cv_exeext
	-echo "$as_me:1524: result: $ac_file" >&5
	+echo "$as_me:1536: result: $ac_file" >&5
	echo "${ECHO_T}$ac_file" >&6

	# Check the compiler produces executables we can run. If not, either
	# the compiler is broken, or we cross compile.
	-echo "$as_me:1529: checking whether the C compiler works" >&5
	+echo "$as_me:1541: checking whether the C compiler works" >&5
	echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
	# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
	# If not cross compiling, check that we can run a simple program.
	if test "$cross_compiling" != yes; then
	if { ac_try='./$ac_file'
	- { (eval echo "$as_me:1535: \"$ac_try\"") >&5
	+ { (eval echo "$as_me:1547: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1538: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1550: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cross_compiling=no
	else
	if test "$cross_compiling" = maybe; then
	cross_compiling=yes
	else
	- { { echo "$as_me:1545: error: cannot run C compiled programs.
	+ { { echo "$as_me:1557: error: cannot run C compiled programs.
	If you meant to cross compile, use \`--host'." >&5
	echo "$as_me: error: cannot run C compiled programs.
	If you meant to cross compile, use \`--host'." >&2;}
	@@ -1550,25 +1562,25 @@
	fi
	fi
	fi
	-echo "$as_me:1553: result: yes" >&5
	+echo "$as_me:1565: result: yes" >&5
	echo "${ECHO_T}yes" >&6

	-rm -f a.out a.exe conftest$ac_cv_exeext
	+rm -f a.out a.exe "conftest$ac_cv_exeext"
	ac_clean_files=$ac_clean_files_save
	# Check the compiler produces executables we can run. If not, either
	# the compiler is broken, or we cross compile.
	-echo "$as_me:1560: checking whether we are cross compiling" >&5
	+echo "$as_me:1572: checking whether we are cross compiling" >&5
	echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
	-echo "$as_me:1562: result: $cross_compiling" >&5
	+echo "$as_me:1574: result: $cross_compiling" >&5
	echo "${ECHO_T}$cross_compiling" >&6

	-echo "$as_me:1565: checking for executable suffix" >&5
	+echo "$as_me:1577: checking for executable suffix" >&5
	echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
	-if { (eval echo "$as_me:1567: \"$ac_link\"") >&5
	+if { (eval echo "$as_me:1579: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:1570: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	+ echo "$as_me:1582: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	# If both `conftest.exe' and `conftest' are `present' (well, observable)
	# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
	# work properly (i.e., refer to `conftest.exe'), while it won't with
	@@ -1583,25 +1595,25 @@
	esac
	done
	else
	- { { echo "$as_me:1586: error: cannot compute EXEEXT: cannot compile and link" >&5
	+ { { echo "$as_me:1598: error: cannot compute EXEEXT: cannot compile and link" >&5
	echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
	{ (exit 1); exit 1; }; }
	fi

	-rm -f conftest$ac_cv_exeext
	-echo "$as_me:1592: result: $ac_cv_exeext" >&5
	+rm -f "conftest$ac_cv_exeext"
	+echo "$as_me:1604: result: $ac_cv_exeext" >&5
	echo "${ECHO_T}$ac_cv_exeext" >&6

	-rm -f conftest.$ac_ext
	+rm -f "conftest.$ac_ext"
	EXEEXT=$ac_cv_exeext
	ac_exeext=$EXEEXT
	-echo "$as_me:1598: checking for object suffix" >&5
	+echo "$as_me:1610: checking for object suffix" >&5
	echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
	if test "${ac_cv_objext+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1604 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1616 "configure"
	#include "confdefs.h"

	int
	@@ -1613,11 +1625,11 @@
	}
	_ACEOF
	rm -f conftest.o conftest.obj
	-if { (eval echo "$as_me:1616: \"$ac_compile\"") >&5
	+if { (eval echo "$as_me:1628: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1619: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	+ echo "$as_me:1631: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
	case $ac_file in
	.$ac_ext \| .xcoff \| .tds \| .d \| .dbg \| .pdb \| .xSYM \| .map \| *.inf ) ;;
	@@ -1627,25 +1639,25 @@
	done
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	-{ { echo "$as_me:1631: error: cannot compute OBJEXT: cannot compile" >&5
	+cat "conftest.$ac_ext" >&5
	+{ { echo "$as_me:1643: error: cannot compute OBJEXT: cannot compile" >&5
	echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
	{ (exit 1); exit 1; }; }
	fi

	-rm -f conftest.$ac_cv_objext conftest.$ac_ext
	+rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
	fi
	-echo "$as_me:1638: result: $ac_cv_objext" >&5
	+echo "$as_me:1650: result: $ac_cv_objext" >&5
	echo "${ECHO_T}$ac_cv_objext" >&6
	OBJEXT=$ac_cv_objext
	ac_objext=$OBJEXT
	-echo "$as_me:1642: checking whether we are using the GNU C compiler" >&5
	+echo "$as_me:1654: checking whether we are using the GNU C compiler" >&5
	echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
	if test "${ac_cv_c_compiler_gnu+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1648 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1660 "configure"
	#include "confdefs.h"

	int
	@@ -1659,41 +1671,41 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1663: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1675: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1666: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1669: \"$ac_try\"") >&5
	+ echo "$as_me:1678: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1681: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1672: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1684: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_compiler_gnu=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_compiler_gnu=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	ac_cv_c_compiler_gnu=$ac_compiler_gnu

	fi
	-echo "$as_me:1684: result: $ac_cv_c_compiler_gnu" >&5
	+echo "$as_me:1696: result: $ac_cv_c_compiler_gnu" >&5
	echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
	GCC=`test $ac_compiler_gnu = yes && echo yes`
	ac_test_CFLAGS=${CFLAGS+set}
	ac_save_CFLAGS=$CFLAGS
	CFLAGS="-g"
	-echo "$as_me:1690: checking whether $CC accepts -g" >&5
	+echo "$as_me:1702: checking whether $CC accepts -g" >&5
	echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
	if test "${ac_cv_prog_cc_g+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1696 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1708 "configure"
	#include "confdefs.h"

	int
	@@ -1704,27 +1716,27 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1720: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1711: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1714: \"$ac_try\"") >&5
	+ echo "$as_me:1723: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1726: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1717: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1729: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_prog_cc_g=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_cv_prog_cc_g=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	fi
	-echo "$as_me:1727: result: $ac_cv_prog_cc_g" >&5
	+echo "$as_me:1739: result: $ac_cv_prog_cc_g" >&5
	echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
	if test "$ac_test_CFLAGS" = set; then
	CFLAGS=$ac_save_CFLAGS
	@@ -1745,23 +1757,23 @@
	# in C++ we need to declare it. In case someone uses the same compiler
	# for both compiling C and C++ we need to have the C++ compiler decide
	# the declaration of exit, since it's the most demanding environment.
	-cat >conftest.$ac_ext <<_ACEOF
	+cat >"conftest.$ac_ext" <<_ACEOF
	#ifndef __cplusplus
	choke me
	#endif
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1754: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1766: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1757: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1760: \"$ac_try\"") >&5
	+ echo "$as_me:1769: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1772: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1763: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1775: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	for ac_declaration in \
	''\
	'#include <stdlib.h>' \
	@@ -1771,8 +1783,8 @@
	'extern "C" void exit (int);' \
	'void exit (int);'
	do
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1775 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1787 "configure"
	#include "confdefs.h"
	#include <stdlib.h>
	$ac_declaration
	@@ -1784,27 +1796,27 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1788: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1791: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1794: \"$ac_try\"") >&5
	+ echo "$as_me:1803: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1806: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1797: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1809: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	:
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	continue
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1807 "configure"
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1819 "configure"
	#include "confdefs.h"
	$ac_declaration
	int
	@@ -1815,65 +1827,65 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1819: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1822: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1825: \"$ac_try\"") >&5
	+ echo "$as_me:1834: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1837: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1828: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1840: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	break
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	done
	rm -rf conftest*
	if test -n "$ac_declaration"; then
	echo '#ifdef __cplusplus' >>confdefs.h
	- echo $ac_declaration >>confdefs.h
	+ echo "$ac_declaration" >>confdefs.h
	echo '#endif' >>confdefs.h
	fi

	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	ac_ext=c
	ac_cpp='$CPP $CPPFLAGS'
	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
	+ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	-ac_main_return=return
	+ac_main_return="return"

	GCC_VERSION=none
	if test "$GCC" = yes ; then
	- echo "$as_me:1858: checking version of $CC" >&5
	+ echo "$as_me:1870: checking version of $CC" >&5
	echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
	GCC_VERSION="`${CC} --version 2>/dev/null \| sed -e '2,$d' -e 's/^.(GCC[^)]) //' -e 's/^.(Debian[^)]) //' -e 's/^[^0-9.]//' -e 's/[^0-9.].//'`"
	test -z "$GCC_VERSION" && GCC_VERSION=unknown
	- echo "$as_me:1862: result: $GCC_VERSION" >&5
	+ echo "$as_me:1874: result: $GCC_VERSION" >&5
	echo "${ECHO_T}$GCC_VERSION" >&6
	fi

	INTEL_COMPILER=no

	if test "$GCC" = yes ; then
	- case $host_os in
	+ case "$host_os" in
	(linux\|gnu)
	- echo "$as_me:1871: checking if this is really Intel C compiler" >&5
	+ echo "$as_me:1883: checking if this is really Intel C compiler" >&5
	echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
	cf_save_CFLAGS="$CFLAGS"
	CFLAGS="$CFLAGS -no-gcc"
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1876 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1888 "configure"
	#include "confdefs.h"

	int
	@@ -1889,28 +1901,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1893: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1905: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1896: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1899: \"$ac_try\"") >&5
	+ echo "$as_me:1908: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1911: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1902: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1914: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	INTEL_COMPILER=yes
	cf_save_CFLAGS="$cf_save_CFLAGS -we147"

	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CFLAGS="$cf_save_CFLAGS"
	- echo "$as_me:1913: result: $INTEL_COMPILER" >&5
	+ echo "$as_me:1925: result: $INTEL_COMPILER" >&5
	echo "${ECHO_T}$INTEL_COMPILER" >&6
	;;
	esac
	@@ -1919,12 +1931,11 @@
	CLANG_COMPILER=no

	if test "$GCC" = yes ; then
	- echo "$as_me:1922: checking if this is really Clang C compiler" >&5
	+ echo "$as_me:1934: checking if this is really Clang C compiler" >&5
	echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
	cf_save_CFLAGS="$CFLAGS"
	- CFLAGS="$CFLAGS -Qunused-arguments"
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 1927 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 1938 "configure"
	#include "confdefs.h"

	int
	@@ -1940,40 +1951,116 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:1944: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:1947: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:1950: \"$ac_try\"") >&5
	+ echo "$as_me:1958: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:1961: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:1953: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:1964: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	CLANG_COMPILER=yes
	-cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"

	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CFLAGS="$cf_save_CFLAGS"
	- echo "$as_me:1964: result: $CLANG_COMPILER" >&5
	+ echo "$as_me:1974: result: $CLANG_COMPILER" >&5
	echo "${ECHO_T}$CLANG_COMPILER" >&6
	fi

	-echo "$as_me:1968: checking for $CC option to accept ANSI C" >&5
	+CLANG_VERSION=none
	+
	+if test "x$CLANG_COMPILER" = "xyes" ; then
	+ case "$CC" in
	+ (c[1-9][0-9]\|*/c[1-9][0-9])
	+ { echo "$as_me:1983: WARNING: replacing broken compiler alias $CC" >&5
	+echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
	+ CFLAGS="$CFLAGS -std=`echo "$CC" \| sed -e 's%.*/%%'`"
	+ CC=clang
	+ ;;
	+ esac
	+
	+ echo "$as_me:1990: checking version of $CC" >&5
	+echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
	+ CLANG_VERSION="`$CC --version 2>/dev/null \| sed -e '2,$d' -e 's/^.(CLANG[^)]) //' -e 's/^.(Debian[^)]) //' -e 's/^[^0-9.]//' -e 's/[^0-9.].//'`"
	+ test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
	+ echo "$as_me:1994: result: $CLANG_VERSION" >&5
	+echo "${ECHO_T}$CLANG_VERSION" >&6
	+
	+ for cf_clang_opt in \
	+ -Qunused-arguments \
	+ -Wno-error=implicit-function-declaration
	+ do
	+ echo "$as_me:2001: checking if option $cf_clang_opt works" >&5
	+echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
	+ cf_save_CFLAGS="$CFLAGS"
	+ CFLAGS="$CFLAGS $cf_clang_opt"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 2006 "configure"
	+#include "confdefs.h"
	+
	+ #include <stdio.h>
	+int
	+main (void)
	+{
	+
	+ printf("hello!\\n");
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
	+if { (eval echo "$as_me:2020: \"$ac_link\"") >&5
	+ (eval $ac_link) 2>&5
	+ ac_status=$?
	+ echo "$as_me:2023: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest$ac_exeext"'
	+ { (eval echo "$as_me:2026: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:2029: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+
	+ cf_clang_optok=yes
	+else
	+ echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+
	+ cf_clang_optok=no
	+fi
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
	+ echo "$as_me:2040: result: $cf_clang_optok" >&5
	+echo "${ECHO_T}$cf_clang_optok" >&6
	+ CFLAGS="$cf_save_CFLAGS"
	+ if test "$cf_clang_optok" = yes; then
	+ test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6
	+
	+echo "${as_me:-configure}:2046: testing adding option $cf_clang_opt ..." 1>&5
	+
	+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
	+ CFLAGS="${CFLAGS}$cf_clang_opt"
	+
	+ fi
	+ done
	+fi
	+
	+echo "$as_me:2055: checking for $CC option to accept ANSI C" >&5
	echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
	if test "${ac_cv_prog_cc_stdc+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	ac_cv_prog_cc_stdc=no
	ac_save_CC=$CC
	-cat >conftest.$ac_ext <<_ACEOF
	-#line 1976 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 2063 "configure"
	#include "confdefs.h"
	#include <stdarg.h>
	#include <stdio.h>
	@@ -1982,9 +2069,7 @@
	/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
	struct buf { int x; };
	FILE * (rcsopen) (struct buf , struct stat *, int);
	-static char *e (p, i)
	- char **p;
	- int i;
	+static char e (char *p, int i)
	{
	return p[i];
	}
	@@ -2021,51 +2106,51 @@
	for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
	do
	CC="$ac_save_CC $ac_arg"
	- rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:2025: \"$ac_compile\"") >&5
	+ rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:2110: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:2028: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:2031: \"$ac_try\"") >&5
	+ echo "$as_me:2113: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:2116: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:2034: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:2119: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_prog_cc_stdc=$ac_arg
	break
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext
	+rm -f "conftest.$ac_objext"
	done
	-rm -f conftest.$ac_ext conftest.$ac_objext
	+rm -f "conftest.$ac_ext" "conftest.$ac_objext"
	CC=$ac_save_CC

	fi

	case "x$ac_cv_prog_cc_stdc" in
	x\|xno)
	- echo "$as_me:2051: result: none needed" >&5
	+ echo "$as_me:2136: result: none needed" >&5
	echo "${ECHO_T}none needed" >&6 ;;
	*)
	- echo "$as_me:2054: result: $ac_cv_prog_cc_stdc" >&5
	+ echo "$as_me:2139: result: $ac_cv_prog_cc_stdc" >&5
	echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
	CC="$CC $ac_cv_prog_cc_stdc" ;;
	esac

	# This should have been defined by AC_PROG_CC
	-: ${CC:=cc}
	+: "${CC:=cc}"

	-echo "$as_me:2062: checking \$CFLAGS variable" >&5
	+echo "$as_me:2147: checking \$CFLAGS variable" >&5
	echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
	case "x$CFLAGS" in
	(-[IUD])
	- echo "$as_me:2066: result: broken" >&5
	+ echo "$as_me:2151: result: broken" >&5
	echo "${ECHO_T}broken" >&6
	- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
	+ { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
	echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
	cf_flags="$CFLAGS"
	CFLAGS=
	@@ -2079,19 +2164,19 @@

	for cf_add_cflags in $cf_arg
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -2110,7 +2195,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -2140,7 +2225,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -2173,18 +2258,18 @@
	done
	;;
	(*)
	- echo "$as_me:2176: result: ok" >&5
	+ echo "$as_me:2261: result: ok" >&5
	echo "${ECHO_T}ok" >&6
	;;
	esac

	-echo "$as_me:2181: checking \$CC variable" >&5
	+echo "$as_me:2266: checking \$CC variable" >&5
	echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
	case "$CC" in
	([\ \ ]-)
	- echo "$as_me:2185: result: broken" >&5
	+ echo "$as_me:2270: result: broken" >&5
	echo "${ECHO_T}broken" >&6
	- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
	+ { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
	echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
	# humor him...
	cf_prog=`echo "$CC" \| sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ][ ]-[^ ].//'`
	@@ -2202,19 +2287,19 @@

	for cf_add_cflags in $cf_arg
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -2233,7 +2318,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -2263,7 +2348,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -2301,24 +2386,24 @@
	done
	test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6

	-echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5
	+echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5

	test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6

	-echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
	+echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5

	test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6

	-echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
	+echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

	;;
	(*)
	- echo "$as_me:2316: result: ok" >&5
	+ echo "$as_me:2401: result: ok" >&5
	echo "${ECHO_T}ok" >&6
	;;
	esac

	-echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5
	+echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5
	echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
	set dummy ${MAKE-make}; ac_make=`echo "$2" \| sed 'y,./+-,__p_,'`
	if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
	@@ -2338,11 +2423,11 @@
	rm -f conftest.make
	fi
	if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
	- echo "$as_me:2341: result: yes" >&5
	+ echo "$as_me:2426: result: yes" >&5
	echo "${ECHO_T}yes" >&6
	SET_MAKE=
	else
	- echo "$as_me:2345: result: no" >&5
	+ echo "$as_me:2430: result: no" >&5
	echo "${ECHO_T}no" >&6
	SET_MAKE="MAKE=${MAKE-make}"
	fi
	@@ -2359,7 +2444,7 @@
	# AFS /usr/afsws/bin/install, which mishandles nonexistent args
	# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
	# ./install, which can be erroneously created by make from ./install.sh.
	-echo "$as_me:2362: checking for a BSD compatible install" >&5
	+echo "$as_me:2447: checking for a BSD compatible install" >&5
	echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
	if test -z "$INSTALL"; then
	if test "${ac_cv_path_install+set}" = set; then
	@@ -2408,7 +2493,7 @@
	INSTALL=$ac_install_sh
	fi
	fi
	-echo "$as_me:2411: result: $INSTALL" >&5
	+echo "$as_me:2496: result: $INSTALL" >&5
	echo "${ECHO_T}$INSTALL" >&6

	# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
	@@ -2419,15 +2504,15 @@

	test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

	-echo "$as_me:2422: checking if filesystem supports mixed-case filenames" >&5
	+echo "$as_me:2507: checking if filesystem supports mixed-case filenames" >&5
	echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
	if test "${cf_cv_mixedcase+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	if test "$cross_compiling" = yes ; then
	- case $target_alias in
	- (-os2-emx\|-msdosdjgpp\|-cygwin\|-msys\|-mingw\|-uwin)
	+ case "$target_alias" in
	+ (-os2-emx\|-msdosdjgpp\|-cygwin\|-msys\|-mingw\|-uwin\|darwin*)
	cf_cv_mixedcase=no
	;;
	(*)
	@@ -2446,7 +2531,7 @@
	fi

	fi
	-echo "$as_me:2449: result: $cf_cv_mixedcase" >&5
	+echo "$as_me:2534: result: $cf_cv_mixedcase" >&5
	echo "${ECHO_T}$cf_cv_mixedcase" >&6
	test "$cf_cv_mixedcase" = yes &&
	cat >>confdefs.h <<\EOF
	@@ -2457,7 +2542,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:2460: checking for $ac_word" >&5
	+echo "$as_me:2545: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_CTAGS+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2472,7 +2557,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_CTAGS="$ac_prog"
	-echo "$as_me:2475: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2560: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2480,10 +2565,10 @@
	fi
	CTAGS=$ac_cv_prog_CTAGS
	if test -n "$CTAGS"; then
	- echo "$as_me:2483: result: $CTAGS" >&5
	+ echo "$as_me:2568: result: $CTAGS" >&5
	echo "${ECHO_T}$CTAGS" >&6
	else
	- echo "$as_me:2486: result: no" >&5
	+ echo "$as_me:2571: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -2494,7 +2579,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:2497: checking for $ac_word" >&5
	+echo "$as_me:2582: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_ETAGS+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2509,7 +2594,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_ETAGS="$ac_prog"
	-echo "$as_me:2512: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2597: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2517,10 +2602,10 @@
	fi
	ETAGS=$ac_cv_prog_ETAGS
	if test -n "$ETAGS"; then
	- echo "$as_me:2520: result: $ETAGS" >&5
	+ echo "$as_me:2605: result: $ETAGS" >&5
	echo "${ECHO_T}$ETAGS" >&6
	else
	- echo "$as_me:2523: result: no" >&5
	+ echo "$as_me:2608: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -2529,7 +2614,7 @@

	# Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
	set dummy ${CTAGS:-ctags}; ac_word=$2
	-echo "$as_me:2532: checking for $ac_word" >&5
	+echo "$as_me:2617: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2544,7 +2629,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_MAKE_LOWER_TAGS="yes"
	-echo "$as_me:2547: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2632: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2553,17 +2638,17 @@
	fi
	MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
	if test -n "$MAKE_LOWER_TAGS"; then
	- echo "$as_me:2556: result: $MAKE_LOWER_TAGS" >&5
	+ echo "$as_me:2641: result: $MAKE_LOWER_TAGS" >&5
	echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
	else
	- echo "$as_me:2559: result: no" >&5
	+ echo "$as_me:2644: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	if test "$cf_cv_mixedcase" = yes ; then
	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
	set dummy ${ETAGS:-etags}; ac_word=$2
	-echo "$as_me:2566: checking for $ac_word" >&5
	+echo "$as_me:2651: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2578,7 +2663,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_MAKE_UPPER_TAGS="yes"
	-echo "$as_me:2581: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2666: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2587,10 +2672,10 @@
	fi
	MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
	if test -n "$MAKE_UPPER_TAGS"; then
	- echo "$as_me:2590: result: $MAKE_UPPER_TAGS" >&5
	+ echo "$as_me:2675: result: $MAKE_UPPER_TAGS" >&5
	echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
	else
	- echo "$as_me:2593: result: no" >&5
	+ echo "$as_me:2678: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -2614,7 +2699,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:2617: checking for $ac_word" >&5
	+echo "$as_me:2702: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_AWK+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2629,7 +2714,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_AWK="$ac_prog"
	-echo "$as_me:2632: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2717: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2637,17 +2722,17 @@
	fi
	AWK=$ac_cv_prog_AWK
	if test -n "$AWK"; then
	- echo "$as_me:2640: result: $AWK" >&5
	+ echo "$as_me:2725: result: $AWK" >&5
	echo "${ECHO_T}$AWK" >&6
	else
	- echo "$as_me:2643: result: no" >&5
	+ echo "$as_me:2728: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	test -n "$AWK" && break
	done

	-test -z "$AWK" && { { echo "$as_me:2650: error: No awk program found" >&5
	+test -z "$AWK" && { { echo "$as_me:2735: error: No awk program found" >&5
	echo "$as_me: error: No awk program found" >&2;}
	{ (exit 1); exit 1; }; }

	@@ -2655,7 +2740,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:2658: checking for $ac_word" >&5
	+echo "$as_me:2743: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_prog_LINT+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2670,7 +2755,7 @@
	test -z "$ac_dir" && ac_dir=.
	$as_executable_p "$ac_dir/$ac_word" \|\| continue
	ac_cv_prog_LINT="$ac_prog"
	-echo "$as_me:2673: found $ac_dir/$ac_word" >&5
	+echo "$as_me:2758: found $ac_dir/$ac_word" >&5
	break
	done

	@@ -2678,10 +2763,10 @@
	fi
	LINT=$ac_cv_prog_LINT
	if test -n "$LINT"; then
	- echo "$as_me:2681: result: $LINT" >&5
	+ echo "$as_me:2766: result: $LINT" >&5
	echo "${ECHO_T}$LINT" >&6
	else
	- echo "$as_me:2684: result: no" >&5
	+ echo "$as_me:2769: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -2694,14 +2779,14 @@
	;;
	esac

	-echo "$as_me:2697: checking if the POSIX test-macros are already defined" >&5
	+echo "$as_me:2782: checking if the POSIX test-macros are already defined" >&5
	echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
	if test "${cf_cv_posix_visible+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	-cat >conftest.$ac_ext <<_ACEOF
	-#line 2704 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 2789 "configure"
	#include "confdefs.h"
	#include <stdio.h>
	int
	@@ -2719,28 +2804,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:2723: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:2808: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:2726: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:2729: \"$ac_try\"") >&5
	+ echo "$as_me:2811: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:2814: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:2732: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:2817: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_posix_visible=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_posix_visible=yes
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:2743: result: $cf_cv_posix_visible" >&5
	+echo "$as_me:2828: result: $cf_cv_posix_visible" >&5
	echo "${ECHO_T}$cf_cv_posix_visible" >&6

	if test "$cf_cv_posix_visible" = no; then
	@@ -2749,7 +2834,7 @@
	cf_POSIX_C_SOURCE=199506L
	cf_xopen_source=

	-case $host_os in
	+case "$host_os" in
	(aix[4-7]*)
	cf_xopen_source="-D_ALL_SOURCE"
	;;
	@@ -2781,18 +2866,18 @@
	cf_xopen_source="-D_SGI_SOURCE"
	cf_XOPEN_SOURCE=
	;;
	-(linux\|uclinux\|gnu\|mint\|kbsd-gnu\|cygwin)
	+(linuxgnu\|linuxgnuabi64\|linuxgnuabin32\|linuxgnueabi\|linuxgnueabihf\|linuxgnux32\|uclinux\|gnu\|mint\|kbsd*-gnu\|cygwin)

	cf_gnu_xopen_source=$cf_XOPEN_SOURCE

	-echo "$as_me:2788: checking if this is the GNU C library" >&5
	+echo "$as_me:2873: checking if this is the GNU C library" >&5
	echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
	if test "${cf_cv_gnu_library+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	-cat >conftest.$ac_ext <<_ACEOF
	-#line 2795 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 2880 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -2810,28 +2895,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:2814: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:2899: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:2817: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:2820: \"$ac_try\"") >&5
	+ echo "$as_me:2902: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:2905: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:2823: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:2908: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_gnu_library=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_gnu_library=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:2834: result: $cf_cv_gnu_library" >&5
	+echo "$as_me:2919: result: $cf_cv_gnu_library" >&5
	echo "${ECHO_T}$cf_cv_gnu_library" >&6

	if test x$cf_cv_gnu_library = xyes; then
	@@ -2839,7 +2924,7 @@
	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
	# was changed to help a little. newlib incorporated the change about 4
	# years later.
	- echo "$as_me:2842: checking if _DEFAULT_SOURCE can be used as a basis" >&5
	+ echo "$as_me:2927: checking if _DEFAULT_SOURCE can be used as a basis" >&5
	echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
	if test "${cf_cv_gnu_library_219+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2850,8 +2935,8 @@
	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 2854 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 2939 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -2869,34 +2954,34 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:2873: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:2876: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:2879: \"$ac_try\"") >&5
	+ echo "$as_me:2961: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:2964: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:2882: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:2967: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_gnu_library_219=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_gnu_library_219=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CPPFLAGS="$cf_save"

	fi
	-echo "$as_me:2894: result: $cf_cv_gnu_library_219" >&5
	+echo "$as_me:2979: result: $cf_cv_gnu_library_219" >&5
	echo "${ECHO_T}$cf_cv_gnu_library_219" >&6

	if test "x$cf_cv_gnu_library_219" = xyes; then
	cf_save="$CPPFLAGS"
	- echo "$as_me:2899: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
	+ echo "$as_me:2984: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
	echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -2909,19 +2994,19 @@

	for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -2940,7 +3025,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -2970,7 +3055,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -3000,8 +3085,8 @@

	fi

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3004 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3089 "configure"
	#include "confdefs.h"

	#include <limits.h>
	@@ -3020,28 +3105,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3109: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3027: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3030: \"$ac_try\"") >&5
	+ echo "$as_me:3112: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3115: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3033: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3118: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_gnu_dftsrc_219=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_gnu_dftsrc_219=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3044: result: $cf_cv_gnu_dftsrc_219" >&5
	+echo "$as_me:3129: result: $cf_cv_gnu_dftsrc_219" >&5
	echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
	test "x$cf_cv_gnu_dftsrc_219" = "xyes" \|\| CPPFLAGS="$cf_save"
	else
	@@ -3050,14 +3135,14 @@

	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then

	- echo "$as_me:3053: checking if we must define _GNU_SOURCE" >&5
	+ echo "$as_me:3138: checking if we must define _GNU_SOURCE" >&5
	echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_gnu_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3060 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3145 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3071,22 +3156,22 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3075: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3160: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3078: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3081: \"$ac_try\"") >&5
	+ echo "$as_me:3163: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3166: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3084: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3169: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_gnu_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_save="$CPPFLAGS"

	cf_fix_cppflags=no
	@@ -3096,19 +3181,19 @@

	for cf_add_cflags in -D_GNU_SOURCE
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -3127,7 +3212,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -3157,7 +3242,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -3187,8 +3272,8 @@

	fi

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3191 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3276 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3202,37 +3287,37 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3206: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3291: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3209: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3212: \"$ac_try\"") >&5
	+ echo "$as_me:3294: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3297: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3215: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3300: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_gnu_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_gnu_source=yes
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CPPFLAGS="$cf_save"

	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3230: result: $cf_cv_gnu_source" >&5
	+echo "$as_me:3315: result: $cf_cv_gnu_source" >&5
	echo "${ECHO_T}$cf_cv_gnu_source" >&6

	if test "$cf_cv_gnu_source" = yes
	then
	- echo "$as_me:3235: checking if we should also define _DEFAULT_SOURCE" >&5
	+ echo "$as_me:3320: checking if we should also define _DEFAULT_SOURCE" >&5
	echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_default_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -3241,8 +3326,8 @@
	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3245 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3330 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3256,28 +3341,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3260: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3263: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3266: \"$ac_try\"") >&5
	+ echo "$as_me:3348: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3351: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3269: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3354: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_default_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_default_source=yes
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3280: result: $cf_cv_default_source" >&5
	+echo "$as_me:3365: result: $cf_cv_default_source" >&5
	echo "${ECHO_T}$cf_cv_default_source" >&6
	if test "$cf_cv_default_source" = yes
	then
	@@ -3314,16 +3399,16 @@
	sed -e 's/-[UD]'"_POSIX_C_SOURCE"'$=[^ ]*$\?[ ]/ /g' \
	-e 's/-[UD]'"_POSIX_C_SOURCE"'$=[^ ]*$\?$//g'`

	-echo "$as_me:3317: checking if we should define _POSIX_C_SOURCE" >&5
	+echo "$as_me:3402: checking if we should define _POSIX_C_SOURCE" >&5
	echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_posix_c_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	-echo "${as_me:-configure}:3323: testing if the symbol is already defined go no further ..." 1>&5
	+echo "${as_me:-configure}:3408: testing if the symbol is already defined go no further ..." 1>&5

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3326 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3411 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3337,22 +3422,22 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3341: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3426: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3344: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3347: \"$ac_try\"") >&5
	+ echo "$as_me:3429: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3432: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3350: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3435: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_posix_c_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_want_posix_source=no
	case .$cf_POSIX_C_SOURCE in
	(.[12]??*)
	@@ -3367,8 +3452,8 @@
	;;
	esac
	if test "$cf_want_posix_source" = yes ; then
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3371 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3456 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3382,28 +3467,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3386: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3471: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3389: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3392: \"$ac_try\"") >&5
	+ echo "$as_me:3474: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3477: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3395: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3480: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	:
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	fi

	-echo "${as_me:-configure}:3406: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
	+echo "${as_me:-configure}:3491: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

	CFLAGS="$cf_trim_CFLAGS"
	CPPFLAGS="$cf_trim_CPPFLAGS"
	@@ -3411,10 +3496,10 @@
	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"

	-echo "${as_me:-configure}:3414: testing if the second compile does not leave our definition intact error ..." 1>&5
	+echo "${as_me:-configure}:3499: testing if the second compile does not leave our definition intact error ..." 1>&5

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3417 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3502 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3428,33 +3513,33 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3432: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3517: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3435: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3438: \"$ac_try\"") >&5
	+ echo "$as_me:3520: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3523: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3441: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3526: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	:
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_posix_c_source=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CFLAGS="$cf_save_CFLAGS"
	CPPFLAGS="$cf_save_CPPFLAGS"

	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3457: result: $cf_cv_posix_c_source" >&5
	+echo "$as_me:3542: result: $cf_cv_posix_c_source" >&5
	echo "${ECHO_T}$cf_cv_posix_c_source" >&6

	if test "$cf_cv_posix_c_source" != no ; then
	@@ -3468,19 +3553,19 @@

	for cf_add_cflags in $cf_cv_posix_c_source
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -3499,7 +3584,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -3529,7 +3614,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -3567,7 +3652,16 @@
	(netbsd*)
	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
	;;
	-(openbsd[4-9]*)
	+(openbsd[6-9]*)
	+ # OpenBSD 6.x has broken locale support, both compile-time and runtime.
	+ # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
	+ # Abusing the conformance level is a workaround.
	+ { echo "$as_me:3659: WARNING: this system does not provide usable locale support" >&5
	+echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
	+ cf_xopen_source="-D_BSD_SOURCE"
	+ cf_XOPEN_SOURCE=700
	+ ;;
	+(openbsd[4-5]*)
	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
	cf_xopen_source="-D_BSD_SOURCE"
	cf_XOPEN_SOURCE=600
	@@ -3594,14 +3688,14 @@
	;;
	(*)

	-echo "$as_me:3597: checking if we should define _XOPEN_SOURCE" >&5
	+echo "$as_me:3691: checking if we should define _XOPEN_SOURCE" >&5
	echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_xopen_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3604 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3698 "configure"
	#include "confdefs.h"

	#include <stdlib.h>
	@@ -3615,33 +3709,34 @@
	#ifndef _XOPEN_SOURCE
	make an error
	#endif
	+
	;
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3623: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3718: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3626: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3629: \"$ac_try\"") >&5
	+ echo "$as_me:3721: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3724: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3632: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3727: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_xopen_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_save="$CPPFLAGS"

	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3644 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3739 "configure"
	#include "confdefs.h"

	#include <stdlib.h>
	@@ -3652,39 +3747,40 @@
	main (void)
	{

	-#ifdef _XOPEN_SOURCE
	+#ifndef _XOPEN_SOURCE
	make an error
	#endif
	+
	;
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3663: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3666: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3669: \"$ac_try\"") >&5
	+ echo "$as_me:3762: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3765: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3672: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3768: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_xopen_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_xopen_source=$cf_XOPEN_SOURCE
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	- CPPFLAGS="$cf_save"
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ CPPFLAGS="$cf_save"

	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3687: result: $cf_cv_xopen_source" >&5
	+echo "$as_me:3783: result: $cf_cv_xopen_source" >&5
	echo "${ECHO_T}$cf_cv_xopen_source" >&6

	if test "$cf_cv_xopen_source" != no ; then
	@@ -3699,26 +3795,52 @@

	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"

	+for cf_add_cflags in $cf_temp_xopen_source
	+do
	+ case "x$cf_add_cflags" in
	+ (x-[DU]*)
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CFLAGS" != "$cf_old_cflag" \|\| break
	+
	+ CFLAGS="$cf_old_cflag"
	+done
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CPPFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CPPFLAGS" != "$cf_old_cflag" \|\| break
	+
	+ CPPFLAGS="$cf_old_cflag"
	+done
	+
	+ ;;
	+ esac
	+
	cf_fix_cppflags=no
	cf_new_cflags=
	cf_new_cppflags=
	cf_new_extra_cppflags=

	-for cf_add_cflags in $cf_temp_xopen_source
	+for cf_add_cflags in $cf_add_cflags
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -3737,7 +3859,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -3767,7 +3889,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -3797,8 +3919,12 @@

	fi

	+done
	+
	fi

	+ cf_save_xopen_cppflags="$CPPFLAGS"
	+
	if test "$cf_cv_posix_visible" = no; then

	cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
	@@ -3814,16 +3940,16 @@
	sed -e 's/-[UD]'"_POSIX_C_SOURCE"'$=[^ ]*$\?[ ]/ /g' \
	-e 's/-[UD]'"_POSIX_C_SOURCE"'$=[^ ]*$\?$//g'`

	-echo "$as_me:3817: checking if we should define _POSIX_C_SOURCE" >&5
	+echo "$as_me:3943: checking if we should define _POSIX_C_SOURCE" >&5
	echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_posix_c_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	-echo "${as_me:-configure}:3823: testing if the symbol is already defined go no further ..." 1>&5
	+echo "${as_me:-configure}:3949: testing if the symbol is already defined go no further ..." 1>&5

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3826 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3952 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3837,22 +3963,22 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:3967: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3844: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3847: \"$ac_try\"") >&5
	+ echo "$as_me:3970: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:3973: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3850: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:3976: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_posix_c_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_want_posix_source=no
	case .$cf_POSIX_C_SOURCE in
	(.[12]??*)
	@@ -3867,8 +3993,8 @@
	;;
	esac
	if test "$cf_want_posix_source" = yes ; then
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3871 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 3997 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3882,28 +4008,28 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3886: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4012: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3889: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3892: \"$ac_try\"") >&5
	+ echo "$as_me:4015: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4018: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3895: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4021: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	:
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	fi

	-echo "${as_me:-configure}:3906: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
	+echo "${as_me:-configure}:4032: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

	CFLAGS="$cf_trim_CFLAGS"
	CPPFLAGS="$cf_trim_CPPFLAGS"
	@@ -3911,10 +4037,10 @@
	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"

	-echo "${as_me:-configure}:3914: testing if the second compile does not leave our definition intact error ..." 1>&5
	+echo "${as_me:-configure}:4040: testing if the second compile does not leave our definition intact error ..." 1>&5

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 3917 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4043 "configure"
	#include "confdefs.h"
	#include <sys/types.h>
	int
	@@ -3928,33 +4054,33 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:3932: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4058: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:3935: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:3938: \"$ac_try\"") >&5
	+ echo "$as_me:4061: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4064: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:3941: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4067: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	:
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_posix_c_source=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	CFLAGS="$cf_save_CFLAGS"
	CPPFLAGS="$cf_save_CPPFLAGS"

	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:3957: result: $cf_cv_posix_c_source" >&5
	+echo "$as_me:4083: result: $cf_cv_posix_c_source" >&5
	echo "${ECHO_T}$cf_cv_posix_c_source" >&6

	if test "$cf_cv_posix_c_source" != no ; then
	@@ -3968,19 +4094,19 @@

	for cf_add_cflags in $cf_cv_posix_c_source
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -3999,7 +4125,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -4029,7 +4155,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -4063,31 +4189,112 @@

	fi # cf_cv_posix_visible

	+ # Some of these niche implementations use copy/paste, double-check...
	+ if test "$cf_cv_xopen_source" != no ; then
	+ test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6
	+
	+echo "${as_me:-configure}:4196: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
	+
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4199 "configure"
	+#include "confdefs.h"
	+
	+#include <stdlib.h>
	+#include <string.h>
	+#include <sys/types.h>
	+
	+int
	+main (void)
	+{
	+
	+#ifndef _XOPEN_SOURCE
	+make an error
	+#endif
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4219: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:4222: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4225: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:4228: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+ :
	+else
	+ echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+
	+ { echo "$as_me:4235: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
	+echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
	+ CPPFLAGS="$cf_save_xopen_cppflags"
	+fi
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ fi
	;;
	esac

	if test -n "$cf_xopen_source" ; then

	+for cf_add_cflags in $cf_xopen_source
	+do
	+ case "x$cf_add_cflags" in
	+ (x-[DU]*)
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CFLAGS" != "$cf_old_cflag" \|\| break
	+ test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:4258: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
	+
	+ CFLAGS="$cf_old_cflag"
	+done
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CPPFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CPPFLAGS" != "$cf_old_cflag" \|\| break
	+ test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:4270: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
	+
	+ CPPFLAGS="$cf_old_cflag"
	+done
	+
	+ ;;
	+ esac
	+
	cf_fix_cppflags=no
	cf_new_cflags=
	cf_new_cppflags=
	cf_new_extra_cppflags=

	-for cf_add_cflags in $cf_xopen_source
	+for cf_add_cflags in $cf_add_cflags
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -4106,7 +4313,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -4136,7 +4343,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -4148,7 +4355,7 @@
	if test -n "$cf_new_cflags" ; then
	test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6

	-echo "${as_me:-configure}:4151: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
	+echo "${as_me:-configure}:4358: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
	CFLAGS="${CFLAGS}$cf_new_cflags"
	@@ -4158,7 +4365,7 @@
	if test -n "$cf_new_cppflags" ; then
	test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6

	-echo "${as_me:-configure}:4161: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
	+echo "${as_me:-configure}:4368: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
	@@ -4168,20 +4375,22 @@
	if test -n "$cf_new_extra_cppflags" ; then
	test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6

	-echo "${as_me:-configure}:4171: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
	+echo "${as_me:-configure}:4378: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"

	fi

	+done
	+
	fi

	if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
	- echo "$as_me:4181: checking if _XOPEN_SOURCE really is set" >&5
	+ echo "$as_me:4390: checking if _XOPEN_SOURCE really is set" >&5
	echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4184 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4393 "configure"
	#include "confdefs.h"
	#include <stdlib.h>
	int
	@@ -4195,31 +4404,31 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:4199: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4408: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:4202: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:4205: \"$ac_try\"") >&5
	+ echo "$as_me:4411: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4414: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4208: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4417: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_XOPEN_SOURCE_set=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_XOPEN_SOURCE_set=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	- echo "$as_me:4217: result: $cf_XOPEN_SOURCE_set" >&5
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ echo "$as_me:4426: result: $cf_XOPEN_SOURCE_set" >&5
	echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
	- if test $cf_XOPEN_SOURCE_set = yes
	+ if test "$cf_XOPEN_SOURCE_set" = yes
	then
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4222 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4431 "configure"
	#include "confdefs.h"
	#include <stdlib.h>
	int
	@@ -4233,40 +4442,40 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:4237: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:4240: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:4243: \"$ac_try\"") >&5
	+ echo "$as_me:4449: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4452: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4246: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4455: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_XOPEN_SOURCE_set_ok=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_XOPEN_SOURCE_set_ok=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	- if test $cf_XOPEN_SOURCE_set_ok = no
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ if test "$cf_XOPEN_SOURCE_set_ok" = no
	then
	- { echo "$as_me:4257: WARNING: _XOPEN_SOURCE is lower than requested" >&5
	+ { echo "$as_me:4466: WARNING: _XOPEN_SOURCE is lower than requested" >&5
	echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
	fi
	else

	-echo "$as_me:4262: checking if we should define _XOPEN_SOURCE" >&5
	+echo "$as_me:4471: checking if we should define _XOPEN_SOURCE" >&5
	echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
	if test "${cf_cv_xopen_source+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4269 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4478 "configure"
	#include "confdefs.h"

	#include <stdlib.h>
	@@ -4280,33 +4489,34 @@
	#ifndef _XOPEN_SOURCE
	make an error
	#endif
	+
	;
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:4288: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:4291: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:4294: \"$ac_try\"") >&5
	+ echo "$as_me:4501: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4504: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4297: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4507: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_xopen_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_save="$CPPFLAGS"

	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"

	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4309 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4519 "configure"
	#include "confdefs.h"

	#include <stdlib.h>
	@@ -4317,39 +4527,40 @@
	main (void)
	{

	-#ifdef _XOPEN_SOURCE
	+#ifndef _XOPEN_SOURCE
	make an error
	#endif
	+
	;
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:4328: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:4539: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:4331: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:4334: \"$ac_try\"") >&5
	+ echo "$as_me:4542: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:4545: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4337: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:4548: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_xopen_source=no
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_xopen_source=$cf_XOPEN_SOURCE
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	- CPPFLAGS="$cf_save"
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+ CPPFLAGS="$cf_save"

	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

	fi
	-echo "$as_me:4352: result: $cf_cv_xopen_source" >&5
	+echo "$as_me:4563: result: $cf_cv_xopen_source" >&5
	echo "${ECHO_T}$cf_cv_xopen_source" >&6

	if test "$cf_cv_xopen_source" != no ; then
	@@ -4364,26 +4575,52 @@

	cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"

	+for cf_add_cflags in $cf_temp_xopen_source
	+do
	+ case "x$cf_add_cflags" in
	+ (x-[DU]*)
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CFLAGS" != "$cf_old_cflag" \|\| break
	+
	+ CFLAGS="$cf_old_cflag"
	+done
	+
	+cf_tmp_cflag=`echo "x$cf_add_cflags" \| sed -e 's/^.//' -e 's/=.*//'`
	+while true
	+do
	+ cf_old_cflag=`echo "x$CPPFLAGS" \| sed -e 's/^.//' -e 's/[ ][ ]-/ -/g' -e "s%$cf_tmp_cflag\$=[^ ][^ ]\$\?%%" -e 's/^[ ]//' -e 's%[ ][ ]-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
	+ test "$CPPFLAGS" != "$cf_old_cflag" \|\| break
	+
	+ CPPFLAGS="$cf_old_cflag"
	+done
	+
	+ ;;
	+ esac
	+
	cf_fix_cppflags=no
	cf_new_cflags=
	cf_new_cppflags=
	cf_new_extra_cppflags=

	-for cf_add_cflags in $cf_temp_xopen_source
	+for cf_add_cflags in $cf_add_cflags
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -4402,7 +4639,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -4432,7 +4669,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -4462,19 +4699,119 @@

	fi

	+done
	+
	fi

	fi
	fi
	fi # cf_cv_posix_visible

	+for ac_prog in ggrep grep
	+do
	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	+set dummy $ac_prog; ac_word=$2
	+echo "$as_me:4714: checking for $ac_word" >&5
	+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	+if test "${ac_cv_prog_GREP+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ if test -n "$GREP"; then
	+ ac_cv_prog_GREP="$GREP" # Let the user override the test.
	+else
	+ ac_save_IFS=$IFS; IFS=$ac_path_separator
	+ac_dummy="$PATH"
	+for ac_dir in $ac_dummy; do
	+ IFS=$ac_save_IFS
	+ test -z "$ac_dir" && ac_dir=.
	+ $as_executable_p "$ac_dir/$ac_word" \|\| continue
	+ac_cv_prog_GREP="$ac_prog"
	+echo "$as_me:4729: found $ac_dir/$ac_word" >&5
	+break
	+done
	+
	+fi
	+fi
	+GREP=$ac_cv_prog_GREP
	+if test -n "$GREP"; then
	+ echo "$as_me:4737: result: $GREP" >&5
	+echo "${ECHO_T}$GREP" >&6
	+else
	+ echo "$as_me:4740: result: no" >&5
	+echo "${ECHO_T}no" >&6
	+fi
	+
	+ test -n "$GREP" && break
	+done
	+test -n "$GREP" \|\| GREP=": "
	+
	+echo "$as_me:4748: checking for egrep" >&5
	+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
	+if test "${ac_cv_path_EGREP+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1
	+ then ac_cv_path_EGREP="$GREP -E"
	+ else
	+ for ac_prog in gegrep egrep
	+do
	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	+set dummy $ac_prog; ac_word=$2
	+echo "$as_me:4760: checking for $ac_word" >&5
	+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	+if test "${ac_cv_path_EGREP+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ case $EGREP in
	+ [\\/]* \| ?:[\\/]*)
	+ ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
	+ ;;
	+ *)
	+ ac_save_IFS=$IFS; IFS=$ac_path_separator
	+ac_dummy="$PATH"
	+for ac_dir in $ac_dummy; do
	+ IFS=$ac_save_IFS
	+ test -z "$ac_dir" && ac_dir=.
	+ if $as_executable_p "$ac_dir/$ac_word"; then
	+ ac_cv_path_EGREP="$ac_dir/$ac_word"
	+ echo "$as_me:4777: found $ac_dir/$ac_word" >&5
	+ break
	+fi
	+done
	+
	+ ;;
	+esac
	+fi
	+EGREP=$ac_cv_path_EGREP
	+
	+if test -n "$EGREP"; then
	+ echo "$as_me:4788: result: $EGREP" >&5
	+echo "${ECHO_T}$EGREP" >&6
	+else
	+ echo "$as_me:4791: result: no" >&5
	+echo "${ECHO_T}no" >&6
	+fi
	+
	+ test -n "$EGREP" && break
	+done
	+test -n "$EGREP" \|\| EGREP=": "
	+
	+ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4799: error: cannot find workable egrep" >&5
	+echo "$as_me: error: cannot find workable egrep" >&2;}
	+ { (exit 1); exit 1; }; }
	+ fi
	+fi
	+echo "$as_me:4804: result: $ac_cv_path_EGREP" >&5
	+echo "${ECHO_T}$ac_cv_path_EGREP" >&6
	+ EGREP="$ac_cv_path_EGREP"
	+
	ac_ext=c
	ac_cpp='$CPP $CPPFLAGS'
	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
	+ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	-ac_main_return=return
	-echo "$as_me:4477: checking how to run the C preprocessor" >&5
	+ac_main_return="return"
	+echo "$as_me:4814: checking how to run the C preprocessor" >&5
	echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
	# On Suns, sometimes $CPP names a directory.
	if test -n "$CPP" && test -d "$CPP"; then
	@@ -4494,20 +4831,20 @@
	# with a fresh cross-compiler works.
	# On the NeXT, cc -E runs the code through the compiler's parser,
	# not just through cpp. "Syntax error" is here to catch this case.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4498 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4835 "configure"
	#include "confdefs.h"
	#include <assert.h>
	Syntax error
	_ACEOF
	-if { (eval echo "$as_me:4503: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:4840: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4509: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:4846: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4520,27 +4857,27 @@
	:
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	# Broken: fails on valid input.
	continue
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"

	# OK, works on sane cases. Now check whether non-existent headers
	# can be detected and how.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4532 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4869 "configure"
	#include "confdefs.h"
	#include <ac_nonexistent.h>
	_ACEOF
	-if { (eval echo "$as_me:4536: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:4873: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4542: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:4879: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4554,16 +4891,16 @@
	continue
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	# Passes both tests.
	ac_preproc_ok=:
	break
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"

	done
	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	if $ac_preproc_ok; then
	break
	fi
	@@ -4576,7 +4913,7 @@
	else
	ac_cv_prog_CPP=$CPP
	fi
	-echo "$as_me:4579: result: $CPP" >&5
	+echo "$as_me:4916: result: $CPP" >&5
	echo "${ECHO_T}$CPP" >&6
	ac_preproc_ok=false
	for ac_c_preproc_warn_flag in '' yes
	@@ -4585,20 +4922,20 @@
	# with a fresh cross-compiler works.
	# On the NeXT, cc -E runs the code through the compiler's parser,
	# not just through cpp. "Syntax error" is here to catch this case.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4589 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4926 "configure"
	#include "confdefs.h"
	#include <assert.h>
	Syntax error
	_ACEOF
	-if { (eval echo "$as_me:4594: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:4931: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4600: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:4937: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4611,27 +4948,27 @@
	:
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	# Broken: fails on valid input.
	continue
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"

	# OK, works on sane cases. Now check whether non-existent headers
	# can be detected and how.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4623 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 4960 "configure"
	#include "confdefs.h"
	#include <ac_nonexistent.h>
	_ACEOF
	-if { (eval echo "$as_me:4627: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:4964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4633: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:4970: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4645,52 +4982,53 @@
	continue
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	# Passes both tests.
	ac_preproc_ok=:
	break
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"

	done
	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	if $ac_preproc_ok; then
	:
	else
	- { { echo "$as_me:4661: error: C preprocessor \"$CPP\" fails sanity check" >&5
	+ { { echo "$as_me:4998: error: C preprocessor \"$CPP\" fails sanity check" >&5
	echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
	{ (exit 1); exit 1; }; }
	fi

	ac_ext=c
	ac_cpp='$CPP $CPPFLAGS'
	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
	+ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	-ac_main_return=return
	+ac_main_return="return"

	-for ac_header in fcntl.h
	-do
	-as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	-echo "$as_me:4676: checking for $ac_header" >&5
	-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
	+echo "$as_me:5010: checking for ANSI C header files" >&5
	+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
	+if test "${ac_cv_header_stdc+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4682 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5016 "configure"
	#include "confdefs.h"
	-#include <$ac_header>
	+#include <stdlib.h>
	+#include <stdarg.h>
	+#include <string.h>
	+#include <float.h>
	+
	_ACEOF
	-if { (eval echo "$as_me:4686: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:5024: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4692: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:5030: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4700,67 +5038,244 @@
	ac_cpp_err=yes
	fi
	if test -z "$ac_cpp_err"; then
	- eval "$as_ac_Header=yes"
	+ ac_cv_header_stdc=yes
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	- eval "$as_ac_Header=no"
	-fi
	-rm -f conftest.err conftest.$ac_ext
	+ cat "conftest.$ac_ext" >&5
	+ ac_cv_header_stdc=no
	fi
	-echo "$as_me:4711: result: `eval echo '${'$as_ac_Header'}'`" >&5
	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
	-if test `eval echo '${'$as_ac_Header'}'` = yes; then
	- cat >>confdefs.h <<EOF
	-#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	-EOF
	+rm -f conftest.err "conftest.$ac_ext"
	+
	+if test $ac_cv_header_stdc = yes; then
	+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5052 "configure"
	+#include "confdefs.h"
	+#include <string.h>

	+_ACEOF
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "memchr" >/dev/null 2>&1; then
	+ :
	+else
	+ ac_cv_header_stdc=no
	fi
	-done
	+rm -rf conftest*

	-for ac_header in \
	-unistd.h \
	+fi

	-do
	-as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	-echo "$as_me:4726: checking for $ac_header" >&5
	-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
	- echo $ECHO_N "(cached) $ECHO_C" >&6
	-else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4732 "configure"
	+if test $ac_cv_header_stdc = yes; then
	+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5070 "configure"
	#include "confdefs.h"
	-#include <$ac_header>
	+#include <stdlib.h>
	+
	_ACEOF
	-if { (eval echo "$as_me:4736: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	- ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	- rm -f conftest.er1
	- cat conftest.err >&5
	- echo "$as_me:4742: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	- if test -s conftest.err; then
	- ac_cpp_err=$ac_c_preproc_warn_flag
	- else
	- ac_cpp_err=
	- fi
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "free" >/dev/null 2>&1; then
	+ :
	else
	- ac_cpp_err=yes
	+ ac_cv_header_stdc=no
	+fi
	+rm -rf conftest*
	+
	+fi
	+
	+if test $ac_cv_header_stdc = yes; then
	+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
	+ if test "$cross_compiling" = yes; then
	+ :
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5091 "configure"
	+#include "confdefs.h"
	+#include <ctype.h>
	+#if ((' ' & 0x0FF) == 0x020)
	+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
	+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
	+#else
	+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
	+ \|\| ('j' <= (c) && (c) <= 'r') \
	+ \|\| ('s' <= (c) && (c) <= 'z'))
	+# define TOUPPER(c) (ISLOWER(c) ? ((c) \| 0x40) : (c))
	+#endif
	+
	+#define XOR(e, f) (((e) && !(f)) \|\| (!(e) && (f)))
	+int
	+main (void)
	+{
	+ int i;
	+ for (i = 0; i < 256; i++)
	+ if (XOR (islower (i), ISLOWER (i))
	+ \|\| toupper (i) != TOUPPER (i))
	+ $ac_main_return(2);
	+ $ac_main_return (0);
	+}
	+_ACEOF
	+rm -f "conftest$ac_exeext"
	+if { (eval echo "$as_me:5117: \"$ac_link\"") >&5
	+ (eval $ac_link) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5120: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
	+ { (eval echo "$as_me:5122: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5125: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+ :
	+else
	+ echo "$as_me: program exited with status $ac_status" >&5
	+echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+ac_cv_header_stdc=no
	+fi
	+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
	+fi
	+fi
	+fi
	+echo "$as_me:5138: result: $ac_cv_header_stdc" >&5
	+echo "${ECHO_T}$ac_cv_header_stdc" >&6
	+if test $ac_cv_header_stdc = yes; then
	+
	+cat >>confdefs.h <<\EOF
	+#define STDC_HEADERS 1
	+EOF
	+
	+fi
	+
	+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
	+
	+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
	+ inttypes.h stdint.h unistd.h
	+do
	+as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	+echo "$as_me:5154: checking for $ac_header" >&5
	+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	+if eval "test \"\${$as_ac_Header+set}\" = set"; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5160 "configure"
	+#include "confdefs.h"
	+$ac_includes_default
	+#include <$ac_header>
	+_ACEOF
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:5166: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5169: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:5172: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5175: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+ eval "$as_ac_Header=yes"
	+else
	+ echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+eval "$as_ac_Header=no"
	+fi
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+fi
	+echo "$as_me:5185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
	+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
	+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
	+ cat >>confdefs.h <<EOF
	+#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	+EOF
	+
	+fi
	+done
	+
	+echo "$as_me:5195: checking whether exit is declared" >&5
	+echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
	+if test "${ac_cv_have_decl_exit+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5201 "configure"
	+#include "confdefs.h"
	+$ac_includes_default
	+int
	+main (void)
	+{
	+#ifndef exit
	+ char p = (char ) exit; (void) p;
	+#endif
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:5216: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5219: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:5222: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5225: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+ ac_cv_have_decl_exit=yes
	+else
	+ echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+ac_cv_have_decl_exit=no
	+fi
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+fi
	+echo "$as_me:5235: result: $ac_cv_have_decl_exit" >&5
	+echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
	+
	+for ac_header in fcntl.h
	+do
	+as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	+echo "$as_me:5241: checking for $ac_header" >&5
	+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	+if eval "test \"\${$as_ac_Header+set}\" = set"; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5247 "configure"
	+#include "confdefs.h"
	+#include <$ac_header>
	+_ACEOF
	+if { (eval echo "$as_me:5251: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	+ ac_status=$?
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	+ rm -f conftest.er1
	+ cat conftest.err >&5
	+ echo "$as_me:5257: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	+ if test -s conftest.err; then
	+ ac_cpp_err=$ac_c_preproc_warn_flag
	+ else
	+ ac_cpp_err=
	+ fi
	+else
	+ ac_cpp_err=yes
	fi
	if test -z "$ac_cpp_err"; then
	eval "$as_ac_Header=yes"
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	eval "$as_ac_Header=no"
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	fi
	-echo "$as_me:4761: result: `eval echo '${'$as_ac_Header'}'`" >&5
	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
	-if test `eval echo '${'$as_ac_Header'}'` = yes; then
	+echo "$as_me:5276: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
	+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
	+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
	cat >>confdefs.h <<EOF
	#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	EOF
	@@ -4768,28 +5283,72 @@
	fi
	done

	-echo "$as_me:4771: checking for working mkstemp" >&5
	+for ac_header in \
	+unistd.h \
	+
	+do
	+as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	+echo "$as_me:5291: checking for $ac_header" >&5
	+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	+if eval "test \"\${$as_ac_Header+set}\" = set"; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5297 "configure"
	+#include "confdefs.h"
	+#include <$ac_header>
	+_ACEOF
	+if { (eval echo "$as_me:5301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	+ ac_status=$?
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	+ rm -f conftest.er1
	+ cat conftest.err >&5
	+ echo "$as_me:5307: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	+ if test -s conftest.err; then
	+ ac_cpp_err=$ac_c_preproc_warn_flag
	+ else
	+ ac_cpp_err=
	+ fi
	+else
	+ ac_cpp_err=yes
	+fi
	+if test -z "$ac_cpp_err"; then
	+ eval "$as_ac_Header=yes"
	+else
	+ echo "$as_me: failed program was:" >&5
	+ cat "conftest.$ac_ext" >&5
	+ eval "$as_ac_Header=no"
	+fi
	+rm -f conftest.err "conftest.$ac_ext"
	+fi
	+echo "$as_me:5326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
	+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
	+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
	+ cat >>confdefs.h <<EOF
	+#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	+EOF
	+
	+fi
	+done
	+
	+echo "$as_me:5336: checking for working mkstemp" >&5
	echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
	if test "${cf_cv_func_mkstemp+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else

	-rm -rf conftest*
	+rm -rf ./conftest*
	if test "$cross_compiling" = yes; then
	cf_cv_func_mkstemp=maybe
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4782 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5347 "configure"
	#include "confdefs.h"

	-#include <sys/types.h>
	-#ifdef HAVE_UNISTD_H
	-#include <unistd.h>
	-#endif
	-#include <stdlib.h>
	-#include <stdio.h>
	-#include <string.h>
	-#include <sys/stat.h>
	+$ac_includes_default
	+
	int main(void)
	{
	char *tmpl = "conftestXXXXXX";
	@@ -4819,40 +5378,40 @@
	}

	_ACEOF
	-rm -f conftest$ac_exeext
	-if { (eval echo "$as_me:4823: \"$ac_link\"") >&5
	+rm -f "conftest$ac_exeext"
	+if { (eval echo "$as_me:5382: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:4826: \$? = $ac_status" >&5
	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
	- { (eval echo "$as_me:4828: \"$ac_try\"") >&5
	+ echo "$as_me:5385: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
	+ { (eval echo "$as_me:5387: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4831: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:5390: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_func_mkstemp=yes

	else
	echo "$as_me: program exited with status $ac_status" >&5
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	cf_cv_func_mkstemp=no

	fi
	-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
	+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
	fi

	fi
	-echo "$as_me:4846: result: $cf_cv_func_mkstemp" >&5
	+echo "$as_me:5405: result: $cf_cv_func_mkstemp" >&5
	echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
	if test "x$cf_cv_func_mkstemp" = xmaybe ; then
	- echo "$as_me:4849: checking for mkstemp" >&5
	+ echo "$as_me:5408: checking for mkstemp" >&5
	echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
	if test "${ac_cv_func_mkstemp+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4855 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5414 "configure"
	#include "confdefs.h"
	#define mkstemp autoconf_temporary
	#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
	@@ -4882,27 +5441,27 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext conftest$ac_exeext
	-if { (eval echo "$as_me:4886: \"$ac_link\"") >&5
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
	+if { (eval echo "$as_me:5445: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:4889: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest$ac_exeext'
	- { (eval echo "$as_me:4892: \"$ac_try\"") >&5
	+ echo "$as_me:5448: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest$ac_exeext"'
	+ { (eval echo "$as_me:5451: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4895: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:5454: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_func_mkstemp=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_cv_func_mkstemp=no
	fi
	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
	fi
	-echo "$as_me:4905: result: $ac_cv_func_mkstemp" >&5
	+echo "$as_me:5464: result: $ac_cv_func_mkstemp" >&5
	echo "${ECHO_T}$ac_cv_func_mkstemp" >&6

	fi
	@@ -4917,24 +5476,24 @@
	for ac_header in unistd.h getopt.h
	do
	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	-echo "$as_me:4920: checking for $ac_header" >&5
	+echo "$as_me:5479: checking for $ac_header" >&5
	echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	if eval "test \"\${$as_ac_Header+set}\" = set"; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 4926 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5485 "configure"
	#include "confdefs.h"
	#include <$ac_header>
	_ACEOF
	-if { (eval echo "$as_me:4930: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:5489: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:4936: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:5495: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -4947,14 +5506,14 @@
	eval "$as_ac_Header=yes"
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	eval "$as_ac_Header=no"
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	fi
	-echo "$as_me:4955: result: `eval echo '${'$as_ac_Header'}'`" >&5
	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
	-if test `eval echo '${'$as_ac_Header'}'` = yes; then
	+echo "$as_me:5514: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
	+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
	+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
	cat >>confdefs.h <<EOF
	#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	EOF
	@@ -4962,7 +5521,7 @@
	fi
	done

	-echo "$as_me:4965: checking for header declaring getopt variables" >&5
	+echo "$as_me:5524: checking for header declaring getopt variables" >&5
	echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
	if test "${cf_cv_getopt_header+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -4971,51 +5530,51 @@
	cf_cv_getopt_header=none
	for cf_header in stdio.h stdlib.h unistd.h getopt.h
	do
	-cat >conftest.$ac_ext <<_ACEOF
	-#line 4975 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5534 "configure"
	#include "confdefs.h"

	#include <$cf_header>
	int
	main (void)
	{
	-int x = optind; char *y = optarg
	+int x = optind; char *y = optarg; (void)x; (void)y
	;
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:4988: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:5547: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:4991: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:4994: \"$ac_try\"") >&5
	+ echo "$as_me:5550: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:5553: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:4997: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:5556: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	cf_cv_getopt_header=$cf_header
	break
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	done

	fi
	-echo "$as_me:5009: result: $cf_cv_getopt_header" >&5
	+echo "$as_me:5568: result: $cf_cv_getopt_header" >&5
	echo "${ECHO_T}$cf_cv_getopt_header" >&6
	-if test $cf_cv_getopt_header != none ; then
	+if test "$cf_cv_getopt_header" != none ; then

	cat >>confdefs.h <<\EOF
	#define HAVE_GETOPT_HEADER 1
	EOF

	fi
	-if test $cf_cv_getopt_header = getopt.h ; then
	+if test "$cf_cv_getopt_header" = getopt.h ; then

	cat >>confdefs.h <<\EOF
	#define NEED_GETOPT_H 1
	@@ -5026,13 +5585,13 @@
	for ac_func in getopt vsnprintf
	do
	as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh`
	-echo "$as_me:5029: checking for $ac_func" >&5
	+echo "$as_me:5588: checking for $ac_func" >&5
	echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
	if eval "test \"\${$as_ac_var+set}\" = set"; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 5035 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5594 "configure"
	#include "confdefs.h"
	#define $ac_func autoconf_temporary
	#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
	@@ -5062,29 +5621,29 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext conftest$ac_exeext
	-if { (eval echo "$as_me:5066: \"$ac_link\"") >&5
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
	+if { (eval echo "$as_me:5625: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:5069: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest$ac_exeext'
	- { (eval echo "$as_me:5072: \"$ac_try\"") >&5
	+ echo "$as_me:5628: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest$ac_exeext"'
	+ { (eval echo "$as_me:5631: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:5075: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:5634: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	eval "$as_ac_var=yes"
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	eval "$as_ac_var=no"
	fi
	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
	fi
	-echo "$as_me:5085: result: `eval echo '${'$as_ac_var'}'`" >&5
	-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
	-if test `eval echo '${'$as_ac_var'}'` = yes; then
	+echo "$as_me:5644: result: `eval echo '${'"$as_ac_var"'}'`" >&5
	+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
	+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
	cat >>confdefs.h <<EOF
	#define `echo "HAVE_$ac_func" \| $as_tr_cpp` 1
	EOF
	@@ -5092,7 +5651,7 @@
	fi
	done

	-echo "$as_me:5095: checking for maximum table size" >&5
	+echo "$as_me:5654: checking for maximum table size" >&5
	echo $ECHO_N "checking for maximum table size... $ECHO_C" >&6

	# Check whether --with-max-table-size or --without-max-table-size was given.
	@@ -5102,12 +5661,12 @@
	fi;
	if test -n "$with_max_table_size"
	then
	- echo "$as_me:5105: result: $with_max_table_size" >&5
	+ echo "$as_me:5664: result: $with_max_table_size" >&5
	echo "${ECHO_T}$with_max_table_size" >&6
	check=`expr "$with_max_table_size" + 0`
	if test "x$check" != "x$with_max_table_size"
	then
	- { { echo "$as_me:5110: error: invalid value for --with-max-table-size: $with_max_table_size" >&5
	+ { { echo "$as_me:5669: error: invalid value for --with-max-table-size: $with_max_table_size" >&5
	echo "$as_me: error: invalid value for --with-max-table-size: $with_max_table_size" >&2;}
	{ (exit 1); exit 1; }; }
	fi
	@@ -5117,48 +5676,463 @@
	EOF

	else
	- echo "$as_me:5120: result: default" >&5
	+ echo "$as_me:5679: result: default" >&5
	echo "${ECHO_T}default" >&6
	fi

	-echo "$as_me:5124: checking if backtracking extension is wanted" >&5
	+echo "$as_me:5683: checking if backtracking extension is wanted" >&5
	echo $ECHO_N "checking if backtracking extension is wanted... $ECHO_C" >&6

	# Check whether --enable-btyacc or --disable-btyacc was given.
	if test "${enable_btyacc+set}" = set; then
	enableval="$enable_btyacc"
	+ test "$enableval" != no && enableval=yes
	+ if test "$enableval" != "yes" ; then
	+ enable_btyacc=no
	+ else
	+ enable_btyacc=yes
	+ fi
	+else
	+ enableval=yes
	+ enable_btyacc=yes

	fi;
	-echo "$as_me:5132: result: $enable_btyacc" >&5
	+echo "$as_me:5700: result: $enable_btyacc" >&5
	echo "${ECHO_T}$enable_btyacc" >&6
	-if test "$enable_btyacc" = "yes"; then
	+if test "$enable_btyacc" = "no"; then
	+ SKELETON=yaccpar
	+else

	cat >>confdefs.h <<\EOF
	#define YYBTYACC 1
	EOF

	SKELETON=btyaccpar
	+fi
	+
	+echo "$as_me:5713: checking for fgrep" >&5
	+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
	+if test "${ac_cv_path_FGREP+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- SKELETON=yaccpar
	+ if echo 'abc' \| $GREP -F 'abc' >/dev/null 2>&1
	+ then ac_cv_path_FGREP="$GREP -F"
	+ else
	+ for ac_prog in gfgrep fgrep
	+do
	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	+set dummy $ac_prog; ac_word=$2
	+echo "$as_me:5725: checking for $ac_word" >&5
	+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	+if test "${ac_cv_path_FGREP+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ case $FGREP in
	+ [\\/]* \| ?:[\\/]*)
	+ ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
	+ ;;
	+ *)
	+ ac_save_IFS=$IFS; IFS=$ac_path_separator
	+ac_dummy="$PATH"
	+for ac_dir in $ac_dummy; do
	+ IFS=$ac_save_IFS
	+ test -z "$ac_dir" && ac_dir=.
	+ if $as_executable_p "$ac_dir/$ac_word"; then
	+ ac_cv_path_FGREP="$ac_dir/$ac_word"
	+ echo "$as_me:5742: found $ac_dir/$ac_word" >&5
	+ break
	+fi
	+done
	+
	+ ;;
	+esac
	+fi
	+FGREP=$ac_cv_path_FGREP
	+
	+if test -n "$FGREP"; then
	+ echo "$as_me:5753: result: $FGREP" >&5
	+echo "${ECHO_T}$FGREP" >&6
	+else
	+ echo "$as_me:5756: result: no" >&5
	+echo "${ECHO_T}no" >&6
	+fi
	+
	+ test -n "$FGREP" && break
	+done
	+test -n "$FGREP" \|\| FGREP=": "
	+
	+ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5764: error: cannot find workable fgrep" >&5
	+echo "$as_me: error: cannot find workable fgrep" >&2;}
	+ { (exit 1); exit 1; }; }
	+ fi
	+fi
	+echo "$as_me:5769: result: $ac_cv_path_FGREP" >&5
	+echo "${ECHO_T}$ac_cv_path_FGREP" >&6
	+ FGREP="$ac_cv_path_FGREP"
	+
	+echo "$as_me:5773: checking if you want to use C11 _Noreturn feature" >&5
	+echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
	+
	+# Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
	+if test "${enable_stdnoreturn+set}" = set; then
	+ enableval="$enable_stdnoreturn"
	+ test "$enableval" != yes && enableval=no
	+ if test "$enableval" != "no" ; then
	+ enable_stdnoreturn=yes
	+ else
	+ enable_stdnoreturn=no
	+ fi
	+else
	+ enableval=no
	+ enable_stdnoreturn=no
	+
	+fi;
	+echo "$as_me:5790: result: $enable_stdnoreturn" >&5
	+echo "${ECHO_T}$enable_stdnoreturn" >&6
	+
	+if test $enable_stdnoreturn = yes; then
	+echo "$as_me:5794: checking for C11 _Noreturn feature" >&5
	+echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
	+if test "${cf_cv_c11_noreturn+set}" = set; then
	+ echo $ECHO_N "(cached) $ECHO_C" >&6
	+else
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 5800 "configure"
	+#include "confdefs.h"
	+
	+#include <stdio.h>
	+#include <stdlib.h>
	+#include <stdnoreturn.h>
	+static _Noreturn void giveup(void) { exit(0); }
	+
	+int
	+main (void)
	+{
	+if (feof(stdin)) giveup()
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:5817: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5820: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:5823: \"$ac_try\"") >&5
	+ (eval $ac_try) 2>&5
	+ ac_status=$?
	+ echo "$as_me:5826: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	+ cf_cv_c11_noreturn=yes
	+else
	+ echo "$as_me: failed program was:" >&5
	+cat "conftest.$ac_ext" >&5
	+cf_cv_c11_noreturn=no
	+fi
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	+
	+fi
	+echo "$as_me:5837: result: $cf_cv_c11_noreturn" >&5
	+echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
	+else
	+ cf_cv_c11_noreturn=no,
	+fi
	+
	+if test "$cf_cv_c11_noreturn" = yes; then
	+
	+cat >>confdefs.h <<\EOF
	+#define HAVE_STDNORETURN_H 1
	+EOF
	+
	+cat >>confdefs.h <<EOF
	+#define STDC_NORETURN _Noreturn
	+EOF
	+
	+ HAVE_STDNORETURN_H=1
	+else
	+ HAVE_STDNORETURN_H=0
	+fi
	+
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+ case $CFLAGS in
	+ (-Werror=)
	+ cf_temp_flags=
	+ for cf_temp_scan in $CFLAGS
	+ do
	+ case "x$cf_temp_scan" in
	+ (x-Werror=format*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ (x-Werror=*)
	+
	+ test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
	+ EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"
	+
	+ ;;
	+ (*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ esac
	+ done
	+ if test "x$CFLAGS" != "x$cf_temp_flags"
	+ then
	+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5893: testing repairing CFLAGS: $CFLAGS ..." 1>&5
	+
	+ CFLAGS="$cf_temp_flags"
	+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5898: testing ... fixed $CFLAGS ..." 1>&5
	+
	+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5902: testing ... extra $EXTRA_CFLAGS ..." 1>&5
	+
	+ fi
	+ ;;
	+ esac
	+fi
	+
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+ case $CPPFLAGS in
	+ (-Werror=)
	+ cf_temp_flags=
	+ for cf_temp_scan in $CPPFLAGS
	+ do
	+ case "x$cf_temp_scan" in
	+ (x-Werror=format*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ (x-Werror=*)
	+
	+ test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
	+ EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"
	+
	+ ;;
	+ (*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ esac
	+ done
	+ if test "x$CPPFLAGS" != "x$cf_temp_flags"
	+ then
	+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5941: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
	+
	+ CPPFLAGS="$cf_temp_flags"
	+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5946: testing ... fixed $CPPFLAGS ..." 1>&5
	+
	+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5950: testing ... extra $EXTRA_CFLAGS ..." 1>&5
	+
	+ fi
	+ ;;
	+ esac
	+fi
	+
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	+then
	+ case $LDFLAGS in
	+ (-Werror=)
	+ cf_temp_flags=
	+ for cf_temp_scan in $LDFLAGS
	+ do
	+ case "x$cf_temp_scan" in
	+ (x-Werror=format*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ (x-Werror=*)
	+
	+ test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
	+ EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"
	+
	+ ;;
	+ (*)
	+
	+ test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
	+ cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
	+
	+ ;;
	+ esac
	+ done
	+ if test "x$LDFLAGS" != "x$cf_temp_flags"
	+ then
	+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5989: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
	+
	+ LDFLAGS="$cf_temp_flags"
	+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5994: testing ... fixed $LDFLAGS ..." 1>&5
	+
	+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
	+
	+echo "${as_me:-configure}:5998: testing ... extra $EXTRA_CFLAGS ..." 1>&5
	+
	+ fi
	+ ;;
	+ esac
	+fi
	+
	+echo "$as_me:6005: checking if you want to turn on gcc warnings" >&5
	+echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
	+
	+# Check whether --enable-warnings or --disable-warnings was given.
	+if test "${enable_warnings+set}" = set; then
	+ enableval="$enable_warnings"
	+ test "$enableval" != yes && enableval=no
	+ if test "$enableval" != "no" ; then
	+ enable_warnings=yes
	+ else
	+ enable_warnings=no
	+ fi
	+else
	+ enableval=no
	+ enable_warnings=no
	+
	+fi;
	+echo "$as_me:6022: result: $enable_warnings" >&5
	+echo "${ECHO_T}$enable_warnings" >&6
	+if test "$enable_warnings" = "yes"
	+then
	+
	+if test "x$have_x" = xyes; then echo "skipping X-const check"; fi
	+cat > "conftest.$ac_ext" <<EOF
	+#line 6029 "${as_me:-configure}"
	+int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
	+EOF
	+if test "$INTEL_COMPILER" = yes
	+then
	+# The "-wdXXX" options suppress warnings:
	+# remark #1419: external declaration in primary source file
	+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
	+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
	+# remark #193: zero used for undefined preprocessing identifier
	+# remark #593: variable "curs_sb_left_arrow" was set but never used
	+# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
	+# remark #869: parameter "tw" was never referenced
	+# remark #981: operands are evaluated in unspecified order
	+# warning #279: controlling expression is constant
	+
	+ { echo "$as_me:6045: checking for $CC warning options..." >&5
	+echo "$as_me: checking for $CC warning options..." >&6;}
	+ cf_save_CFLAGS="$CFLAGS"
	+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
	+ for cf_opt in \
	+ wd1419 \
	+ wd1683 \
	+ wd1684 \
	+ wd193 \
	+ wd593 \
	+ wd279 \
	+ wd810 \
	+ wd869 \
	+ wd981
	+ do
	+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
	+ if { (eval echo "$as_me:6061: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:6064: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	+ test -n "$verbose" && echo "$as_me:6066: result: ... -$cf_opt" >&5
	+echo "${ECHO_T}... -$cf_opt" >&6
	+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
	+ fi
	+ done
	+ CFLAGS="$cf_save_CFLAGS"
	+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
	+then
	+ { echo "$as_me:6074: checking for $CC warning options..." >&5
	+echo "$as_me: checking for $CC warning options..." >&6;}
	+ cf_save_CFLAGS="$CFLAGS"
	+ cf_warn_CONST=""
	+ test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
	+ cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
	+ test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings=
	+ for cf_opt in W Wall \
	+ Wbad-function-cast \
	+ Wcast-align \
	+ Wcast-qual \
	+ Wdeclaration-after-statement \
	+ Wextra \
	+ Winline \
	+ Wmissing-declarations \
	+ Wmissing-prototypes \
	+ Wnested-externs \
	+ Wpointer-arith \
	+ Wshadow \
	+ Wstrict-prototypes \
	+ Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wwrite-strings
	+ do
	+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
	+ if { (eval echo "$as_me:6097: \"$ac_compile\"") >&5
	+ (eval $ac_compile) 2>&5
	+ ac_status=$?
	+ echo "$as_me:6100: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	+ test -n "$verbose" && echo "$as_me:6102: result: ... -$cf_opt" >&5
	+echo "${ECHO_T}... -$cf_opt" >&6
	+ case "$cf_opt" in
	+ (Winline)
	+ case "$GCC_VERSION" in
	+ ([34].*)
	+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
	+
	+echo "${as_me:-configure}:6110: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
	+
	+ continue;;
	+ esac
	+ ;;
	+ (Wpointer-arith)
	+ case "$GCC_VERSION" in
	+ ([12].*)
	+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
	+
	+echo "${as_me:-configure}:6120: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
	+
	+ continue;;
	+ esac
	+ ;;
	+ esac
	+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
	+ fi
	+ done
	+ CFLAGS="$cf_save_CFLAGS"
	fi
	+rm -rf ./conftest*

	-if ( test "$GCC" = yes \|\| test "$GXX" = yes )
	-then
	-echo "$as_me:5147: checking if you want to check for gcc warnings" >&5
	-echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6
	-
	-# Check whether --with-warnings or --without-warnings was given.
	-if test "${with_warnings+set}" = set; then
	- withval="$with_warnings"
	- cf_opt_with_warnings=$withval
	-else
	- cf_opt_with_warnings=no
	-fi;
	-echo "$as_me:5157: result: $cf_opt_with_warnings" >&5
	-echo "${ECHO_T}$cf_opt_with_warnings" >&6
	-if test "$cf_opt_with_warnings" != no ; then
	+fi

	-if test "$GCC" = yes
	+if test "$GCC" = yes \|\| test "$GXX" = yes
	then
	cat > conftest.i <<EOF
	#ifndef GCC_PRINTF
	@@ -5176,10 +6150,11 @@
	EOF
	if test "$GCC" = yes
	then
	- { echo "$as_me:5179: checking for $CC __attribute__ directives..." >&5
	+ { echo "$as_me:6153: checking for $CC __attribute__ directives..." >&5
	echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
	-cat > conftest.$ac_ext <<EOF
	-#line 5182 "${as_me:-configure}"
	+cat > "conftest.$ac_ext" <<EOF
	+#line 6156 "${as_me:-configure}"
	+#include <stdio.h>
	#include "confdefs.h"
	#include "conftest.h"
	#include "conftest.i"
	@@ -5194,8 +6169,8 @@
	#define GCC_SCANFLIKE(fmt,var) /nothing/
	#endif
	extern void wow(char *,...) GCC_SCANFLIKE(1,2);
	-extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
	-extern void foo(void) GCC_NORETURN;
	+extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
	+extern GCC_NORETURN void foo(void);
	int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
	EOF
	cf_printf_attribute=no
	@@ -5208,7 +6183,7 @@
	cf_directive="__attribute__(($cf_attribute))"
	echo "checking for $CC $cf_directive" 1>&5

	- case $cf_attribute in
	+ case "$cf_attribute" in
	(printf)
	cf_printf_attribute=yes
	cat >conftest.h <<EOF
	@@ -5228,15 +6203,15 @@
	;;
	esac

	- if { (eval echo "$as_me:5231: \"$ac_compile\"") >&5
	+ if { (eval echo "$as_me:6206: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:5234: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	- test -n "$verbose" && echo "$as_me:5236: result: ... $cf_attribute" >&5
	+ echo "$as_me:6209: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; then
	+ test -n "$verbose" && echo "$as_me:6211: result: ... $cf_attribute" >&5
	echo "${ECHO_T}... $cf_attribute" >&6
	cat conftest.h >>confdefs.h
	- case $cf_attribute in
	+ case "$cf_attribute" in
	(noreturn)

	cat >>confdefs.h <<EOF
	@@ -5287,122 +6262,14 @@
	fi
	done
	else
	- fgrep define conftest.i >>confdefs.h
	-fi
	-rm -rf conftest*
	+ ${FGREP-fgrep} define conftest.i >>confdefs.h
	fi
	-
	-if test "x$have_x" = xyes; then echo "skipping X-const check"; fi
	-cat > conftest.$ac_ext <<EOF
	-#line 5297 "${as_me:-configure}"
	-int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
	-EOF
	-if test "$INTEL_COMPILER" = yes
	-then
	-# The "-wdXXX" options suppress warnings:
	-# remark #1419: external declaration in primary source file
	-# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
	-# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
	-# remark #193: zero used for undefined preprocessing identifier
	-# remark #593: variable "curs_sb_left_arrow" was set but never used
	-# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
	-# remark #869: parameter "tw" was never referenced
	-# remark #981: operands are evaluated in unspecified order
	-# warning #279: controlling expression is constant
	-
	- { echo "$as_me:5313: checking for $CC warning options..." >&5
	-echo "$as_me: checking for $CC warning options..." >&6;}
	- cf_save_CFLAGS="$CFLAGS"
	- EXTRA_CFLAGS="-Wall"
	- for cf_opt in \
	- wd1419 \
	- wd1683 \
	- wd1684 \
	- wd193 \
	- wd593 \
	- wd279 \
	- wd810 \
	- wd869 \
	- wd981
	- do
	- CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
	- if { (eval echo "$as_me:5329: \"$ac_compile\"") >&5
	- (eval $ac_compile) 2>&5
	- ac_status=$?
	- echo "$as_me:5332: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	- test -n "$verbose" && echo "$as_me:5334: result: ... -$cf_opt" >&5
	-echo "${ECHO_T}... -$cf_opt" >&6
	- EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
	- fi
	- done
	- CFLAGS="$cf_save_CFLAGS"
	-elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
	-then
	- { echo "$as_me:5342: checking for $CC warning options..." >&5
	-echo "$as_me: checking for $CC warning options..." >&6;}
	- cf_save_CFLAGS="$CFLAGS"
	- EXTRA_CFLAGS=
	- cf_warn_CONST=""
	- test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
	- cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
	- test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings=
	- for cf_opt in W Wall \
	- Wbad-function-cast \
	- Wcast-align \
	- Wcast-qual \
	- Wdeclaration-after-statement \
	- Wextra \
	- Winline \
	- Wmissing-declarations \
	- Wmissing-prototypes \
	- Wnested-externs \
	- Wpointer-arith \
	- Wshadow \
	- Wstrict-prototypes \
	- Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wwrite-strings
	- do
	- CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
	- if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
	- (eval $ac_compile) 2>&5
	- ac_status=$?
	- echo "$as_me:5369: \$? = $ac_status" >&5
	- (exit $ac_status); }; then
	- test -n "$verbose" && echo "$as_me:5371: result: ... -$cf_opt" >&5
	-echo "${ECHO_T}... -$cf_opt" >&6
	- case $cf_opt in
	- (Winline)
	- case $GCC_VERSION in
	- ([34].*)
	- test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
	-
	-echo "${as_me:-configure}:5379: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
	-
	- continue;;
	- esac
	- ;;
	- (Wpointer-arith)
	- case $GCC_VERSION in
	- ([12].*)
	- test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
	-
	-echo "${as_me:-configure}:5389: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
	-
	- continue;;
	- esac
	- ;;
	- esac
	- EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
	- fi
	- done
	- CFLAGS="$cf_save_CFLAGS"
	+rm -rf ./conftest*
	fi
	-rm -rf conftest*

	-fi
	fi

	-echo "$as_me:5405: checking if you want to see long compiling messages" >&5
	+echo "$as_me:6272: checking if you want to see long compiling messages" >&5
	echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6

	# Check whether --enable-echo or --disable-echo was given.
	@@ -5436,30 +6303,35 @@
	ECHO_CC=''

	fi;
	-echo "$as_me:5439: result: $enableval" >&5
	+echo "$as_me:6306: result: $enableval" >&5
	echo "${ECHO_T}$enableval" >&6

	-echo "$as_me:5442: checking if you want to use dmalloc for testing" >&5
	+echo "$as_me:6309: checking if you want to use dmalloc for testing" >&5
	echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6

	# Check whether --with-dmalloc or --without-dmalloc was given.
	if test "${with_dmalloc+set}" = set; then
	withval="$with_dmalloc"
	+ case "x$withval" in
	+ (x\|xno) ;;
	+ (*)
	+ : "${with_cflags:=-g}"
	+ : "${enable_leaks:=no}"
	+ with_dmalloc=yes

	cat >>confdefs.h <<EOF
	#define USE_DMALLOC 1
	EOF

	- : ${with_cflags:=-g}
	- : ${with_no_leaks:=yes}
	- with_dmalloc=yes
	+ ;;
	+ esac
	else
	with_dmalloc=
	fi;
	-echo "$as_me:5459: result: ${with_dmalloc:-no}" >&5
	+echo "$as_me:6331: result: ${with_dmalloc:-no}" >&5
	echo "${ECHO_T}${with_dmalloc:-no}" >&6

	-case .$with_cflags in
	+case ".$with_cflags" in
	(.-g)
	case .$CFLAGS in
	(.-g)
	@@ -5473,19 +6345,19 @@

	for cf_add_cflags in -g
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -5504,7 +6376,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -5534,7 +6406,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -5570,24 +6442,24 @@
	esac

	if test "$with_dmalloc" = yes ; then
	- echo "$as_me:5573: checking for dmalloc.h" >&5
	+ echo "$as_me:6445: checking for dmalloc.h" >&5
	echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
	if test "${ac_cv_header_dmalloc_h+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 5579 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 6451 "configure"
	#include "confdefs.h"
	#include <dmalloc.h>
	_ACEOF
	-if { (eval echo "$as_me:5583: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:6455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:5589: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:6461: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -5600,24 +6472,24 @@
	ac_cv_header_dmalloc_h=yes
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	ac_cv_header_dmalloc_h=no
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	fi
	-echo "$as_me:5608: result: $ac_cv_header_dmalloc_h" >&5
	+echo "$as_me:6480: result: $ac_cv_header_dmalloc_h" >&5
	echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
	-if test $ac_cv_header_dmalloc_h = yes; then
	+if test "$ac_cv_header_dmalloc_h" = yes; then

	-echo "$as_me:5612: checking for dmalloc_debug in -ldmalloc" >&5
	+echo "$as_me:6484: checking for dmalloc_debug in -ldmalloc" >&5
	echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
	if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	ac_check_lib_save_LIBS=$LIBS
	LIBS="-ldmalloc $LIBS"
	-cat >conftest.$ac_ext <<_ACEOF
	-#line 5620 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 6492 "configure"
	#include "confdefs.h"

	/* Override any gcc2 internal prototype to avoid an error. */
	@@ -5635,30 +6507,30 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext conftest$ac_exeext
	-if { (eval echo "$as_me:5639: \"$ac_link\"") >&5
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
	+if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:5642: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest$ac_exeext'
	- { (eval echo "$as_me:5645: \"$ac_try\"") >&5
	+ echo "$as_me:6514: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest$ac_exeext"'
	+ { (eval echo "$as_me:6517: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:5648: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:6520: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_lib_dmalloc_dmalloc_debug=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_cv_lib_dmalloc_dmalloc_debug=no
	fi
	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
	LIBS=$ac_check_lib_save_LIBS
	fi
	-echo "$as_me:5659: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
	+echo "$as_me:6531: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
	echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
	-if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
	+if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
	cat >>confdefs.h <<EOF
	#define HAVE_LIBDMALLOC 1
	EOF
	@@ -5671,27 +6543,32 @@

	fi

	-echo "$as_me:5674: checking if you want to use dbmalloc for testing" >&5
	+echo "$as_me:6546: checking if you want to use dbmalloc for testing" >&5
	echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6

	# Check whether --with-dbmalloc or --without-dbmalloc was given.
	if test "${with_dbmalloc+set}" = set; then
	withval="$with_dbmalloc"
	+ case "x$withval" in
	+ (x\|xno) ;;
	+ (*)
	+ : "${with_cflags:=-g}"
	+ : "${enable_leaks:=no}"
	+ with_dbmalloc=yes

	cat >>confdefs.h <<EOF
	#define USE_DBMALLOC 1
	EOF

	- : ${with_cflags:=-g}
	- : ${with_no_leaks:=yes}
	- with_dbmalloc=yes
	+ ;;
	+ esac
	else
	with_dbmalloc=
	fi;
	-echo "$as_me:5691: result: ${with_dbmalloc:-no}" >&5
	+echo "$as_me:6568: result: ${with_dbmalloc:-no}" >&5
	echo "${ECHO_T}${with_dbmalloc:-no}" >&6

	-case .$with_cflags in
	+case ".$with_cflags" in
	(.-g)
	case .$CFLAGS in
	(.-g)
	@@ -5705,19 +6582,19 @@

	for cf_add_cflags in -g
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -5736,7 +6613,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -5766,7 +6643,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -5802,24 +6679,24 @@
	esac

	if test "$with_dbmalloc" = yes ; then
	- echo "$as_me:5805: checking for dbmalloc.h" >&5
	+ echo "$as_me:6682: checking for dbmalloc.h" >&5
	echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
	if test "${ac_cv_header_dbmalloc_h+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 5811 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 6688 "configure"
	#include "confdefs.h"
	#include <dbmalloc.h>
	_ACEOF
	-if { (eval echo "$as_me:5815: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	+if { (eval echo "$as_me:6692: \"$ac_cpp "conftest.$ac_ext"\"") >&5
	+ (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
	ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	+ $EGREP -v '^ *\+' conftest.er1 >conftest.err
	rm -f conftest.er1
	cat conftest.err >&5
	- echo "$as_me:5821: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	+ echo "$as_me:6698: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } >/dev/null; then
	if test -s conftest.err; then
	ac_cpp_err=$ac_c_preproc_warn_flag
	else
	@@ -5832,24 +6709,24 @@
	ac_cv_header_dbmalloc_h=yes
	else
	echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	+ cat "conftest.$ac_ext" >&5
	ac_cv_header_dbmalloc_h=no
	fi
	-rm -f conftest.err conftest.$ac_ext
	+rm -f conftest.err "conftest.$ac_ext"
	fi
	-echo "$as_me:5840: result: $ac_cv_header_dbmalloc_h" >&5
	+echo "$as_me:6717: result: $ac_cv_header_dbmalloc_h" >&5
	echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
	-if test $ac_cv_header_dbmalloc_h = yes; then
	+if test "$ac_cv_header_dbmalloc_h" = yes; then

	-echo "$as_me:5844: checking for debug_malloc in -ldbmalloc" >&5
	+echo "$as_me:6721: checking for debug_malloc in -ldbmalloc" >&5
	echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
	if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	ac_check_lib_save_LIBS=$LIBS
	LIBS="-ldbmalloc $LIBS"
	-cat >conftest.$ac_ext <<_ACEOF
	-#line 5852 "configure"
	+cat >"conftest.$ac_ext" <<_ACEOF
	+#line 6729 "configure"
	#include "confdefs.h"

	/* Override any gcc2 internal prototype to avoid an error. */
	@@ -5867,30 +6744,30 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext conftest$ac_exeext
	-if { (eval echo "$as_me:5871: \"$ac_link\"") >&5
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
	+if { (eval echo "$as_me:6748: \"$ac_link\"") >&5
	(eval $ac_link) 2>&5
	ac_status=$?
	- echo "$as_me:5874: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest$ac_exeext'
	- { (eval echo "$as_me:5877: \"$ac_try\"") >&5
	+ echo "$as_me:6751: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest$ac_exeext"'
	+ { (eval echo "$as_me:6754: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:5880: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:6757: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_lib_dbmalloc_debug_malloc=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_cv_lib_dbmalloc_debug_malloc=no
	fi
	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
	LIBS=$ac_check_lib_save_LIBS
	fi
	-echo "$as_me:5891: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
	+echo "$as_me:6768: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
	echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
	-if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
	+if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
	cat >>confdefs.h <<EOF
	#define HAVE_LIBDBMALLOC 1
	EOF
	@@ -5903,27 +6780,32 @@

	fi

	-echo "$as_me:5906: checking if you want to use valgrind for testing" >&5
	+echo "$as_me:6783: checking if you want to use valgrind for testing" >&5
	echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6

	# Check whether --with-valgrind or --without-valgrind was given.
	if test "${with_valgrind+set}" = set; then
	withval="$with_valgrind"
	+ case "x$withval" in
	+ (x\|xno) ;;
	+ (*)
	+ : "${with_cflags:=-g}"
	+ : "${enable_leaks:=no}"
	+ with_valgrind=yes

	cat >>confdefs.h <<EOF
	#define USE_VALGRIND 1
	EOF

	- : ${with_cflags:=-g}
	- : ${with_no_leaks:=yes}
	- with_valgrind=yes
	+ ;;
	+ esac
	else
	with_valgrind=
	fi;
	-echo "$as_me:5923: result: ${with_valgrind:-no}" >&5
	+echo "$as_me:6805: result: ${with_valgrind:-no}" >&5
	echo "${ECHO_T}${with_valgrind:-no}" >&6

	-case .$with_cflags in
	+case ".$with_cflags" in
	(.-g)
	case .$CFLAGS in
	(.-g)
	@@ -5937,19 +6819,19 @@

	for cf_add_cflags in -g
	do
	-case $cf_fix_cppflags in
	+case "$cf_fix_cppflags" in
	(no)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-undef\|-nostdinc\|-I\|-D\|-U\|-E\|-P\|-C)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^-D[^=]='\''\"[^"]//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^-D[^=]='\''\"[^"]//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	&& cf_fix_cppflags=yes

	- if test $cf_fix_cppflags = yes ; then
	+ if test "$cf_fix_cppflags" = yes ; then

	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
	@@ -5968,7 +6850,7 @@
	(*$cf_add_cflags)
	;;
	(*)
	- case $cf_add_cflags in
	+ case "$cf_add_cflags" in
	(-D*)
	cf_tst_cppflags=`echo "x$cf_add_cflags" \| sed -e 's/^...//' -e 's/=.*//'`

	@@ -5998,7 +6880,7 @@
	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

	- cf_tst_cflags=`echo ${cf_add_cflags} \|sed -e 's/^[^"]*"'\''//'`
	+ cf_tst_cflags=`echo "${cf_add_cflags}" \|sed -e 's/^[^"]*"'\''//'`

	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
	&& test -z "${cf_tst_cflags}" \
	@@ -6033,20 +6915,21 @@
	;;
	esac

	-echo "$as_me:6036: checking if you want to perform memory-leak testing" >&5
	+echo "$as_me:6918: checking if you want to perform memory-leak testing" >&5
	echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6

	# Check whether --enable-leaks or --disable-leaks was given.
	if test "${enable_leaks+set}" = set; then
	enableval="$enable_leaks"
	- if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
	+ enable_leaks=$enableval
	else
	- : ${with_no_leaks:=no}
	+ enable_leaks=yes
	fi;
	-echo "$as_me:6046: result: $with_no_leaks" >&5
	+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
	+echo "$as_me:6929: result: $with_no_leaks" >&5
	echo "${ECHO_T}$with_no_leaks" >&6

	-if test "$with_no_leaks" = yes ; then
	+if test "$enable_leaks" = no ; then

	cat >>confdefs.h <<\EOF
	#define NO_LEAKS 1
	@@ -6060,7 +6943,7 @@

	# Extract the first word of "groff", so it can be a program name with args.
	set dummy groff; ac_word=$2
	-echo "$as_me:6063: checking for $ac_word" >&5
	+echo "$as_me:6946: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_path_GROFF_PATH+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -6077,7 +6960,7 @@
	test -z "$ac_dir" && ac_dir=.
	if $as_executable_p "$ac_dir/$ac_word"; then
	ac_cv_path_GROFF_PATH="$ac_dir/$ac_word"
	- echo "$as_me:6080: found $ac_dir/$ac_word" >&5
	+ echo "$as_me:6963: found $ac_dir/$ac_word" >&5
	break
	fi
	done
	@@ -6089,10 +6972,10 @@
	GROFF_PATH=$ac_cv_path_GROFF_PATH

	if test -n "$GROFF_PATH"; then
	- echo "$as_me:6092: result: $GROFF_PATH" >&5
	+ echo "$as_me:6975: result: $GROFF_PATH" >&5
	echo "${ECHO_T}$GROFF_PATH" >&6
	else
	- echo "$as_me:6095: result: no" >&5
	+ echo "$as_me:6978: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -6100,7 +6983,7 @@
	do
	# Extract the first word of "$ac_prog", so it can be a program name with args.
	set dummy $ac_prog; ac_word=$2
	-echo "$as_me:6103: checking for $ac_word" >&5
	+echo "$as_me:6986: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_path_NROFF_PATH+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -6117,7 +7000,7 @@
	test -z "$ac_dir" && ac_dir=.
	if $as_executable_p "$ac_dir/$ac_word"; then
	ac_cv_path_NROFF_PATH="$ac_dir/$ac_word"
	- echo "$as_me:6120: found $ac_dir/$ac_word" >&5
	+ echo "$as_me:7003: found $ac_dir/$ac_word" >&5
	break
	fi
	done
	@@ -6128,10 +7011,10 @@
	NROFF_PATH=$ac_cv_path_NROFF_PATH

	if test -n "$NROFF_PATH"; then
	- echo "$as_me:6131: result: $NROFF_PATH" >&5
	+ echo "$as_me:7014: result: $NROFF_PATH" >&5
	echo "${ECHO_T}$NROFF_PATH" >&6
	else
	- echo "$as_me:6134: result: no" >&5
	+ echo "$as_me:7017: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -6141,7 +7024,7 @@

	# Extract the first word of "tbl", so it can be a program name with args.
	set dummy tbl; ac_word=$2
	-echo "$as_me:6144: checking for $ac_word" >&5
	+echo "$as_me:7027: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_path_TBL_PATH+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -6158,7 +7041,7 @@
	test -z "$ac_dir" && ac_dir=.
	if $as_executable_p "$ac_dir/$ac_word"; then
	ac_cv_path_TBL_PATH="$ac_dir/$ac_word"
	- echo "$as_me:6161: found $ac_dir/$ac_word" >&5
	+ echo "$as_me:7044: found $ac_dir/$ac_word" >&5
	break
	fi
	done
	@@ -6170,10 +7053,10 @@
	TBL_PATH=$ac_cv_path_TBL_PATH

	if test -n "$TBL_PATH"; then
	- echo "$as_me:6173: result: $TBL_PATH" >&5
	+ echo "$as_me:7056: result: $TBL_PATH" >&5
	echo "${ECHO_T}$TBL_PATH" >&6
	else
	- echo "$as_me:6176: result: no" >&5
	+ echo "$as_me:7059: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -6193,7 +7076,7 @@
	(x\|xyes)
	# Extract the first word of "man2html", so it can be a program name with args.
	set dummy man2html; ac_word=$2
	-echo "$as_me:6196: checking for $ac_word" >&5
	+echo "$as_me:7079: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_path_cf_man2html+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -6210,7 +7093,7 @@
	test -z "$ac_dir" && ac_dir=.
	if $as_executable_p "$ac_dir/$ac_word"; then
	ac_cv_path_cf_man2html="$ac_dir/$ac_word"
	- echo "$as_me:6213: found $ac_dir/$ac_word" >&5
	+ echo "$as_me:7096: found $ac_dir/$ac_word" >&5
	break
	fi
	done
	@@ -6222,16 +7105,16 @@
	cf_man2html=$ac_cv_path_cf_man2html

	if test -n "$cf_man2html"; then
	- echo "$as_me:6225: result: $cf_man2html" >&5
	+ echo "$as_me:7108: result: $cf_man2html" >&5
	echo "${ECHO_T}$cf_man2html" >&6
	else
	- echo "$as_me:6228: result: no" >&5
	+ echo "$as_me:7111: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	case "x$cf_man2html" in
	(x/*)
	- echo "$as_me:6234: checking for the modified Earl Hood script" >&5
	+ echo "$as_me:7117: checking for the modified Earl Hood script" >&5
	echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6
	if ( $cf_man2html -help 2>&1 \| grep 'Make an index of headers at the end' >/dev/null )
	then
	@@ -6240,7 +7123,7 @@
	cf_man2html=no
	cf_man2html_ok=no
	fi
	- echo "$as_me:6243: result: $cf_man2html_ok" >&5
	+ echo "$as_me:7126: result: $cf_man2html_ok" >&5
	echo "${ECHO_T}$cf_man2html_ok" >&6
	;;
	(*)
	@@ -6249,7 +7132,7 @@
	esac
	esac

	-echo "$as_me:6252: checking for program to convert manpage to html" >&5
	+echo "$as_me:7135: checking for program to convert manpage to html" >&5
	echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6

	# Check whether --with-man2html or --without-man2html was given.
	@@ -6264,11 +7147,11 @@

	case $cf_man2html in
	(yes)
	- echo "$as_me:6267: result: man2html" >&5
	+ echo "$as_me:7150: result: man2html" >&5
	echo "${ECHO_T}man2html" >&6
	# Extract the first word of "man2html", so it can be a program name with args.
	set dummy man2html; ac_word=$2
	-echo "$as_me:6271: checking for $ac_word" >&5
	+echo "$as_me:7154: checking for $ac_word" >&5
	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	if test "${ac_cv_path_cf_man2html+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	@@ -6285,7 +7168,7 @@
	test -z "$ac_dir" && ac_dir=.
	if $as_executable_p "$ac_dir/$ac_word"; then
	ac_cv_path_cf_man2html="$ac_dir/$ac_word"
	- echo "$as_me:6288: found $ac_dir/$ac_word" >&5
	+ echo "$as_me:7171: found $ac_dir/$ac_word" >&5
	break
	fi
	done
	@@ -6297,10 +7180,10 @@
	cf_man2html=$ac_cv_path_cf_man2html

	if test -n "$cf_man2html"; then
	- echo "$as_me:6300: result: $cf_man2html" >&5
	+ echo "$as_me:7183: result: $cf_man2html" >&5
	echo "${ECHO_T}$cf_man2html" >&6
	else
	- echo "$as_me:6303: result: no" >&5
	+ echo "$as_me:7186: result: no" >&5
	echo "${ECHO_T}no" >&6
	fi

	@@ -6308,11 +7191,11 @@
	(no\|groff\|/groff)
	cf_with_groff=yes
	cf_man2html=$GROFF_PATH
	- echo "$as_me:6311: result: $cf_man2html" >&5
	+ echo "$as_me:7194: result: $cf_man2html" >&5
	echo "${ECHO_T}$cf_man2html" >&6
	;;
	(*)
	- echo "$as_me:6315: result: $cf_man2html" >&5
	+ echo "$as_me:7198: result: $cf_man2html" >&5
	echo "${ECHO_T}$cf_man2html" >&6
	;;
	esac
	@@ -6341,6 +7224,7 @@

	CF_EOF

	+NROFF_OPTS=
	if test "x$cf_with_groff" = xyes
	then
	MAN2HTML_NOTE="$GROFF_NOTE"
	@@ -6349,6 +7233,18 @@
	$SHELL -c "$TBL_PATH \${ROOT}.\${TYPE} \| $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}"
	CF_EOF
	else
	+ # disable hyphenation if this is groff
	+ if test "x$GROFF_PATH" != xno
	+ then
	+ echo "$as_me:7239: checking if nroff is really groff" >&5
	+echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6
	+ cf_check_groff="`$NROFF_PATH --version 2>/dev/null \| grep groff`"
	+ test -n "$cf_check_groff" && cf_check_groff=yes
	+ test -n "$cf_check_groff" \|\| cf_check_groff=no
	+ echo "$as_me:7244: result: $cf_check_groff" >&5
	+echo "${ECHO_T}$cf_check_groff" >&6
	+ test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
	+ fi
	MAN2HTML_NOTE=""

	if test "x$prefix" != xNONE; then
	@@ -6364,26 +7260,26 @@
	;;
	(.[a-zA-Z]:[\\/]*) # OS/2 EMX
	;;
	-(.\${prefix}\|.\${dir})
	+(.\$\{prefix\}\|.\$\{dir\})
	eval cf_man2html="$cf_man2html"
	case ".$cf_man2html" in
	(.NONE/*)
	- cf_man2html=`echo $cf_man2html \| sed -e s%NONE%$cf_path_syntax%`
	+ cf_man2html=`echo "$cf_man2html" \| sed -e s%NONE%$cf_path_syntax%`
	;;
	esac
	;;
	(.no\|.NONE/*)
	- cf_man2html=`echo $cf_man2html \| sed -e s%NONE%$cf_path_syntax%`
	+ cf_man2html=`echo "$cf_man2html" \| sed -e s%NONE%$cf_path_syntax%`
	;;
	(*)
	- { { echo "$as_me:6379: error: expected a pathname, not \"$cf_man2html\"" >&5
	+ { { echo "$as_me:7275: error: expected a pathname, not \"$cf_man2html\"" >&5
	echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;}
	{ (exit 1); exit 1; }; }
	;;
	esac

	MAN2HTML_PATH="$cf_man2html"
	- echo "$as_me:6386: checking for $cf_man2html top/bottom margins" >&5
	+ echo "$as_me:7282: checking for $cf_man2html top/bottom margins" >&5
	echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6

	# for this example, expect 3 lines of content, the remainder is head/foot
	@@ -6395,16 +7291,16 @@

	LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out

	- cf_man2html_1st=`fgrep -n MARKER conftest.out \|sed -e 's/^[^0-9]://' -e 's/:.//'`
	- cf_man2html_top=`expr $cf_man2html_1st - 2`
	- cf_man2html_bot=`wc -l conftest.out \|sed -e 's/[^0-9]//g'`
	- cf_man2html_bot=`expr $cf_man2html_bot - 2 - $cf_man2html_top`
	+ cf_man2html_1st="`${FGREP-fgrep} -n MARKER conftest.out \|sed -e 's/^[^0-9]://' -e 's/:.//'`"
	+ cf_man2html_top=`expr "$cf_man2html_1st" - 2`
	+ cf_man2html_bot="`wc -l conftest.out \|sed -e 's/[^0-9]//g'`"
	+ cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"`
	cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot"

	- echo "$as_me:6404: result: $cf_man2html_top_bot" >&5
	+ echo "$as_me:7300: result: $cf_man2html_top_bot" >&5
	echo "${ECHO_T}$cf_man2html_top_bot" >&6

	- echo "$as_me:6407: checking for pagesize to use" >&5
	+ echo "$as_me:7303: checking for pagesize to use" >&5
	echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6
	for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
	do
	@@ -6424,23 +7320,23 @@
	done

	LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out
	- cf_man2html_page=`fgrep -n HEAD1 conftest.out \|sed -n '$p' \|sed -e 's/^[^0-9]://' -e 's/:.//'`
	+ cf_man2html_page="`${FGREP-fgrep} -n HEAD1 conftest.out \|sed -n '$p' \|sed -e 's/^[^0-9]://' -e 's/:.//'`"
	test -z "$cf_man2html_page" && cf_man2html_page=99999
	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999

	rm -rf conftest*
	- echo "$as_me:6432: result: $cf_man2html_page" >&5
	+ echo "$as_me:7328: result: $cf_man2html_page" >&5
	echo "${ECHO_T}$cf_man2html_page" >&6

	cat >>$MAN2HTML_TEMP <<CF_EOF
	: \${MAN2HTML_PATH=$MAN2HTML_PATH}
	-MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title="\$ROOT$\$TYPE$" -compress -pgsize $cf_man2html_page"
	+MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title=\"\$ROOT(\$TYPE)\" -compress -pgsize $cf_man2html_page"
	case \${TYPE} in
	(ms)
	- $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH -\${MACS} \| \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS
	+ $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH $NROFF_OPTS -\${MACS} \| \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS
	;;
	(*)
	- $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH -\${MACS} \| \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS
	+ $TBL_PATH \${ROOT}.\${TYPE} \| $NROFF_PATH $NROFF_OPTS -\${MACS} \| \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS
	;;
	esac
	CF_EOF
	@@ -6448,198 +7344,13 @@

	chmod 700 $MAN2HTML_TEMP

	-echo "$as_me:6451: checking for ANSI C header files" >&5
	-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
	-if test "${ac_cv_header_stdc+set}" = set; then
	- echo $ECHO_N "(cached) $ECHO_C" >&6
	-else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6457 "configure"
	-#include "confdefs.h"
	-#include <stdlib.h>
	-#include <stdarg.h>
	-#include <string.h>
	-#include <float.h>
	-
	-_ACEOF
	-if { (eval echo "$as_me:6465: \"$ac_cpp conftest.$ac_ext\"") >&5
	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
	- ac_status=$?
	- egrep -v '^ *\+' conftest.er1 >conftest.err
	- rm -f conftest.er1
	- cat conftest.err >&5
	- echo "$as_me:6471: \$? = $ac_status" >&5
	- (exit $ac_status); } >/dev/null; then
	- if test -s conftest.err; then
	- ac_cpp_err=$ac_c_preproc_warn_flag
	- else
	- ac_cpp_err=
	- fi
	-else
	- ac_cpp_err=yes
	-fi
	-if test -z "$ac_cpp_err"; then
	- ac_cv_header_stdc=yes
	-else
	- echo "$as_me: failed program was:" >&5
	- cat conftest.$ac_ext >&5
	- ac_cv_header_stdc=no
	-fi
	-rm -f conftest.err conftest.$ac_ext
	-
	-if test $ac_cv_header_stdc = yes; then
	- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6493 "configure"
	-#include "confdefs.h"
	-#include <string.h>
	-
	-_ACEOF
	-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	- egrep "memchr" >/dev/null 2>&1; then
	- :
	-else
	- ac_cv_header_stdc=no
	-fi
	-rm -rf conftest*
	-
	-fi
	-
	-if test $ac_cv_header_stdc = yes; then
	- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6511 "configure"
	-#include "confdefs.h"
	-#include <stdlib.h>
	-
	-_ACEOF
	-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	- egrep "free" >/dev/null 2>&1; then
	- :
	-else
	- ac_cv_header_stdc=no
	-fi
	-rm -rf conftest*
	-
	-fi
	-
	-if test $ac_cv_header_stdc = yes; then
	- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
	- if test "$cross_compiling" = yes; then
	- :
	-else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6532 "configure"
	-#include "confdefs.h"
	-#include <ctype.h>
	-#if ((' ' & 0x0FF) == 0x020)
	-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
	-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
	-#else
	-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
	- \|\| ('j' <= (c) && (c) <= 'r') \
	- \|\| ('s' <= (c) && (c) <= 'z'))
	-# define TOUPPER(c) (ISLOWER(c) ? ((c) \| 0x40) : (c))
	-#endif
	-
	-#define XOR(e, f) (((e) && !(f)) \|\| (!(e) && (f)))
	-int
	-main (void)
	-{
	- int i;
	- for (i = 0; i < 256; i++)
	- if (XOR (islower (i), ISLOWER (i))
	- \|\| toupper (i) != TOUPPER (i))
	- $ac_main_return(2);
	- $ac_main_return (0);
	-}
	-_ACEOF
	-rm -f conftest$ac_exeext
	-if { (eval echo "$as_me:6558: \"$ac_link\"") >&5
	- (eval $ac_link) 2>&5
	- ac_status=$?
	- echo "$as_me:6561: \$? = $ac_status" >&5
	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
	- { (eval echo "$as_me:6563: \"$ac_try\"") >&5
	- (eval $ac_try) 2>&5
	- ac_status=$?
	- echo "$as_me:6566: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	- :
	-else
	- echo "$as_me: program exited with status $ac_status" >&5
	-echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	-ac_cv_header_stdc=no
	-fi
	-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
	-fi
	-fi
	-fi
	-echo "$as_me:6579: result: $ac_cv_header_stdc" >&5
	-echo "${ECHO_T}$ac_cv_header_stdc" >&6
	-if test $ac_cv_header_stdc = yes; then
	-
	-cat >>confdefs.h <<\EOF
	-#define STDC_HEADERS 1
	-EOF
	-
	-fi
	-
	-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
	-
	-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
	- inttypes.h stdint.h unistd.h
	-do
	-as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	-echo "$as_me:6595: checking for $ac_header" >&5
	-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
	- echo $ECHO_N "(cached) $ECHO_C" >&6
	-else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6601 "configure"
	-#include "confdefs.h"
	-$ac_includes_default
	-#include <$ac_header>
	-_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:6607: \"$ac_compile\"") >&5
	- (eval $ac_compile) 2>&5
	- ac_status=$?
	- echo "$as_me:6610: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:6613: \"$ac_try\"") >&5
	- (eval $ac_try) 2>&5
	- ac_status=$?
	- echo "$as_me:6616: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	- eval "$as_ac_Header=yes"
	-else
	- echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	-eval "$as_ac_Header=no"
	-fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	-fi
	-echo "$as_me:6626: result: `eval echo '${'$as_ac_Header'}'`" >&5
	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
	-if test `eval echo '${'$as_ac_Header'}'` = yes; then
	- cat >>confdefs.h <<EOF
	-#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	-EOF
	-
	-fi
	-done
	-
	-echo "$as_me:6636: checking for mode_t" >&5
	+echo "$as_me:7347: checking for mode_t" >&5
	echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
	if test "${ac_cv_type_mode_t+set}" = set; then
	echo $ECHO_N "(cached) $ECHO_C" >&6
	else
	- cat >conftest.$ac_ext <<_ACEOF
	-#line 6642 "configure"
	+ cat >"conftest.$ac_ext" <<_ACEOF
	+#line 7353 "configure"
	#include "confdefs.h"
	$ac_includes_default
	int
	@@ -6653,29 +7364,29 @@
	return 0;
	}
	_ACEOF
	-rm -f conftest.$ac_objext
	-if { (eval echo "$as_me:6657: \"$ac_compile\"") >&5
	+rm -f "conftest.$ac_objext"
	+if { (eval echo "$as_me:7368: \"$ac_compile\"") >&5
	(eval $ac_compile) 2>&5
	ac_status=$?
	- echo "$as_me:6660: \$? = $ac_status" >&5
	- (exit $ac_status); } &&
	- { ac_try='test -s conftest.$ac_objext'
	- { (eval echo "$as_me:6663: \"$ac_try\"") >&5
	+ echo "$as_me:7371: \$? = $ac_status" >&5
	+ (exit "$ac_status"); } &&
	+ { ac_try='test -s "conftest.$ac_objext"'
	+ { (eval echo "$as_me:7374: \"$ac_try\"") >&5
	(eval $ac_try) 2>&5
	ac_status=$?
	- echo "$as_me:6666: \$? = $ac_status" >&5
	- (exit $ac_status); }; }; then
	+ echo "$as_me:7377: \$? = $ac_status" >&5
	+ (exit "$ac_status"); }; }; then
	ac_cv_type_mode_t=yes
	else
	echo "$as_me: failed program was:" >&5
	-cat conftest.$ac_ext >&5
	+cat "conftest.$ac_ext" >&5
	ac_cv_type_mode_t=no
	fi
	-rm -f conftest.$ac_objext conftest.$ac_ext
	+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
	fi
	-echo "$as_me:6676: result: $ac_cv_type_mode_t" >&5
	+echo "$as_me:7387: result: $ac_cv_type_mode_t" >&5
	echo "${ECHO_T}$ac_cv_type_mode_t" >&6
	-if test $ac_cv_type_mode_t = yes; then
	+if test "$ac_cv_type_mode_t" = yes; then
	:
	else

	@@ -6763,25 +7474,29 @@

	DEFS=-DHAVE_CONFIG_H

	-: ${CONFIG_STATUS=./config.status}
	+: "${CONFIG_STATUS=./config.status}"
	ac_clean_files_save=$ac_clean_files
	ac_clean_files="$ac_clean_files $CONFIG_STATUS"
	-{ echo "$as_me:6769: creating $CONFIG_STATUS" >&5
	+{ echo "$as_me:7480: creating $CONFIG_STATUS" >&5
	echo "$as_me: creating $CONFIG_STATUS" >&6;}
	-cat >$CONFIG_STATUS <<_ACEOF
	+cat >"$CONFIG_STATUS" <<_ACEOF
	#! $SHELL
	# Generated automatically by configure.
	# Run this file to recreate the current configuration.
	# Compiler output produced by configure, useful for debugging
	# configure, is in config.log if it exists.

	+me=\`echo "\$0" \| sed -e 's,.*\\/,,'\`
	+
	debug=false
	SHELL=\${CONFIG_SHELL-$SHELL}
	ac_cs_invocation="\$0 \$@"

	+CLICOLOR_FORCE= GREP_OPTIONS=
	+unset CLICOLOR_FORCE GREP_OPTIONS
	_ACEOF

	-cat >>$CONFIG_STATUS <<\_ACEOF
	+cat >>"$CONFIG_STATUS" <<\_ACEOF
	# Be Bourne compatible
	if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
	emulate sh
	@@ -6794,9 +7509,9 @@
	as_me=`echo "$0" \|sed 's,.*[\\/],,'`

	if expr a : '$a$' >/dev/null 2>&1; then
	- as_expr=expr
	+ as_expr="expr"
	else
	- as_expr=false
	+ as_expr="false"
	fi

	rm -f conf$$ conf$$.exe conf$$.file
	@@ -6811,7 +7526,7 @@
	as_ln_s='ln -s'
	fi
	elif ln conf$$.file conf$$ 2>/dev/null; then
	- as_ln_s=ln
	+ as_ln_s='ln'
	else
	as_ln_s='cp -p'
	fi
	@@ -6821,9 +7536,9 @@

	# Support unset when possible.
	if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
	- as_unset=unset
	+ as_unset="unset"
	else
	- as_unset=false
	+ as_unset="false"
	fi

	# NLS nuisances.
	@@ -6851,22 +7566,22 @@

	# Files that config.status was made for.
	if test -n "$ac_config_files"; then
	- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
	+ echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS"
	fi

	if test -n "$ac_config_headers"; then
	- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
	+ echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS"
	fi

	if test -n "$ac_config_links"; then
	- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
	+ echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS"
	fi

	if test -n "$ac_config_commands"; then
	- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
	+ echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS"
	fi

	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF

	ac_cs_usage="\
	\`$as_me' instantiates files from templates according to the
	@@ -6892,21 +7607,22 @@
	Report bugs to <dickey@invisible-island.net>."
	EOF

	-cat >>$CONFIG_STATUS <<EOF
	+cat >>"$CONFIG_STATUS" <<EOF
	ac_cs_version="\\
	config.status
	-configured by $0, generated by GNU Autoconf 2.52.20200111,
	+configured by $0, generated by GNU Autoconf 2.52.20230114,
	with options \\"`echo "$ac_configure_args" \| sed 's/[\\""\`\$]/\\\\&/g'`\\"

	+Copyright 2003-2022,2023 Thomas E. Dickey
	Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
	Free Software Foundation, Inc.
	This config.status script is free software; the Free Software Foundation
	gives unlimited permission to copy, distribute and modify it."
	-srcdir=$srcdir
	+srcdir="$srcdir"
	INSTALL="$INSTALL"
	EOF

	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	# If no file are specified by the user, then we need to provide default
	# value. By we need to know if files were specified by the user.
	ac_need_defaults=:
	@@ -6929,17 +7645,17 @@
	case $1 in
	# Handling of the options.
	EOF
	-cat >>$CONFIG_STATUS <<EOF
	+cat >>"$CONFIG_STATUS" <<EOF
	-recheck \| --recheck \| --rechec \| --reche \| --rech \| --rec \| --re \| --r)
	echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
	exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
	EOF
	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	--version \| --vers* \| -V )
	echo "$ac_cs_version"; exit 0 ;;
	--he \| --h)
	# Conflict between --help and --header
	- { { echo "$as_me:6942: error: ambiguous option: $1
	+ { { echo "$as_me:7658: error: ambiguous option: $1
	Try \`$0 --help' for more information." >&5
	echo "$as_me: error: ambiguous option: $1
	Try \`$0 --help' for more information." >&2;}
	@@ -6958,7 +7674,7 @@
	ac_need_defaults=false;;

	# This is an error.
	- -*) { { echo "$as_me:6961: error: unrecognized option: $1
	+ -*) { { echo "$as_me:7677: error: unrecognized option: $1
	Try \`$0 --help' for more information." >&5
	echo "$as_me: error: unrecognized option: $1
	Try \`$0 --help' for more information." >&2;}
	@@ -6977,25 +7693,25 @@
	## Running config.status. ##
	## ----------------------- ##

	-This file was extended by $as_me 2.52.20200111, executed with
	+This file was extended by $as_me 2.52.20230114, executed with
	CONFIG_FILES = $CONFIG_FILES
	CONFIG_HEADERS = $CONFIG_HEADERS
	CONFIG_LINKS = $CONFIG_LINKS
	CONFIG_COMMANDS = $CONFIG_COMMANDS
	- > $ac_cs_invocation
	+ > "$ac_cs_invocation"
	on `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`

	_ACEOF
	EOF

	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	for ac_config_target in $ac_config_targets
	do
	case "$ac_config_target" in
	# Handling of arguments.
	"makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;;
	"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
	- *) { { echo "$as_me:6998: error: invalid argument: $ac_config_target" >&5
	+ *) { { echo "$as_me:7714: error: invalid argument: $ac_config_target" >&5
	echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
	{ (exit 1); exit 1; }; };;
	esac
	@@ -7005,7 +7721,7 @@
	# then the envvar interface is used. Set only those that are not.
	# We use the long form for the default assignment because of an extremely
	# bizarre bug on SunOS 4.1.3.
	-if $ac_need_defaults; then
	+if "$ac_need_defaults"; then
	test "${CONFIG_FILES+set}" = set \|\| CONFIG_FILES=$config_files
	test "${CONFIG_HEADERS+set}" = set \|\| CONFIG_HEADERS=$config_headers
	fi
	@@ -7018,14 +7734,14 @@
	}

	# Create a (secure) tmp directory for tmp files.
	-: ${TMPDIR=/tmp}
	+: "${TMPDIR=/tmp}"
	{
	tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
	test -n "$tmp" && test -d "$tmp"
	} \|\|
	{
	tmp=$TMPDIR/cs$$-$RANDOM
	- (umask 077 && mkdir $tmp)
	+ (umask 077 && mkdir "$tmp")
	} \|\|
	{
	echo "$me: cannot create a temporary directory in $TMPDIR" >&2
	@@ -7034,7 +7750,7 @@

	EOF

	-cat >>$CONFIG_STATUS <<EOF
	+cat >>"$CONFIG_STATUS" <<EOF

	#
	# CONFIG_FILES section.
	@@ -7045,7 +7761,9 @@
	if test -n "\$CONFIG_FILES"; then
	# Protect against being on the right side of a sed subst in config.status.
	sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
	- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
	+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >"\$tmp"/subs.sed <<\\CEOF
	+s,@X_CFLAGS@,$X_CFLAGS,;t t
	+s,@X_LIBS@,$X_LIBS,;t t
	s,@SHELL@,$SHELL,;t t
	s,@exec_prefix@,$exec_prefix,;t t
	s,@prefix@,$prefix,;t t
	@@ -7109,9 +7827,15 @@
	s,@AWK@,$AWK,;t t
	s,@LINT@,$LINT,;t t
	s,@LINT_OPTS@,$LINT_OPTS,;t t
	+s,@LINT_LIBS@,$LINT_LIBS,;t t
	s,@CPP@,$CPP,;t t
	+s,@GREP@,$GREP,;t t
	+s,@EGREP@,$EGREP,;t t
	s,@SKELETON@,$SKELETON,;t t
	s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
	+s,@FGREP@,$FGREP,;t t
	+s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t
	+s,@STDC_NORETURN@,$STDC_NORETURN,;t t
	s,@ECHO_LT@,$ECHO_LT,;t t
	s,@ECHO_LD@,$ECHO_LD,;t t
	s,@RULE_CC@,$RULE_CC,;t t
	@@ -7130,7 +7854,7 @@

	EOF

	- cat >>$CONFIG_STATUS <<\EOF
	+ cat >>"$CONFIG_STATUS" <<\EOF
	# Split the substitutions into bite-sized pieces for seds with
	# small command number limits, like on Digital OSF/1 and HP-UX.
	ac_max_sed_lines=48
	@@ -7139,13 +7863,13 @@
	ac_end=$ac_max_sed_lines # Line after last line for current file.
	ac_more_lines=:
	ac_sed_cmds=
	- while $ac_more_lines; do
	- if test $ac_beg -gt 1; then
	- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
	+ while "$ac_more_lines"; do
	+ if test "$ac_beg" -gt 1; then
	+ sed "1,${ac_beg}d; ${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag
	else
	- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
	+ sed "${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag
	fi
	- if test ! -s $tmp/subs.frag; then
	+ if test ! -s "$tmp"/subs.frag; then
	ac_more_lines=false
	else
	# The purpose of the label and of the branching condition is to
	@@ -7153,19 +7877,19 @@
	# is no need to browse any of the substitutions).
	# These are the two extra sed commands mentioned above.
	(echo ':t
	- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
	+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
	# It is possible to make a multiline substitution using escaped newlines.
	# Ensure that we do not split the substitution between script fragments.
	ac_BEG=$ac_end
	- ac_END=`expr $ac_end + $ac_max_sed_lines`
	- sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
	- if test -s $tmp/subs.next; then
	- grep '^s,@[^@,][^@,]@,.\\$' $tmp/subs.next >$tmp/subs.edit
	- if test ! -s $tmp/subs.edit; then
	- grep "^s,@[^@,][^@,]@,.,;t t$" $tmp/subs.next >$tmp/subs.edit
	- if test ! -s $tmp/subs.edit; then
	- if test $ac_beg -gt 1; then
	- ac_end=`expr $ac_end - 1`
	+ ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
	+ sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
	+ if test -s "$tmp"/subs.next; then
	+ grep '^s,@[^@,][^@,]@,.\\$' "$tmp"/subs.next >"$tmp"/subs.edit
	+ if test ! -s "$tmp"/subs.edit; then
	+ grep "^s,@[^@,][^@,]@,.,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
	+ if test ! -s "$tmp"/subs.edit; then
	+ if test "$ac_beg" -gt 1; then
	+ ac_end=`expr "$ac_end" - 1`
	continue
	fi
	fi
	@@ -7173,27 +7897,27 @@
	fi

	if test -z "$ac_sed_cmds"; then
	- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
	+ ac_sed_cmds="sed -f \"$tmp\"/subs-$ac_sed_frag.sed"
	else
	- ac_sed_cmds="$ac_sed_cmds \| sed -f $tmp/subs-$ac_sed_frag.sed"
	+ ac_sed_cmds="$ac_sed_cmds \| sed -f \"$tmp\"/subs-$ac_sed_frag.sed"
	fi
	- ac_sed_frag=`expr $ac_sed_frag + 1`
	+ ac_sed_frag=`expr "$ac_sed_frag" + 1`
	ac_beg=$ac_end
	- ac_end=`expr $ac_end + $ac_max_sed_lines`
	+ ac_end=`expr "$ac_end" + "$ac_max_sed_lines"`
	fi
	done
	if test -z "$ac_sed_cmds"; then
	- ac_sed_cmds=cat
	+ ac_sed_cmds="cat"
	fi
	fi # test -n "$CONFIG_FILES"

	EOF
	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
	# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
	- case $ac_file in
	+ case "$ac_file" in
	- \| :- \| :-:* ) # input from stdin
	- cat >$tmp/stdin
	+ cat >"$tmp"/stdin
	ac_file_in=`echo "$ac_file" \| sed 's,[^:]*:,,'`
	ac_file=`echo "$ac_file" \| sed 's,:.*,,'` ;;
	: ) ac_file_in=`echo "$ac_file" \| sed 's,[^:]*:,,'`
	@@ -7230,26 +7954,26 @@
	esac
	done; }

	- ac_dir_suffix="/`echo $ac_dir\|sed 's,^\./,,'`"
	+ ac_dir_suffix="/`echo "$ac_dir"\|sed 's,^\./,,'`"
	# A "../" for each directory in $ac_dir_suffix.
	ac_dots=`echo "$ac_dir_suffix" \| sed 's,/[^/]*,../,g'`
	else
	ac_dir_suffix= ac_dots=
	fi

	- case $srcdir in
	+ case "$srcdir" in
	.) ac_srcdir=.
	if test -z "$ac_dots"; then
	ac_top_srcdir=.
	else
	- ac_top_srcdir=`echo $ac_dots \| sed 's,/$,,'`
	+ ac_top_srcdir=`echo "$ac_dots" \| sed 's,/$,,'`
	fi ;;
	[\\/]* \| ?:[\\/]* )
	- ac_srcdir=$srcdir$ac_dir_suffix;
	- ac_top_srcdir=$srcdir ;;
	+ ac_srcdir="$srcdir$ac_dir_suffix";
	+ ac_top_srcdir="$srcdir" ;;
	*) # Relative path.
	- ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
	- ac_top_srcdir=$ac_dots$srcdir ;;
	+ ac_srcdir="$ac_dots$srcdir$ac_dir_suffix"
	+ ac_top_srcdir="$ac_dots$srcdir" ;;
	esac

	case $INSTALL in
	@@ -7258,7 +7982,7 @@
	esac

	if test x"$ac_file" != x-; then
	- { echo "$as_me:7261: creating $ac_file" >&5
	+ { echo "$as_me:7985: creating $ac_file" >&5
	echo "$as_me: creating $ac_file" >&6;}
	rm -f "$ac_file"
	fi
	@@ -7273,48 +7997,48 @@
	ac_file_inputs=`IFS=:
	for f in $ac_file_in; do
	case $f in
	- -) echo $tmp/stdin ;;
	+ -) echo "$tmp"/stdin ;;
	[\\/$]*)
	# Absolute (can't be DOS-style, as IFS=:)
	- test -f "$f" \|\| { { echo "$as_me:7279: error: cannot find input file: $f" >&5
	+ test -f "$f" \|\| { { echo "$as_me:8003: error: cannot find input file: $f" >&5
	echo "$as_me: error: cannot find input file: $f" >&2;}
	{ (exit 1); exit 1; }; }
	- echo $f;;
	+ echo "$f";;
	*) # Relative
	if test -f "$f"; then
	# Build tree
	- echo $f
	+ echo "$f"
	elif test -f "$srcdir/$f"; then
	# Source tree
	- echo $srcdir/$f
	+ echo "$srcdir/$f"
	else
	# /dev/null tree
	- { { echo "$as_me:7292: error: cannot find input file: $f" >&5
	+ { { echo "$as_me:8016: error: cannot find input file: $f" >&5
	echo "$as_me: error: cannot find input file: $f" >&2;}
	{ (exit 1); exit 1; }; }
	fi;;
	esac
	done` \|\| { (exit 1); exit 1; }
	EOF
	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	ac_warn_datarootdir=no
	if test x"$ac_file" != x-; then
	for ac_item in $ac_file_inputs
	do
	- ac_seen=`grep '@$datadir\\|mandir\\|infodir$@' $ac_item`
	+ ac_seen=`grep '@$datadir\\|mandir\\|infodir$@' "$ac_item"`
	if test -n "$ac_seen"; then
	- ac_used=`grep '@datarootdir@' $ac_item`
	+ ac_used=`grep '@datarootdir@' "$ac_item"`
	if test -z "$ac_used"; then
	- { echo "$as_me:7308: WARNING: datarootdir was used implicitly but not set:
	+ { echo "$as_me:8032: WARNING: datarootdir was used implicitly but not set:
	$ac_seen" >&5
	echo "$as_me: WARNING: datarootdir was used implicitly but not set:
	$ac_seen" >&2;}
	ac_warn_datarootdir=yes
	fi
	fi
	- ac_seen=`grep '${datarootdir}' $ac_item`
	+ ac_seen=`grep '${datarootdir}' "$ac_item"`
	if test -n "$ac_seen"; then
	- { echo "$as_me:7317: WARNING: datarootdir was used explicitly but not set:
	+ { echo "$as_me:8041: WARNING: datarootdir was used explicitly but not set:
	$ac_seen" >&5
	echo "$as_me: WARNING: datarootdir was used explicitly but not set:
	$ac_seen" >&2;}
	@@ -7328,53 +8052,61 @@
	fi

	EOF
	-cat >>$CONFIG_STATUS <<EOF
	+cat >>"$CONFIG_STATUS" <<EOF
	sed "$ac_vpsub
	$extrasub
	EOF
	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	:t
	/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
	s,@configure_input@,$configure_input,;t t
	s,@srcdir@,$ac_srcdir,;t t
	s,@top_srcdir@,$ac_top_srcdir,;t t
	s,@INSTALL@,$ac_INSTALL,;t t
	-" $ac_file_inputs \| (eval "$ac_sed_cmds") >$tmp/out
	- rm -f $tmp/stdin
	+" $ac_file_inputs \| (eval "$ac_sed_cmds") >"$tmp"/out
	+ rm -f "$tmp"/stdin
	+EOF
	+: "${FGREP:=grep -F}"
	+: "${EGREP:=grep -E}"
	+cat >>"$CONFIG_STATUS" <<EOF
	+ : "\${FGREP:=$FGREP}"
	+ : "\${EGREP:=$EGREP}"
	+EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	if test x"$ac_file" != x-; then
	- cp $tmp/out $ac_file
	+ cp "$tmp/out" "$ac_file"

	for ac_name in prefix exec_prefix datarootdir
	do
	- ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
	+ ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"`
	if test -n "$ac_seen"; then
	- ac_init=`egrep '[ ]'$ac_name'[ ]=' $ac_file`
	+ ac_init=`$EGREP '[ ]'$ac_name'[ ]=' "$ac_file"`
	if test -z "$ac_init"; then
	- ac_seen=`echo "$ac_seen" \|sed -e 's,^,'$ac_file':,'`
	- { echo "$as_me:7354: WARNING: Variable $ac_name is used but was not set:
	+ ac_seen=`echo "$ac_seen" \|sed -e 's,^,'"$ac_file"':,'`
	+ { echo "$as_me:8086: WARNING: Variable $ac_name is used but was not set:
	$ac_seen" >&5
	echo "$as_me: WARNING: Variable $ac_name is used but was not set:
	$ac_seen" >&2;}
	fi
	fi
	done
	- egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
	- egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
	- if test -s $tmp/out; then
	- ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
	- { echo "$as_me:7365: WARNING: Some variables may not be substituted:
	+ $EGREP -n '@[a-z_][a-z_0-9]+@' "$ac_file" >"$tmp"/out
	+ $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
	+ if test -s "$tmp"/out; then
	+ ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
	+ { echo "$as_me:8097: WARNING: Some variables may not be substituted:
	$ac_seen" >&5
	echo "$as_me: WARNING: Some variables may not be substituted:
	$ac_seen" >&2;}
	fi
	else
	- cat $tmp/out
	+ cat "$tmp"/out
	fi
	- rm -f $tmp/out
	+ rm -f "$tmp"/out

	done
	EOF
	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF

	#
	# CONFIG_HEADER section.
	@@ -7401,9 +8133,9 @@

	for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
	# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
	- case $ac_file in
	+ case "$ac_file" in
	- \| :- \| :-:* ) # input from stdin
	- cat >$tmp/stdin
	+ cat >"$tmp"/stdin
	ac_file_in=`echo "$ac_file" \| sed 's,[^:]*:,,'`
	ac_file=`echo "$ac_file" \| sed 's,:.*,,'` ;;
	: ) ac_file_in=`echo "$ac_file" \| sed 's,[^:]*:,,'`
	@@ -7411,7 +8143,7 @@
	* ) ac_file_in=$ac_file.in ;;
	esac

	- test x"$ac_file" != x- && { echo "$as_me:7414: creating $ac_file" >&5
	+ test x"$ac_file" != x- && { echo "$as_me:8146: creating $ac_file" >&5
	echo "$as_me: creating $ac_file" >&6;}

	# First look for the input files in the build tree, otherwise in the
	@@ -7419,10 +8151,10 @@
	ac_file_inputs=`IFS=:
	for f in $ac_file_in; do
	case $f in
	- -) echo $tmp/stdin ;;
	+ -) echo "$tmp"/stdin ;;
	[\\/$]*)
	# Absolute (can't be DOS-style, as IFS=:)
	- test -f "$f" \|\| { { echo "$as_me:7425: error: cannot find input file: $f" >&5
	+ test -f "$f" \|\| { { echo "$as_me:8157: error: cannot find input file: $f" >&5
	echo "$as_me: error: cannot find input file: $f" >&2;}
	{ (exit 1); exit 1; }; }
	echo $f;;
	@@ -7432,17 +8164,17 @@
	echo $f
	elif test -f "$srcdir/$f"; then
	# Source tree
	- echo $srcdir/$f
	+ echo "$srcdir/$f"
	else
	# /dev/null tree
	- { { echo "$as_me:7438: error: cannot find input file: $f" >&5
	+ { { echo "$as_me:8170: error: cannot find input file: $f" >&5
	echo "$as_me: error: cannot find input file: $f" >&2;}
	{ (exit 1); exit 1; }; }
	fi;;
	esac
	done` \|\| { (exit 1); exit 1; }
	# Remove the trailing spaces.
	- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
	+ sed 's/[ ]*$//' $ac_file_inputs >"$tmp"/in

	EOF

	@@ -7487,73 +8219,73 @@

	# Break up conftest.defines because some shells have a limit on the size
	# of here documents, and old seds have small limits too (100 cmds).
	-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
	-echo ' if egrep "^[ ]#[ ]define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
	-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
	-echo ' :' >>$CONFIG_STATUS
	+echo ' # Handle all the #define templates only if necessary.' >>"$CONFIG_STATUS"
	+echo ' if ${EGREP-grep -E} "^[ ]#[ ]define" "$tmp"/in >/dev/null; then' >>"$CONFIG_STATUS"
	+echo ' # If there are no defines, we may have an empty if/fi' >>"$CONFIG_STATUS"
	+echo ' :' >>"$CONFIG_STATUS"
	rm -f conftest.tail
	while grep . conftest.defines >/dev/null
	do
	- # Write a limited-size here document to $tmp/defines.sed.
	- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
	+ # Write a limited-size here document to "$tmp"/defines.sed.
	+ echo ' cat >"$tmp"/defines.sed <<CEOF' >>"$CONFIG_STATUS"
	# Speed up: don't consider the non `#define' lines.
	- echo '/^[ ]#[ ]define/!b' >>$CONFIG_STATUS
	+ echo '/^[ ]#[ ]define/!b' >>"$CONFIG_STATUS"
	# Work around the forget-to-reset-the-flag bug.
	- echo 't clr' >>$CONFIG_STATUS
	- echo ': clr' >>$CONFIG_STATUS
	- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
	+ echo 't clr' >>"$CONFIG_STATUS"
	+ echo ': clr' >>"$CONFIG_STATUS"
	+ sed "${ac_max_here_lines}q" conftest.defines >>"$CONFIG_STATUS"
	echo 'CEOF
	- sed -f $tmp/defines.sed $tmp/in >$tmp/out
	- rm -f $tmp/in
	- mv $tmp/out $tmp/in
	-' >>$CONFIG_STATUS
	- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
	+ sed -f "$tmp"/defines.sed "$tmp"/in >"$tmp"/out
	+ rm -f "$tmp"/in
	+ mv "$tmp"/out "$tmp"/in
	+' >>"$CONFIG_STATUS"
	+ sed "1,${ac_max_here_lines}d" conftest.defines >conftest.tail
	rm -f conftest.defines
	mv conftest.tail conftest.defines
	done
	rm -f conftest.defines
	-echo ' fi # egrep' >>$CONFIG_STATUS
	-echo >>$CONFIG_STATUS
	+echo ' fi # grep' >>"$CONFIG_STATUS"
	+echo >>"$CONFIG_STATUS"

	# Break up conftest.undefs because some shells have a limit on the size
	# of here documents, and old seds have small limits too (100 cmds).
	-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
	+echo ' # Handle all the #undef templates' >>"$CONFIG_STATUS"
	rm -f conftest.tail
	while grep . conftest.undefs >/dev/null
	do
	- # Write a limited-size here document to $tmp/undefs.sed.
	- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
	+ # Write a limited-size here document to "$tmp"/undefs.sed.
	+ echo ' cat >"$tmp"/undefs.sed <<CEOF' >>"$CONFIG_STATUS"
	# Speed up: don't consider the non `#undef'
	- echo '/^[ ]#[ ]undef/!b' >>$CONFIG_STATUS
	+ echo '/^[ ]#[ ]undef/!b' >>"$CONFIG_STATUS"
	# Work around the forget-to-reset-the-flag bug.
	- echo 't clr' >>$CONFIG_STATUS
	- echo ': clr' >>$CONFIG_STATUS
	- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
	+ echo 't clr' >>"$CONFIG_STATUS"
	+ echo ': clr' >>"$CONFIG_STATUS"
	+ sed "${ac_max_here_lines}q" conftest.undefs >>"$CONFIG_STATUS"
	echo 'CEOF
	- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
	- rm -f $tmp/in
	- mv $tmp/out $tmp/in
	-' >>$CONFIG_STATUS
	- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
	+ sed -f "$tmp"/undefs.sed "$tmp"/in >"$tmp"/out
	+ rm -f "$tmp"/in
	+ mv "$tmp"/out "$tmp"/in
	+' >>"$CONFIG_STATUS"
	+ sed "1,${ac_max_here_lines}d" conftest.undefs >conftest.tail
	rm -f conftest.undefs
	mv conftest.tail conftest.undefs
	done
	rm -f conftest.undefs

	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF
	# Let's still pretend it is `configure' which instantiates (i.e., don't
	# use $as_me), people would be surprised to read:
	# /* config.h. Generated automatically by config.status. */
	if test x"$ac_file" = x-; then
	- echo "/* Generated automatically by configure. */" >$tmp/config.h
	+ echo "/* Generated automatically by configure. */" >"$tmp"/config.h
	else
	- echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
	+ echo "/* $ac_file. Generated automatically by configure. */" >"$tmp"/config.h
	fi
	- cat $tmp/in >>$tmp/config.h
	- rm -f $tmp/in
	+ cat "$tmp"/in >>"$tmp"/config.h
	+ rm -f "$tmp"/in
	if test x"$ac_file" != x-; then
	- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
	- { echo "$as_me:7556: $ac_file is unchanged" >&5
	+ if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
	+ { echo "$as_me:8288: $ac_file is unchanged" >&5
	echo "$as_me: $ac_file is unchanged" >&6;}
	else
	ac_dir=`$as_expr X"$ac_file" : 'X$.[^/]$//[^/][^/]/$' \\| \
	@@ -7585,21 +8317,21 @@
	done; }

	fi
	- rm -f $ac_file
	- mv $tmp/config.h $ac_file
	+ rm -f "$ac_file"
	+ mv "$tmp/config.h" "$ac_file"
	fi
	else
	- cat $tmp/config.h
	- rm -f $tmp/config.h
	+ cat "$tmp"/config.h
	+ rm -f "$tmp"/config.h
	fi
	done
	EOF

	-cat >>$CONFIG_STATUS <<\EOF
	+cat >>"$CONFIG_STATUS" <<\EOF

	{ (exit 0); exit 0; }
	EOF
	-chmod +x $CONFIG_STATUS
	+chmod +x "$CONFIG_STATUS"
	ac_clean_files=$ac_clean_files_save

	# configure is writing to config.log, and then calls config.status.
	@@ -7613,11 +8345,11 @@
	if test "$no_create" != yes; then
	ac_cs_success=:
	exec 5>/dev/null
	- $SHELL $CONFIG_STATUS \|\| ac_cs_success=false
	+ $SHELL "$CONFIG_STATUS" \|\| ac_cs_success=false
	exec 5>>config.log
	# Use \|\|, not &&, to avoid exiting from the if with $? = 1, which
	# would make configure fail if this is the last instruction.
	- $ac_cs_success \|\| { (exit 1); exit 1; }
	+ "$ac_cs_success" \|\| { (exit 1); exit 1; }
	fi

	test -z "$cf_make_docs" && cf_make_docs=0
	@@ -7642,7 +8374,7 @@
	${GROFF_NOTE} \$(SHELL) -c "tbl \$*.1 \| groff -man" >\$@
	${GROFF_NOTE}
	${GROFF_NOTE}.1.txt :
	-${GROFF_NOTE} GROFF_NO_SGR=stupid \$(SHELL) -c "tbl \$*.1 \| nroff -Tascii -man \| col -bx" >\$@
	+${GROFF_NOTE} GROFF_NO_SGR=stupid \$(SHELL) -c "tbl \$*.1 \| nroff -rHY=0 -Tascii -man \| col -bx" >\$@

	${MAN2HTML_NOTE}.1.html :
	${MAN2HTML_NOTE} ./${MAN2HTML_TEMP} \$* 1 man >\$@
	diff --git a/contrib/byacc/configure.in b/contrib/byacc/configure.in
	--- a/contrib/byacc/configure.in
	+++ b/contrib/byacc/configure.in
	@@ -1,7 +1,7 @@
	dnl Process this file with 'autoconf' to produce a 'configure' script
	-dnl $Id: configure.in,v 1.23 2020/03/10 22:53:47 tom Exp $
	-AC_PREREQ(2.52.20200111)
	-AC_REVISION($Revision: 1.23 $)
	+dnl $Id: configure.in,v 1.28 2023/02/02 00:14:51 tom Exp $
	+AC_PREREQ(2.52.20200802)
	+AC_REVISION($Revision: 1.28 $)
	AC_INIT(main.c)
	AC_CONFIG_HEADER(config.h:config_h.in)

	@@ -18,6 +18,8 @@
	CF_WITHOUT_X

	CF_XOPEN_SOURCE
	+AC_CHECK_DECL(exit)
	+
	AC_CHECK_HEADERS(fcntl.h)
	CF_MKSTEMP
	CF_GETOPT_HEADER
	@@ -41,19 +43,21 @@
	fi

	AC_MSG_CHECKING(if backtracking extension is wanted)
	-AC_ARG_ENABLE([btyacc],
	- [AC_HELP_STRING([--enable-btyacc],
	- [turn on support for the btyacc backtracking extension (default: no)])])
	+CF_ARG_DISABLE([btyacc],
	+ [AC_HELP_STRING([--disable-btyacc],
	+ [disable support for the btyacc backtracking extension (default: enabled)])],
	+ [enable_btyacc=no],
	+ [enable_btyacc=yes])
	AC_MSG_RESULT($enable_btyacc)
	-if test "$enable_btyacc" = "yes"; then
	+if test "$enable_btyacc" = "no"; then
	+ SKELETON=yaccpar
	+else
	AC_DEFINE(YYBTYACC,1,[Define to 1 to enable backtracking extension])
	SKELETON=btyaccpar
	-else
	- SKELETON=yaccpar
	fi
	AC_SUBST(SKELETON)

	-CF_WITH_WARNINGS(Wwrite-strings)
	+CF_ENABLE_WARNINGS(Wwrite-strings,yes)
	CF_DISABLE_ECHO
	CF_DISABLE_LEAKS
	CF_WITH_MAN2HTML
	diff --git a/contrib/byacc/defs.h b/contrib/byacc/defs.h
	--- a/contrib/byacc/defs.h
	+++ b/contrib/byacc/defs.h
	@@ -1,4 +1,4 @@
	-/* $Id: defs.h,v 1.65 2019/11/19 23:47:49 tom Exp $ */
	+/* $Id: defs.h,v 1.71 2022/11/06 21:44:54 tom Exp $ */

	#ifdef HAVE_CONFIG_H
	#include <config.h>
	@@ -16,8 +16,8 @@
	#define class myClass
	#endif

	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0

	#define CONCAT(first,second) first #second
	#define CONCAT1(string,number) CONCAT(string, number)
	@@ -48,7 +48,7 @@

	#define MAXCHAR UCHAR_MAX
	#ifndef MAXTABLE
	-#define MAXTABLE 32500
	+#define MAXTABLE INT_MAX
	#endif
	#if MAXTABLE <= SHRT_MAX
	#define YYINT short
	@@ -58,6 +58,10 @@
	#define YYINT int
	#define MAXYYINT INT_MAX
	#define MINYYINT INT_MIN
	+#elif MAXTABLE <= LONG_MAX
	+#define YYINT long
	+#define MAXYYINT LONG_MAX
	+#define MINYYINT LONG_MIN
	#else
	#error "MAXTABLE is too large for this machine architecture!"
	#endif
	@@ -113,21 +117,25 @@
	,START
	,UNION
	,IDENT
	+
	+ /* trivial bison "extensions" which have POSIX equivalents */
	+ ,NONPOSIX_DEBUG
	+
	+ /* other bison "extensions", some useful */
	+ ,ERROR_VERBOSE
	,EXPECT
	,EXPECT_RR
	- ,PURE_PARSER
	- ,PARSE_PARAM
	,LEX_PARAM
	+ ,PARSE_PARAM
	,POSIX_YACC
	+ ,PURE_PARSER
	,TOKEN_TABLE
	- ,ERROR_VERBOSE
	- ,XXXDEBUG
	,XCODE

	#if defined(YYBTYACC)
	- ,LOCATIONS
	,DESTRUCTOR
	,INITIAL_ACTION
	+ ,LOCATIONS
	#endif
	}
	KEY_CASES;
	@@ -350,6 +358,10 @@
	extern char unionized;
	extern char line_format[];

	+#define fprintf_lineno(f, n, s) \
	+ if (!lflag) \
	+ fprintf(f, line_format, (n), (s) ? (s) : "(null)")
	+
	extern Value_t start_symbol;
	extern char **symbol_name;
	extern char **symbol_pname;
	@@ -375,7 +387,7 @@
	extern bucket *first_symbol;
	extern bucket *last_symbol;

	-extern int nstates;
	+extern Value_t nstates;
	extern core *first_state;
	extern shifts *first_shift;
	extern reductions *first_reduction;
	@@ -412,24 +424,20 @@

	/* global functions */

	+#ifdef HAVE_STDNORETURN_H
	+#undef GCC_NORETURN
	+#include <stdnoreturn.h>
	+#define GCC_NORETURN _Noreturn
	+#endif
	+
	#ifndef GCC_NORETURN
	-#if defined(__dead2)
	-#define GCC_NORETURN __dead2
	-#elif defined(__dead)
	-#define GCC_NORETURN __dead
	+#if defined(_MSC_VER)
	+#define GCC_NORETURN __declspec(noreturn)
	#else
	#define GCC_NORETURN /* nothing */
	#endif
	#endif

	-#ifdef __GNUC__
	-#define ATTRIBUTE_NORETURN __attribute__((noreturn))
	-#elif defined(_MSC_VER)
	-#define ATTRIBUTE_NORETURN __declspec(noreturn)
	-#else
	-#define ATTRIBUTE_NORETURN
	-#endif
	-
	#if defined(NDEBUG) && defined(_MSC_VER)
	#define NODEFAULT __assume(0);
	#else
	@@ -464,76 +472,49 @@

	extern void arg_number_disagree_warning(int a_lineno, char *a_name);
	extern void arg_type_disagree_warning(int a_lineno, int i, char *a_name);
	-ATTRIBUTE_NORETURN
	-extern void at_error(int a_lineno, char a_line, char a_cptr) GCC_NORETURN;
	+extern GCC_NORETURN void at_error(int a_lineno, char a_line, char a_cptr);
	extern void at_warning(int a_lineno, int i);
	-ATTRIBUTE_NORETURN
	-extern void bad_formals(void) GCC_NORETURN;
	+extern GCC_NORETURN void bad_formals(void);
	extern void default_action_warning(char *s);
	extern void destructor_redeclared_warning(const struct ainfo *);
	-ATTRIBUTE_NORETURN
	-extern void dollar_error(int a_lineno, char a_line, char a_cptr) GCC_NORETURN;
	+extern GCC_NORETURN void dollar_error(int a_lineno, char a_line, char a_cptr);
	extern void dollar_warning(int a_lineno, int i);
	-ATTRIBUTE_NORETURN
	-extern void fatal(const char *msg) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void illegal_character(char *c_cptr) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void illegal_tag(int t_lineno, char t_line, char t_cptr) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void missing_brace(void) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void no_grammar(void) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void no_space(void) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void open_error(const char *filename) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void over_unionized(char *u_cptr) GCC_NORETURN;
	+extern GCC_NORETURN void fatal(const char *msg);
	+extern GCC_NORETURN void illegal_character(char *c_cptr);
	+extern GCC_NORETURN void illegal_tag(int t_lineno, char t_line, char t_cptr);
	+extern GCC_NORETURN void missing_brace(void);
	+extern GCC_NORETURN void no_grammar(void);
	+extern GCC_NORETURN void no_space(void);
	+extern GCC_NORETURN void open_error(const char *filename);
	+extern GCC_NORETURN void over_unionized(char *u_cptr);
	extern void prec_redeclared(void);
	extern void reprec_warning(char *s);
	extern void restarted_warning(void);
	extern void retyped_warning(char *s);
	extern void revalued_warning(char *s);
	extern void start_requires_args(char *a_name);
	-ATTRIBUTE_NORETURN
	-extern void syntax_error(int st_lineno, char st_line, char st_cptr) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void terminal_lhs(int s_lineno) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void terminal_start(char *s) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void tokenized_start(char *s) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void undefined_goal(char *s) GCC_NORETURN;
	+extern GCC_NORETURN void syntax_error(int st_lineno, char st_line, char st_cptr);
	+extern GCC_NORETURN void terminal_lhs(int s_lineno);
	+extern GCC_NORETURN void terminal_start(char *s);
	+extern GCC_NORETURN void tokenized_start(char *s);
	+extern GCC_NORETURN void undefined_goal(char *s);
	extern void undefined_symbol_warning(char *s);
	-ATTRIBUTE_NORETURN
	-extern void unexpected_EOF(void) GCC_NORETURN;
	+extern GCC_NORETURN void unexpected_EOF(void);
	extern void unknown_arg_warning(int d_lineno, const char *dlr_opt,
	const char d_arg, const char d_line,
	const char *d_cptr);
	-ATTRIBUTE_NORETURN
	-extern void unknown_rhs(int i) GCC_NORETURN;
	+extern GCC_NORETURN void unknown_rhs(int i);
	extern void unsupported_flag_warning(const char flag, const char details);
	-ATTRIBUTE_NORETURN
	-extern void unterminated_action(const struct ainfo *) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void unterminated_comment(const struct ainfo *) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void unterminated_string(const struct ainfo *) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void unterminated_text(const struct ainfo *) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void unterminated_union(const struct ainfo *) GCC_NORETURN;
	+extern GCC_NORETURN void unterminated_action(const struct ainfo *);
	+extern GCC_NORETURN void unterminated_comment(const struct ainfo *);
	+extern GCC_NORETURN void unterminated_string(const struct ainfo *);
	+extern GCC_NORETURN void unterminated_text(const struct ainfo *);
	+extern GCC_NORETURN void unterminated_union(const struct ainfo *);
	extern void untyped_arg_warning(int a_lineno, const char dlr_opt, const char a_name);
	-ATTRIBUTE_NORETURN
	-extern void untyped_lhs(void) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void untyped_rhs(int i, char *s) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void used_reserved(char *s) GCC_NORETURN;
	-ATTRIBUTE_NORETURN
	-extern void unterminated_arglist(const struct ainfo *) GCC_NORETURN;
	+extern GCC_NORETURN void untyped_lhs(void);
	+extern GCC_NORETURN void untyped_rhs(int i, char *s);
	+extern GCC_NORETURN void used_reserved(char *s);
	+extern GCC_NORETURN void unterminated_arglist(const struct ainfo *);
	extern void wrong_number_args_warning(const char which, const char a_name);
	extern void wrong_type_for_arg_warning(int i, char *a_name);

	@@ -552,8 +533,7 @@

	/* main.c */
	extern void *allocate(size_t n);
	-ATTRIBUTE_NORETURN
	-extern void done(int k) GCC_NORETURN;
	+extern GCC_NORETURN void done(int k);

	/* mkpar.c */
	extern void free_parser(void);
	diff --git a/contrib/byacc/graph.c b/contrib/byacc/graph.c
	--- a/contrib/byacc/graph.c
	+++ b/contrib/byacc/graph.c
	@@ -1,4 +1,4 @@
	-/* $Id: graph.c,v 1.8 2014/02/19 00:46:57 Tom.Shields Exp $ */
	+/* $Id: graph.c,v 1.9 2020/09/10 17:22:51 tom Exp $ */

	#include "defs.h"

	@@ -52,15 +52,16 @@
	graph_state(int stateno)
	{
	Value_t *isp;
	- int rule;
	Value_t *sp;
	- Value_t *sp1;

	larno = (unsigned)lookaheads[stateno];
	fprintf(graph_file, "\n\tq%d [label=\"%d:\\l", stateno, stateno);

	for (isp = itemset; isp < itemsetend; isp++)
	{
	+ Value_t *sp1;
	+ int rule;
	+
	sp1 = sp = ritem + *isp;

	while (*sp >= 0)
	@@ -90,15 +91,14 @@
	static void
	graph_LA(int ruleno)
	{
	- int i;
	unsigned tokensetsize;
	- unsigned *rowp;

	tokensetsize = (unsigned)WORDSIZE(ntokens);

	if (ruleno == LAruleno[larno])
	{
	- rowp = LA + larno * tokensetsize;
	+ int i;
	+ unsigned rowp = LA + larno tokensetsize;

	fprintf(graph_file, " { ");
	for (i = ntokens - 1; i >= 0; i--)
	diff --git a/contrib/byacc/install-sh b/contrib/byacc/install-sh
	--- a/contrib/byacc/install-sh
	+++ b/contrib/byacc/install-sh
	@@ -1,7 +1,8 @@
	-#! /bin/sh
	-#
	+#!/bin/sh
	# install - install a program, script, or datafile
	-#
	+
	+scriptversion=2020-11-14.01; # UTC
	+
	# This originates from X11R5 (mit/util/scripts/install.sh), which was
	# later released in X11R6 (xc/config/util/install.sh) with the
	# following copyright and license.
	@@ -34,261 +35,507 @@
	# 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
	+# '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.
	+# from scratch.
	+
	+tab=' '
	+nl='
	+'
	+IFS=" $tab$nl"
	+
	+# Set DOITPROG to "echo" to test this script.

	+doit=${DOITPROG-}
	+doit_exec=${doit:-exec}

	-# set DOITPROG to echo to test this script
	+# Put in absolute file names if you don't have them in your path;
	+# or use environment vars.

	-# Don't use :- since 4.3BSD and earlier shells don't like it.
	-doit="${DOITPROG-}"
	+chgrpprog=${CHGRPPROG-chgrp}
	+chmodprog=${CHMODPROG-chmod}
	+chownprog=${CHOWNPROG-chown}
	+cmpprog=${CMPPROG-cmp}
	+cpprog=${CPPROG-cp}
	+mkdirprog=${MKDIRPROG-mkdir}
	+mvprog=${MVPROG-mv}
	+rmprog=${RMPROG-rm}
	+stripprog=${STRIPPROG-strip}

	+posix_mkdir=

	-# put in absolute paths if you don't have them in your path; or use env. vars.
	+# Desired mode of installed file.
	+mode=0755

	-mvprog="${MVPROG-mv}"
	-cpprog="${CPPROG-cp}"
	-chmodprog="${CHMODPROG-chmod}"
	-chownprog="${CHOWNPROG-chown}"
	-chgrpprog="${CHGRPPROG-chgrp}"
	-stripprog="${STRIPPROG-strip}"
	-rmprog="${RMPROG-rm}"
	-mkdirprog="${MKDIRPROG-mkdir}"
	+# Create dirs (including intermediate dirs) using mode 755.
	+# This is like GNU 'install' as of coreutils 8.32 (2020).
	+mkdir_umask=22

	-transformbasename=""
	-transform_arg=""
	-instcmd="$mvprog"
	-chmodcmd="$chmodprog 0755"
	-chowncmd=""
	-chgrpcmd=""
	-stripcmd=""
	+backupsuffix=
	+chgrpcmd=
	+chmodcmd=$chmodprog
	+chowncmd=
	+mvcmd=$mvprog
	rmcmd="$rmprog -f"
	-mvcmd="$mvprog"
	-src=""
	-dst=""
	-dir_arg=""
	-
	-while [ x"$1" != x ]; do
	- case $1 in
	- -c) instcmd=$cpprog
	- shift
	- continue;;
	-
	- -d) dir_arg=true
	- shift
	- continue;;
	-
	- -m) chmodcmd="$chmodprog $2"
	- shift
	- shift
	- continue;;
	-
	- -o) chowncmd="$chownprog $2"
	- shift
	- shift
	- continue;;
	-
	- -g) chgrpcmd="$chgrpprog $2"
	- shift
	- shift
	- continue;;
	-
	- -s) stripcmd=$stripprog
	- shift
	- continue;;
	-
	- -t=*) transformarg=`echo $1 \| sed 's/-t=//'`
	- shift
	- continue;;
	-
	- -b=*) transformbasename=`echo $1 \| sed 's/-b=//'`
	- shift
	- continue;;
	-
	- *) if [ x"$src" = x ]
	- then
	- src=$1
	- else
	- # this colon is to work around a 386BSD /bin/sh bug
	- :
	- dst=$1
	- fi
	- shift
	- continue;;
	- esac
	-done
	+stripcmd=

	-if [ x"$src" = x ]
	-then
	- echo "$0: no input file specified" >&2
	- exit 1
	-else
	- :
	-fi
	+src=
	+dst=
	+dir_arg=
	+dst_arg=

	-if [ x"$dir_arg" != x ]; then
	- dst=$src
	- src=""
	+copy_on_change=false
	+is_target_a_directory=possibly

	- if [ -d "$dst" ]; then
	- instcmd=:
	- chmodcmd=""
	- else
	- instcmd=$mkdirprog
	- fi
	-else
	+usage="\
	+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
	+ or: $0 [OPTION]... SRCFILES... DIRECTORY
	+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
	+ or: $0 [OPTION]... -d DIRECTORIES...

	-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
	-# might cause directories to be created, which would be especially bad
	-# if $src (and thus $dsttmp) contains '*'.
	+In the 1st form, copy SRCFILE to DSTFILE.
	+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
	+In the 4th, create DIRECTORIES.

	- if [ -f "$src" ] \|\| [ -d "$src" ]
	- then
	- :
	- else
	- echo "$0: $src does not exist" >&2
	- exit 1
	- fi
	+Options:
	+ --help display this help and exit.
	+ --version display version info and exit.

	- if [ x"$dst" = x ]
	- then
	- echo "$0: no destination specified" >&2
	- exit 1
	- else
	- :
	- fi
	+ -c (ignored)
	+ -C install only if different (preserve data modification time)
	+ -d create directories instead of installing files.
	+ -g GROUP $chgrpprog installed files to GROUP.
	+ -m MODE $chmodprog installed files to MODE.
	+ -o USER $chownprog installed files to USER.
	+ -p pass -p to $cpprog.
	+ -s $stripprog installed files.
	+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
	+ -t DIRECTORY install into DIRECTORY.
	+ -T report an error if DSTFILE is a directory.

	-# If destination is a directory, append the input filename; if your system
	-# does not like double slashes in filenames, you may need to add some logic
	+Environment variables override the default commands:
	+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
	+ RMPROG STRIPPROG

	- if [ -d "$dst" ]
	- then
	- dst=$dst/`basename "$src"`
	- else
	- :
	- fi
	-fi
	+By default, rm is invoked with -f; when overridden with RMPROG,
	+it's up to you to specify -f if you want it.

	-## this sed command emulates the dirname command
	-dstdir=`echo "$dst" \| sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
	+If -S is not specified, no backups are attempted.

	-# Make sure that the destination directory exists.
	-# this part is taken from Noah Friedman's mkinstalldirs script
	+Email bug reports to bug-automake@gnu.org.
	+Automake home page: https://www.gnu.org/software/automake/
	+"

	-# Skip lots of stat calls in the usual case.
	-if [ ! -d "$dstdir" ]; then
	-defaultIFS='
	- '
	-IFS="${IFS-$defaultIFS}"
	+while test $# -ne 0; do
	+ case $1 in
	+ -c) ;;

	-oIFS=$IFS
	-# Some sh's can't handle IFS=/ for some reason.
	-IFS='%'
	-set - `echo "$dstdir" \| sed -e 's@/@%@g' -e 's@^%@/@'`
	-IFS=$oIFS
	+ -C) copy_on_change=true;;

	-pathcomp=''
	+ -d) dir_arg=true;;

	-while [ $# -ne 0 ] ; do
	- pathcomp=$pathcomp$1
	- shift
	+ -g) chgrpcmd="$chgrpprog $2"
	+ shift;;

	- if [ ! -d "$pathcomp" ] ;
	- then
	- $mkdirprog "$pathcomp"
	- else
	- :
	- fi
	+ --help) echo "$usage"; exit $?;;

	- pathcomp=$pathcomp/
	-done
	-fi
	+ -m) mode=$2
	+ case $mode in
	+ ' ' \| "$tab" \| "$nl" \| ''* \| '?' \| '[')
	+ echo "$0: invalid mode: $mode" >&2
	+ exit 1;;
	+ esac
	+ shift;;

	-if [ x"$dir_arg" != x ]
	-then
	- $doit $instcmd "$dst" &&
	+ -o) chowncmd="$chownprog $2"
	+ shift;;

	- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
	- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
	- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
	- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
	-else
	+ -p) cpprog="$cpprog -p";;

	-# If we're going to rename the final executable, determine the name now.
	+ -s) stripcmd=$stripprog;;

	- if [ x"$transformarg" = x ]
	- then
	- dstfile=`basename "$dst"`
	- else
	- dstfile=`basename "$dst" $transformbasename \|
	- sed $transformarg`$transformbasename
	- fi
	+ -S) backupsuffix="$2"
	+ shift;;

	-# don't allow the sed command to completely eliminate the filename
	+ -t)
	+ is_target_a_directory=always
	+ dst_arg=$2
	+ # Protect names problematic for 'test' and other utilities.
	+ case $dst_arg in
	+ -* \| [=!]) dst_arg=./$dst_arg;;
	+ esac
	+ shift;;

	- if [ x"$dstfile" = x ]
	- then
	- dstfile=`basename "$dst"`
	- else
	- :
	- fi
	+ -T) is_target_a_directory=never;;

	-# Make a couple of temp file names in the proper directory.
	+ --version) echo "$0 $scriptversion"; exit $?;;

	- dsttmp=$dstdir/#inst.$$#
	- rmtmp=$dstdir/#rm.$$#
	+ --) shift
	+ break;;

	-# Trap to clean up temp files at exit.
	+ -*) echo "$0: invalid option: $1" >&2
	+ exit 1;;

	- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
	- trap '(exit $?); exit' 1 2 13 15
	+ *) break;;
	+ esac
	+ shift
	+done

	-# Move or copy the file name to the temp name
	+# We allow the use of options -d and -T together, by making -d
	+# take the precedence; this is for compatibility with GNU install.

	- $doit $instcmd "$src" "$dsttmp" &&
	+if test -n "$dir_arg"; then
	+ if test -n "$dst_arg"; then
	+ echo "$0: target directory not allowed when installing a directory." >&2
	+ exit 1
	+ fi
	+fi

	-# and set any options; do chmod last to preserve setuid bits
	+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
	+ # When -d is used, all remaining arguments are directories to create.
	+ # When -t is used, the destination is already specified.
	+ # Otherwise, the last argument is the destination. Remove it from $@.
	+ for arg
	+ do
	+ if test -n "$dst_arg"; then
	+ # $@ is not empty: it contains at least $arg.
	+ set fnord "$@" "$dst_arg"
	+ shift # fnord
	+ fi
	+ shift # arg
	+ dst_arg=$arg
	+ # Protect names problematic for 'test' and other utilities.
	+ case $dst_arg in
	+ -* \| [=!]) dst_arg=./$dst_arg;;
	+ esac
	+ done
	+fi

	-# If any of these fail, we abort the whole thing. If we want to
	-# ignore errors from any of these, just make sure not to ignore
	-# errors from the above "$doit $instcmd $src $dsttmp" command.
	+if test $# -eq 0; then
	+ if test -z "$dir_arg"; then
	+ echo "$0: no input file specified." >&2
	+ exit 1
	+ fi
	+ # It's OK to call 'install-sh -d' without argument.
	+ # This can happen when creating conditional directories.
	+ exit 0
	+fi

	- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
	- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
	- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
	- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
	+if test -z "$dir_arg"; then
	+ if test $# -gt 1 \|\| test "$is_target_a_directory" = always; then
	+ if test ! -d "$dst_arg"; then
	+ echo "$0: $dst_arg: Is not a directory." >&2
	+ exit 1
	+ fi
	+ fi
	+fi

	-# Now remove or move aside any old file at destination location. We try this
	-# two ways since rm can't unlink itself on some systems and the destination
	-# file might be busy for other reasons. In this case, the final cleanup
	-# might fail but the new file should still install successfully.
	+if test -z "$dir_arg"; then
	+ do_exit='(exit $ret); exit $ret'
	+ trap "ret=129; $do_exit" 1
	+ trap "ret=130; $do_exit" 2
	+ trap "ret=141; $do_exit" 13
	+ trap "ret=143; $do_exit" 15
	+
	+ # Set umask so as not to create temps with too-generous modes.
	+ # However, 'strip' requires both read and write access to temps.
	+ case $mode in
	+ # Optimize common cases.
	+ *644) cp_umask=133;;
	+ *755) cp_umask=22;;
	+
	+ *[0-7])
	+ if test -z "$stripcmd"; then
	+ u_plus_rw=
	+ else
	+ u_plus_rw='% 200'
	+ fi
	+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
	+ *)
	+ if test -z "$stripcmd"; then
	+ u_plus_rw=
	+ else
	+ u_plus_rw=,u+rw
	+ fi
	+ cp_umask=$mode$u_plus_rw;;
	+ esac
	+fi

	-{
	- if [ -f "$dstdir/$dstfile" ]
	+for src
	+do
	+ # Protect names problematic for 'test' and other utilities.
	+ case $src in
	+ -* \| [=!]) src=./$src;;
	+ esac
	+
	+ if test -n "$dir_arg"; then
	+ dst=$src
	+ dstdir=$dst
	+ test -d "$dstdir"
	+ dstdir_status=$?
	+ # Don't chown directories that already exist.
	+ if test $dstdir_status = 0; then
	+ chowncmd=""
	+ fi
	+ else
	+
	+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
	+ # might cause directories to be created, which would be especially bad
	+ # if $src (and thus $dsttmp) contains '*'.
	+ if test ! -f "$src" && test ! -d "$src"; then
	+ echo "$0: $src does not exist." >&2
	+ exit 1
	+ fi
	+
	+ if test -z "$dst_arg"; then
	+ echo "$0: no destination specified." >&2
	+ exit 1
	+ fi
	+ dst=$dst_arg
	+
	+ # If destination is a directory, append the input filename.
	+ if test -d "$dst"; then
	+ if test "$is_target_a_directory" = never; then
	+ echo "$0: $dst_arg: Is a directory" >&2
	+ exit 1
	+ fi
	+ dstdir=$dst
	+ dstbase=`basename "$src"`
	+ case $dst in
	+ */) dst=$dst$dstbase;;
	+ *) dst=$dst/$dstbase;;
	+ esac
	+ dstdir_status=0
	+ else
	+ dstdir=`dirname "$dst"`
	+ test -d "$dstdir"
	+ dstdir_status=$?
	+ fi
	+ fi
	+
	+ case $dstdir in
	+ */) dstdirslash=$dstdir;;
	+ *) dstdirslash=$dstdir/;;
	+ esac
	+
	+ obsolete_mkdir_used=false
	+
	+ if test $dstdir_status != 0; then
	+ case $posix_mkdir in
	+ '')
	+ # With -d, create the new directory with the user-specified mode.
	+ # Otherwise, rely on $mkdir_umask.
	+ if test -n "$dir_arg"; then
	+ mkdir_mode=-m$mode
	+ else
	+ mkdir_mode=
	+ fi
	+
	+ posix_mkdir=false
	+ # The $RANDOM variable is not portable (e.g., dash). Use it
	+ # here however when possible just to lower collision chance.
	+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
	+
	+ trap '
	+ ret=$?
	+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
	+ exit $ret
	+ ' 0
	+
	+ # Because "mkdir -p" follows existing symlinks and we likely work
	+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
	+ # directory is successfully created first before we actually test
	+ # 'mkdir -p'.
	+ if (umask $mkdir_umask &&
	+ $mkdirprog $mkdir_mode "$tmpdir" &&
	+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
	then
	- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \|\|
	- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \|\|
	- {
	- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
	- (exit 1); exit
	- }
	+ if test -z "$dir_arg" \|\| {
	+ # Check for POSIX incompatibilities with -m.
	+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
	+ # other-writable bit of parent directory when it shouldn't.
	+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
	+ test_tmpdir="$tmpdir/a"
	+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
	+ case $ls_ld_tmpdir in
	+ d????-?r-*) different_mode=700;;
	+ d????-?--*) different_mode=755;;
	+ *) false;;
	+ esac &&
	+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
	+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
	+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
	+ }
	+ }
	+ then posix_mkdir=:
	+ fi
	+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
	else
	- :
	+ # Remove any dirs left behind by ancient mkdir implementations.
	+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
	fi
	-} &&
	-
	-# Now rename the file to the real destination.
	-
	- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
	-
	-fi &&
	+ trap '' 0;;
	+ esac

	-# The final little trick to "correctly" pass the exit status to the exit trap.
	+ if
	+ $posix_mkdir && (
	+ umask $mkdir_umask &&
	+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
	+ )
	+ then :
	+ else
	+
	+ # mkdir does not conform to POSIX,
	+ # or it failed possibly due to a race condition. Create the
	+ # directory the slow way, step by step, checking for races as we go.
	+
	+ case $dstdir in
	+ /*) prefix='/';;
	+ [-=!]*) prefix='./';;
	+ *) prefix='';;
	+ esac
	+
	+ oIFS=$IFS
	+ IFS=/
	+ set -f
	+ set fnord $dstdir
	+ shift
	+ set +f
	+ IFS=$oIFS
	+
	+ prefixes=
	+
	+ for d
	+ do
	+ test X"$d" = X && continue
	+
	+ prefix=$prefix$d
	+ if test -d "$prefix"; then
	+ prefixes=
	+ else
	+ if $posix_mkdir; then
	+ (umask $mkdir_umask &&
	+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
	+ # Don't fail if two instances are running concurrently.
	+ test -d "$prefix" \|\| exit 1
	+ else
	+ case $prefix in
	+ \') qprefix=`echo "$prefix" \| sed "s/'/'\\\\\\\\''/g"`;;
	+ *) qprefix=$prefix;;
	+ esac
	+ prefixes="$prefixes '$qprefix'"
	+ fi
	+ fi
	+ prefix=$prefix/
	+ done
	+
	+ if test -n "$prefixes"; then
	+ # Don't fail if two instances are running concurrently.
	+ (umask $mkdir_umask &&
	+ eval "\$doit_exec \$mkdirprog $prefixes") \|\|
	+ test -d "$dstdir" \|\| exit 1
	+ obsolete_mkdir_used=true
	+ fi
	+ fi
	+ fi
	+
	+ if test -n "$dir_arg"; then
	+ { test -z "$chowncmd" \|\| $doit $chowncmd "$dst"; } &&
	+ { test -z "$chgrpcmd" \|\| $doit $chgrpcmd "$dst"; } &&
	+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false \|\|
	+ test -z "$chmodcmd" \|\| $doit $chmodcmd $mode "$dst"; } \|\| exit 1
	+ else
	+
	+ # Make a couple of temp file names in the proper directory.
	+ dsttmp=${dstdirslash}_inst.$$_
	+ rmtmp=${dstdirslash}_rm.$$_
	+
	+ # Trap to clean up those temp files at exit.
	+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
	+
	+ # Copy the file name to the temp name.
	+ (umask $cp_umask &&
	+ { test -z "$stripcmd" \|\| {
	+ # Create $dsttmp read-write so that cp doesn't create it read-only,
	+ # which would cause strip to fail.
	+ if test -z "$doit"; then
	+ : >"$dsttmp" # No need to fork-exec 'touch'.
	+ else
	+ $doit touch "$dsttmp"
	+ fi
	+ }
	+ } &&
	+ $doit_exec $cpprog "$src" "$dsttmp") &&
	+
	+ # and set any options; do chmod last to preserve setuid bits.
	+ #
	+ # If any of these fail, we abort the whole thing. If we want to
	+ # ignore errors from any of these, just make sure not to ignore
	+ # errors from the above "$doit $cpprog $src $dsttmp" command.
	+ #
	+ { test -z "$chowncmd" \|\| $doit $chowncmd "$dsttmp"; } &&
	+ { test -z "$chgrpcmd" \|\| $doit $chgrpcmd "$dsttmp"; } &&
	+ { test -z "$stripcmd" \|\| $doit $stripcmd "$dsttmp"; } &&
	+ { test -z "$chmodcmd" \|\| $doit $chmodcmd $mode "$dsttmp"; } &&
	+
	+ # If -C, don't bother to copy if it wouldn't change the file.
	+ if $copy_on_change &&
	+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
	+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
	+ set -f &&
	+ set X $old && old=:$2:$4:$5:$6 &&
	+ set X $new && new=:$2:$4:$5:$6 &&
	+ set +f &&
	+ test "$old" = "$new" &&
	+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
	+ then
	+ rm -f "$dsttmp"
	+ else
	+ # If $backupsuffix is set, and the file being installed
	+ # already exists, attempt a backup. Don't worry if it fails,
	+ # e.g., if mv doesn't support -f.
	+ if test -n "$backupsuffix" && test -f "$dst"; then
	+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
	+ fi
	+
	+ # Rename the file to the real destination.
	+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \|\|
	+
	+ # The rename failed, perhaps because mv can't rename something else
	+ # to itself, or perhaps because mv is so ancient that it does not
	+ # support -f.
	+ {
	+ # Now remove or move aside any old file at destination location.
	+ # We try this two ways since rm can't unlink itself on some
	+ # systems and the destination file might be busy for other
	+ # reasons. In this case, the final cleanup might fail but the new
	+ # file should still install successfully.
	+ {
	+ test ! -f "$dst" \|\|
	+ $doit $rmcmd "$dst" 2>/dev/null \|\|
	+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
	+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
	+ } \|\|
	+ { echo "$0: cannot unlink or rename $dst" >&2
	+ (exit 1); exit 1
	+ }
	+ } &&
	+
	+ # Now rename the file to the real destination.
	+ $doit $mvcmd "$dsttmp" "$dst"
	+ }
	+ fi \|\| exit 1
	+
	+ trap '' 0
	+ fi
	+done

	-{
	- (exit 0); exit
	-}
	+# Local variables:
	+# eval: (add-hook 'before-save-hook 'time-stamp)
	+# time-stamp-start: "scriptversion="
	+# time-stamp-format: "%:y-%02m-%02d.%02H"
	+# time-stamp-time-zone: "UTC0"
	+# time-stamp-end: "; # UTC"
	+# End:
	diff --git a/contrib/byacc/lalr.c b/contrib/byacc/lalr.c
	--- a/contrib/byacc/lalr.c
	+++ b/contrib/byacc/lalr.c
	@@ -1,4 +1,4 @@
	-/* $Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp $ */
	+/* $Id: lalr.c,v 1.14 2021/05/20 23:57:23 tom Exp $ */

	#include "defs.h"

	@@ -41,7 +41,7 @@

	static Value_t infinity;
	static int maxrhs;
	-static int ngotos;
	+static Value_t ngotos;
	static unsigned *F;
	static Value_t **includes;
	static shorts **lookback;
	@@ -183,7 +183,6 @@
	Value_t *temp_base;
	Value_t *temp_map;
	Value_t state2;
	- Value_t state1;

	goto_base = NEW2(nvars + 1, Value_t);
	temp_base = NEW2(nvars + 1, Value_t);
	@@ -227,7 +226,8 @@

	for (sp = first_shift; sp; sp = sp->next)
	{
	- state1 = sp->number;
	+ Value_t state1 = sp->number;
	+
	for (i = sp->nshifts - 1; i >= 0; i--)
	{
	state2 = sp->shift[i];
	@@ -250,16 +250,14 @@
	static Value_t
	map_goto(int state, int symbol)
	{
	- int high;
	- int low;
	- int middle;
	- int s;
	-
	- low = goto_map[symbol];
	- high = goto_map[symbol + 1];
	+ int low = goto_map[symbol];
	+ int high = goto_map[symbol + 1];

	for (;;)
	{
	+ int middle;
	+ int s;
	+
	assert(low <= high);
	middle = (low + high) >> 1;
	s = from_state[middle];
	@@ -284,7 +282,6 @@
	Value_t *rp;
	Value_t **reads;
	int nedges;
	- int stateno;
	int symbol;
	int nwords;

	@@ -298,7 +295,8 @@
	rowp = F;
	for (i = 0; i < ngotos; i++)
	{
	- stateno = to_state[i];
	+ int stateno = to_state[i];
	+
	sp = shift_table[stateno];

	if (sp)
	@@ -358,11 +356,8 @@
	Value_t *rp;
	shifts *sp;
	int length;
	- int nedges;
	int done_flag;
	- Value_t state1;
	Value_t stateno;
	- int symbol1;
	int symbol2;
	Value_t *shortp;
	Value_t *edge;
	@@ -375,9 +370,9 @@

	for (i = 0; i < ngotos; i++)
	{
	- nedges = 0;
	- state1 = from_state[i];
	- symbol1 = accessing_symbol[to_state[i]];
	+ int nedges = 0;
	+ int symbol1 = accessing_symbol[to_state[i]];
	+ Value_t state1 = from_state[i];

	for (rulep = derives[symbol1]; *rulep >= 0; rulep++)
	{
	@@ -475,7 +470,6 @@
	Value_t *nedges;
	Value_t *sp;
	int i;
	- int k;

	nedges = NEW2(n, Value_t);

	@@ -494,7 +488,8 @@

	for (i = 0; i < n; i++)
	{
	- k = nedges[i];
	+ int k = nedges[i];
	+
	if (k > 0)
	{
	sp = NEW2(k + 1, Value_t);
	@@ -646,10 +641,10 @@
	void
	lalr_leaks(void)
	{
	- int i;
	-
	if (includes != 0)
	{
	+ int i;
	+
	for (i = 0; i < ngotos; i++)
	{
	free(includes[i]);
	diff --git a/contrib/byacc/lr0.c b/contrib/byacc/lr0.c
	--- a/contrib/byacc/lr0.c
	+++ b/contrib/byacc/lr0.c
	@@ -1,4 +1,4 @@
	-/* $Id: lr0.c,v 1.19 2016/06/07 00:21:53 tom Exp $ */
	+/* $Id: lr0.c,v 1.21 2021/05/20 23:57:23 tom Exp $ */

	#include "defs.h"

	@@ -16,7 +16,7 @@
	static void set_derives(void);
	static void set_nullable(void);

	-int nstates;
	+Value_t nstates;
	core *first_state;
	shifts *first_shift;
	reductions *first_reduction;
	@@ -44,7 +44,6 @@
	{
	Value_t *itemp;
	Value_t *item_end;
	- int symbol;
	int i;
	int count;
	int max;
	@@ -56,7 +55,8 @@
	item_end = ritem + nitems;
	for (itemp = ritem; itemp < item_end; itemp++)
	{
	- symbol = *itemp;
	+ int symbol = *itemp;
	+
	if (symbol >= 0)
	{
	count++;
	@@ -94,7 +94,6 @@
	append_states(void)
	{
	int i;
	- int j;
	Value_t symbol;

	#ifdef TRACE
	@@ -102,8 +101,9 @@
	#endif
	for (i = 1; i < nshifts; i++)
	{
	+ int j = i;
	+
	symbol = shift_symbol[i];
	- j = i;
	while (j > 0 && shift_symbol[j - 1] > symbol)
	{
	shift_symbol[j] = shift_symbol[j - 1];
	@@ -161,10 +161,8 @@
	{
	int key;
	Value_t *isp1;
	- Value_t *isp2;
	Value_t *iend;
	core *sp;
	- int found;
	int n;

	#ifdef TRACE
	@@ -180,11 +178,14 @@
	sp = state_set[key];
	if (sp)
	{
	- found = 0;
	+ int found = 0;
	+
	while (!found)
	{
	if (sp->nitems == n)
	{
	+ Value_t *isp2;
	+
	found = 1;
	isp1 = kernel_base[symbol];
	isp2 = sp->items;
	@@ -252,7 +253,6 @@
	int shiftcount;
	Value_t *isp;
	Value_t *ksp;
	- Value_t symbol;

	for (i = 0; i < nsyms; i++)
	kernel_end[i] = 0;
	@@ -261,8 +261,9 @@
	isp = itemset;
	while (isp < itemsetend)
	{
	- i = *isp++;
	- symbol = ritem[i];
	+ int j = *isp++;
	+ Value_t symbol = ritem[j];
	+
	if (symbol > 0)
	{
	ksp = kernel_end[symbol];
	@@ -272,7 +273,7 @@
	ksp = kernel_base[symbol];
	}

	- *ksp++ = (Value_t)(i + 1);
	+ *ksp++ = (Value_t)(j + 1);
	kernel_end[symbol] = ksp;
	}
	}
	@@ -435,16 +436,14 @@
	{
	Value_t *isp;
	Value_t *rp1;
	- Value_t *rp2;
	- int item;
	Value_t count;
	reductions *p;
	- Value_t *rend;

	count = 0;
	for (isp = itemset; isp < itemsetend; isp++)
	{
	- item = ritem[*isp];
	+ int item = ritem[*isp];
	+
	if (item < 0)
	{
	redset[count++] = (Value_t)-item;
	@@ -453,6 +452,9 @@

	if (count)
	{
	+ Value_t *rp2;
	+ Value_t *rend;
	+
	p = (reductions *)allocate((sizeof(reductions) +
	(unsigned)(count - 1) *
	sizeof(Value_t)));
	diff --git a/contrib/byacc/main.c b/contrib/byacc/main.c
	--- a/contrib/byacc/main.c
	+++ b/contrib/byacc/main.c
	@@ -1,4 +1,4 @@
	-/* $Id: main.c,v 1.69 2019/11/25 23:24:36 Tom.Shields Exp $ */
	+/* $Id: main.c,v 1.73 2021/08/08 20:39:34 tom Exp $ */

	#include <signal.h>
	#if !defined(_WIN32) \|\| defined(__MINGW32__)
	@@ -148,6 +148,8 @@
	_exit(EXIT_FAILURE);

	#ifdef NO_LEAKS
	+ DO_FREE(input_file_name);
	+
	if (rflag)
	DO_FREE(code_file_name);

	@@ -201,40 +203,89 @@
	#endif
	}

	+#define SIZEOF(v) (sizeof(v) / sizeof((v)[0]))
	+
	+/*
	+ * Long options are provided only as a compatibility aid for scripters.
	+ */
	+/* INDENT-OFF */
	+static const struct {
	+ const char long_opt[16];
	+ const char yacc_arg;
	+ const char yacc_opt;
	+} long_opts[] = {
	+ { "defines", 1, 'H' },
	+ { "file-prefix", 1, 'b' },
	+ { "graph", 0, 'g' },
	+ { "help", 0, 'h' },
	+ { "name-prefix", 1, 'p' },
	+ { "no-lines", 0, 'l' },
	+ { "output", 1, 'o' },
	+ { "version", 0, 'V' }
	+};
	+/* INDENT-ON */
	+
	+/*
	+ * Usage-message is designed for 80 columns, with some unknowns. Account for
	+ * those in the maximum width so that the usage message uses no relocatable
	+ * pointers.
	+ */
	+#define USAGE_COLS (80 + sizeof(DEFINES_SUFFIX) + sizeof(OUTPUT_SUFFIX))
	+
	static void
	usage(void)
	{
	- static const char *msg[] =
	- {
	- ""
	- ,"Options:"
	- ," -b file_prefix set filename prefix (default \"y.\")"
	- ," -B create a backtracking parser"
	- ," -d write definitions (" DEFINES_SUFFIX ")"
	- ," -H defines_file write definitions to defines_file"
	- ," -i write interface (y.tab.i)"
	- ," -g write a graphical description"
	- ," -l suppress #line directives"
	- ," -L enable position processing, e.g., \"%locations\""
	- ," -o output_file (default \"" OUTPUT_SUFFIX "\")"
	- ," -p symbol_prefix set symbol prefix (default \"yy\")"
	- ," -P create a reentrant parser, e.g., \"%pure-parser\""
	- ," -r produce separate code and table files (y.code.c)"
	- ," -s suppress #define's for quoted names in %token lines"
	- ," -t add debugging support"
	- ," -v write description (y.output)"
	- ," -V show version information and exit"
	+ /* INDENT-OFF */
	+ static const char msg[][USAGE_COLS] =
	+ {
	+ { " -b file_prefix set filename prefix (default \"y.\")" },
	+ { " -B create a backtracking parser" },
	+ { " -d write definitions (" DEFINES_SUFFIX ")" },
	+ { " -h print this help-message" },
	+ { " -H defines_file write definitions to defines_file" },
	+ { " -i write interface (y.tab.i)" },
	+ { " -g write a graphical description" },
	+ { " -l suppress #line directives" },
	+ { " -L enable position processing, e.g., \"%locations\"" },
	+ { " -o output_file (default \"" OUTPUT_SUFFIX "\")" },
	+ { " -p symbol_prefix set symbol prefix (default \"yy\")" },
	+ { " -P create a reentrant parser, e.g., \"%pure-parser\"" },
	+ { " -r produce separate code and table files (y.code.c)" },
	+ { " -s suppress #define's for quoted names in %token lines" },
	+ { " -t add debugging support" },
	+ { " -v write description (y.output)" },
	+ { " -V show version information and exit" },
	};
	+ /* INDENT-ON */
	unsigned n;

	fflush(stdout);
	fprintf(stderr, "Usage: %s [options] filename\n", myname);
	- for (n = 0; n < sizeof(msg) / sizeof(msg[0]); ++n)
	+
	+ fprintf(stderr, "\nOptions:\n");
	+ for (n = 0; n < SIZEOF(msg); ++n)
	+ {
	fprintf(stderr, "%s\n", msg[n]);
	+ }
	+
	+ fprintf(stderr, "\nLong options:\n");
	+ for (n = 0; n < SIZEOF(long_opts); ++n)
	+ {
	+ fprintf(stderr, " --%-20s-%c\n",
	+ long_opts[n].long_opt,
	+ long_opts[n].yacc_opt);
	+ }

	exit(EXIT_FAILURE);
	}

	+static void
	+invalid_option(const char *option)
	+{
	+ fprintf(stderr, "invalid option: %s\n", option);
	+ usage();
	+}
	+
	static void
	setflag(int ch)
	{
	@@ -313,17 +364,66 @@
	int i;
	#ifdef HAVE_GETOPT
	int ch;
	+#endif

	+ /*
	+ * Map bison's long-options into yacc short options.
	+ */
	+ for (i = 1; i < argc; ++i)
	+ {
	+ char *a = argv[i];
	+
	+ if (!strncmp(a, "--", 2))
	+ {
	+ char *eqls;
	+ size_t lc;
	+ size_t len;
	+
	+ if ((len = strlen(a)) == 2)
	+ break;
	+
	+ if ((eqls = strchr(a, '=')) != NULL)
	+ {
	+ len = (size_t)(eqls - a);
	+ if (len == 0 \|\| eqls[1] == '\0')
	+ invalid_option(a);
	+ }
	+
	+ for (lc = 0; lc < SIZEOF(long_opts); ++lc)
	+ {
	+ if (!strncmp(long_opts[lc].long_opt, a + 2, len - 2))
	+ {
	+ if (eqls != NULL && !long_opts[lc].yacc_arg)
	+ invalid_option(a);
	+ *a++ = '-';
	+ *a++ = long_opts[lc].yacc_opt;
	+ *a = '\0';
	+ if (eqls)
	+ {
	+ while ((a++ = ++eqls) != '\0') /* empty */ ;
	+ }
	+ break;
	+ }
	+ }
	+ if (!strncmp(a, "--", 2))
	+ invalid_option(a);
	+ }
	+ }
	+
	+#ifdef HAVE_GETOPT
	if (argc > 0)
	myname = argv[0];

	- while ((ch = getopt(argc, argv, "Bb:dgH:ilLo:Pp:rstVvy")) != -1)
	+ while ((ch = getopt(argc, argv, "Bb:dghH:ilLo:Pp:rstVvy")) != -1)
	{
	switch (ch)
	{
	case 'b':
	file_prefix = optarg;
	break;
	+ case 'h':
	+ usage();
	+ break;
	case 'H':
	dflag = dflag2 = 1;
	defines_file_name = optarg;
	@@ -509,7 +609,7 @@

	if (suffix != NULL)
	{
	- len = (size_t) (suffix - output_file_name);
	+ len = (size_t)(suffix - output_file_name);
	file_prefix = TMALLOC(char, len + 1);
	NO_SPACE(file_prefix);
	strncpy(file_prefix, output_file_name, len)[len] = 0;
	@@ -628,10 +728,8 @@
	#define MY_FMT "%s/%.*sXXXXXX"
	FILE *result;
	#if USE_MKSTEMP
	- int fd;
	const char *tmpdir;
	char *name;
	- const char *mark;

	if (((tmpdir = getenv("TMPDIR")) == 0 \|\| access(tmpdir, W_OK) != 0) \|\|
	((tmpdir = getenv("TEMP")) == 0 \|\| access(tmpdir, W_OK) != 0))
	@@ -654,6 +752,9 @@
	result = 0;
	if (name != 0)
	{
	+ int fd;
	+ const char *mark;
	+
	mode_t save_umask = umask(0177);

	if ((mark = strrchr(label, '_')) == 0)
	diff --git a/contrib/byacc/makefile.in b/contrib/byacc/makefile.in
	--- a/contrib/byacc/makefile.in
	+++ b/contrib/byacc/makefile.in
	@@ -1,4 +1,4 @@
	-# $Id: makefile.in,v 1.24 2015/07/05 22:12:29 tom Exp $
	+# $Id: makefile.in,v 1.25 2022/11/06 21:03:11 tom Exp $
	#
	# UNIX template-makefile for Berkeley Yacc

	@@ -27,6 +27,7 @@
	AWK = @AWK@
	CTAGS = @CTAGS@
	ETAGS = @ETAGS@
	+FGREP = @FGREP@
	LINT = @LINT@
	LINTFLAGS = @LINT_OPTS@

	@@ -147,13 +148,16 @@

	################################################################################
	check: $(THIS)$x
	- $(SHELL) $(testdir)/run_test.sh $(testdir)
	+ @echo "** making $@"
	+ @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_test.sh $(testdir)

	check_make: $(THIS)$x
	- $(SHELL) $(testdir)/run_make.sh $(testdir)
	+ @echo "** making $@"
	+ @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_make.sh $(testdir)

	check_lint:
	- $(SHELL) $(testdir)/run_lint.sh $(testdir)
	+ @echo "** making $@"
	+ @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_lint.sh $(testdir)
	################################################################################
	tags: $(H_FILES) $(C_FILES)
	$(CTAGS) $(C_FILES) $(H_FILES)
	diff --git a/contrib/byacc/mkpar.c b/contrib/byacc/mkpar.c
	--- a/contrib/byacc/mkpar.c
	+++ b/contrib/byacc/mkpar.c
	@@ -1,4 +1,4 @@
	-/* $Id: mkpar.c,v 1.16 2019/11/04 01:23:02 tom Exp $ */
	+/* $Id: mkpar.c,v 1.18 2021/05/20 23:57:23 tom Exp $ */

	#include "defs.h"

	@@ -76,18 +76,19 @@
	action actions, temp;
	shifts *sp;
	Value_t *to_state2;
	- Value_t i, k;
	- Value_t symbol;

	actions = 0;
	sp = shift_table[stateno];
	if (sp)
	{
	+ Value_t i;
	+
	to_state2 = sp->shift;
	for (i = (Value_t)(sp->nshifts - 1); i >= 0; i--)
	{
	- k = to_state2[i];
	- symbol = accessing_symbol[k];
	+ Value_t k = to_state2[i];
	+ Value_t symbol = accessing_symbol[k];
	+
	if (ISTOKEN(symbol))
	{
	temp = NEW(action);
	@@ -108,16 +109,16 @@
	add_reductions(int stateno, action *actions)
	{
	int i, j, m, n;
	- int ruleno, tokensetsize;
	- unsigned *rowp;
	+ int tokensetsize;

	tokensetsize = WORDSIZE(ntokens);
	m = lookaheads[stateno];
	n = lookaheads[stateno + 1];
	for (i = m; i < n; i++)
	{
	- ruleno = LAruleno[i];
	- rowp = LA + i * tokensetsize;
	+ int ruleno = LAruleno[i];
	+ unsigned rowp = LA + i tokensetsize;
	+
	for (j = ntokens - 1; j >= 0; j--)
	{
	if (BIT(rowp, j))
	@@ -170,14 +171,15 @@
	static void
	find_final_state(void)
	{
	- int goal, i;
	Value_t *to_state2;
	shifts *p;

	if ((p = shift_table[0]) != 0)
	{
	+ int i;
	+ int goal = ritem[1];
	+
	to_state2 = p->shift;
	- goal = ritem[1];
	for (i = p->nshifts - 1; i >= 0; --i)
	{
	final_state = to_state2[i];
	@@ -218,7 +220,7 @@
	if (nunused == 1)
	fprintf(stderr, "%s: 1 rule never reduced\n", myname);
	else
	- fprintf(stderr, "%s: %d rules never reduced\n", myname, nunused);
	+ fprintf(stderr, "%s: %ld rules never reduced\n", myname, (long)nunused);
	}
	}

	@@ -226,7 +228,6 @@
	remove_conflicts(void)
	{
	int i;
	- int symbol;
	action p, pref = 0;

	SRtotal = 0;
	@@ -235,9 +236,10 @@
	RRconflicts = NEW2(nstates, Value_t);
	for (i = 0; i < nstates; i++)
	{
	+ int symbol = -1;
	+
	SRcount = 0;
	RRcount = 0;
	- symbol = -1;
	#if defined(YYBTYACC)
	pref = NULL;
	#endif
	diff --git a/contrib/byacc/output.c b/contrib/byacc/output.c
	--- a/contrib/byacc/output.c
	+++ b/contrib/byacc/output.c
	@@ -1,4 +1,4 @@
	-/* $Id: output.c,v 1.92 2019/11/20 00:55:05 tom Exp $ */
	+/* $Id: output.c,v 1.100 2022/01/09 18:03:56 tom Exp $ */

	#include "defs.h"

	@@ -96,7 +96,7 @@
	if (!lflag && (fp == code_file))
	{
	++outline;
	- fprintf(fp, line_format, outline + 1, code_file_name);
	+ fprintf_lineno(fp, outline + 1, code_file_name);
	}
	}

	@@ -106,7 +106,7 @@
	if (!lflag)
	{
	++outline;
	- fprintf(code_file, line_format, lineno, input_file_name);
	+ fprintf_lineno(code_file, lineno, input_file_name);
	}
	}

	@@ -372,12 +372,12 @@
	static void
	output_accessing_symbols(void)
	{
	- int i, j;
	- int *translate;
	-
	if (nstates != 0)
	{
	- translate = TMALLOC(int, nstates);
	+ int i, j;
	+ int *translate;
	+
	+ translate = TCMALLOC(int, nstates);
	NO_SPACE(translate);

	for (i = 0; i < nstates; ++i)
	@@ -442,7 +442,7 @@
	Value_t csym = -1;
	Value_t cbase = 0;
	#endif
	- int max, min;
	+ Value_t max, min;
	Value_t actionrow, r, *s;
	action *p;

	@@ -791,11 +791,9 @@
	matching_vector(int vector)
	{
	int i;
	- int j;
	int k;
	int t;
	int w;
	- int match;
	int prev;

	i = order[vector];
	@@ -807,19 +805,25 @@

	for (prev = vector - 1; prev >= 0; prev--)
	{
	- j = order[prev];
	- if (width[j] != w \|\| tally[j] != t)
	- return (-1);
	+ int j = order[prev];

	- match = 1;
	- for (k = 0; match && k < t; k++)
	+ if (width[j] != w \|\| tally[j] != t)
	{
	- if (tos[j][k] != tos[i][k] \|\| froms[j][k] != froms[i][k])
	- match = 0;
	+ return (-1);
	}
	+ else
	+ {
	+ int match = 1;

	- if (match)
	- return (j);
	+ for (k = 0; match && k < t; k++)
	+ {
	+ if (tos[j][k] != tos[i][k] \|\| froms[j][k] != froms[i][k])
	+ match = 0;
	+ }
	+
	+ if (match)
	+ return (j);
	+ }
	}

	return (-1);
	@@ -830,7 +834,7 @@
	{
	int i, j, k, l;
	int t;
	- int loc;
	+ Value_t loc;
	int ok;
	Value_t *from;
	Value_t *to;
	@@ -854,7 +858,7 @@
	ok = 1;
	for (k = 0; ok && k < t; k++)
	{
	- loc = j + from[k];
	+ loc = (Value_t)(j + from[k]);
	if (loc >= maxtable - 1)
	{
	if (loc >= MAXTABLE - 1)
	@@ -893,7 +897,7 @@
	{
	for (k = 0; k < t; k++)
	{
	- loc = j + from[k];
	+ loc = (Value_t)(j + from[k]);
	table[loc] = to[k];
	check[loc] = from[k];
	if (loc > high)
	@@ -913,7 +917,6 @@
	{
	int i;
	Value_t place;
	- int state;

	base = NEW2(nvectors, Value_t);
	pos = NEW2(nentries, Value_t);
	@@ -930,7 +933,7 @@

	for (i = 0; i < nentries; i++)
	{
	- state = matching_vector(i);
	+ int state = matching_vector(i);

	if (state < 0)
	place = (Value_t)pack_vector(i);
	@@ -1048,7 +1051,7 @@
	if (high >= MAXYYINT)
	{
	fprintf(stderr, "YYTABLESIZE: %ld\n", high);
	- fprintf(stderr, "Table is longer than %d elements.\n", MAXYYINT);
	+ fprintf(stderr, "Table is longer than %ld elements.\n", (long)MAXYYINT);
	done(1);
	}

	@@ -1225,7 +1228,6 @@
	output_defines(FILE * fp)
	{
	int c, i;
	- char *s;

	if (fp == defines_file)
	{
	@@ -1234,7 +1236,8 @@

	for (i = 2; i < ntokens; ++i)
	{
	- s = symbol_name[i];
	+ char *s = symbol_name[i];
	+
	if (is_C_identifier(s) && (!sflag \|\| *s != '"'))
	{
	fprintf(fp, "#define ");
	@@ -1256,14 +1259,14 @@
	}
	if (fp == code_file)
	++outline;
	- fprintf(fp, " %d\n", symbol_value[i]);
	+ fprintf(fp, " %ld\n", (long)symbol_value[i]);
	}
	}

	if (fp == code_file)
	++outline;
	if (fp != defines_file \|\| iflag)
	- fprintf(fp, "#define YYERRCODE %d\n", symbol_value[1]);
	+ fprintf(fp, "#define YYERRCODE %ld\n", (long)symbol_value[1]);

	if (fp == defines_file)
	{
	@@ -1340,7 +1343,7 @@
	const char *s;

	++outline;
	- fprintf(code_file, "#define YYFINAL %d\n", final_state);
	+ fprintf(code_file, "#define YYFINAL %ld\n", (long)final_state);

	outline += output_yydebug(code_file);

	@@ -1372,7 +1375,7 @@
	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 */
	@@ -1685,15 +1688,49 @@
	output_semantic_actions(void)
	{
	int c, last;
	+ int state;
	+ char line_state[20];

	rewind(action_file);
	if ((c = getc(action_file)) == EOF)
	return;

	+ if (!lflag)
	+ {
	+ state = -1;
	+ sprintf(line_state, line_format, 1, "");
	+ }
	+
	last = c;
	putc_code(code_file, c);
	while ((c = getc(action_file)) != EOF)
	{
	+ /*
	+ * When writing the action file, we did not know the line-numbers in
	+ * the code-file, but wrote empty #line directives. Detect those and
	+ * replace with proper #line directives.
	+ */
	+ if (!lflag && (last == '\n' \|\| state >= 0))
	+ {
	+ if (c == line_state[state + 1])
	+ {
	+ ++state;
	+ if (line_state[state + 1] == '\0')
	+ {
	+ write_code_lineno(code_file);
	+ state = -1;
	+ }
	+ last = c;
	+ continue;
	+ }
	+ else
	+ {
	+ int n;
	+ for (n = 0; n <= state; ++n)
	+ putc_code(code_file, line_state[n]);
	+ state = -1;
	+ }
	+ }
	putc_code(code_file, c);
	last = c;
	}
	@@ -1956,8 +1993,8 @@
	++outline;
	puts_code(code_file, destructor_code);
	putc_code(code_file, '\n');
	- putl_code(code_file, "\tbreak;\n");
	write_code_lineno(code_file);
	+ putl_code(code_file, "\tbreak;\n");
	FREE(destructor_code);
	}
	}
	diff --git a/contrib/byacc/package/byacc.spec b/contrib/byacc/package/byacc.spec
	--- a/contrib/byacc/package/byacc.spec
	+++ b/contrib/byacc/package/byacc.spec
	@@ -1,17 +1,18 @@
	-Summary: byacc - public domain Berkeley LALR Yacc parser generator
	-%define AppProgram byacc
	-%define AltProgram btyacc
	-%define AppVersion 20200330
	-%define UseProgram yacc
	-# $Id: byacc.spec,v 1.49 2020/03/30 23:31:42 tom Exp $
	-Name: %{AppProgram}
	-Version: %{AppVersion}
	+Summary: public domain Berkeley LALR Yacc parser generator
	+
	+%global AppVersion 2.0
	+%global AppPatched 20230201
	+
	+%global AltProgram byacc2
	+%global UseProgram yacc
	+
	+# $Id: byacc.spec,v 1.70 2023/02/02 00:12:06 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
	@@ -20,10 +21,10 @@
	routine written in the C programming language. It has a public domain
	license which includes the generated C.

	-%package -n btyacc
	-Summary: Curses library with POSIX thread support.
	+%package -n byacc2
	+Summary: public domain Berkeley LALR Yacc parser generator with backtracking

	-%description -n btyacc
	+%description -n byacc2
	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
	@@ -34,15 +35,16 @@

	%prep

	-%define debug_package %{nil}
	+%global debug_package %{nil}

	-%setup -q -n %{AppProgram}-%{AppVersion}
	+%setup -q -n %{name}-%{AppPatched}

	%build
	%define my_srcdir ..
	%define CFG_OPTS \\\
	--verbose \\\
	--disable-echo \\\
	+ --enable-stdnoreturn \\\
	--target %{_target_platform} \\\
	--prefix=%{_prefix} \\\
	--srcdir=%{my_srcdir} \\\
	@@ -57,18 +59,16 @@
	CONFIGURE_TOP=%{my_srcdir} \
	%configure %{CFG_OPTS} \
	--program-prefix=b \
	- --program-transform-name='s,\^,b,'
	make
	popd

	-mkdir BUILD-btyacc
	-pushd BUILD-btyacc
	+mkdir BUILD-byacc2
	+pushd BUILD-byacc2
	CONFIGURE_TOP=%{my_srcdir} \
	%configure %{CFG_OPTS} \
	--enable-btyacc \
	- --program-prefix=bt \
	- --with-max-table-size=18000 \
	- --program-transform-name='s,\^,bt,'
	+ --program-transform-name='s,\<yacc,byacc2,g' \
	+ --with-max-table-size=123456 \
	make
	popd

	@@ -77,10 +77,10 @@

	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-btyacc
	+pushd BUILD-byacc2
	make install DESTDIR=$RPM_BUILD_ROOT
	popd

	@@ -88,19 +88,27 @@
	[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

	%files
	-%defattr(-,root,root)
	-%{_prefix}/bin/%{AppProgram}
	-%{_prefix}/bin/%{UseProgram}
	-%{_mandir}/man1/%{AppProgram}.*
	-
	-%files -n btyacc
	-%defattr(-,root,root)
	-%{_prefix}/bin/%{AltProgram}
	+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
	+%license LICENSE
	+%{_bindir}/%{name}
	+%{_bindir}/%{UseProgram}
	+%{_mandir}/man1/%{name}.*
	+
	+%files -n byacc2
	+%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
	+
	* Fri May 25 2018 Thomas Dickey
	- add btyacc package

	diff --git a/contrib/byacc/package/debian/changelog b/contrib/byacc/package/debian/changelog
	--- a/contrib/byacc/package/debian/changelog
	+++ b/contrib/byacc/package/debian/changelog
	@@ -1,3 +1,106 @@
	+byacc (1:2.0.20230201) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 01 Feb 2023 19:12:06 -0500
	+
	+byacc (1:2.0.20221229) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 29 Dec 2022 05:23:05 -0500
	+
	+byacc (1:2.0.20221106) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 06 Nov 2022 10:51:43 -0500
	+
	+byacc (1:2.0.20220128) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 28 Jan 2022 08:38:52 -0500
	+
	+byacc (1:2.0.20220114) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 14 Jan 2022 16:33:35 -0500
	+
	+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
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Jan 2022 07:06:35 -0500
	+
	+byacc (20211224) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 24 Dec 2021 19:13:22 -0500
	+
	+byacc (20210808) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 08 Aug 2021 15:26:10 -0400
	+
	+byacc (20210802) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 02 Aug 2021 16:50:01 -0400
	+
	+byacc (20210801) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Aug 2021 15:30:22 -0400
	+
	+byacc (20210619) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Jun 2021 14:06:48 -0400
	+
	+byacc (20210520) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 20 May 2021 15:25:00 -0400
	+
	+byacc (20210328) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 28 Mar 2021 11:14:10 -0400
	+
	+byacc (20210109) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Jan 2021 09:32:51 -0500
	+
	+byacc (20200910) unstable; urgency=low
	+
	+ * maintenance updates
	+
	+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 10 Sep 2020 10:45:10 -0400
	+
	byacc (20200330) unstable; urgency=low

	* maintenance updates
	diff --git a/contrib/byacc/package/debian/compat b/contrib/byacc/package/debian/compat
	deleted file mode 100644
	--- a/contrib/byacc/package/debian/compat
	+++ /dev/null
	@@ -1 +0,0 @@
	-5
	diff --git a/contrib/byacc/package/debian/control b/contrib/byacc/package/debian/control
	--- a/contrib/byacc/package/debian/control
	+++ b/contrib/byacc/package/debian/control
	@@ -1,23 +1,19 @@
	Source: byacc
	Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
	+Uploaders: Thomas E. Dickey <dickey@his.com>
	Section: devel
	Priority: optional
	-Standards-Version: 3.8.4
	-Build-Depends: debhelper (>= 5)
	-Homepage: http://invisible-island.net/byacc/
	+Standards-Version: 4.6.0.1
	+Build-Depends: debhelper-compat (= 12),
	+Rules-Requires-Root: no
	+Homepage: https://invisible-island.net/byacc/
	+Vcs-Browser: https://salsa.debian.org/debian/byacc
	+Vcs-Git: https://salsa.debian.org/debian/byacc.git

	-Package: byacc
	-Architecture: any
	-Depends: ${shlibs:Depends}, ${misc:Depends}
	-Description: public domain Berkeley LALR Yacc parser generator
	- 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.
	-
	-Package: btyacc
	+Package: byacc2
	+Provides: yacc
	Architecture: any
	+Multi-Arch: foreign
	Depends: ${shlibs:Depends}, ${misc:Depends}
	Description: public domain Berkeley LALR Yacc parser generator
	This package provides a parser generator utility that reads a grammar
	@@ -26,4 +22,7 @@
	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.
	+ The package is renamed to allow installing at the same time as "byacc".
	+ .
	+ Related packages: bison, btyacc, byacc, antlr
	diff --git a/contrib/byacc/package/debian/copyright b/contrib/byacc/package/debian/copyright
	--- a/contrib/byacc/package/debian/copyright
	+++ b/contrib/byacc/package/debian/copyright
	@@ -1,42 +1,48 @@
	-Upstream source http://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: byacc
	+Upstream-Contact: <dickey@invisible-island.net> (Thomas E. Dickey)
	+Source: https://invisible-island.net/byacc/
	+
	+Files: *
	+Copyright: 2001-2022,2023 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-2019,2020 by Thomas E. Dickey
	+Copyright: 2004-2022,2023 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 @@
	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 @@
	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 @@

	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: debian/*
	-Copyright: 2012 Thomas E. Dickey
	-Licence: other-BSD
	+Files: package/debian/*
	+Copyright: 2012-2022,2023 Thomas E. Dickey
	+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 @@
	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 @@
	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/contrib/byacc/package/debian/docs b/contrib/byacc/package/debian/docs
	deleted file mode 100644
	--- a/contrib/byacc/package/debian/docs
	+++ /dev/null
	@@ -1,4 +0,0 @@
	-README
	-ACKNOWLEDGEMENTS
	-NEW_FEATURES
	-NOTES
	diff --git a/contrib/byacc/package/debian/postinst b/contrib/byacc/package/debian/postinst
	deleted file mode 100644
	--- a/contrib/byacc/package/debian/postinst
	+++ /dev/null
	@@ -1,15 +0,0 @@
	-#! /bin/sh
	-# postinst script for byacc
	-
	-set -e
	-
	-if [ $1 != "upgrade" ] ; then
	- update-alternatives \
	- --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
	-fi
	-
	-#DEBHELPER#
	-
	-exit 0
	diff --git a/contrib/byacc/package/debian/prerm b/contrib/byacc/package/debian/prerm
	deleted file mode 100644
	--- a/contrib/byacc/package/debian/prerm
	+++ /dev/null
	@@ -1,12 +0,0 @@
	-#! /bin/sh
	-# prerm script for byacc
	-
	-set -e
	-
	-if [ $1 != "upgrade" ]; then
	- update-alternatives --remove yacc /usr/bin/byacc
	-fi
	-
	-#DEBHELPER#
	-
	-exit 0
	diff --git a/contrib/byacc/package/debian/rules b/contrib/byacc/package/debian/rules
	--- a/contrib/byacc/package/debian/rules
	+++ b/contrib/byacc/package/debian/rules
	@@ -1,139 +1,29 @@
	#!/usr/bin/make -f
	-# $Id: rules,v 1.3 2018/05/25 20:03:37 tom Exp $
	-#
	+
	# Uncomment this to turn on verbose mode.
	#export DH_VERBOSE=1

	-# These are used for cross-compiling and for saving the configure script
	-# from having to guess our platform (since we know it already)
	-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
	-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
	-
	-PACKAGES.arch = byacc btyacc
	-
	-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
	-CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
	-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
	-
	-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
	- CFLAGS += -O0
	-else
	- CFLAGS += -O2
	-endif
	-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
	- INSTALL_PROGRAM += -s
	-endif
	-
	-BYACC_DIR = $(CURDIR)/debian/byacc
	-BTYACC_DIR = $(CURDIR)/debian/btyacc
	-
	-BYACC_TMP = t/byacc
	-BTYACC_TMP = t/btyacc
	-
	-verbose = # -v
	-
	-configure = \
	- CPPFLAGS="$(CPPFLAGS)" \
	- CFLAGS="$(CFLAGS)" \
	- LDFLAGS="$(LDFLAGS)" \
	- ../../configure \
	- --host=$(DEB_HOST_GNU_TYPE) \
	- --build=$(DEB_BUILD_GNU_TYPE) \
	- --prefix=/usr \
	- --mandir=\$${prefix}/share/man \
	- --sysconfdir=/etc \
	- --program-transform-name='s,^,b,'
	+export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all

	-all: build
	+%:
	+ dh $@

	-config: config-arch
	-build: build-arch
	-install: install-arch
	-binary: binary-arch
	+# dh_autoreconf interferes with portability -- skip it
	+override_dh_autoreconf:
	+ echo "skip: dh_autoreconf autoreconf-dickey -- -f -i"

	-config-arch: $(PACKAGES.arch:%=config-%-stamp)
	-build-arch: $(PACKAGES.arch:%=build-%-stamp)
	-install-arch: $(PACKAGES.arch:%=install-%-stamp)
	-
	-config-byacc-stamp:
	- dh_testdir
	-
	- rm -rf $(BYACC_TMP)
	- mkdir -p $(BYACC_TMP)
	- cd $(BYACC_TMP); $(configure)
	-
	- touch $@
	-
	-config-btyacc-stamp:
	- dh_testdir
	-
	- rm -rf $(BTYACC_TMP)
	- mkdir -p $(BTYACC_TMP)
	- cd $(BTYACC_TMP); $(configure) \
	+override_dh_auto_configure:
	+ dh_auto_configure -- \
	+ --enable-warnings \
	+ --verbose \
	+ --enable-stdnoreturn \
	--enable-btyacc \
	- --with-max-table-size=18000 \
	- --program-transform-name='s,^,bt,'
	-
	- touch $@
	-
	-build-byacc-stamp: config-byacc-stamp
	- dh_testdir
	-
	- cd $(BYACC_TMP); $(MAKE)
	-
	- touch $@
	-
	-build-btyacc-stamp: config-btyacc-stamp
	- dh_testdir
	-
	- cd $(BTYACC_TMP); $(MAKE)
	-
	- touch $@
	-
	-install-byacc-stamp: build-byacc-stamp
	- dh_testdir
	- dh_testroot
	- dh_installdirs
	-
	- cd $(BYACC_TMP); $(MAKE) install DESTDIR=$(BYACC_DIR)
	-
	- touch $@
	-
	-install-btyacc-stamp: build-btyacc-stamp
	- dh_testdir
	- dh_testroot
	- dh_installdirs
	-
	- cd $(BTYACC_TMP); $(MAKE) install DESTDIR=$(BTYACC_DIR)
	-
	- touch $@
	-
	-clean:
	- dh_testdir
	- dh_testroot
	-
	- dh_clean $(verbose)
	-
	- rm -rf t
	+ --with-max-table-size=123456 \
	+ --program-transform-name='s,^yacc,byacc2,'

	-# Build architecture-dependent files here.
	-binary-arch: build install
	-ifneq ($(PACKAGES.arch),)
	- rm -f $(PACKAGES.arch:%=install-%-stamp)
	- dh_testdir
	- dh_testroot
	- dh_lintian $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_installexamples $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) CHANGES
	- dh_strip $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_compress $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_fixperms $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_installdeb $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_shlibdeps $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_gencontrol $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_md5sums $(verbose) $(PACKAGES.arch:%=-p%)
	- dh_builddeb $(verbose) $(PACKAGES.arch:%=-p%)
	-endif
	+ # workaround for whatis
	+ sed -i '/- an LALR/s,^..N,byacc2,' yacc.1

	-.PHONY: build clean config config-arch binary binary-arch install install-arch
	+ # omit tests which rely upon getopt error-messages
	+ sed -i.bak '/MYFILE=nosuchfile/,/# Test special cases/d' test/run_test.sh
	+ diff -u test/run_test.sh.bak test/run_test.sh \|\| echo OK
	diff --git a/contrib/byacc/package/debian/watch b/contrib/byacc/package/debian/watch
	--- a/contrib/byacc/package/debian/watch
	+++ b/contrib/byacc/package/debian/watch
	@@ -1,4 +1,20 @@
	-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=pgpmode=auto,\
	+dversionmangle=s/^2\.0\.//,\
	+oversionmangle=s/^(.*)/2.0.$1/ \
	+ https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz
	diff --git a/contrib/byacc/package/mingw-byacc.spec b/contrib/byacc/package/mingw-byacc.spec
	--- a/contrib/byacc/package/mingw-byacc.spec
	+++ b/contrib/byacc/package/mingw-byacc.spec
	@@ -1,16 +1,17 @@
	-Summary: byacc - public domain Berkeley LALR Yacc parser generator
	-%define AppProgram byacc
	-%define AppVersion 20200330
	-%define UseProgram yacc
	-# $Id: mingw-byacc.spec,v 1.29 2020/03/30 23:31:42 tom Exp $
	-Name: %{AppProgram}
	-Version: %{AppVersion}
	+Summary: public domain Berkeley LALR Yacc parser generator
	+
	+%global AppVersion 2.0
	+%global AppPatched 20230201
	+
	+%global UseProgram yacc
	+
	+# $Id: mingw-byacc.spec,v 1.47 2023/02/02 00:12:06 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 @@

	%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 @@
	%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/contrib/byacc/package/pkgsrc/Makefile b/contrib/byacc/package/pkgsrc/Makefile
	--- a/contrib/byacc/package/pkgsrc/Makefile
	+++ b/contrib/byacc/package/pkgsrc/Makefile
	@@ -1,17 +1,17 @@
	-# $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
	+# $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $
	#

	-DISTNAME= byacc-20200330
	-PKGREVISION= 1
	+DISTNAME= byacc-20230201
	CATEGORIES= devel
	-MASTER_SITES= ftp://ftp.invisible-island.net/byacc/
	+MASTER_SITES= https://invisible-mirror.net/archives/byacc/
	+DIST_SUBDIR= byacc-20220101
	EXTRACT_SUFX= .tgz

	-MAINTAINER= pkgsrc-users@NetBSD.org
	-HOMEPAGE= http://invisible-island.net/byacc/byacc.html
	+MAINTAINER= fcambus@NetBSD.org
	+HOMEPAGE= https://invisible-island.net/byacc/byacc.html
	COMMENT= Berkeley Yacc
	+LICENSE= public-domain

	-PKG_DESTDIR_SUPPORT= user-destdir

	GNU_CONFIGURE= YES
	MAKE_FILE= makefile
	diff --git a/contrib/byacc/reader.c b/contrib/byacc/reader.c
	--- a/contrib/byacc/reader.c
	+++ b/contrib/byacc/reader.c
	@@ -1,4 +1,4 @@
	-/* $Id: reader.c,v 1.79 2020/03/30 23:54:13 tom Exp $ */
	+/* $Id: reader.c,v 1.91 2022/01/09 18:04:58 tom Exp $ */

	#include "defs.h"

	@@ -20,6 +20,13 @@
	/* this is a hard limit, but seems more than adequate */
	#define MAXARGS 20

	+#define begin_case(f,n) fprintf(f, "case %d:\n", (int)(n))
	+
	+#define end_case(f) \
	+ fprintf(f, "\n"); \
	+ fprintf_lineno(f, 1, ""); \
	+ fprintf(f, "break;\n")
	+
	static void start_rule(bucket *bp, int s_lineno);
	#if defined(YYBTYACC)
	static void copy_initial_action(void);
	@@ -185,7 +192,7 @@
	else
	UNLESS(!isdigit(UCH(ch)));
	line_1st = n;
	- ld = ldNUM;
	+ ld = ldNUM; /* this is needed, but cppcheck says no... */
	/* FALLTHRU */
	case ldNUM:
	if (isdigit(UCH(ch)))
	@@ -223,7 +230,7 @@

	if (ld == ldOK)
	{
	- size_t need = (size_t) (name_end - name_1st);
	+ size_t need = (size_t)(name_end - name_1st);
	if ((long)need > (long)input_file_name_len)
	{
	input_file_name_len = ((need + 1) * 3) / 2;
	@@ -261,11 +268,12 @@
	get_line(void)
	{
	FILE *f = input_file;
	- int c;
	- int i;

	do
	{
	+ int c;
	+ int i;
	+
	if (saw_eof \|\| (c = getc(f)) == EOF)
	{
	if (line)
	@@ -450,7 +458,7 @@
	keywords[] = {
	{ "binary", NONASSOC },
	{ "code", XCODE },
	- { "debug", XXXDEBUG },
	+ { "debug", NONPOSIX_DEBUG },
	#if defined(YYBTYACC)
	{ "destructor", DESTRUCTOR },
	#endif
	@@ -493,11 +501,12 @@
	{
	int c;
	char *t_cptr = cptr;
	- struct keyword *key;

	c = *++cptr;
	if (isalpha(UCH(c)))
	{
	+ struct keyword *key;
	+
	cinc = 0;
	for (;;)
	{
	@@ -587,7 +596,6 @@
	copy_string(int quote)
	{
	struct mstring *temp = msnew();
	- int c;
	struct ainfo a;
	a.a_lineno = lineno;
	a.a_line = dup_line();
	@@ -595,7 +603,8 @@

	for (;;)
	{
	- c = *cptr++;
	+ int c = *cptr++;
	+
	mputc(temp, c);
	if (c == quote)
	{
	@@ -726,7 +735,7 @@
	if (pos == -1 \|\| !check_key(pos))
	{
	syntax_error(lineno, line, cptr);
	- return;
	+ /NOTREACHED /
	}
	}
	}
	@@ -747,7 +756,8 @@
	code_mstr = msnew();
	}
	cline++;
	- msprintf(code_mstr, line_format, lineno, input_file_name);
	+ if (!lflag)
	+ msprintf(code_mstr, line_format, lineno, input_file_name);
	for (;;)
	{
	c = *cptr++;
	@@ -758,7 +768,7 @@
	if (line == NULL)
	{
	unexpected_EOF();
	- return;
	+ /NOTREACHED /
	}
	continue;
	case '\n':
	@@ -777,7 +787,7 @@
	cline++;
	}
	code_lines[pos].lines = msdone(code_mstr);
	- code_lines[pos].num = (size_t) cline;
	+ code_lines[pos].num = (size_t)cline;
	return;
	}
	break;
	@@ -806,8 +816,7 @@
	if (line == NULL)
	unterminated_text(&a);
	}
	- if (!lflag)
	- fprintf(f, line_format, lineno, input_file_name);
	+ fprintf_lineno(f, lineno, input_file_name);

	loop:
	c = *cptr++;
	@@ -898,9 +907,8 @@
	puts_both("#ifndef YYSTYPE_IS_DECLARED\n");
	puts_both("#define YYSTYPE_IS_DECLARED 1\n");

	- if (!lflag)
	- fprintf(text_file, line_format, lineno, input_file_name);
	- puts_both("typedef union");
	+ fprintf_lineno(text_file, lineno, input_file_name);
	+ puts_both("typedef union YYSTYPE");

	depth = 0;
	loop:
	@@ -1140,19 +1148,23 @@
	}
	if (buf == 0)
	{
	- buf_size = (size_t) linesize;
	+ buf_size = (size_t)linesize;
	buf = TMALLOC(char, buf_size);
	+ NO_SPACE(buf);
	}
	else if (c == '\n')
	{
	+ char *tmp;
	+
	get_line();
	if (line == NULL)
	unexpected_EOF();
	--cptr;
	- buf_size += (size_t) linesize;
	- buf = TREALLOC(char, buf, buf_size);
	+ buf_size += (size_t)linesize;
	+ tmp = TREALLOC(char, buf, buf_size);
	+ NO_SPACE(tmp);
	+ buf = tmp;
	}
	- NO_SPACE(buf);
	if (curly)
	{
	if ((state == 2) && (c == L_CURL))
	@@ -1203,13 +1215,21 @@
	if (parms[i] == ']')
	{
	int level = 1;
	- while (i >= 0 && level > 0 && parms[i] != '[')
	+ while (i >= 0)
	{
	- if (parms[i] == ']')
	+ char ch = parms[i--];
	+ if (ch == ']')
	+ {
	++level;
	- else if (parms[i] == '[')
	- --level;
	- i--;
	+ }
	+ else if (ch == '[')
	+ {
	+ if (--level <= 1)
	+ {
	+ ++i;
	+ break;
	+ }
	+ }
	}
	if (i <= 0)
	unexpected_EOF();
	@@ -1433,8 +1453,6 @@
	static int
	is_reserved(char *name)
	{
	- char *s;
	-
	if (strcmp(name, ".") == 0 \|\|
	strcmp(name, "$accept") == 0 \|\|
	strcmp(name, "$end") == 0)
	@@ -1442,7 +1460,8 @@

	if (name[0] == '$' && name[1] == '$' && isdigit(UCH(name[2])))
	{
	- s = name + 3;
	+ char *s = name + 3;
	+
	while (isdigit(UCH(*s)))
	++s;
	if (*s == NUL)
	@@ -1554,7 +1573,7 @@

	FREE(t_line);
	havetags = 1;
	- return cache_tag(cache, (size_t) cinc);
	+ return cache_tag(cache, (size_t)cinc);
	}

	#if defined(YYBTYACC)
	@@ -1565,7 +1584,7 @@

	while (IS_NAME2(UCH(*cptr)))
	cptr++;
	- return cache_tag(b, (size_t) (cptr - b));
	+ return cache_tag(b, (size_t)(cptr - b));
	}
	#endif

	@@ -1690,14 +1709,14 @@
	declare_argtypes(bucket *bp)
	{
	char *tags[MAXARGS];
	- int args = 0, c;
	+ int args = 0;

	if (bp->args >= 0)
	retyped_warning(bp->name);
	cptr++; /* skip open paren */
	for (;;)
	{
	- c = nextc();
	+ int c = nextc();
	if (c == EOF)
	unexpected_EOF();
	if (c != '<')
	@@ -1792,15 +1811,15 @@
	static void
	read_declarations(void)
	{
	- int c, k;
	-
	cache_size = CACHE_SIZE;
	cache = TMALLOC(char, cache_size);
	NO_SPACE(cache);

	for (;;)
	{
	- c = nextc();
	+ int k;
	+ int c = nextc();
	+
	if (c == EOF)
	unexpected_EOF();
	if (c != '%')
	@@ -1877,8 +1896,8 @@
	break;
	#endif

	- case XXXDEBUG:
	- /* XXX: FIXME */
	+ case NONPOSIX_DEBUG:
	+ tflag = 1;
	break;

	case POSIX_YACC:
	@@ -2029,7 +2048,7 @@
	p++;
	if (save)
	{
	- *save = cache_tag(b, (size_t) (p - b));
	+ *save = cache_tag(b, (size_t)(p - b));
	}
	return p;
	}
	@@ -2127,7 +2146,7 @@
	{
	char p = theptr;
	struct mstring *c = msnew();
	- int i, j, n;
	+ int i, n;
	Value_t *offsets = NULL, maxoffset;
	bucket **rhs;

	@@ -2141,7 +2160,9 @@
	}
	if (maxoffset > 0)
	{
	- offsets = TMALLOC(Value_t, maxoffset + 1);
	+ int j;
	+
	+ offsets = TCMALLOC(Value_t, maxoffset + 1);
	NO_SPACE(offsets);

	for (j = 0, i++; i < nitems; i++)
	@@ -2230,7 +2251,7 @@
	{
	char p = theptr;
	int rv = 0;
	- int i, j, n = 0;
	+ int i, n = 0;
	Value_t *offsets = NULL, maxoffset = 0;
	bucket **rhs;
	char *tag = 0;
	@@ -2250,7 +2271,9 @@
	}
	if (maxoffset > 0)
	{
	- offsets = TMALLOC(Value_t, maxoffset + 1);
	+ int j;
	+
	+ offsets = TCMALLOC(Value_t, maxoffset + 1);
	NO_SPACE(offsets);

	for (j = 0, i++; i < nitems; i++)
	@@ -2370,7 +2393,6 @@
	{
	int c;
	bucket *bp;
	- char *s_cptr;
	int s_lineno;
	#if defined(YYBTYACC)
	char *args = NULL;
	@@ -2379,6 +2401,8 @@

	for (;;)
	{
	+ char *s_cptr;
	+
	c = nextc();
	if (c != '%')
	break;
	@@ -2457,12 +2481,12 @@
	static void
	end_rule(void)
	{
	- int i;
	-
	if (!last_was_action && plhs[nrules]->tag)
	{
	if (pitem[nitems - 1])
	{
	+ int i;
	+
	for (i = nitems - 1; (i > 0) && pitem[i]; --i)
	continue;
	if (pitem[i + 1] == 0 \|\| pitem[i + 1]->tag != plhs[nrules]->tag)
	@@ -2529,11 +2553,10 @@
	rule = nrules;
	insert_arg_cache(code, rule);
	trialaction = 1; /* arg rules always run in trial mode */
	- fprintf(f, "case %d:\n", rule - 2);
	- if (!lflag)
	- fprintf(f, line_format, line_number, input_file_name);
	- fprintf(f, "%s;\n", code);
	- fprintf(f, "break;\n");
	+ begin_case(f, rule - 2);
	+ fprintf_lineno(f, line_number, input_file_name);
	+ fprintf(f, "%s;", code);
	+ end_case(f);
	insert_empty_rule();
	plhs[rule]->tag = cache_tag(tag, strlen(tag));
	plhs[rule]->class = ARGUMENT;
	@@ -2669,7 +2692,7 @@
	trialaction = (*cptr == L_BRAC);
	#endif

	- fprintf(f, "case %d:\n", nrules - 2);
	+ begin_case(f, nrules - 2);
	#if defined(YYBTYACC)
	if (backtrack)
	{
	@@ -2677,8 +2700,7 @@
	fprintf(f, " if (!yytrial)\n");
	}
	#endif
	- if (!lflag)
	- fprintf(f, line_format, lineno, input_file_name);
	+ fprintf_lineno(f, lineno, input_file_name);
	if (*cptr == '=')
	++cptr;

	@@ -2741,10 +2763,12 @@
	else if (i > maxoffset)
	{
	dollar_warning(d_lineno, i);
	- fprintf(f, "yystack.l_mark[%d].%s", i - maxoffset, tag);
	+ fprintf(f, "yystack.l_mark[%ld].%s",
	+ (long)(i - maxoffset), tag);
	}
	else if (offsets)
	- fprintf(f, "yystack.l_mark[%d].%s", offsets[i], tag);
	+ fprintf(f, "yystack.l_mark[%ld].%s",
	+ (long)offsets[i], tag);
	FREE(d_line);
	goto loop;
	}
	@@ -2802,7 +2826,7 @@
	tag = rhs[offsets[i]]->tag;
	if (tag == 0)
	untyped_rhs(i, rhs[offsets[i]]->name);
	- fprintf(f, "yystack.l_mark[%d].%s", offsets[i], tag);
	+ fprintf(f, "yystack.l_mark[%ld].%s", (long)offsets[i], tag);
	}
	else
	{
	@@ -2811,10 +2835,10 @@
	else if (i > maxoffset)
	{
	dollar_warning(lineno, i);
	- fprintf(f, "yystack.l_mark[%d]", i - maxoffset);
	+ fprintf(f, "yystack.l_mark[%ld]", (long)(i - maxoffset));
	}
	else if (offsets)
	- fprintf(f, "yystack.l_mark[%d]", offsets[i]);
	+ fprintf(f, "yystack.l_mark[%ld]", (long)offsets[i]);
	}
	goto loop;
	}
	@@ -2920,12 +2944,11 @@
	if (c == L_CURL && !haveyyval)
	{
	fprintf(f, " if (!yytrial)\n");
	- if (!lflag)
	- fprintf(f, line_format, lineno, input_file_name);
	+ fprintf_lineno(f, lineno, input_file_name);
	trialaction = 0;
	goto loop;
	}
	- fprintf(f, "\nbreak;\n");
	+ end_case(f);
	FREE(a.a_line);
	if (maxoffset > 0)
	FREE(offsets);
	@@ -2945,7 +2968,7 @@
	case ';':
	if (depth > 0)
	goto loop;
	- fprintf(f, "\nbreak;\n");
	+ end_case(f);
	free(a.a_line);
	if (maxoffset > 0)
	FREE(offsets);
	@@ -2982,13 +3005,12 @@
	if (c == L_CURL && !haveyyval)
	{
	fprintf(f, " if (!yytrial)\n");
	- if (!lflag)
	- fprintf(f, line_format, lineno, input_file_name);
	+ fprintf_lineno(f, lineno, input_file_name);
	goto loop;
	}
	}
	#endif
	- fprintf(f, "\nbreak;\n");
	+ end_case(f);
	free(a.a_line);
	if (maxoffset > 0)
	FREE(offsets);
	@@ -3150,7 +3172,6 @@
	copy_destructor(void)
	{
	char *code_text;
	- int c;
	struct ainfo a;
	bucket *bp;

	@@ -3158,7 +3179,7 @@

	for (;;)
	{
	- c = nextc();
	+ int c = nextc();
	if (c == EOF)
	unexpected_EOF();
	if (c == '<')
	@@ -3337,6 +3358,16 @@
	((c = cptr[4]) == 'c' \|\| c == 'C') &&
	((c = cptr[5], !IS_IDENT(c))))
	cptr += 5;
	+ else if ((c == 'e' \|\| c == 'E') &&
	+ ((c = cptr[2]) == 'm' \|\| c == 'M') &&
	+ ((c = cptr[3]) == 'p' \|\| c == 'P') &&
	+ ((c = cptr[4]) == 't' \|\| c == 'T') &&
	+ ((c = cptr[5]) == 'y' \|\| c == 'Y') &&
	+ ((c = cptr[6], !IS_IDENT(c))))
	+ {
	+ cptr += 6;
	+ return (1);
	+ }
	else
	syntax_error(lineno, line, cptr);

	@@ -3362,14 +3393,13 @@
	static void
	read_grammar(void)
	{
	- int c;
	-
	initialize_grammar();
	advance_to_start();

	for (;;)
	{
	- c = nextc();
	+ int c = nextc();
	+
	if (c == EOF)
	break;
	if (isalpha(UCH(c))
	@@ -3378,13 +3408,17 @@
	\|\| c == '$'
	\|\| c == '\''
	\|\| c == '"')
	+ {
	add_symbol();
	+ }
	+ else if (c == L_CURL \|\| c == '='
	#if defined(YYBTYACC)
	- else if (c == L_CURL \|\| c == '=' \|\| (backtrack && c == L_BRAC))
	-#else
	- else if (c == L_CURL \|\| c == '=')
	+ \|\| (backtrack && c == L_BRAC)
	#endif
	+ )
	+ {
	copy_action();
	+ }
	else if (c == '\|')
	{
	end_rule();
	@@ -3426,7 +3460,8 @@
	pack_names(void)
	{
	bucket *bp;
	- char p, s, *t;
	+ char *p;
	+ char *t;

	name_pool_size = 13; /* 13 == sizeof("$end") + sizeof("$accept") */
	for (bp = first_symbol; bp; bp = bp->next)
	@@ -3440,8 +3475,9 @@
	t = name_pool + 13;
	for (bp = first_symbol; bp; bp = bp->next)
	{
	+ char *s = bp->name;
	+
	p = t;
	- s = bp->name;
	while ((t++ = s++) != 0)
	continue;
	FREE(bp->name);
	@@ -3470,14 +3506,14 @@
	static void
	protect_string(char src, char *des)
	{
	- unsigned len;
	- char *s;
	- char *d;
	-
	*des = src;
	if (src)
	{
	- len = 1;
	+ char *s;
	+ char *d;
	+
	+ unsigned len = 1;
	+
	s = src;
	while (*s)
	{
	@@ -3688,8 +3724,6 @@
	{
	int i;
	Value_t j;
	- Assoc_t assoc;
	- Value_t prec2;

	ritem = TMALLOC(Value_t, nitems);
	NO_SPACE(ritem);
	@@ -3720,6 +3754,9 @@
	j = 4;
	for (i = 3; i < nrules; ++i)
	{
	+ Assoc_t assoc;
	+ Value_t prec2;
	+
	#if defined(YYBTYACC)
	if (plhs[i]->args > 0)
	{
	@@ -3811,11 +3848,11 @@
	{
	int i;
	bucket *bp;
	- char *tag;

	for (i = 2; i < nsyms; ++i)
	{
	- tag = symbol_type_tag[i];
	+ char *tag = symbol_type_tag[i];
	+
	if (symbol_destructor[i] == NULL)
	{
	if (tag == NULL)
	@@ -3849,8 +3886,10 @@
	}
	else
	{ /* replace "$$" with "(val)[.tag]" in destructor code /
	+ char *destructor_source = symbol_destructor[i];
	symbol_destructor[i]
	- = process_destructor_XX(symbol_destructor[i], tag);
	+ = process_destructor_XX(destructor_source, tag);
	+ FREE(destructor_source);
	}
	}
	/* 'symbol_type_tag[]' elements are freed by 'free_tags()' */
	diff --git a/contrib/byacc/test/btyacc/big_b.error b/contrib/byacc/test/btyacc/big_b.error
	--- a/contrib/byacc/test/btyacc/big_b.error
	+++ b/contrib/byacc/test/btyacc/big_b.error
	@@ -4,6 +4,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -17,3 +18,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/big_l.error b/contrib/byacc/test/btyacc/big_l.error
	--- a/contrib/byacc/test/btyacc/big_l.error
	+++ b/contrib/byacc/test/btyacc/big_l.error
	@@ -4,6 +4,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -17,3 +18,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
	--- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
	+++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
	@@ -11,7 +11,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
	--- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
	+++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -147,7 +147,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 29 "btyacc_calc1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	@@ -839,7 +839,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1350,6 +1350,7 @@
	case 2:
	#line 51 "btyacc_calc1.y"
	{YYVALID;}
	+#line 1354 "btyacc_calc1.tab.c"
	break;
	case 3:
	#line 52 "btyacc_calc1.y"
	@@ -1358,6 +1359,7 @@
	{
	yyerrok;
	}
	+#line 1363 "btyacc_calc1.tab.c"
	break;
	case 4:
	if (!yytrial)
	@@ -1365,6 +1367,7 @@
	{
	(void) printf("%15.8f\n", yystack.l_mark[0].dval);
	}
	+#line 1371 "btyacc_calc1.tab.c"
	break;
	case 5:
	if (!yytrial)
	@@ -1372,6 +1375,7 @@
	{
	(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[0].vval.lo, yystack.l_mark[0].vval.hi);
	}
	+#line 1379 "btyacc_calc1.tab.c"
	break;
	case 6:
	if (!yytrial)
	@@ -1379,6 +1383,7 @@
	{
	dreg[yystack.l_mark[-2].ival] = yystack.l_mark[0].dval;
	}
	+#line 1387 "btyacc_calc1.tab.c"
	break;
	case 7:
	if (!yytrial)
	@@ -1386,6 +1391,7 @@
	{
	vreg[yystack.l_mark[-2].ival] = yystack.l_mark[0].vval;
	}
	+#line 1395 "btyacc_calc1.tab.c"
	break;
	case 9:
	if (!yytrial)
	@@ -1393,6 +1399,7 @@
	{
	yyval.dval = dreg[yystack.l_mark[0].ival];
	}
	+#line 1403 "btyacc_calc1.tab.c"
	break;
	case 10:
	if (!yytrial)
	@@ -1400,6 +1407,7 @@
	{
	yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
	}
	+#line 1411 "btyacc_calc1.tab.c"
	break;
	case 11:
	if (!yytrial)
	@@ -1407,6 +1415,7 @@
	{
	yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
	}
	+#line 1419 "btyacc_calc1.tab.c"
	break;
	case 12:
	if (!yytrial)
	@@ -1414,6 +1423,7 @@
	{
	yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
	}
	+#line 1427 "btyacc_calc1.tab.c"
	break;
	case 13:
	if (!yytrial)
	@@ -1421,6 +1431,7 @@
	{
	yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
	}
	+#line 1435 "btyacc_calc1.tab.c"
	break;
	case 14:
	if (!yytrial)
	@@ -1428,6 +1439,7 @@
	{
	yyval.dval = -yystack.l_mark[0].dval;
	}
	+#line 1443 "btyacc_calc1.tab.c"
	break;
	case 15:
	if (!yytrial)
	@@ -1435,6 +1447,7 @@
	{
	yyval.dval = yystack.l_mark[-1].dval;
	}
	+#line 1451 "btyacc_calc1.tab.c"
	break;
	case 16:
	if (!yytrial)
	@@ -1442,6 +1455,7 @@
	{
	yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
	}
	+#line 1459 "btyacc_calc1.tab.c"
	break;
	case 17:
	if (!yytrial)
	@@ -1455,6 +1469,7 @@
	YYERROR;
	}
	}
	+#line 1473 "btyacc_calc1.tab.c"
	break;
	case 18:
	if (!yytrial)
	@@ -1462,6 +1477,7 @@
	{
	yyval.vval = vreg[yystack.l_mark[0].ival];
	}
	+#line 1481 "btyacc_calc1.tab.c"
	break;
	case 19:
	if (!yytrial)
	@@ -1470,6 +1486,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
	}
	+#line 1490 "btyacc_calc1.tab.c"
	break;
	case 20:
	if (!yytrial)
	@@ -1478,6 +1495,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
	}
	+#line 1499 "btyacc_calc1.tab.c"
	break;
	case 21:
	if (!yytrial)
	@@ -1486,6 +1504,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
	}
	+#line 1508 "btyacc_calc1.tab.c"
	break;
	case 22:
	if (!yytrial)
	@@ -1494,6 +1513,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
	}
	+#line 1517 "btyacc_calc1.tab.c"
	break;
	case 23:
	if (!yytrial)
	@@ -1501,6 +1521,7 @@
	{
	yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1525 "btyacc_calc1.tab.c"
	break;
	case 24:
	if (!yytrial)
	@@ -1508,6 +1529,7 @@
	{
	yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1533 "btyacc_calc1.tab.c"
	break;
	case 25:
	if (!yytrial)
	@@ -1516,6 +1538,7 @@
	if (dcheck(yystack.l_mark[0].vval)) YYERROR;
	yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1542 "btyacc_calc1.tab.c"
	break;
	case 26:
	if (!yytrial)
	@@ -1524,6 +1547,7 @@
	if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
	yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1551 "btyacc_calc1.tab.c"
	break;
	case 27:
	if (!yytrial)
	@@ -1532,6 +1556,7 @@
	yyval.vval.hi = -yystack.l_mark[0].vval.lo;
	yyval.vval.lo = -yystack.l_mark[0].vval.hi;
	}
	+#line 1560 "btyacc_calc1.tab.c"
	break;
	case 28:
	if (!yytrial)
	@@ -1539,8 +1564,9 @@
	{
	yyval.vval = yystack.l_mark[-1].vval;
	}
	+#line 1568 "btyacc_calc1.tab.c"
	break;
	-#line 1544 "btyacc_calc1.tab.c"
	+#line 1570 "btyacc_calc1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.h b/contrib/byacc/test/btyacc/btyacc_demo.tab.h
	--- a/contrib/byacc/test/btyacc/btyacc_demo.tab.h
	+++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.h
	@@ -20,7 +20,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union {
	+typedef union YYSTYPE {
	Scope *scope;
	Expr *expr;
	Expr_List *elist;
	diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.c b/contrib/byacc/test/btyacc/btyacc_demo.tab.c
	--- a/contrib/byacc/test/btyacc/btyacc_demo.tab.c
	+++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -152,7 +152,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 36 "btyacc_demo.y"
	-typedef union {
	+typedef union YYSTYPE {
	Scope *scope;
	Expr *expr;
	Expr_List *elist;
	@@ -679,8 +679,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 683 "btyacc_demo.tab.c"
	break;
	-#line 684 "btyacc_demo.tab.c"
	case 45:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -688,8 +688,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 692 "btyacc_demo.tab.c"
	break;
	-#line 693 "btyacc_demo.tab.c"
	case 42:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -697,8 +697,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 701 "btyacc_demo.tab.c"
	break;
	-#line 702 "btyacc_demo.tab.c"
	case 47:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -706,8 +706,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 710 "btyacc_demo.tab.c"
	break;
	-#line 711 "btyacc_demo.tab.c"
	case 37:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -715,8 +715,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 719 "btyacc_demo.tab.c"
	break;
	-#line 720 "btyacc_demo.tab.c"
	case 257:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -724,8 +724,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 728 "btyacc_demo.tab.c"
	break;
	-#line 729 "btyacc_demo.tab.c"
	case 258:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -733,8 +733,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 737 "btyacc_demo.tab.c"
	break;
	-#line 738 "btyacc_demo.tab.c"
	case 40:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -742,8 +742,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 746 "btyacc_demo.tab.c"
	break;
	-#line 747 "btyacc_demo.tab.c"
	case 91:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -751,8 +751,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 755 "btyacc_demo.tab.c"
	break;
	-#line 756 "btyacc_demo.tab.c"
	case 46:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -760,8 +760,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 764 "btyacc_demo.tab.c"
	break;
	-#line 765 "btyacc_demo.tab.c"
	case 259:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -769,8 +769,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).id); }
	+#line 773 "btyacc_demo.tab.c"
	break;
	-#line 774 "btyacc_demo.tab.c"
	case 260:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -778,8 +778,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).expr); }
	+#line 782 "btyacc_demo.tab.c"
	break;
	-#line 783 "btyacc_demo.tab.c"
	case 261:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -787,8 +787,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 791 "btyacc_demo.tab.c"
	break;
	-#line 792 "btyacc_demo.tab.c"
	case 262:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -796,8 +796,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 800 "btyacc_demo.tab.c"
	break;
	-#line 801 "btyacc_demo.tab.c"
	case 263:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -805,8 +805,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 809 "btyacc_demo.tab.c"
	break;
	-#line 810 "btyacc_demo.tab.c"
	case 264:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -814,8 +814,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 818 "btyacc_demo.tab.c"
	break;
	-#line 819 "btyacc_demo.tab.c"
	case 265:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -823,8 +823,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 827 "btyacc_demo.tab.c"
	break;
	-#line 828 "btyacc_demo.tab.c"
	case 266:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -832,8 +832,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 836 "btyacc_demo.tab.c"
	break;
	-#line 837 "btyacc_demo.tab.c"
	case 267:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -841,8 +841,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 845 "btyacc_demo.tab.c"
	break;
	-#line 846 "btyacc_demo.tab.c"
	case 268:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -850,8 +850,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 854 "btyacc_demo.tab.c"
	break;
	-#line 855 "btyacc_demo.tab.c"
	case 269:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -859,8 +859,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 863 "btyacc_demo.tab.c"
	break;
	-#line 864 "btyacc_demo.tab.c"
	case 59:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -868,8 +868,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 872 "btyacc_demo.tab.c"
	break;
	-#line 873 "btyacc_demo.tab.c"
	case 44:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -877,8 +877,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 881 "btyacc_demo.tab.c"
	break;
	-#line 882 "btyacc_demo.tab.c"
	case 41:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -886,8 +886,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 890 "btyacc_demo.tab.c"
	break;
	-#line 891 "btyacc_demo.tab.c"
	case 93:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -895,8 +895,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 899 "btyacc_demo.tab.c"
	break;
	-#line 900 "btyacc_demo.tab.c"
	case 123:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -904,8 +904,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 908 "btyacc_demo.tab.c"
	break;
	-#line 909 "btyacc_demo.tab.c"
	case 125:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -913,8 +913,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 917 "btyacc_demo.tab.c"
	break;
	-#line 918 "btyacc_demo.tab.c"
	case 270:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -922,8 +922,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 926 "btyacc_demo.tab.c"
	break;
	-#line 927 "btyacc_demo.tab.c"
	case 271:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -931,8 +931,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 935 "btyacc_demo.tab.c"
	break;
	-#line 936 "btyacc_demo.tab.c"
	case 272:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -940,8 +940,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).expr); }
	+#line 944 "btyacc_demo.tab.c"
	break;
	-#line 945 "btyacc_demo.tab.c"
	case 273:
	#line 67 "btyacc_demo.y"
	{ /* 'msg' is a 'char ' indicating the context of destructor invocation/
	@@ -950,8 +950,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((val).decl->scope); free((val).decl->type); }
	+#line 954 "btyacc_demo.tab.c"
	break;
	-#line 955 "btyacc_demo.tab.c"
	case 274:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -959,8 +959,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 963 "btyacc_demo.tab.c"
	break;
	-#line 964 "btyacc_demo.tab.c"
	case 275:
	#line 83 "btyacc_demo.y"
	{ printf("%s accessed by symbol with no type @ position[%d,%d..%d,%d]\n",
	@@ -968,8 +968,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	/* in this example, we don't know what to do here */ }
	+#line 972 "btyacc_demo.tab.c"
	break;
	-#line 973 "btyacc_demo.tab.c"
	case 276:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -977,8 +977,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).code); }
	+#line 981 "btyacc_demo.tab.c"
	break;
	-#line 982 "btyacc_demo.tab.c"
	case 277:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -986,8 +986,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).code); }
	+#line 990 "btyacc_demo.tab.c"
	break;
	-#line 991 "btyacc_demo.tab.c"
	case 278:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -995,8 +995,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).code); }
	+#line 999 "btyacc_demo.tab.c"
	break;
	-#line 1000 "btyacc_demo.tab.c"
	case 279:
	#line 73 "btyacc_demo.y"
	{ printf("%s accessed by symbol with type <decl> (case s.b. 279 & 280) @ position[%d,%d..%d,%d]\n",
	@@ -1004,8 +1004,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).decl); }
	+#line 1008 "btyacc_demo.tab.c"
	break;
	-#line 1009 "btyacc_demo.tab.c"
	case 280:
	#line 73 "btyacc_demo.y"
	{ printf("%s accessed by symbol with type <decl> (case s.b. 279 & 280) @ position[%d,%d..%d,%d]\n",
	@@ -1013,8 +1013,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).decl); }
	+#line 1017 "btyacc_demo.tab.c"
	break;
	-#line 1018 "btyacc_demo.tab.c"
	case 281:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1022,8 +1022,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1026 "btyacc_demo.tab.c"
	break;
	-#line 1027 "btyacc_demo.tab.c"
	case 282:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1031,8 +1031,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1035 "btyacc_demo.tab.c"
	break;
	-#line 1036 "btyacc_demo.tab.c"
	case 283:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1040,8 +1040,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1044 "btyacc_demo.tab.c"
	break;
	-#line 1045 "btyacc_demo.tab.c"
	case 284:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1049,8 +1049,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1053 "btyacc_demo.tab.c"
	break;
	-#line 1054 "btyacc_demo.tab.c"
	case 285:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1058,8 +1058,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1062 "btyacc_demo.tab.c"
	break;
	-#line 1063 "btyacc_demo.tab.c"
	case 286:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1067,8 +1067,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1071 "btyacc_demo.tab.c"
	break;
	-#line 1072 "btyacc_demo.tab.c"
	case 287:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1076,8 +1076,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).dlist); }
	+#line 1080 "btyacc_demo.tab.c"
	break;
	-#line 1081 "btyacc_demo.tab.c"
	case 288:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1085,8 +1085,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).dlist); }
	+#line 1089 "btyacc_demo.tab.c"
	break;
	-#line 1090 "btyacc_demo.tab.c"
	case 289:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1094,8 +1094,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1098 "btyacc_demo.tab.c"
	break;
	-#line 1099 "btyacc_demo.tab.c"
	case 290:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1103,8 +1103,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1107 "btyacc_demo.tab.c"
	break;
	-#line 1108 "btyacc_demo.tab.c"
	case 291:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1112,8 +1112,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1116 "btyacc_demo.tab.c"
	break;
	-#line 1117 "btyacc_demo.tab.c"
	case 292:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1121,8 +1121,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1125 "btyacc_demo.tab.c"
	break;
	-#line 1126 "btyacc_demo.tab.c"
	case 293:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1130,8 +1130,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1134 "btyacc_demo.tab.c"
	break;
	-#line 1135 "btyacc_demo.tab.c"
	case 294:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1139,8 +1139,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1143 "btyacc_demo.tab.c"
	break;
	-#line 1144 "btyacc_demo.tab.c"
	case 295:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1148,8 +1148,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).type); }
	+#line 1152 "btyacc_demo.tab.c"
	break;
	-#line 1153 "btyacc_demo.tab.c"
	case 296:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1157,8 +1157,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1161 "btyacc_demo.tab.c"
	break;
	-#line 1162 "btyacc_demo.tab.c"
	case 297:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1166,8 +1166,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1170 "btyacc_demo.tab.c"
	break;
	-#line 1171 "btyacc_demo.tab.c"
	case 298:
	#line 78 "btyacc_demo.y"
	{ printf("%s accessed by symbol of any type other than <decl> @ position[%d,%d..%d,%d]\n",
	@@ -1175,8 +1175,8 @@
	(loc).first_line, (loc).first_column,
	(loc).last_line, (loc).last_column);
	free((*val).scope); }
	+#line 1179 "btyacc_demo.tab.c"
	break;
	-#line 1180 "btyacc_demo.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -1342,7 +1342,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1853,38 +1853,46 @@
	case 1:
	#line 93 "btyacc_demo.y"
	{ yyval.scope = yystack.l_mark[0].scope; }
	+#line 1857 "btyacc_demo.tab.c"
	break;
	case 2:
	#line 94 "btyacc_demo.y"
	{ yyval.scope = global_scope; }
	+#line 1862 "btyacc_demo.tab.c"
	break;
	case 3:
	#line 95 "btyacc_demo.y"
	{ Decl *d = lookup(yystack.l_mark[-2].scope, yystack.l_mark[-1].id);
	if (!d \|\| !d->scope) YYERROR;
	yyval.scope = d->scope; }
	+#line 1869 "btyacc_demo.tab.c"
	break;
	case 4:
	#line 101 "btyacc_demo.y"
	{ Decl *d = lookup(yystack.l_mark[-1].scope, yystack.l_mark[0].id);
	if (d == NULL \|\| d->istype() == 0) YYERROR;
	yyval.type = d->type; }
	+#line 1876 "btyacc_demo.tab.c"
	break;
	case 5:
	#line 106 "btyacc_demo.y"
	yyval.scope = global_scope = new_scope(0);
	+#line 1881 "btyacc_demo.tab.c"
	break;
	case 8:
	#line 107 "btyacc_demo.y"
	yyval.scope = yystack.l_mark[-1].scope;
	+#line 1886 "btyacc_demo.tab.c"
	break;
	case 10:
	#line 109 "btyacc_demo.y"
	{YYVALID;}
	+#line 1891 "btyacc_demo.tab.c"
	break;
	case 11:
	#line 110 "btyacc_demo.y"
	yyval.scope = start_fn_def(yystack.l_mark[-2].scope, yystack.l_mark[0].decl);
	+#line 1896 "btyacc_demo.tab.c"
	break;
	case 12:
	if (!yytrial)
	@@ -1896,220 +1904,266 @@
	yyloc.last_line = yystack.p_mark[0].last_line;
	yyloc.last_column = yystack.p_mark[0].last_column;
	finish_fn_def(yystack.l_mark[-2].decl, yystack.l_mark[0].code); }
	+#line 1908 "btyacc_demo.tab.c"
	break;
	case 13:
	#line 121 "btyacc_demo.y"
	{ yyval.type = yystack.l_mark[0].type; }
	+#line 1913 "btyacc_demo.tab.c"
	break;
	case 14:
	#line 122 "btyacc_demo.y"
	{ yyval.type = type_combine(yystack.l_mark[-2].type, yystack.l_mark[0].type); }
	+#line 1918 "btyacc_demo.tab.c"
	break;
	case 15:
	#line 125 "btyacc_demo.y"
	{ yyval.type = 0; }
	+#line 1923 "btyacc_demo.tab.c"
	break;
	case 16:
	#line 126 "btyacc_demo.y"
	{ yyval.type = type_combine(yystack.l_mark[-1].type, yystack.l_mark[0].type); }
	+#line 1928 "btyacc_demo.tab.c"
	break;
	case 17:
	#line 130 "btyacc_demo.y"
	{ yyval.type = yystack.l_mark[0].type; }
	+#line 1933 "btyacc_demo.tab.c"
	break;
	case 18:
	#line 131 "btyacc_demo.y"
	{ yyval.type = yystack.l_mark[0].type; }
	+#line 1938 "btyacc_demo.tab.c"
	break;
	case 19:
	#line 132 "btyacc_demo.y"
	{ yyval.type = bare_extern(); }
	+#line 1943 "btyacc_demo.tab.c"
	break;
	case 20:
	#line 133 "btyacc_demo.y"
	{ yyval.type = bare_register(); }
	+#line 1948 "btyacc_demo.tab.c"
	break;
	case 21:
	#line 134 "btyacc_demo.y"
	{ yyval.type = bare_static(); }
	+#line 1953 "btyacc_demo.tab.c"
	break;
	case 22:
	#line 138 "btyacc_demo.y"
	{ yyval.type = bare_const(); }
	+#line 1958 "btyacc_demo.tab.c"
	break;
	case 23:
	#line 139 "btyacc_demo.y"
	{ yyval.type = bare_volatile(); }
	+#line 1963 "btyacc_demo.tab.c"
	break;
	case 24:
	#line 143 "btyacc_demo.y"
	yyval.scope = yystack.l_mark[-3].scope;
	+#line 1968 "btyacc_demo.tab.c"
	break;
	case 25:
	#line 143 "btyacc_demo.y"
	yyval.type = yystack.l_mark[-3].type;
	+#line 1973 "btyacc_demo.tab.c"
	break;
	case 28:
	#line 148 "btyacc_demo.y"
	{ if (!yystack.l_mark[0].type) YYERROR; } if (!yytrial)
	#line 149 "btyacc_demo.y"
	{ yyval.decl = declare(yystack.l_mark[-1].scope, 0, yystack.l_mark[0].type); }
	+#line 1980 "btyacc_demo.tab.c"
	break;
	case 29:
	if (!yytrial)
	#line 150 "btyacc_demo.y"
	{ yyval.decl = declare(yystack.l_mark[-2].scope, yystack.l_mark[0].id, yystack.l_mark[-1].type); }
	+#line 1986 "btyacc_demo.tab.c"
	break;
	case 30:
	#line 151 "btyacc_demo.y"
	yyval.scope = yystack.l_mark[-2].scope;
	+#line 1991 "btyacc_demo.tab.c"
	break;
	case 31:
	#line 151 "btyacc_demo.y"
	yyval.type = yystack.l_mark[-2].type;
	+#line 1996 "btyacc_demo.tab.c"
	break;
	case 32:
	if (!yytrial)
	#line 151 "btyacc_demo.y"
	{ yyval.decl = yystack.l_mark[-1].decl; }
	+#line 2002 "btyacc_demo.tab.c"
	break;
	case 33:
	if (!yytrial)
	#line 153 "btyacc_demo.y"
	{ yyval.decl = make_pointer(yystack.l_mark[0].decl, yystack.l_mark[-3].type); }
	+#line 2008 "btyacc_demo.tab.c"
	break;
	case 34:
	if (!yytrial)
	#line 155 "btyacc_demo.y"
	{ yyval.decl = make_array(yystack.l_mark[-4].decl->type, yystack.l_mark[-1].expr); }
	+#line 2014 "btyacc_demo.tab.c"
	break;
	case 35:
	if (!yytrial)
	#line 157 "btyacc_demo.y"
	{ yyval.decl = build_function(yystack.l_mark[-5].decl, yystack.l_mark[-2].dlist, yystack.l_mark[0].type); }
	+#line 2020 "btyacc_demo.tab.c"
	break;
	case 36:
	if (!yytrial)
	#line 160 "btyacc_demo.y"
	{ yyval.dlist = 0; }
	+#line 2026 "btyacc_demo.tab.c"
	break;
	case 37:
	if (!yytrial)
	#line 161 "btyacc_demo.y"
	{ yyval.dlist = yystack.l_mark[0].dlist; }
	+#line 2032 "btyacc_demo.tab.c"
	break;
	case 38:
	if (!yytrial)
	#line 164 "btyacc_demo.y"
	{ yyval.dlist = append_dlist(yystack.l_mark[-3].dlist, yystack.l_mark[0].decl); }
	+#line 2038 "btyacc_demo.tab.c"
	break;
	case 39:
	if (!yytrial)
	#line 165 "btyacc_demo.y"
	{ yyval.dlist = build_dlist(yystack.l_mark[0].decl); }
	+#line 2044 "btyacc_demo.tab.c"
	break;
	case 40:
	if (!yytrial)
	#line 168 "btyacc_demo.y"
	{ yyval.decl = yystack.l_mark[0].decl; }
	+#line 2050 "btyacc_demo.tab.c"
	break;
	case 41:
	if (!yytrial)
	#line 172 "btyacc_demo.y"
	{ yyval.expr = build_expr(yystack.l_mark[-3].expr, ADD, yystack.l_mark[0].expr); }
	+#line 2056 "btyacc_demo.tab.c"
	break;
	case 42:
	if (!yytrial)
	#line 173 "btyacc_demo.y"
	{ yyval.expr = build_expr(yystack.l_mark[-3].expr, SUB, yystack.l_mark[0].expr); }
	+#line 2062 "btyacc_demo.tab.c"
	break;
	case 43:
	if (!yytrial)
	#line 174 "btyacc_demo.y"
	{ yyval.expr = build_expr(yystack.l_mark[-3].expr, MUL, yystack.l_mark[0].expr); }
	+#line 2068 "btyacc_demo.tab.c"
	break;
	case 44:
	if (!yytrial)
	#line 175 "btyacc_demo.y"
	{ yyval.expr = build_expr(yystack.l_mark[-3].expr, MOD, yystack.l_mark[0].expr); }
	+#line 2074 "btyacc_demo.tab.c"
	break;
	case 45:
	if (!yytrial)
	#line 176 "btyacc_demo.y"
	{ yyval.expr = build_expr(yystack.l_mark[-3].expr, DIV, yystack.l_mark[0].expr); }
	+#line 2080 "btyacc_demo.tab.c"
	break;
	case 46:
	if (!yytrial)
	#line 177 "btyacc_demo.y"
	{ yyval.expr = build_expr(0, DEREF, yystack.l_mark[0].expr); }
	+#line 2086 "btyacc_demo.tab.c"
	break;
	case 47:
	if (!yytrial)
	#line 178 "btyacc_demo.y"
	{ yyval.expr = var_expr(yystack.l_mark[-1].scope, yystack.l_mark[0].id); }
	+#line 2092 "btyacc_demo.tab.c"
	break;
	case 48:
	if (!yytrial)
	#line 179 "btyacc_demo.y"
	{ yyval.expr = yystack.l_mark[0].expr; }
	+#line 2098 "btyacc_demo.tab.c"
	break;
	case 49:
	if (!yytrial)
	#line 183 "btyacc_demo.y"
	{ yyval.code = 0; }
	+#line 2104 "btyacc_demo.tab.c"
	break;
	case 50:
	#line 184 "btyacc_demo.y"
	{YYVALID;} if (!yytrial)
	#line 184 "btyacc_demo.y"
	{ yyval.code = build_expr_code(yystack.l_mark[-1].expr); }
	+#line 2111 "btyacc_demo.tab.c"
	break;
	case 51:
	#line 185 "btyacc_demo.y"
	yyval.scope = yystack.l_mark[-6].scope;
	+#line 2116 "btyacc_demo.tab.c"
	break;
	case 52:
	#line 185 "btyacc_demo.y"
	yyval.scope = yystack.l_mark[-9].scope;
	+#line 2121 "btyacc_demo.tab.c"
	break;
	case 53:
	#line 185 "btyacc_demo.y"
	{YYVALID;} if (!yytrial)
	#line 186 "btyacc_demo.y"
	{ yyval.code = build_if(yystack.l_mark[-7].expr, yystack.l_mark[-3].code, yystack.l_mark[0].code); }
	+#line 2128 "btyacc_demo.tab.c"
	break;
	case 54:
	#line 187 "btyacc_demo.y"
	{YYVALID;} if (!yytrial)
	#line 188 "btyacc_demo.y"
	{ yyval.code = build_if(yystack.l_mark[-4].expr, yystack.l_mark[0].code, 0); }
	+#line 2135 "btyacc_demo.tab.c"
	break;
	case 55:
	#line 189 "btyacc_demo.y"
	yyval.scope = new_scope(yystack.l_mark[0].scope);
	+#line 2140 "btyacc_demo.tab.c"
	break;
	case 56:
	#line 189 "btyacc_demo.y"
	{YYVALID;} if (!yytrial)
	#line 189 "btyacc_demo.y"
	{ yyval.code = yystack.l_mark[0].code; }
	+#line 2147 "btyacc_demo.tab.c"
	break;
	case 57:
	if (!yytrial)
	#line 192 "btyacc_demo.y"
	{ yyval.code = 0; }
	+#line 2153 "btyacc_demo.tab.c"
	break;
	case 58:
	if (!yytrial)
	#line 193 "btyacc_demo.y"
	{ yyval.code = code_append(yystack.l_mark[-2].code, yystack.l_mark[0].code); }
	+#line 2159 "btyacc_demo.tab.c"
	break;
	case 59:
	if (!yytrial)
	#line 197 "btyacc_demo.y"
	{ yyval.code = yystack.l_mark[-1].code; }
	+#line 2165 "btyacc_demo.tab.c"
	break;
	-#line 2113 "btyacc_demo.tab.c"
	+#line 2167 "btyacc_demo.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
	--- a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
	--- a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -148,7 +148,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 50 "btyacc_destroy1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -507,8 +507,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 511 "btyacc_destroy1.tab.c"
	break;
	-#line 512 "btyacc_destroy1.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -674,7 +674,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1186,31 +1186,37 @@
	if (!yytrial)
	#line 62 "btyacc_destroy1.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1190 "btyacc_destroy1.tab.c"
	break;
	case 2:
	if (!yytrial)
	#line 64 "btyacc_destroy1.y"
	{ yyval.nlist = yystack.l_mark[-3].nlist; }
	+#line 1196 "btyacc_destroy1.tab.c"
	break;
	case 3:
	if (!yytrial)
	#line 67 "btyacc_destroy1.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1202 "btyacc_destroy1.tab.c"
	break;
	case 4:
	if (!yytrial)
	#line 68 "btyacc_destroy1.y"
	{ yyval.cval = cLOCAL; }
	+#line 1208 "btyacc_destroy1.tab.c"
	break;
	case 5:
	if (!yytrial)
	#line 71 "btyacc_destroy1.y"
	{ yyval.tval = tREAL; }
	+#line 1214 "btyacc_destroy1.tab.c"
	break;
	case 6:
	if (!yytrial)
	#line 72 "btyacc_destroy1.y"
	{ yyval.tval = tINTEGER; }
	+#line 1220 "btyacc_destroy1.tab.c"
	break;
	case 7:
	if (!yytrial)
	@@ -1218,6 +1224,7 @@
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1228 "btyacc_destroy1.tab.c"
	break;
	case 8:
	if (!yytrial)
	@@ -1225,13 +1232,15 @@
	{ yyval.nlist->s = mksymbol(0, 0, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1236 "btyacc_destroy1.tab.c"
	break;
	case 9:
	if (!yytrial)
	#line 86 "btyacc_destroy1.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1242 "btyacc_destroy1.tab.c"
	break;
	-#line 1235 "btyacc_destroy1.tab.c"
	+#line 1244 "btyacc_destroy1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
	--- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
	--- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -148,7 +148,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 50 "btyacc_destroy2.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -507,8 +507,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 511 "btyacc_destroy2.tab.c"
	break;
	-#line 512 "btyacc_destroy2.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -674,7 +674,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1186,31 +1186,37 @@
	if (!yytrial)
	#line 62 "btyacc_destroy2.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1190 "btyacc_destroy2.tab.c"
	break;
	case 2:
	if (!yytrial)
	#line 64 "btyacc_destroy2.y"
	{ yyval.nlist = yystack.l_mark[-3].nlist; }
	+#line 1196 "btyacc_destroy2.tab.c"
	break;
	case 3:
	if (!yytrial)
	#line 67 "btyacc_destroy2.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1202 "btyacc_destroy2.tab.c"
	break;
	case 4:
	if (!yytrial)
	#line 68 "btyacc_destroy2.y"
	{ yyval.cval = cLOCAL; }
	+#line 1208 "btyacc_destroy2.tab.c"
	break;
	case 5:
	if (!yytrial)
	#line 71 "btyacc_destroy2.y"
	{ yyval.tval = tREAL; }
	+#line 1214 "btyacc_destroy2.tab.c"
	break;
	case 6:
	if (!yytrial)
	#line 72 "btyacc_destroy2.y"
	{ yyval.tval = tINTEGER; }
	+#line 1220 "btyacc_destroy2.tab.c"
	break;
	case 7:
	if (!yytrial)
	@@ -1218,6 +1224,7 @@
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1228 "btyacc_destroy2.tab.c"
	break;
	case 8:
	if (!yytrial)
	@@ -1225,13 +1232,15 @@
	{ yyval.nlist->s = mksymbol(0, 0, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1236 "btyacc_destroy2.tab.c"
	break;
	case 9:
	if (!yytrial)
	#line 86 "btyacc_destroy2.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1242 "btyacc_destroy2.tab.c"
	break;
	-#line 1235 "btyacc_destroy2.tab.c"
	+#line 1244 "btyacc_destroy2.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
	--- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
	--- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
	+++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -148,7 +148,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 53 "btyacc_destroy3.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -507,8 +507,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 511 "btyacc_destroy3.tab.c"
	break;
	-#line 512 "btyacc_destroy3.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -674,7 +674,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1186,31 +1186,37 @@
	if (!yytrial)
	#line 65 "btyacc_destroy3.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1190 "btyacc_destroy3.tab.c"
	break;
	case 2:
	if (!yytrial)
	#line 67 "btyacc_destroy3.y"
	{ yyval.nlist = yystack.l_mark[-3].nlist; }
	+#line 1196 "btyacc_destroy3.tab.c"
	break;
	case 3:
	if (!yytrial)
	#line 70 "btyacc_destroy3.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1202 "btyacc_destroy3.tab.c"
	break;
	case 4:
	if (!yytrial)
	#line 71 "btyacc_destroy3.y"
	{ yyval.cval = cLOCAL; }
	+#line 1208 "btyacc_destroy3.tab.c"
	break;
	case 5:
	if (!yytrial)
	#line 74 "btyacc_destroy3.y"
	{ yyval.tval = tREAL; }
	+#line 1214 "btyacc_destroy3.tab.c"
	break;
	case 6:
	if (!yytrial)
	#line 75 "btyacc_destroy3.y"
	{ yyval.tval = tINTEGER; }
	+#line 1220 "btyacc_destroy3.tab.c"
	break;
	case 7:
	if (!yytrial)
	@@ -1218,6 +1224,7 @@
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1228 "btyacc_destroy3.tab.c"
	break;
	case 8:
	if (!yytrial)
	@@ -1225,13 +1232,15 @@
	{ yyval.nlist->s = mksymbol(0, 0, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1236 "btyacc_destroy3.tab.c"
	break;
	case 9:
	if (!yytrial)
	#line 89 "btyacc_destroy3.y"
	{ yyval.nlist = yystack.l_mark[-5].nlist; }
	+#line 1242 "btyacc_destroy3.tab.c"
	break;
	-#line 1235 "btyacc_destroy3.tab.c"
	+#line 1244 "btyacc_destroy3.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc.tab.c b/contrib/byacc/test/btyacc/calc.tab.c
	--- a/contrib/byacc/test/btyacc/calc.tab.c
	+++ b/contrib/byacc/test/btyacc/calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -669,7 +669,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1180,64 +1180,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 1184 "calc.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1189 "calc.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1194 "calc.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1199 "calc.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1204 "calc.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1209 "calc.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1214 "calc.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1219 "calc.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1224 "calc.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1229 "calc.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1234 "calc.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1239 "calc.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1244 "calc.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1249 "calc.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1254 "calc.tab.c"
	break;
	-#line 1241 "calc.tab.c"
	+#line 1256 "calc.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc1.tab.h b/contrib/byacc/test/btyacc/calc1.tab.h
	--- a/contrib/byacc/test/btyacc/calc1.tab.h
	+++ b/contrib/byacc/test/btyacc/calc1.tab.h
	@@ -11,7 +11,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	diff --git a/contrib/byacc/test/btyacc/calc1.tab.c b/contrib/byacc/test/btyacc/calc1.tab.c
	--- a/contrib/byacc/test/btyacc/calc1.tab.c
	+++ b/contrib/byacc/test/btyacc/calc1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -150,7 +150,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 31 "calc1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	@@ -813,7 +813,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1326,78 +1326,91 @@
	{
	(void) printf("%15.8f\n", yystack.l_mark[-1].dval);
	}
	+#line 1330 "calc1.tab.c"
	break;
	case 4:
	#line 61 "calc1.y"
	{
	(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi);
	}
	+#line 1337 "calc1.tab.c"
	break;
	case 5:
	#line 65 "calc1.y"
	{
	dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval;
	}
	+#line 1344 "calc1.tab.c"
	break;
	case 6:
	#line 69 "calc1.y"
	{
	vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval;
	}
	+#line 1351 "calc1.tab.c"
	break;
	case 7:
	#line 73 "calc1.y"
	{
	yyerrok;
	}
	+#line 1358 "calc1.tab.c"
	break;
	case 9:
	#line 80 "calc1.y"
	{
	yyval.dval = dreg[yystack.l_mark[0].ival];
	}
	+#line 1365 "calc1.tab.c"
	break;
	case 10:
	#line 84 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
	}
	+#line 1372 "calc1.tab.c"
	break;
	case 11:
	#line 88 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
	}
	+#line 1379 "calc1.tab.c"
	break;
	case 12:
	#line 92 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
	}
	+#line 1386 "calc1.tab.c"
	break;
	case 13:
	#line 96 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
	}
	+#line 1393 "calc1.tab.c"
	break;
	case 14:
	#line 100 "calc1.y"
	{
	yyval.dval = -yystack.l_mark[0].dval;
	}
	+#line 1400 "calc1.tab.c"
	break;
	case 15:
	#line 104 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-1].dval;
	}
	+#line 1407 "calc1.tab.c"
	break;
	case 16:
	#line 110 "calc1.y"
	{
	yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
	}
	+#line 1414 "calc1.tab.c"
	break;
	case 17:
	#line 114 "calc1.y"
	@@ -1410,12 +1423,14 @@
	YYERROR;
	}
	}
	+#line 1427 "calc1.tab.c"
	break;
	case 18:
	#line 124 "calc1.y"
	{
	yyval.vval = vreg[yystack.l_mark[0].ival];
	}
	+#line 1434 "calc1.tab.c"
	break;
	case 19:
	#line 128 "calc1.y"
	@@ -1423,6 +1438,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
	}
	+#line 1442 "calc1.tab.c"
	break;
	case 20:
	#line 133 "calc1.y"
	@@ -1430,6 +1446,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
	}
	+#line 1450 "calc1.tab.c"
	break;
	case 21:
	#line 138 "calc1.y"
	@@ -1437,6 +1454,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
	}
	+#line 1458 "calc1.tab.c"
	break;
	case 22:
	#line 143 "calc1.y"
	@@ -1444,18 +1462,21 @@
	yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
	}
	+#line 1466 "calc1.tab.c"
	break;
	case 23:
	#line 148 "calc1.y"
	{
	yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1473 "calc1.tab.c"
	break;
	case 24:
	#line 152 "calc1.y"
	{
	yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1480 "calc1.tab.c"
	break;
	case 25:
	#line 156 "calc1.y"
	@@ -1463,6 +1484,7 @@
	if (dcheck(yystack.l_mark[0].vval)) YYERROR;
	yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1488 "calc1.tab.c"
	break;
	case 26:
	#line 161 "calc1.y"
	@@ -1470,6 +1492,7 @@
	if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
	yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1496 "calc1.tab.c"
	break;
	case 27:
	#line 166 "calc1.y"
	@@ -1477,14 +1500,16 @@
	yyval.vval.hi = -yystack.l_mark[0].vval.lo;
	yyval.vval.lo = -yystack.l_mark[0].vval.hi;
	}
	+#line 1504 "calc1.tab.c"
	break;
	case 28:
	#line 171 "calc1.y"
	{
	yyval.vval = yystack.l_mark[-1].vval;
	}
	+#line 1511 "calc1.tab.c"
	break;
	-#line 1488 "calc1.tab.c"
	+#line 1513 "calc1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc2.tab.c b/contrib/byacc/test/btyacc/calc2.tab.c
	--- a/contrib/byacc/test/btyacc/calc2.tab.c
	+++ b/contrib/byacc/test/btyacc/calc2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -682,7 +682,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1193,64 +1193,79 @@
	case 3:
	#line 35 "calc2.y"
	{ yyerrok ; }
	+#line 1197 "calc2.tab.c"
	break;
	case 4:
	#line 39 "calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1202 "calc2.tab.c"
	break;
	case 5:
	#line 41 "calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1207 "calc2.tab.c"
	break;
	case 6:
	#line 45 "calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1212 "calc2.tab.c"
	break;
	case 7:
	#line 47 "calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1217 "calc2.tab.c"
	break;
	case 8:
	#line 49 "calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1222 "calc2.tab.c"
	break;
	case 9:
	#line 51 "calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1227 "calc2.tab.c"
	break;
	case 10:
	#line 53 "calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1232 "calc2.tab.c"
	break;
	case 11:
	#line 55 "calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1237 "calc2.tab.c"
	break;
	case 12:
	#line 57 "calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1242 "calc2.tab.c"
	break;
	case 13:
	#line 59 "calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1247 "calc2.tab.c"
	break;
	case 14:
	#line 61 "calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1252 "calc2.tab.c"
	break;
	case 15:
	#line 63 "calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1257 "calc2.tab.c"
	break;
	case 17:
	#line 68 "calc2.y"
	{ yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1262 "calc2.tab.c"
	break;
	case 18:
	#line 70 "calc2.y"
	{ yyval = (base) yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1267 "calc2.tab.c"
	break;
	-#line 1254 "calc2.tab.c"
	+#line 1269 "calc2.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc3.tab.c b/contrib/byacc/test/btyacc/calc3.tab.c
	--- a/contrib/byacc/test/btyacc/calc3.tab.c
	+++ b/contrib/byacc/test/btyacc/calc3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -696,7 +696,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1207,64 +1207,79 @@
	case 3:
	#line 38 "calc3.y"
	{ yyerrok ; }
	+#line 1211 "calc3.tab.c"
	break;
	case 4:
	#line 42 "calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1216 "calc3.tab.c"
	break;
	case 5:
	#line 44 "calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1221 "calc3.tab.c"
	break;
	case 6:
	#line 48 "calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1226 "calc3.tab.c"
	break;
	case 7:
	#line 50 "calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1231 "calc3.tab.c"
	break;
	case 8:
	#line 52 "calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1236 "calc3.tab.c"
	break;
	case 9:
	#line 54 "calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1241 "calc3.tab.c"
	break;
	case 10:
	#line 56 "calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1246 "calc3.tab.c"
	break;
	case 11:
	#line 58 "calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1251 "calc3.tab.c"
	break;
	case 12:
	#line 60 "calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1256 "calc3.tab.c"
	break;
	case 13:
	#line 62 "calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1261 "calc3.tab.c"
	break;
	case 14:
	#line 64 "calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1266 "calc3.tab.c"
	break;
	case 15:
	#line 66 "calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1271 "calc3.tab.c"
	break;
	case 17:
	#line 71 "calc3.y"
	{ yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1276 "calc3.tab.c"
	break;
	case 18:
	#line 73 "calc3.y"
	{ yyval = (base) yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1281 "calc3.tab.c"
	break;
	-#line 1268 "calc3.tab.c"
	+#line 1283 "calc3.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_all.tab.c b/contrib/byacc/test/btyacc/calc_code_all.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_all.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_all.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -697,7 +697,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1208,64 +1208,79 @@
	case 3:
	#line 35 "calc_code_all.y"
	{ yyerrok ; }
	+#line 1212 "calc_code_all.tab.c"
	break;
	case 4:
	#line 39 "calc_code_all.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1217 "calc_code_all.tab.c"
	break;
	case 5:
	#line 41 "calc_code_all.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1222 "calc_code_all.tab.c"
	break;
	case 6:
	#line 45 "calc_code_all.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1227 "calc_code_all.tab.c"
	break;
	case 7:
	#line 47 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1232 "calc_code_all.tab.c"
	break;
	case 8:
	#line 49 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1237 "calc_code_all.tab.c"
	break;
	case 9:
	#line 51 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1242 "calc_code_all.tab.c"
	break;
	case 10:
	#line 53 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1247 "calc_code_all.tab.c"
	break;
	case 11:
	#line 55 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1252 "calc_code_all.tab.c"
	break;
	case 12:
	#line 57 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1257 "calc_code_all.tab.c"
	break;
	case 13:
	#line 59 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1262 "calc_code_all.tab.c"
	break;
	case 14:
	#line 61 "calc_code_all.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1267 "calc_code_all.tab.c"
	break;
	case 15:
	#line 63 "calc_code_all.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1272 "calc_code_all.tab.c"
	break;
	case 17:
	#line 68 "calc_code_all.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1277 "calc_code_all.tab.c"
	break;
	case 18:
	#line 70 "calc_code_all.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1282 "calc_code_all.tab.c"
	break;
	-#line 1269 "calc_code_all.tab.c"
	+#line 1284 "calc_code_all.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_default.tab.c b/contrib/byacc/test/btyacc/calc_code_default.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_default.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_default.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -677,7 +677,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1188,64 +1188,79 @@
	case 3:
	#line 31 "calc_code_default.y"
	{ yyerrok ; }
	+#line 1192 "calc_code_default.tab.c"
	break;
	case 4:
	#line 35 "calc_code_default.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1197 "calc_code_default.tab.c"
	break;
	case 5:
	#line 37 "calc_code_default.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1202 "calc_code_default.tab.c"
	break;
	case 6:
	#line 41 "calc_code_default.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1207 "calc_code_default.tab.c"
	break;
	case 7:
	#line 43 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1212 "calc_code_default.tab.c"
	break;
	case 8:
	#line 45 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1217 "calc_code_default.tab.c"
	break;
	case 9:
	#line 47 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1222 "calc_code_default.tab.c"
	break;
	case 10:
	#line 49 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1227 "calc_code_default.tab.c"
	break;
	case 11:
	#line 51 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1232 "calc_code_default.tab.c"
	break;
	case 12:
	#line 53 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1237 "calc_code_default.tab.c"
	break;
	case 13:
	#line 55 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1242 "calc_code_default.tab.c"
	break;
	case 14:
	#line 57 "calc_code_default.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1247 "calc_code_default.tab.c"
	break;
	case 15:
	#line 59 "calc_code_default.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1252 "calc_code_default.tab.c"
	break;
	case 17:
	#line 64 "calc_code_default.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1257 "calc_code_default.tab.c"
	break;
	case 18:
	#line 66 "calc_code_default.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1262 "calc_code_default.tab.c"
	break;
	-#line 1249 "calc_code_default.tab.c"
	+#line 1264 "calc_code_default.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_imports.tab.c b/contrib/byacc/test/btyacc/calc_code_imports.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_imports.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_imports.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -669,7 +669,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1180,64 +1180,79 @@
	case 3:
	#line 31 "calc_code_imports.y"
	{ yyerrok ; }
	+#line 1184 "calc_code_imports.tab.c"
	break;
	case 4:
	#line 35 "calc_code_imports.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1189 "calc_code_imports.tab.c"
	break;
	case 5:
	#line 37 "calc_code_imports.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1194 "calc_code_imports.tab.c"
	break;
	case 6:
	#line 41 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1199 "calc_code_imports.tab.c"
	break;
	case 7:
	#line 43 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1204 "calc_code_imports.tab.c"
	break;
	case 8:
	#line 45 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1209 "calc_code_imports.tab.c"
	break;
	case 9:
	#line 47 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1214 "calc_code_imports.tab.c"
	break;
	case 10:
	#line 49 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1219 "calc_code_imports.tab.c"
	break;
	case 11:
	#line 51 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1224 "calc_code_imports.tab.c"
	break;
	case 12:
	#line 53 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1229 "calc_code_imports.tab.c"
	break;
	case 13:
	#line 55 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1234 "calc_code_imports.tab.c"
	break;
	case 14:
	#line 57 "calc_code_imports.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1239 "calc_code_imports.tab.c"
	break;
	case 15:
	#line 59 "calc_code_imports.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1244 "calc_code_imports.tab.c"
	break;
	case 17:
	#line 64 "calc_code_imports.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1249 "calc_code_imports.tab.c"
	break;
	case 18:
	#line 66 "calc_code_imports.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1254 "calc_code_imports.tab.c"
	break;
	-#line 1241 "calc_code_imports.tab.c"
	+#line 1256 "calc_code_imports.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_provides.tab.c b/contrib/byacc/test/btyacc/calc_code_provides.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_provides.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_provides.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -677,7 +677,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1188,64 +1188,79 @@
	case 3:
	#line 31 "calc_code_provides.y"
	{ yyerrok ; }
	+#line 1192 "calc_code_provides.tab.c"
	break;
	case 4:
	#line 35 "calc_code_provides.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1197 "calc_code_provides.tab.c"
	break;
	case 5:
	#line 37 "calc_code_provides.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1202 "calc_code_provides.tab.c"
	break;
	case 6:
	#line 41 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1207 "calc_code_provides.tab.c"
	break;
	case 7:
	#line 43 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1212 "calc_code_provides.tab.c"
	break;
	case 8:
	#line 45 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1217 "calc_code_provides.tab.c"
	break;
	case 9:
	#line 47 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1222 "calc_code_provides.tab.c"
	break;
	case 10:
	#line 49 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1227 "calc_code_provides.tab.c"
	break;
	case 11:
	#line 51 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1232 "calc_code_provides.tab.c"
	break;
	case 12:
	#line 53 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1237 "calc_code_provides.tab.c"
	break;
	case 13:
	#line 55 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1242 "calc_code_provides.tab.c"
	break;
	case 14:
	#line 57 "calc_code_provides.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1247 "calc_code_provides.tab.c"
	break;
	case 15:
	#line 59 "calc_code_provides.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1252 "calc_code_provides.tab.c"
	break;
	case 17:
	#line 64 "calc_code_provides.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1257 "calc_code_provides.tab.c"
	break;
	case 18:
	#line 66 "calc_code_provides.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1262 "calc_code_provides.tab.c"
	break;
	-#line 1249 "calc_code_provides.tab.c"
	+#line 1264 "calc_code_provides.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_requires.tab.c b/contrib/byacc/test/btyacc/calc_code_requires.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_requires.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_requires.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -677,7 +677,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1188,64 +1188,79 @@
	case 3:
	#line 31 "calc_code_requires.y"
	{ yyerrok ; }
	+#line 1192 "calc_code_requires.tab.c"
	break;
	case 4:
	#line 35 "calc_code_requires.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1197 "calc_code_requires.tab.c"
	break;
	case 5:
	#line 37 "calc_code_requires.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1202 "calc_code_requires.tab.c"
	break;
	case 6:
	#line 41 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1207 "calc_code_requires.tab.c"
	break;
	case 7:
	#line 43 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1212 "calc_code_requires.tab.c"
	break;
	case 8:
	#line 45 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1217 "calc_code_requires.tab.c"
	break;
	case 9:
	#line 47 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1222 "calc_code_requires.tab.c"
	break;
	case 10:
	#line 49 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1227 "calc_code_requires.tab.c"
	break;
	case 11:
	#line 51 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1232 "calc_code_requires.tab.c"
	break;
	case 12:
	#line 53 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1237 "calc_code_requires.tab.c"
	break;
	case 13:
	#line 55 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1242 "calc_code_requires.tab.c"
	break;
	case 14:
	#line 57 "calc_code_requires.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1247 "calc_code_requires.tab.c"
	break;
	case 15:
	#line 59 "calc_code_requires.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1252 "calc_code_requires.tab.c"
	break;
	case 17:
	#line 64 "calc_code_requires.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1257 "calc_code_requires.tab.c"
	break;
	case 18:
	#line 66 "calc_code_requires.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1262 "calc_code_requires.tab.c"
	break;
	-#line 1249 "calc_code_requires.tab.c"
	+#line 1264 "calc_code_requires.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/calc_code_top.tab.c b/contrib/byacc/test/btyacc/calc_code_top.tab.c
	--- a/contrib/byacc/test/btyacc/calc_code_top.tab.c
	+++ b/contrib/byacc/test/btyacc/calc_code_top.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -677,7 +677,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1188,64 +1188,79 @@
	case 3:
	#line 31 "calc_code_top.y"
	{ yyerrok ; }
	+#line 1192 "calc_code_top.tab.c"
	break;
	case 4:
	#line 35 "calc_code_top.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1197 "calc_code_top.tab.c"
	break;
	case 5:
	#line 37 "calc_code_top.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1202 "calc_code_top.tab.c"
	break;
	case 6:
	#line 41 "calc_code_top.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1207 "calc_code_top.tab.c"
	break;
	case 7:
	#line 43 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1212 "calc_code_top.tab.c"
	break;
	case 8:
	#line 45 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1217 "calc_code_top.tab.c"
	break;
	case 9:
	#line 47 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1222 "calc_code_top.tab.c"
	break;
	case 10:
	#line 49 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1227 "calc_code_top.tab.c"
	break;
	case 11:
	#line 51 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1232 "calc_code_top.tab.c"
	break;
	case 12:
	#line 53 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1237 "calc_code_top.tab.c"
	break;
	case 13:
	#line 55 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1242 "calc_code_top.tab.c"
	break;
	case 14:
	#line 57 "calc_code_top.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1247 "calc_code_top.tab.c"
	break;
	case 15:
	#line 59 "calc_code_top.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1252 "calc_code_top.tab.c"
	break;
	case 17:
	#line 64 "calc_code_top.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1257 "calc_code_top.tab.c"
	break;
	case 18:
	#line 66 "calc_code_top.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1262 "calc_code_top.tab.c"
	break;
	-#line 1249 "calc_code_top.tab.c"
	+#line 1264 "calc_code_top.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/code_calc.code.c b/contrib/byacc/test/btyacc/code_calc.code.c
	--- a/contrib/byacc/test/btyacc/code_calc.code.c
	+++ b/contrib/byacc/test/btyacc/code_calc.code.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -542,7 +542,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1053,64 +1053,79 @@
	case 3:
	#line 32 "code_calc.y"
	{ yyerrok ; }
	+#line 1057 "code_calc.code.c"
	break;
	case 4:
	#line 36 "code_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1062 "code_calc.code.c"
	break;
	case 5:
	#line 38 "code_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1067 "code_calc.code.c"
	break;
	case 6:
	#line 42 "code_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1072 "code_calc.code.c"
	break;
	case 7:
	#line 44 "code_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1077 "code_calc.code.c"
	break;
	case 8:
	#line 46 "code_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1082 "code_calc.code.c"
	break;
	case 9:
	#line 48 "code_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1087 "code_calc.code.c"
	break;
	case 10:
	#line 50 "code_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1092 "code_calc.code.c"
	break;
	case 11:
	#line 52 "code_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1097 "code_calc.code.c"
	break;
	case 12:
	#line 54 "code_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1102 "code_calc.code.c"
	break;
	case 13:
	#line 56 "code_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1107 "code_calc.code.c"
	break;
	case 14:
	#line 58 "code_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1112 "code_calc.code.c"
	break;
	case 15:
	#line 60 "code_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1117 "code_calc.code.c"
	break;
	case 17:
	#line 65 "code_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1122 "code_calc.code.c"
	break;
	case 18:
	#line 67 "code_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1127 "code_calc.code.c"
	break;
	-#line 1114 "code_calc.code.c"
	+#line 1129 "code_calc.code.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/code_error.code.c b/contrib/byacc/test/btyacc/code_error.code.c
	--- a/contrib/byacc/test/btyacc/code_error.code.c
	+++ b/contrib/byacc/test/btyacc/code_error.code.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -512,7 +512,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/defines1.calc.c b/contrib/byacc/test/btyacc/defines1.calc.c
	--- a/contrib/byacc/test/btyacc/defines1.calc.c
	+++ b/contrib/byacc/test/btyacc/defines1.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -576,7 +576,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1087,64 +1087,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 1091 "y.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1096 "y.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1101 "y.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1106 "y.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1111 "y.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1116 "y.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1121 "y.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1126 "y.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1131 "y.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1136 "y.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1141 "y.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1146 "y.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1151 "y.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1156 "y.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1161 "y.tab.c"
	break;
	-#line 1148 "y.tab.c"
	+#line 1163 "y.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/defines2.calc.c b/contrib/byacc/test/btyacc/defines2.calc.c
	--- a/contrib/byacc/test/btyacc/defines2.calc.c
	+++ b/contrib/byacc/test/btyacc/defines2.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -576,7 +576,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1087,64 +1087,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 1091 "y.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1096 "y.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1101 "y.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1106 "y.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1111 "y.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1116 "y.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1121 "y.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1126 "y.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1131 "y.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1136 "y.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1141 "y.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1146 "y.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1151 "y.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1156 "y.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1161 "y.tab.c"
	break;
	-#line 1148 "y.tab.c"
	+#line 1163 "y.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/defines3.calc.c b/contrib/byacc/test/btyacc/defines3.calc.c
	--- a/contrib/byacc/test/btyacc/defines3.calc.c
	+++ b/contrib/byacc/test/btyacc/defines3.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -576,7 +576,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1087,64 +1087,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 1091 "prefix.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1096 "prefix.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1101 "prefix.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1106 "prefix.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1111 "prefix.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1116 "prefix.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1121 "prefix.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1126 "prefix.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1131 "prefix.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1136 "prefix.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1141 "prefix.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1146 "prefix.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1151 "prefix.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1156 "prefix.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1161 "prefix.tab.c"
	break;
	-#line 1148 "prefix.tab.c"
	+#line 1163 "prefix.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/empty.tab.c b/contrib/byacc/test/btyacc/empty.tab.c
	--- a/contrib/byacc/test/btyacc/empty.tab.c
	+++ b/contrib/byacc/test/btyacc/empty.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -531,7 +531,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/err_inherit1.tab.c b/contrib/byacc/test/btyacc/err_inherit1.tab.c
	--- a/contrib/byacc/test/btyacc/err_inherit1.tab.c
	+++ b/contrib/byacc/test/btyacc/err_inherit1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_inherit2.tab.c b/contrib/byacc/test/btyacc/err_inherit2.tab.c
	--- a/contrib/byacc/test/btyacc/err_inherit2.tab.c
	+++ b/contrib/byacc/test/btyacc/err_inherit2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.h b/contrib/byacc/test/btyacc/err_inherit3.tab.h
	--- a/contrib/byacc/test/btyacc/err_inherit3.tab.h
	+++ b/contrib/byacc/test/btyacc/err_inherit3.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.c b/contrib/byacc/test/btyacc/err_inherit3.tab.c
	--- a/contrib/byacc/test/btyacc/err_inherit3.tab.c
	+++ b/contrib/byacc/test/btyacc/err_inherit3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -143,7 +143,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 39 "err_inherit3.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -440,8 +440,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 444 "err_inherit3.tab.c"
	break;
	-#line 445 "err_inherit3.tab.c"
	case 264:
	#line 30 "err_inherit3.y"
	{
	@@ -452,8 +452,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 456 "err_inherit3.tab.c"
	break;
	-#line 457 "err_inherit3.tab.c"
	case 265:
	#line 30 "err_inherit3.y"
	{
	@@ -464,8 +464,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 468 "err_inherit3.tab.c"
	break;
	-#line 469 "err_inherit3.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -631,7 +631,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1142,60 +1142,73 @@
	case 1:
	#line 50 "err_inherit3.y"
	yyval.cval = yystack.l_mark[-1].cval;
	+#line 1146 "err_inherit3.tab.c"
	break;
	case 2:
	#line 50 "err_inherit3.y"
	yyval.tval = yystack.l_mark[-1].tval;
	+#line 1151 "err_inherit3.tab.c"
	break;
	case 3:
	#line 51 "err_inherit3.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1156 "err_inherit3.tab.c"
	break;
	case 4:
	#line 53 "err_inherit3.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1161 "err_inherit3.tab.c"
	break;
	case 5:
	#line 56 "err_inherit3.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1166 "err_inherit3.tab.c"
	break;
	case 6:
	#line 57 "err_inherit3.y"
	{ yyval.cval = cLOCAL; }
	+#line 1171 "err_inherit3.tab.c"
	break;
	case 7:
	#line 60 "err_inherit3.y"
	{ yyval.tval = tREAL; }
	+#line 1176 "err_inherit3.tab.c"
	break;
	case 8:
	#line 61 "err_inherit3.y"
	{ yyval.tval = tINTEGER; }
	+#line 1181 "err_inherit3.tab.c"
	break;
	case 9:
	#line 64 "err_inherit3.y"
	yyval.cval = yystack.l_mark[-2];
	+#line 1186 "err_inherit3.tab.c"
	break;
	case 10:
	#line 65 "err_inherit3.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-5].tval, yystack.l_mark[-5].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1193 "err_inherit3.tab.c"
	break;
	case 11:
	#line 69 "err_inherit3.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-3], yystack.l_mark[-3], yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1200 "err_inherit3.tab.c"
	break;
	case 12:
	#line 74 "err_inherit3.y"
	yyval.cval = cLOCAL;
	+#line 1205 "err_inherit3.tab.c"
	break;
	case 13:
	#line 75 "err_inherit3.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1210 "err_inherit3.tab.c"
	break;
	-#line 1199 "err_inherit3.tab.c"
	+#line 1212 "err_inherit3.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.h b/contrib/byacc/test/btyacc/err_inherit4.tab.h
	--- a/contrib/byacc/test/btyacc/err_inherit4.tab.h
	+++ b/contrib/byacc/test/btyacc/err_inherit4.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.c b/contrib/byacc/test/btyacc/err_inherit4.tab.c
	--- a/contrib/byacc/test/btyacc/err_inherit4.tab.c
	+++ b/contrib/byacc/test/btyacc/err_inherit4.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -151,7 +151,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 41 "err_inherit4.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -452,18 +452,18 @@
	case 263:
	#line 28 "err_inherit4.y"
	{ }
	+#line 456 "err_inherit4.tab.c"
	break;
	-#line 457 "err_inherit4.tab.c"
	case 264:
	#line 28 "err_inherit4.y"
	{ }
	+#line 461 "err_inherit4.tab.c"
	break;
	-#line 462 "err_inherit4.tab.c"
	case 265:
	#line 28 "err_inherit4.y"
	{ }
	+#line 466 "err_inherit4.tab.c"
	break;
	-#line 467 "err_inherit4.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -629,7 +629,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1140,52 +1140,63 @@
	case 1:
	#line 52 "err_inherit4.y"
	yyval.cval = yystack.l_mark[-1].cval;
	+#line 1144 "err_inherit4.tab.c"
	break;
	case 2:
	#line 52 "err_inherit4.y"
	yyval.tval = yystack.l_mark[-1].tval;
	+#line 1149 "err_inherit4.tab.c"
	break;
	case 3:
	#line 53 "err_inherit4.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; yyloc = yystack.p_mark[0]; }
	+#line 1154 "err_inherit4.tab.c"
	break;
	case 4:
	#line 55 "err_inherit4.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; yyloc = yystack.p_mark[-3]; }
	+#line 1159 "err_inherit4.tab.c"
	break;
	case 5:
	#line 58 "err_inherit4.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1164 "err_inherit4.tab.c"
	break;
	case 6:
	#line 59 "err_inherit4.y"
	{ yyval.cval = cLOCAL; }
	+#line 1169 "err_inherit4.tab.c"
	break;
	case 7:
	#line 62 "err_inherit4.y"
	{ yyval.tval = tREAL; }
	+#line 1174 "err_inherit4.tab.c"
	break;
	case 8:
	#line 63 "err_inherit4.y"
	{ yyval.tval = tINTEGER; }
	+#line 1179 "err_inherit4.tab.c"
	break;
	case 9:
	#line 67 "err_inherit4.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-3].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1186 "err_inherit4.tab.c"
	break;
	case 10:
	#line 71 "err_inherit4.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-1].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1193 "err_inherit4.tab.c"
	break;
	case 11:
	#line 77 "err_inherit4.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; yyloc = yystack.p_mark[1]; }
	+#line 1198 "err_inherit4.tab.c"
	break;
	-#line 1189 "err_inherit4.tab.c"
	+#line 1200 "err_inherit4.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/err_inherit5.tab.c b/contrib/byacc/test/btyacc/err_inherit5.tab.c
	--- a/contrib/byacc/test/btyacc/err_inherit5.tab.c
	+++ b/contrib/byacc/test/btyacc/err_inherit5.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax1.tab.c b/contrib/byacc/test/btyacc/err_syntax1.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax1.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax10.tab.c b/contrib/byacc/test/btyacc/err_syntax10.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax10.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax10.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -530,7 +530,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/err_syntax11.tab.c b/contrib/byacc/test/btyacc/err_syntax11.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax11.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax11.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -536,7 +536,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/err_syntax12.tab.c b/contrib/byacc/test/btyacc/err_syntax12.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax12.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax12.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -542,7 +542,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/err_syntax13.tab.c b/contrib/byacc/test/btyacc/err_syntax13.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax13.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax13.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax14.tab.c b/contrib/byacc/test/btyacc/err_syntax14.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax14.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax14.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax15.tab.c b/contrib/byacc/test/btyacc/err_syntax15.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax15.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax15.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax16.tab.c b/contrib/byacc/test/btyacc/err_syntax16.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax16.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax16.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax17.tab.c b/contrib/byacc/test/btyacc/err_syntax17.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax17.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax17.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax18.tab.c b/contrib/byacc/test/btyacc/err_syntax18.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax18.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax18.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -539,7 +539,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1050,8 +1050,9 @@
	case 1:
	#line 9 "err_syntax18.y"
	{ yyval = yystack.l_mark[1]; }
	+#line 1054 "err_syntax18.tab.c"
	break;
	-#line 1055 "err_syntax18.tab.c"
	+#line 1056 "err_syntax18.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/err_syntax19.tab.c b/contrib/byacc/test/btyacc/err_syntax19.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax19.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax19.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax2.tab.c b/contrib/byacc/test/btyacc/err_syntax2.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax2.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax20.tab.c b/contrib/byacc/test/btyacc/err_syntax20.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax20.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax20.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -534,7 +534,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1045,8 +1045,9 @@
	case 1:
	#line 12 "err_syntax20.y"
	{ yystack.l_mark[-1].rechk = 3; }
	+#line 1049 "err_syntax20.tab.c"
	break;
	-#line 1050 "err_syntax20.tab.c"
	+#line 1051 "err_syntax20.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/err_syntax21.tab.c b/contrib/byacc/test/btyacc/err_syntax21.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax21.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax21.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax22.tab.c b/contrib/byacc/test/btyacc/err_syntax22.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax22.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax22.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax23.tab.c b/contrib/byacc/test/btyacc/err_syntax23.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax23.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax23.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax24.tab.c b/contrib/byacc/test/btyacc/err_syntax24.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax24.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax24.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax25.tab.c b/contrib/byacc/test/btyacc/err_syntax25.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax25.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax25.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax26.tab.c b/contrib/byacc/test/btyacc/err_syntax26.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax26.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax26.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax27.tab.c b/contrib/byacc/test/btyacc/err_syntax27.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax27.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax27.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax3.tab.c b/contrib/byacc/test/btyacc/err_syntax3.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax3.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax4.tab.c b/contrib/byacc/test/btyacc/err_syntax4.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax4.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax4.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax5.tab.c b/contrib/byacc/test/btyacc/err_syntax5.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax5.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax5.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax6.tab.c b/contrib/byacc/test/btyacc/err_syntax6.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax6.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax6.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax7.tab.c b/contrib/byacc/test/btyacc/err_syntax7.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax7.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax7.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax7a.tab.c b/contrib/byacc/test/btyacc/err_syntax7a.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax7a.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax7a.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax7b.tab.c b/contrib/byacc/test/btyacc/err_syntax7b.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax7b.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax7b.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax8.tab.c b/contrib/byacc/test/btyacc/err_syntax8.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax8.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax8.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax8a.tab.c b/contrib/byacc/test/btyacc/err_syntax8a.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax8a.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax8a.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/err_syntax9.tab.c b/contrib/byacc/test/btyacc/err_syntax9.tab.c
	--- a/contrib/byacc/test/btyacc/err_syntax9.tab.c
	+++ b/contrib/byacc/test/btyacc/err_syntax9.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/btyacc/error.tab.c b/contrib/byacc/test/btyacc/error.tab.c
	--- a/contrib/byacc/test/btyacc/error.tab.c
	+++ b/contrib/byacc/test/btyacc/error.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -535,7 +535,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.h b/contrib/byacc/test/btyacc/expr.oxout.tab.h
	--- a/contrib/byacc/test/btyacc/expr.oxout.tab.h
	+++ b/contrib/byacc/test/btyacc/expr.oxout.tab.h
	@@ -1,5 +1,5 @@
	-#ifndef _expr.oxout__defines_h_
	-#define _expr.oxout__defines_h_
	+#ifndef _expr_oxout__defines_h_
	+#define _expr_oxout__defines_h_

	#define ID 257
	#define CONST 258
	@@ -9,12 +9,12 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union {
	+typedef union YYSTYPE {
	struct yyyOxAttrbs {
	struct yyyStackItem *yyyOxStackItem;
	} yyyOxAttrbs;
	} YYSTYPE;
	#endif /* !YYSTYPE_IS_DECLARED */
	-extern YYSTYPE expr.oxout_lval;
	+extern YYSTYPE expr_oxout_lval;

	-#endif /* _expr.oxout__defines_h_ */
	+#endif /* _expr_oxout__defines_h_ */
	diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.c b/contrib/byacc/test/btyacc/expr.oxout.tab.c
	--- a/contrib/byacc/test/btyacc/expr.oxout.tab.c
	+++ b/contrib/byacc/test/btyacc/expr.oxout.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -18,102 +18,102 @@
	#define YYDEBUGSTR YYPREFIX "debug"

	#ifndef yyparse
	-#define yyparse expr.oxout_parse
	+#define yyparse expr_oxout_parse
	#endif /* yyparse */

	#ifndef yylex
	-#define yylex expr.oxout_lex
	+#define yylex expr_oxout_lex
	#endif /* yylex */

	#ifndef yyerror
	-#define yyerror expr.oxout_error
	+#define yyerror expr_oxout_error
	#endif /* yyerror */

	#ifndef yychar
	-#define yychar expr.oxout_char
	+#define yychar expr_oxout_char
	#endif /* yychar */

	#ifndef yyval
	-#define yyval expr.oxout_val
	+#define yyval expr_oxout_val
	#endif /* yyval */

	#ifndef yylval
	-#define yylval expr.oxout_lval
	+#define yylval expr_oxout_lval
	#endif /* yylval */

	#ifndef yydebug
	-#define yydebug expr.oxout_debug
	+#define yydebug expr_oxout_debug
	#endif /* yydebug */

	#ifndef yynerrs
	-#define yynerrs expr.oxout_nerrs
	+#define yynerrs expr_oxout_nerrs
	#endif /* yynerrs */

	#ifndef yyerrflag
	-#define yyerrflag expr.oxout_errflag
	+#define yyerrflag expr_oxout_errflag
	#endif /* yyerrflag */

	#ifndef yylhs
	-#define yylhs expr.oxout_lhs
	+#define yylhs expr_oxout_lhs
	#endif /* yylhs */

	#ifndef yylen
	-#define yylen expr.oxout_len
	+#define yylen expr_oxout_len
	#endif /* yylen */

	#ifndef yydefred
	-#define yydefred expr.oxout_defred
	+#define yydefred expr_oxout_defred
	#endif /* yydefred */

	#ifndef yystos
	-#define yystos expr.oxout_stos
	+#define yystos expr_oxout_stos
	#endif /* yystos */

	#ifndef yydgoto
	-#define yydgoto expr.oxout_dgoto
	+#define yydgoto expr_oxout_dgoto
	#endif /* yydgoto */

	#ifndef yysindex
	-#define yysindex expr.oxout_sindex
	+#define yysindex expr_oxout_sindex
	#endif /* yysindex */

	#ifndef yyrindex
	-#define yyrindex expr.oxout_rindex
	+#define yyrindex expr_oxout_rindex
	#endif /* yyrindex */

	#ifndef yygindex
	-#define yygindex expr.oxout_gindex
	+#define yygindex expr_oxout_gindex
	#endif /* yygindex */

	#ifndef yytable
	-#define yytable expr.oxout_table
	+#define yytable expr_oxout_table
	#endif /* yytable */

	#ifndef yycheck
	-#define yycheck expr.oxout_check
	+#define yycheck expr_oxout_check
	#endif /* yycheck */

	#ifndef yyname
	-#define yyname expr.oxout_name
	+#define yyname expr_oxout_name
	#endif /* yyname */

	#ifndef yyrule
	-#define yyrule expr.oxout_rule
	+#define yyrule expr_oxout_rule
	#endif /* yyrule */

	#if YYBTYACC

	#ifndef yycindex
	-#define yycindex expr.oxout_cindex
	+#define yycindex expr_oxout_cindex
	#endif /* yycindex */

	#ifndef yyctable
	-#define yyctable expr.oxout_ctable
	+#define yyctable expr_oxout_ctable
	#endif /* yyctable */

	#endif /* YYBTYACC */

	-#define YYPREFIX "expr.oxout_"
	+#define YYPREFIX "expr_oxout_"

	#define YYPURE 0

	@@ -137,7 +137,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 31 "expr.oxout.y"
	-typedef union {
	+typedef union YYSTYPE {
	struct yyyOxAttrbs {
	struct yyyStackItem *yyyOxStackItem;
	} yyyOxAttrbs;
	@@ -199,44 +199,44 @@
	#define CONST 258
	#define YYERRCODE 256
	typedef int YYINT;
	-static const YYINT expr.oxout_lhs[] = { -1,
	+static const YYINT expr_oxout_lhs[] = { -1,
	2, 0, 1, 3, 3, 3, 3, 3, 3, 3,
	};
	-static const YYINT expr.oxout_len[] = { 2,
	+static const YYINT expr_oxout_len[] = { 2,
	0, 2, 1, 3, 3, 3, 3, 3, 1, 1,
	};
	-static const YYINT expr.oxout_defred[] = { 1,
	+static const YYINT expr_oxout_defred[] = { 1,
	0, 0, 9, 10, 0, 2, 0, 0, 0, 0,
	0, 0, 8, 0, 0, 4, 0,
	};
	#if defined(YYDESTRUCT_CALL) \|\| defined(YYSTYPE_TOSTRING)
	-static const YYINT expr.oxout_stos[] = { 0,
	+static const YYINT expr_oxout_stos[] = { 0,
	260, 262, 257, 258, 40, 261, 263, 263, 43, 45,
	42, 47, 41, 263, 263, 263, 263,
	};
	#endif /* YYDESTRUCT_CALL \|\| YYSTYPE_TOSTRING */
	-static const YYINT expr.oxout_dgoto[] = { 1,
	+static const YYINT expr_oxout_dgoto[] = { 1,
	6, 2, 7,
	};
	-static const YYINT expr.oxout_sindex[] = { 0,
	+static const YYINT expr_oxout_sindex[] = { 0,
	0, -40, 0, 0, -40, 0, -18, -24, -40, -40,
	-40, -40, 0, -37, -37, 0, -39,
	};
	-static const YYINT expr.oxout_rindex[] = { 0,
	+static const YYINT expr_oxout_rindex[] = { 0,
	0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
	0, 0, 0, 2, 8, 0, 1,
	};
	#if YYBTYACC
	-static const YYINT expr.oxout_cindex[] = { 0,
	+static const YYINT expr_oxout_cindex[] = { 0,
	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	0, 0, 0, 0, 0, 0, 0,
	};
	#endif
	-static const YYINT expr.oxout_gindex[] = { 0,
	+static const YYINT expr_oxout_gindex[] = { 0,
	0, 0, 4,
	};
	#define YYTABLESIZE 218
	-static const YYINT expr.oxout_table[] = { 5,
	+static const YYINT expr_oxout_table[] = { 5,
	6, 5, 11, 0, 11, 3, 0, 7, 8, 12,
	0, 0, 14, 15, 16, 17, 13, 11, 9, 0,
	10, 0, 12, 11, 9, 0, 10, 0, 12, 0,
	@@ -260,7 +260,7 @@
	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	0, 0, 0, 0, 0, 0, 3, 4,
	};
	-static const YYINT expr.oxout_check[] = { 40,
	+static const YYINT expr_oxout_check[] = { 40,
	0, 0, 42, -1, 42, 0, -1, 0, 5, 47,
	-1, -1, 9, 10, 11, 12, 41, 42, 43, -1,
	45, -1, 47, 42, 43, -1, 45, -1, 47, -1,
	@@ -285,7 +285,7 @@
	-1, -1, -1, -1, -1, -1, 257, 258,
	};
	#if YYBTYACC
	-static const YYINT expr.oxout_ctable[] = { -1,
	+static const YYINT expr_oxout_ctable[] = { -1,
	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
	@@ -318,7 +318,7 @@
	#define YYUNDFTOKEN 264
	#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a))
	#if YYDEBUG
	-static const char *const expr.oxout_name[] = {
	+static const char *const expr_oxout_name[] = {

	"$end",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	0,0,0,"'('","')'","'*'","'+'",0,"'-'",0,"'/'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	@@ -329,7 +329,7 @@
	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"error","ID",
	"CONST","$accept","yyyAugNonterm","s","$$1","expr","illegal-symbol",
	};
	-static const char *const expr.oxout_rule[] = {
	+static const char *const expr_oxout_rule[] = {
	"$accept : yyyAugNonterm",
	"$$1 :",
	"yyyAugNonterm : $$1 s",
	@@ -532,8 +532,8 @@


	void yyyHandleOverflow(char which)
	- {char msg1,msg2;
	- long oldSize,newSize;
	+ {char msg1 = "?", msg2;
	+ long oldSize = 0, newSize;
	switch(which)
	{
	case yyySSALof :
	@@ -840,7 +840,7 @@
	}
	if (yyyCond(2) != yyyPass) {
	#line 23 "expr.Y"
	- printf("postfix: ")/* missing ; */
	+ printf("postfix: ");

	#line 497 "expr.oxout.y"
	}
	@@ -1142,11 +1142,11 @@
	static int yyyInitDone = 0;
	if (yyyInitDone) return;

	- if ((yyyRS = (struct yyyRSitem *)
	- calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(struct yyyRSitem))
	+ if ((yyyRS = (yyyRSitem *)
	+ calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(yyyRSitem))
	)
	==
	- ((struct yyyRSitem *) NULL)
	+ ((yyyRSitem *) NULL)
	)
	yyyfatal("malloc error in ox ready set space allocation\n");
	yyyRS++;
	@@ -1201,7 +1201,7 @@
	(yyyRCT *) calloc((size_t)yyyNattrbs, (size_t)sizeof(yyyRCT));
	if ((yyyOxStackItem)->node->refCountList == (yyyRCT ) NULL)
	yyyfatal("malloc error in ox reference count list space allocation\n");
	- (*yyyOxStackItem)->node->prodNum = yyyProdNum;
	+ (*yyyOxStackItem)->node->prodNum = (int) yyyProdNum;
	va_start(ap, yyval_OxAttrbs);
	for (i=1;i<=yyyRHSlength;i++)
	{yyySIT yaccStDum = va_arg(ap,struct yyyOxAttrbs )->yyyOxStackItem;
	@@ -1302,9 +1302,9 @@



	-void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *yylval)
	+void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *mylval)
	{yyyRCT *rcPdum;
	- yyySIT **yyyOxStackItem = &yylval->yyyOxAttrbs.yyyOxStackItem;
	+ yyySIT **yyyOxStackItem = &mylval->yyyOxAttrbs.yyyOxStackItem;
	(yyyOxStackItem) = (yyySIT ) malloc((size_t)sizeof(yyySIT));
	if ((yyyOxStackItem) == (yyySIT ) NULL)
	yyyfatal("malloc error in ox yacc semantic stack space allocation\n");
	@@ -1955,7 +1955,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -2466,62 +2466,72 @@
	case 1:
	#line 64 "expr.oxout.y"
	{yyyYoxInit();}
	+#line 2470 "expr.oxout.tab.c"
	break;
	case 2:
	#line 66 "expr.oxout.y"
	{
	yyyDecorate(); yyyExecuteRRsection(yystack.l_mark[0].yyyOxAttrbs.yyyOxStackItem->node);
	}
	+#line 2477 "expr.oxout.tab.c"
	break;
	case 3:
	#line 73 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(1,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(1,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2484 "expr.oxout.tab.c"
	break;
	case 4:
	#line 80 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(2,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(2,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2491 "expr.oxout.tab.c"
	break;
	case 5:
	#line 87 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(3,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(3,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2498 "expr.oxout.tab.c"
	break;
	case 6:
	#line 94 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(4,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(4,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2505 "expr.oxout.tab.c"
	break;
	case 7:
	#line 101 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(5,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(5,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2512 "expr.oxout.tab.c"
	break;
	case 8:
	#line 108 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(6,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(6,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2519 "expr.oxout.tab.c"
	break;
	case 9:
	#line 114 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(7,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(7,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2526 "expr.oxout.tab.c"
	break;
	case 10:
	#line 121 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(8,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(8,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 2533 "expr.oxout.tab.c"
	break;
	-#line 2525 "expr.oxout.tab.c"
	+#line 2535 "expr.oxout.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/grammar.tab.c b/contrib/byacc/test/btyacc/grammar.tab.c
	--- a/contrib/byacc/test/btyacc/grammar.tab.c
	+++ b/contrib/byacc/test/btyacc/grammar.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -1509,7 +1509,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -2022,12 +2022,14 @@
	{
	yyerrok;
	}
	+#line 2026 "grammar.tab.c"
	break;
	case 11:
	#line 382 "grammar.y"
	{
	yyerrok;
	}
	+#line 2033 "grammar.tab.c"
	break;
	case 13:
	#line 393 "grammar.y"
	@@ -2037,12 +2039,14 @@
	* have generated.
	*/
	}
	+#line 2043 "grammar.tab.c"
	break;
	case 14:
	#line 400 "grammar.y"
	{
	/* empty */
	}
	+#line 2050 "grammar.tab.c"
	break;
	case 15:
	#line 407 "grammar.y"
	@@ -2056,6 +2060,7 @@
	free_decl_spec(&yystack.l_mark[-1].decl_spec);
	end_typedef();
	}
	+#line 2064 "grammar.tab.c"
	break;
	case 16:
	#line 418 "grammar.y"
	@@ -2072,6 +2077,7 @@
	free_decl_spec(&yystack.l_mark[-2].decl_spec);
	end_typedef();
	}
	+#line 2081 "grammar.tab.c"
	break;
	case 17:
	#line 432 "grammar.y"
	@@ -2079,24 +2085,28 @@
	cur_decl_spec_flags = yystack.l_mark[0].decl_spec.flags;
	free_decl_spec(&yystack.l_mark[0].decl_spec);
	}
	+#line 2089 "grammar.tab.c"
	break;
	case 18:
	#line 437 "grammar.y"
	{
	end_typedef();
	}
	+#line 2096 "grammar.tab.c"
	break;
	case 19:
	#line 444 "grammar.y"
	{
	begin_typedef();
	}
	+#line 2103 "grammar.tab.c"
	break;
	case 20:
	#line 448 "grammar.y"
	{
	begin_typedef();
	}
	+#line 2110 "grammar.tab.c"
	break;
	case 23:
	#line 460 "grammar.y"
	@@ -2111,6 +2121,7 @@
	new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
	free_declarator(yystack.l_mark[0].declarator);
	}
	+#line 2125 "grammar.tab.c"
	break;
	case 24:
	#line 472 "grammar.y"
	@@ -2122,6 +2133,7 @@
	new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
	free_declarator(yystack.l_mark[0].declarator);
	}
	+#line 2137 "grammar.tab.c"
	break;
	case 25:
	#line 484 "grammar.y"
	@@ -2135,6 +2147,7 @@
	func_params->begin_comment = cur_file->begin_comment;
	func_params->end_comment = cur_file->end_comment;
	}
	+#line 2151 "grammar.tab.c"
	break;
	case 26:
	#line 495 "grammar.y"
	@@ -2161,6 +2174,7 @@
	free_decl_spec(&yystack.l_mark[-4].decl_spec);
	free_declarator(yystack.l_mark[-3].declarator);
	}
	+#line 2178 "grammar.tab.c"
	break;
	case 28:
	#line 520 "grammar.y"
	@@ -2173,6 +2187,7 @@
	func_params->begin_comment = cur_file->begin_comment;
	func_params->end_comment = cur_file->end_comment;
	}
	+#line 2191 "grammar.tab.c"
	break;
	case 29:
	#line 530 "grammar.y"
	@@ -2191,6 +2206,7 @@
	free_decl_spec(&decl_spec);
	free_declarator(yystack.l_mark[-4].declarator);
	}
	+#line 2210 "grammar.tab.c"
	break;
	case 36:
	#line 561 "grammar.y"
	@@ -2199,114 +2215,133 @@
	free(yystack.l_mark[-1].decl_spec.text);
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 2219 "grammar.tab.c"
	break;
	case 40:
	#line 576 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2226 "grammar.tab.c"
	break;
	case 41:
	#line 580 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_EXTERN);
	}
	+#line 2233 "grammar.tab.c"
	break;
	case 42:
	#line 584 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2240 "grammar.tab.c"
	break;
	case 43:
	#line 588 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_STATIC);
	}
	+#line 2247 "grammar.tab.c"
	break;
	case 44:
	#line 592 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_INLINE);
	}
	+#line 2254 "grammar.tab.c"
	break;
	case 45:
	#line 596 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_JUNK);
	}
	+#line 2261 "grammar.tab.c"
	break;
	case 46:
	#line 603 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
	}
	+#line 2268 "grammar.tab.c"
	break;
	case 47:
	#line 607 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2275 "grammar.tab.c"
	break;
	case 48:
	#line 611 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_FLOAT);
	}
	+#line 2282 "grammar.tab.c"
	break;
	case 49:
	#line 615 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2289 "grammar.tab.c"
	break;
	case 50:
	#line 619 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2296 "grammar.tab.c"
	break;
	case 51:
	#line 623 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_SHORT);
	}
	+#line 2303 "grammar.tab.c"
	break;
	case 52:
	#line 627 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2310 "grammar.tab.c"
	break;
	case 53:
	#line 631 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2317 "grammar.tab.c"
	break;
	case 54:
	#line 635 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2324 "grammar.tab.c"
	break;
	case 55:
	#line 639 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
	}
	+#line 2331 "grammar.tab.c"
	break;
	case 56:
	#line 643 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2338 "grammar.tab.c"
	break;
	case 57:
	#line 647 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2345 "grammar.tab.c"
	break;
	case 58:
	#line 651 "grammar.y"
	@@ -2316,12 +2351,14 @@
	if (s != NULL)
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
	}
	+#line 2355 "grammar.tab.c"
	break;
	case 61:
	#line 663 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 2362 "grammar.tab.c"
	break;
	case 62:
	#line 667 "grammar.y"
	@@ -2334,6 +2371,7 @@
	if (s != NULL)
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
	}
	+#line 2375 "grammar.tab.c"
	break;
	case 63:
	#line 680 "grammar.y"
	@@ -2343,6 +2381,7 @@
	(void)sprintf(s = buf, "%.s %.s", TEXT_LEN, yystack.l_mark[-2].text.text, TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
	}
	+#line 2385 "grammar.tab.c"
	break;
	case 64:
	#line 687 "grammar.y"
	@@ -2352,6 +2391,7 @@
	(void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 2395 "grammar.tab.c"
	break;
	case 65:
	#line 694 "grammar.y"
	@@ -2359,30 +2399,35 @@
	(void)sprintf(buf, "%.s %.s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text);
	new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 2403 "grammar.tab.c"
	break;
	case 66:
	#line 702 "grammar.y"
	{
	imply_typedef(yyval.text.text);
	}
	+#line 2410 "grammar.tab.c"
	break;
	case 67:
	#line 706 "grammar.y"
	{
	imply_typedef(yyval.text.text);
	}
	+#line 2417 "grammar.tab.c"
	break;
	case 68:
	#line 713 "grammar.y"
	{
	new_decl_list(&yyval.decl_list, yystack.l_mark[0].declarator);
	}
	+#line 2424 "grammar.tab.c"
	break;
	case 69:
	#line 717 "grammar.y"
	{
	add_decl_list(&yyval.decl_list, &yystack.l_mark[-2].decl_list, yystack.l_mark[0].declarator);
	}
	+#line 2431 "grammar.tab.c"
	break;
	case 70:
	#line 724 "grammar.y"
	@@ -2394,6 +2439,7 @@
	}
	cur_declarator = yyval.declarator;
	}
	+#line 2443 "grammar.tab.c"
	break;
	case 71:
	#line 733 "grammar.y"
	@@ -2404,6 +2450,7 @@
	fputs(" =", cur_file->tmp_file);
	}
	}
	+#line 2454 "grammar.tab.c"
	break;
	case 73:
	#line 745 "grammar.y"
	@@ -2413,6 +2460,7 @@
	(void)sprintf(s = buf, "enum %.*s", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
	}
	+#line 2464 "grammar.tab.c"
	break;
	case 74:
	#line 752 "grammar.y"
	@@ -2422,6 +2470,7 @@
	(void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 2474 "grammar.tab.c"
	break;
	case 75:
	#line 759 "grammar.y"
	@@ -2429,6 +2478,7 @@
	(void)sprintf(buf, "enum %.*s", TEXT_LEN, yystack.l_mark[0].text.text);
	new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 2482 "grammar.tab.c"
	break;
	case 76:
	#line 767 "grammar.y"
	@@ -2436,6 +2486,7 @@
	imply_typedef("enum");
	yyval.text = yystack.l_mark[0].text;
	}
	+#line 2490 "grammar.tab.c"
	break;
	case 79:
	#line 780 "grammar.y"
	@@ -2447,12 +2498,14 @@
	yyval.declarator->begin = yystack.l_mark[-1].text.begin;
	yyval.declarator->pointer = TRUE;
	}
	+#line 2502 "grammar.tab.c"
	break;
	case 81:
	#line 793 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin);
	}
	+#line 2509 "grammar.tab.c"
	break;
	case 82:
	#line 797 "grammar.y"
	@@ -2463,6 +2516,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-2].text.begin;
	}
	+#line 2520 "grammar.tab.c"
	break;
	case 83:
	#line 805 "grammar.y"
	@@ -2472,6 +2526,7 @@
	free(yyval.declarator->text);
	yyval.declarator->text = xstrdup(buf);
	}
	+#line 2530 "grammar.tab.c"
	break;
	case 84:
	#line 812 "grammar.y"
	@@ -2482,6 +2537,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2541 "grammar.tab.c"
	break;
	case 85:
	#line 820 "grammar.y"
	@@ -2492,6 +2548,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_TRADITIONAL;
	}
	+#line 2552 "grammar.tab.c"
	break;
	case 86:
	#line 831 "grammar.y"
	@@ -2499,6 +2556,7 @@
	(void)sprintf(yyval.text.text, "%.s", TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	}
	+#line 2560 "grammar.tab.c"
	break;
	case 87:
	#line 836 "grammar.y"
	@@ -2506,6 +2564,7 @@
	(void)sprintf(yyval.text.text, "%.s%.*s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-2].text.begin;
	}
	+#line 2568 "grammar.tab.c"
	break;
	case 88:
	#line 844 "grammar.y"
	@@ -2513,6 +2572,7 @@
	strcpy(yyval.text.text, "");
	yyval.text.begin = 0L;
	}
	+#line 2576 "grammar.tab.c"
	break;
	case 90:
	#line 853 "grammar.y"
	@@ -2521,6 +2581,7 @@
	yyval.text.begin = yystack.l_mark[0].decl_spec.begin;
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 2585 "grammar.tab.c"
	break;
	case 91:
	#line 859 "grammar.y"
	@@ -2529,24 +2590,28 @@
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 2594 "grammar.tab.c"
	break;
	case 93:
	#line 869 "grammar.y"
	{
	add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, "...");
	}
	+#line 2601 "grammar.tab.c"
	break;
	case 94:
	#line 876 "grammar.y"
	{
	new_param_list(&yyval.param_list, yystack.l_mark[0].parameter);
	}
	+#line 2608 "grammar.tab.c"
	break;
	case 95:
	#line 880 "grammar.y"
	{
	add_param_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].parameter);
	}
	+#line 2615 "grammar.tab.c"
	break;
	case 96:
	#line 887 "grammar.y"
	@@ -2554,6 +2619,7 @@
	check_untagged(&yystack.l_mark[-1].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
	}
	+#line 2623 "grammar.tab.c"
	break;
	case 97:
	#line 892 "grammar.y"
	@@ -2561,6 +2627,7 @@
	check_untagged(&yystack.l_mark[-1].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
	}
	+#line 2631 "grammar.tab.c"
	break;
	case 98:
	#line 897 "grammar.y"
	@@ -2568,12 +2635,14 @@
	check_untagged(&yystack.l_mark[0].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[0].decl_spec, (Declarator *)0);
	}
	+#line 2639 "grammar.tab.c"
	break;
	case 99:
	#line 905 "grammar.y"
	{
	new_ident_list(&yyval.param_list);
	}
	+#line 2646 "grammar.tab.c"
	break;
	case 101:
	#line 913 "grammar.y"
	@@ -2581,18 +2650,21 @@
	new_ident_list(&yyval.param_list);
	add_ident_list(&yyval.param_list, &yyval.param_list, yystack.l_mark[0].text.text);
	}
	+#line 2654 "grammar.tab.c"
	break;
	case 102:
	#line 918 "grammar.y"
	{
	add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].text.text);
	}
	+#line 2661 "grammar.tab.c"
	break;
	case 103:
	#line 925 "grammar.y"
	{
	yyval.text = yystack.l_mark[0].text;
	}
	+#line 2668 "grammar.tab.c"
	break;
	case 104:
	#line 929 "grammar.y"
	@@ -2605,12 +2677,14 @@
	(void)sprintf(yyval.text.text, "&%.*s", TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	}
	+#line 2681 "grammar.tab.c"
	break;
	case 105:
	#line 942 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
	}
	+#line 2688 "grammar.tab.c"
	break;
	case 106:
	#line 946 "grammar.y"
	@@ -2621,6 +2695,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-1].text.begin;
	}
	+#line 2699 "grammar.tab.c"
	break;
	case 108:
	#line 958 "grammar.y"
	@@ -2631,6 +2706,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-2].text.begin;
	}
	+#line 2710 "grammar.tab.c"
	break;
	case 109:
	#line 966 "grammar.y"
	@@ -2640,12 +2716,14 @@
	free(yyval.declarator->text);
	yyval.declarator->text = xstrdup(buf);
	}
	+#line 2720 "grammar.tab.c"
	break;
	case 110:
	#line 973 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
	}
	+#line 2727 "grammar.tab.c"
	break;
	case 111:
	#line 977 "grammar.y"
	@@ -2656,6 +2734,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2738 "grammar.tab.c"
	break;
	case 112:
	#line 985 "grammar.y"
	@@ -2665,6 +2744,7 @@
	yyval.declarator->head = (yystack.l_mark[-2].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-2].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2748 "grammar.tab.c"
	break;
	case 113:
	#line 992 "grammar.y"
	@@ -2678,6 +2758,7 @@
	yyval.declarator->head = yyval.declarator;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2762 "grammar.tab.c"
	break;
	case 114:
	#line 1003 "grammar.y"
	@@ -2690,8 +2771,9 @@
	yyval.declarator->head = yyval.declarator;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2775 "grammar.tab.c"
	break;
	-#line 2695 "grammar.tab.c"
	+#line 2777 "grammar.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/help.error b/contrib/byacc/test/btyacc/help.error
	--- a/contrib/byacc/test/btyacc/help.error
	+++ b/contrib/byacc/test/btyacc/help.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/inherit0.tab.c b/contrib/byacc/test/btyacc/inherit0.tab.c
	--- a/contrib/byacc/test/btyacc/inherit0.tab.c
	+++ b/contrib/byacc/test/btyacc/inherit0.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -554,7 +554,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1065,48 +1065,59 @@
	case 1:
	#line 20 "inherit0.y"
	{ yyval = yystack.l_mark[0]; }
	+#line 1069 "inherit0.tab.c"
	break;
	case 2:
	#line 22 "inherit0.y"
	{ yyval = yystack.l_mark[0]; }
	+#line 1074 "inherit0.tab.c"
	break;
	case 3:
	#line 25 "inherit0.y"
	{ yyval = 1; }
	+#line 1079 "inherit0.tab.c"
	break;
	case 4:
	#line 26 "inherit0.y"
	{ yyval = 2; }
	+#line 1084 "inherit0.tab.c"
	break;
	case 5:
	#line 29 "inherit0.y"
	{ yyval = 1; }
	+#line 1089 "inherit0.tab.c"
	break;
	case 6:
	#line 30 "inherit0.y"
	{ yyval = 2; }
	+#line 1094 "inherit0.tab.c"
	break;
	case 7:
	#line 34 "inherit0.y"
	{ mksymbol(yystack.l_mark[-2], yystack.l_mark[-3], yystack.l_mark[0]); }
	+#line 1099 "inherit0.tab.c"
	break;
	case 8:
	#line 36 "inherit0.y"
	{ mksymbol(yystack.l_mark[-1], yystack.l_mark[-2], yystack.l_mark[0]); }
	+#line 1104 "inherit0.tab.c"
	break;
	case 9:
	#line 40 "inherit0.y"
	{ yyval = 2; }
	+#line 1109 "inherit0.tab.c"
	break;
	case 10:
	#line 41 "inherit0.y"
	{ yyval = yystack.l_mark[-2]; }
	+#line 1114 "inherit0.tab.c"
	break;
	case 11:
	#line 43 "inherit0.y"
	{ yyval = yystack.l_mark[0]; }
	+#line 1119 "inherit0.tab.c"
	break;
	-#line 1110 "inherit0.tab.c"
	+#line 1121 "inherit0.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/inherit1.tab.h b/contrib/byacc/test/btyacc/inherit1.tab.h
	--- a/contrib/byacc/test/btyacc/inherit1.tab.h
	+++ b/contrib/byacc/test/btyacc/inherit1.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/inherit1.tab.c b/contrib/byacc/test/btyacc/inherit1.tab.c
	--- a/contrib/byacc/test/btyacc/inherit1.tab.c
	+++ b/contrib/byacc/test/btyacc/inherit1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -145,7 +145,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 32 "inherit1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -575,7 +575,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1086,52 +1086,63 @@
	case 1:
	#line 44 "inherit1.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1090 "inherit1.tab.c"
	break;
	case 2:
	#line 46 "inherit1.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1095 "inherit1.tab.c"
	break;
	case 3:
	#line 49 "inherit1.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1100 "inherit1.tab.c"
	break;
	case 4:
	#line 50 "inherit1.y"
	{ yyval.cval = cLOCAL; }
	+#line 1105 "inherit1.tab.c"
	break;
	case 5:
	#line 53 "inherit1.y"
	{ yyval.tval = tREAL; }
	+#line 1110 "inherit1.tab.c"
	break;
	case 6:
	#line 54 "inherit1.y"
	{ yyval.tval = tINTEGER; }
	+#line 1115 "inherit1.tab.c"
	break;
	case 7:
	#line 58 "inherit1.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-3].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1122 "inherit1.tab.c"
	break;
	case 8:
	#line 62 "inherit1.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-1].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1129 "inherit1.tab.c"
	break;
	case 9:
	#line 68 "inherit1.y"
	{ yyval.cval = cLOCAL; }
	+#line 1134 "inherit1.tab.c"
	break;
	case 10:
	#line 69 "inherit1.y"
	{ yyval.tval = yystack.l_mark[-2].tval; }
	+#line 1139 "inherit1.tab.c"
	break;
	case 11:
	#line 71 "inherit1.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1144 "inherit1.tab.c"
	break;
	-#line 1135 "inherit1.tab.c"
	+#line 1146 "inherit1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/inherit2.tab.h b/contrib/byacc/test/btyacc/inherit2.tab.h
	--- a/contrib/byacc/test/btyacc/inherit2.tab.h
	+++ b/contrib/byacc/test/btyacc/inherit2.tab.h
	@@ -12,7 +12,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	diff --git a/contrib/byacc/test/btyacc/inherit2.tab.c b/contrib/byacc/test/btyacc/inherit2.tab.c
	--- a/contrib/byacc/test/btyacc/inherit2.tab.c
	+++ b/contrib/byacc/test/btyacc/inherit2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -143,7 +143,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 39 "inherit2.y"
	-typedef union
	+typedef union YYSTYPE
	{
	class cval;
	type tval;
	@@ -439,8 +439,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 443 "inherit2.tab.c"
	break;
	-#line 444 "inherit2.tab.c"
	case 264:
	#line 30 "inherit2.y"
	{
	@@ -451,8 +451,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 455 "inherit2.tab.c"
	break;
	-#line 456 "inherit2.tab.c"
	case 265:
	#line 30 "inherit2.y"
	{
	@@ -463,8 +463,8 @@
	free(pp->s); free(pp);
	}
	}
	+#line 467 "inherit2.tab.c"
	break;
	-#line 468 "inherit2.tab.c"
	}
	}
	#define YYDESTRUCT_IS_DECLARED 1
	@@ -630,7 +630,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1141,56 +1141,68 @@
	case 1:
	#line 50 "inherit2.y"
	yyval.cval = yystack.l_mark[-1].cval;
	+#line 1145 "inherit2.tab.c"
	break;
	case 2:
	#line 50 "inherit2.y"
	yyval.tval = yystack.l_mark[-1].tval;
	+#line 1150 "inherit2.tab.c"
	break;
	case 3:
	#line 51 "inherit2.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1155 "inherit2.tab.c"
	break;
	case 4:
	#line 53 "inherit2.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1160 "inherit2.tab.c"
	break;
	case 5:
	#line 56 "inherit2.y"
	{ yyval.cval = cGLOBAL; }
	+#line 1165 "inherit2.tab.c"
	break;
	case 6:
	#line 57 "inherit2.y"
	{ yyval.cval = cLOCAL; }
	+#line 1170 "inherit2.tab.c"
	break;
	case 7:
	#line 60 "inherit2.y"
	{ yyval.tval = tREAL; }
	+#line 1175 "inherit2.tab.c"
	break;
	case 8:
	#line 61 "inherit2.y"
	{ yyval.tval = tINTEGER; }
	+#line 1180 "inherit2.tab.c"
	break;
	case 9:
	#line 65 "inherit2.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-2].tval, yystack.l_mark[-3].cval, yystack.l_mark[0].id);
	yyval.nlist->next = yystack.l_mark[-1].nlist;
	}
	+#line 1187 "inherit2.tab.c"
	break;
	case 10:
	#line 69 "inherit2.y"
	{ yyval.nlist->s = mksymbol(yystack.l_mark[-1].tval, yystack.l_mark[-2].cval, yystack.l_mark[0].id);
	yyval.nlist->next = NULL;
	}
	+#line 1194 "inherit2.tab.c"
	break;
	case 11:
	#line 74 "inherit2.y"
	yyval.cval = cLOCAL;
	+#line 1199 "inherit2.tab.c"
	break;
	case 12:
	#line 75 "inherit2.y"
	{ yyval.nlist = yystack.l_mark[0].nlist; }
	+#line 1204 "inherit2.tab.c"
	break;
	-#line 1194 "inherit2.tab.c"
	+#line 1206 "inherit2.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/no_b_opt.error b/contrib/byacc/test/btyacc/no_b_opt.error
	--- a/contrib/byacc/test/btyacc/no_b_opt.error
	+++ b/contrib/byacc/test/btyacc/no_b_opt.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/no_output2.error b/contrib/byacc/test/btyacc/no_output2.error
	--- a/contrib/byacc/test/btyacc/no_output2.error
	+++ b/contrib/byacc/test/btyacc/no_output2.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/no_p_opt.error b/contrib/byacc/test/btyacc/no_p_opt.error
	--- a/contrib/byacc/test/btyacc/no_p_opt.error
	+++ b/contrib/byacc/test/btyacc/no_p_opt.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/nostdin.error b/contrib/byacc/test/btyacc/nostdin.error
	--- a/contrib/byacc/test/btyacc/nostdin.error
	+++ b/contrib/byacc/test/btyacc/nostdin.error
	@@ -4,6 +4,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -17,3 +18,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.h b/contrib/byacc/test/btyacc/ok_syntax1.tab.h
	--- a/contrib/byacc/test/btyacc/ok_syntax1.tab.h
	+++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.h
	@@ -23,7 +23,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	char * cval;
	int ival;
	diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.c b/contrib/byacc/test/btyacc/ok_syntax1.tab.c
	--- a/contrib/byacc/test/btyacc/ok_syntax1.tab.c
	+++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -137,7 +137,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 43 "ok_syntax1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	char * cval;
	int ival;
	@@ -719,7 +719,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1230,64 +1230,79 @@
	case 3:
	#line 66 "ok_syntax1.y"
	{ yyerrok ; }
	+#line 1234 "ok_syntax1.tab.c"
	break;
	case 4:
	#line 70 "ok_syntax1.y"
	{ printf("%d\n",yystack.l_mark[0].ival);}
	+#line 1239 "ok_syntax1.tab.c"
	break;
	case 5:
	#line 72 "ok_syntax1.y"
	{ regs[yystack.l_mark[-2].ival] = yystack.l_mark[0].ival; }
	+#line 1244 "ok_syntax1.tab.c"
	break;
	case 6:
	#line 76 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-1].ival; }
	+#line 1249 "ok_syntax1.tab.c"
	break;
	case 7:
	#line 78 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival + yystack.l_mark[0].ival; }
	+#line 1254 "ok_syntax1.tab.c"
	break;
	case 8:
	#line 80 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival - yystack.l_mark[0].ival; }
	+#line 1259 "ok_syntax1.tab.c"
	break;
	case 9:
	#line 82 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival * yystack.l_mark[0].ival; }
	+#line 1264 "ok_syntax1.tab.c"
	break;
	case 10:
	#line 84 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival / yystack.l_mark[0].ival; }
	+#line 1269 "ok_syntax1.tab.c"
	break;
	case 11:
	#line 86 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival % yystack.l_mark[0].ival; }
	+#line 1274 "ok_syntax1.tab.c"
	break;
	case 12:
	#line 88 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival & yystack.l_mark[0].ival; }
	+#line 1279 "ok_syntax1.tab.c"
	break;
	case 13:
	#line 90 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival \| yystack.l_mark[0].ival; }
	+#line 1284 "ok_syntax1.tab.c"
	break;
	case 14:
	#line 92 "ok_syntax1.y"
	{ yyval.ival = - yystack.l_mark[0].ival; }
	+#line 1289 "ok_syntax1.tab.c"
	break;
	case 15:
	#line 94 "ok_syntax1.y"
	{ yyval.ival = regs[yystack.l_mark[0].ival]; }
	+#line 1294 "ok_syntax1.tab.c"
	break;
	case 17:
	#line 99 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[0].ival; (*base) = (yystack.l_mark[0].ival==0) ? 8 : 10; }
	+#line 1299 "ok_syntax1.tab.c"
	break;
	case 18:
	#line 101 "ok_syntax1.y"
	{ yyval.ival = (base) yystack.l_mark[-1].ival + yystack.l_mark[0].ival; }
	+#line 1304 "ok_syntax1.tab.c"
	break;
	-#line 1291 "ok_syntax1.tab.c"
	+#line 1306 "ok_syntax1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/pure_calc.tab.c b/contrib/byacc/test/btyacc/pure_calc.tab.c
	--- a/contrib/byacc/test/btyacc/pure_calc.tab.c
	+++ b/contrib/byacc/test/btyacc/pure_calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -692,7 +692,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1203,64 +1203,79 @@
	case 3:
	#line 34 "pure_calc.y"
	{ yyerrok ; }
	+#line 1207 "pure_calc.tab.c"
	break;
	case 4:
	#line 38 "pure_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1212 "pure_calc.tab.c"
	break;
	case 5:
	#line 40 "pure_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1217 "pure_calc.tab.c"
	break;
	case 6:
	#line 44 "pure_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1222 "pure_calc.tab.c"
	break;
	case 7:
	#line 46 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1227 "pure_calc.tab.c"
	break;
	case 8:
	#line 48 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1232 "pure_calc.tab.c"
	break;
	case 9:
	#line 50 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1237 "pure_calc.tab.c"
	break;
	case 10:
	#line 52 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1242 "pure_calc.tab.c"
	break;
	case 11:
	#line 54 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1247 "pure_calc.tab.c"
	break;
	case 12:
	#line 56 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1252 "pure_calc.tab.c"
	break;
	case 13:
	#line 58 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1257 "pure_calc.tab.c"
	break;
	case 14:
	#line 60 "pure_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1262 "pure_calc.tab.c"
	break;
	case 15:
	#line 62 "pure_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1267 "pure_calc.tab.c"
	break;
	case 17:
	#line 67 "pure_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1272 "pure_calc.tab.c"
	break;
	case 18:
	#line 69 "pure_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1277 "pure_calc.tab.c"
	break;
	-#line 1264 "pure_calc.tab.c"
	+#line 1279 "pure_calc.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/pure_error.tab.c b/contrib/byacc/test/btyacc/pure_error.tab.c
	--- a/contrib/byacc/test/btyacc/pure_error.tab.c
	+++ b/contrib/byacc/test/btyacc/pure_error.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -560,7 +560,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/quote_calc-s.tab.c b/contrib/byacc/test/btyacc/quote_calc-s.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc-s.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -687,7 +687,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1198,64 +1198,79 @@
	case 3:
	#line 35 "quote_calc.y"
	{ yyerrok ; }
	+#line 1202 "quote_calc-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1207 "quote_calc-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1212 "quote_calc-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1217 "quote_calc-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1222 "quote_calc-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1227 "quote_calc-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1232 "quote_calc-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1237 "quote_calc-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1242 "quote_calc-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1247 "quote_calc-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1252 "quote_calc-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1257 "quote_calc-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1262 "quote_calc-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1267 "quote_calc-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1272 "quote_calc-s.tab.c"
	break;
	-#line 1259 "quote_calc-s.tab.c"
	+#line 1274 "quote_calc-s.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc.tab.c b/contrib/byacc/test/btyacc/quote_calc.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -693,7 +693,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1204,64 +1204,79 @@
	case 3:
	#line 35 "quote_calc.y"
	{ yyerrok ; }
	+#line 1208 "quote_calc.tab.c"
	break;
	case 4:
	#line 39 "quote_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1213 "quote_calc.tab.c"
	break;
	case 5:
	#line 41 "quote_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1218 "quote_calc.tab.c"
	break;
	case 6:
	#line 45 "quote_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1223 "quote_calc.tab.c"
	break;
	case 7:
	#line 47 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1228 "quote_calc.tab.c"
	break;
	case 8:
	#line 49 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1233 "quote_calc.tab.c"
	break;
	case 9:
	#line 51 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1238 "quote_calc.tab.c"
	break;
	case 10:
	#line 53 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1243 "quote_calc.tab.c"
	break;
	case 11:
	#line 55 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1248 "quote_calc.tab.c"
	break;
	case 12:
	#line 57 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1253 "quote_calc.tab.c"
	break;
	case 13:
	#line 59 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1258 "quote_calc.tab.c"
	break;
	case 14:
	#line 61 "quote_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1263 "quote_calc.tab.c"
	break;
	case 15:
	#line 63 "quote_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1268 "quote_calc.tab.c"
	break;
	case 17:
	#line 68 "quote_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1273 "quote_calc.tab.c"
	break;
	case 18:
	#line 70 "quote_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1278 "quote_calc.tab.c"
	break;
	-#line 1265 "quote_calc.tab.c"
	+#line 1280 "quote_calc.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc2-s.tab.c b/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -687,7 +687,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1198,64 +1198,79 @@
	case 3:
	#line 35 "quote_calc2.y"
	{ yyerrok ; }
	+#line 1202 "quote_calc2-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1207 "quote_calc2-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1212 "quote_calc2-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1217 "quote_calc2-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1222 "quote_calc2-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1227 "quote_calc2-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1232 "quote_calc2-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1237 "quote_calc2-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1242 "quote_calc2-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1247 "quote_calc2-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1252 "quote_calc2-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1257 "quote_calc2-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1262 "quote_calc2-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc2.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1267 "quote_calc2-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc2.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1272 "quote_calc2-s.tab.c"
	break;
	-#line 1259 "quote_calc2-s.tab.c"
	+#line 1274 "quote_calc2-s.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc2.tab.c b/contrib/byacc/test/btyacc/quote_calc2.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc2.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -693,7 +693,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1204,64 +1204,79 @@
	case 3:
	#line 35 "quote_calc2.y"
	{ yyerrok ; }
	+#line 1208 "quote_calc2.tab.c"
	break;
	case 4:
	#line 39 "quote_calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1213 "quote_calc2.tab.c"
	break;
	case 5:
	#line 41 "quote_calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1218 "quote_calc2.tab.c"
	break;
	case 6:
	#line 45 "quote_calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1223 "quote_calc2.tab.c"
	break;
	case 7:
	#line 47 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1228 "quote_calc2.tab.c"
	break;
	case 8:
	#line 49 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1233 "quote_calc2.tab.c"
	break;
	case 9:
	#line 51 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1238 "quote_calc2.tab.c"
	break;
	case 10:
	#line 53 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1243 "quote_calc2.tab.c"
	break;
	case 11:
	#line 55 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1248 "quote_calc2.tab.c"
	break;
	case 12:
	#line 57 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1253 "quote_calc2.tab.c"
	break;
	case 13:
	#line 59 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1258 "quote_calc2.tab.c"
	break;
	case 14:
	#line 61 "quote_calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1263 "quote_calc2.tab.c"
	break;
	case 15:
	#line 63 "quote_calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1268 "quote_calc2.tab.c"
	break;
	case 17:
	#line 68 "quote_calc2.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1273 "quote_calc2.tab.c"
	break;
	case 18:
	#line 70 "quote_calc2.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1278 "quote_calc2.tab.c"
	break;
	-#line 1265 "quote_calc2.tab.c"
	+#line 1280 "quote_calc2.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc3-s.tab.c b/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -688,7 +688,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1199,64 +1199,79 @@
	case 3:
	#line 35 "quote_calc3.y"
	{ yyerrok ; }
	+#line 1203 "quote_calc3-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1208 "quote_calc3-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1213 "quote_calc3-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1218 "quote_calc3-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1223 "quote_calc3-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1228 "quote_calc3-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1233 "quote_calc3-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1238 "quote_calc3-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1243 "quote_calc3-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1248 "quote_calc3-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1253 "quote_calc3-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1258 "quote_calc3-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1263 "quote_calc3-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc3.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1268 "quote_calc3-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc3.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1273 "quote_calc3-s.tab.c"
	break;
	-#line 1260 "quote_calc3-s.tab.c"
	+#line 1275 "quote_calc3-s.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc3.tab.c b/contrib/byacc/test/btyacc/quote_calc3.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc3.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -688,7 +688,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1199,64 +1199,79 @@
	case 3:
	#line 35 "quote_calc3.y"
	{ yyerrok ; }
	+#line 1203 "quote_calc3.tab.c"
	break;
	case 4:
	#line 39 "quote_calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1208 "quote_calc3.tab.c"
	break;
	case 5:
	#line 41 "quote_calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1213 "quote_calc3.tab.c"
	break;
	case 6:
	#line 45 "quote_calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1218 "quote_calc3.tab.c"
	break;
	case 7:
	#line 47 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1223 "quote_calc3.tab.c"
	break;
	case 8:
	#line 49 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1228 "quote_calc3.tab.c"
	break;
	case 9:
	#line 51 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1233 "quote_calc3.tab.c"
	break;
	case 10:
	#line 53 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1238 "quote_calc3.tab.c"
	break;
	case 11:
	#line 55 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1243 "quote_calc3.tab.c"
	break;
	case 12:
	#line 57 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1248 "quote_calc3.tab.c"
	break;
	case 13:
	#line 59 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1253 "quote_calc3.tab.c"
	break;
	case 14:
	#line 61 "quote_calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1258 "quote_calc3.tab.c"
	break;
	case 15:
	#line 63 "quote_calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1263 "quote_calc3.tab.c"
	break;
	case 17:
	#line 68 "quote_calc3.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1268 "quote_calc3.tab.c"
	break;
	case 18:
	#line 70 "quote_calc3.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1273 "quote_calc3.tab.c"
	break;
	-#line 1260 "quote_calc3.tab.c"
	+#line 1275 "quote_calc3.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc4-s.tab.c b/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -688,7 +688,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1199,64 +1199,79 @@
	case 3:
	#line 35 "quote_calc4.y"
	{ yyerrok ; }
	+#line 1203 "quote_calc4-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc4.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1208 "quote_calc4-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc4.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1213 "quote_calc4-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc4.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1218 "quote_calc4-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1223 "quote_calc4-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1228 "quote_calc4-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1233 "quote_calc4-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1238 "quote_calc4-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1243 "quote_calc4-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1248 "quote_calc4-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1253 "quote_calc4-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc4.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1258 "quote_calc4-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc4.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1263 "quote_calc4-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc4.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1268 "quote_calc4-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc4.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1273 "quote_calc4-s.tab.c"
	break;
	-#line 1260 "quote_calc4-s.tab.c"
	+#line 1275 "quote_calc4-s.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/quote_calc4.tab.c b/contrib/byacc/test/btyacc/quote_calc4.tab.c
	--- a/contrib/byacc/test/btyacc/quote_calc4.tab.c
	+++ b/contrib/byacc/test/btyacc/quote_calc4.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -688,7 +688,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1199,64 +1199,79 @@
	case 3:
	#line 35 "quote_calc4.y"
	{ yyerrok ; }
	+#line 1203 "quote_calc4.tab.c"
	break;
	case 4:
	#line 39 "quote_calc4.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1208 "quote_calc4.tab.c"
	break;
	case 5:
	#line 41 "quote_calc4.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1213 "quote_calc4.tab.c"
	break;
	case 6:
	#line 45 "quote_calc4.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1218 "quote_calc4.tab.c"
	break;
	case 7:
	#line 47 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1223 "quote_calc4.tab.c"
	break;
	case 8:
	#line 49 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1228 "quote_calc4.tab.c"
	break;
	case 9:
	#line 51 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1233 "quote_calc4.tab.c"
	break;
	case 10:
	#line 53 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1238 "quote_calc4.tab.c"
	break;
	case 11:
	#line 55 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1243 "quote_calc4.tab.c"
	break;
	case 12:
	#line 57 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1248 "quote_calc4.tab.c"
	break;
	case 13:
	#line 59 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1253 "quote_calc4.tab.c"
	break;
	case 14:
	#line 61 "quote_calc4.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1258 "quote_calc4.tab.c"
	break;
	case 15:
	#line 63 "quote_calc4.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1263 "quote_calc4.tab.c"
	break;
	case 17:
	#line 68 "quote_calc4.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1268 "quote_calc4.tab.c"
	break;
	case 18:
	#line 70 "quote_calc4.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1273 "quote_calc4.tab.c"
	break;
	-#line 1260 "quote_calc4.tab.c"
	+#line 1275 "quote_calc4.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/rename_debug.c b/contrib/byacc/test/btyacc/rename_debug.c
	--- a/contrib/byacc/test/btyacc/rename_debug.c
	+++ b/contrib/byacc/test/btyacc/rename_debug.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -398,7 +398,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/btyacc/stdin1.calc.c b/contrib/byacc/test/btyacc/stdin1.calc.c
	--- a/contrib/byacc/test/btyacc/stdin1.calc.c
	+++ b/contrib/byacc/test/btyacc/stdin1.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -576,7 +576,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1087,64 +1087,79 @@
	case 3:
	#line 28 "(null)"
	{ yyerrok ; }
	+#line 1091 "stdin1.calc.c"
	break;
	case 4:
	#line 32 "(null)"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1096 "stdin1.calc.c"
	break;
	case 5:
	#line 34 "(null)"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1101 "stdin1.calc.c"
	break;
	case 6:
	#line 38 "(null)"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1106 "stdin1.calc.c"
	break;
	case 7:
	#line 40 "(null)"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1111 "stdin1.calc.c"
	break;
	case 8:
	#line 42 "(null)"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1116 "stdin1.calc.c"
	break;
	case 9:
	#line 44 "(null)"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1121 "stdin1.calc.c"
	break;
	case 10:
	#line 46 "(null)"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1126 "stdin1.calc.c"
	break;
	case 11:
	#line 48 "(null)"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1131 "stdin1.calc.c"
	break;
	case 12:
	#line 50 "(null)"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1136 "stdin1.calc.c"
	break;
	case 13:
	#line 52 "(null)"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1141 "stdin1.calc.c"
	break;
	case 14:
	#line 54 "(null)"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1146 "stdin1.calc.c"
	break;
	case 15:
	#line 56 "(null)"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1151 "stdin1.calc.c"
	break;
	case 17:
	#line 61 "(null)"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1156 "stdin1.calc.c"
	break;
	case 18:
	#line 63 "(null)"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1161 "stdin1.calc.c"
	break;
	-#line 1148 "stdin1.calc.c"
	+#line 1163 "stdin1.calc.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/stdin2.calc.c b/contrib/byacc/test/btyacc/stdin2.calc.c
	--- a/contrib/byacc/test/btyacc/stdin2.calc.c
	+++ b/contrib/byacc/test/btyacc/stdin2.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -576,7 +576,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1087,64 +1087,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 1091 "stdin2.calc.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 1096 "stdin2.calc.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 1101 "stdin2.calc.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 1106 "stdin2.calc.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 1111 "stdin2.calc.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 1116 "stdin2.calc.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 1121 "stdin2.calc.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 1126 "stdin2.calc.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 1131 "stdin2.calc.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 1136 "stdin2.calc.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 1141 "stdin2.calc.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 1146 "stdin2.calc.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 1151 "stdin2.calc.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 1156 "stdin2.calc.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 1161 "stdin2.calc.c"
	break;
	-#line 1148 "stdin2.calc.c"
	+#line 1163 "stdin2.calc.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
	--- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
	+++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
	@@ -11,7 +11,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	int ival; /* dreg & vreg array index values*/
	double dval; /* floating point values*/
	diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
	--- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
	+++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -151,7 +151,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 32 "varsyntax_calc1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	int ival; /* dreg & vreg array index values*/
	double dval; /* floating point values*/
	@@ -814,7 +814,7 @@
	yyps->save = 0;
	#endif /* YYBTYACC */
	yym = 0;
	- yyn = 0;
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1327,78 +1327,91 @@
	{
	(void) printf("%15.8f\n", yystack.l_mark[-1].dval);
	}
	+#line 1331 "varsyntax_calc1.tab.c"
	break;
	case 4:
	#line 63 "varsyntax_calc1.y"
	{
	(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi);
	}
	+#line 1338 "varsyntax_calc1.tab.c"
	break;
	case 5:
	#line 67 "varsyntax_calc1.y"
	{
	dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval;
	}
	+#line 1345 "varsyntax_calc1.tab.c"
	break;
	case 6:
	#line 71 "varsyntax_calc1.y"
	{
	vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval;
	}
	+#line 1352 "varsyntax_calc1.tab.c"
	break;
	case 7:
	#line 75 "varsyntax_calc1.y"
	{
	yyerrok;
	}
	+#line 1359 "varsyntax_calc1.tab.c"
	break;
	case 9:
	#line 82 "varsyntax_calc1.y"
	{
	yyval.dval = dreg[yystack.l_mark[0].ival]; /* $$ & $1 are sufficient here*/
	}
	+#line 1366 "varsyntax_calc1.tab.c"
	break;
	case 10:
	#line 86 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
	}
	+#line 1373 "varsyntax_calc1.tab.c"
	break;
	case 11:
	#line 90 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
	}
	+#line 1380 "varsyntax_calc1.tab.c"
	break;
	case 12:
	#line 94 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
	}
	+#line 1387 "varsyntax_calc1.tab.c"
	break;
	case 13:
	#line 98 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
	}
	+#line 1394 "varsyntax_calc1.tab.c"
	break;
	case 14:
	#line 102 "varsyntax_calc1.y"
	{
	yyval.dval = -yystack.l_mark[0].dval;
	}
	+#line 1401 "varsyntax_calc1.tab.c"
	break;
	case 15:
	#line 106 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-1].dval;
	}
	+#line 1408 "varsyntax_calc1.tab.c"
	break;
	case 16:
	#line 112 "varsyntax_calc1.y"
	{
	yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
	}
	+#line 1415 "varsyntax_calc1.tab.c"
	break;
	case 17:
	#line 116 "varsyntax_calc1.y"
	@@ -1411,12 +1424,14 @@
	YYERROR;
	}
	}
	+#line 1428 "varsyntax_calc1.tab.c"
	break;
	case 18:
	#line 126 "varsyntax_calc1.y"
	{
	yyval.vval = vreg[yystack.l_mark[0].ival];
	}
	+#line 1435 "varsyntax_calc1.tab.c"
	break;
	case 19:
	#line 130 "varsyntax_calc1.y"
	@@ -1424,6 +1439,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
	}
	+#line 1443 "varsyntax_calc1.tab.c"
	break;
	case 20:
	#line 135 "varsyntax_calc1.y"
	@@ -1431,6 +1447,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
	}
	+#line 1451 "varsyntax_calc1.tab.c"
	break;
	case 21:
	#line 140 "varsyntax_calc1.y"
	@@ -1438,6 +1455,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
	}
	+#line 1459 "varsyntax_calc1.tab.c"
	break;
	case 22:
	#line 145 "varsyntax_calc1.y"
	@@ -1445,18 +1463,21 @@
	yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
	}
	+#line 1467 "varsyntax_calc1.tab.c"
	break;
	case 23:
	#line 150 "varsyntax_calc1.y"
	{
	yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1474 "varsyntax_calc1.tab.c"
	break;
	case 24:
	#line 154 "varsyntax_calc1.y"
	{
	yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1481 "varsyntax_calc1.tab.c"
	break;
	case 25:
	#line 158 "varsyntax_calc1.y"
	@@ -1464,6 +1485,7 @@
	if (dcheck(yystack.l_mark[0].vval)) YYERROR;
	yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 1489 "varsyntax_calc1.tab.c"
	break;
	case 26:
	#line 163 "varsyntax_calc1.y"
	@@ -1471,6 +1493,7 @@
	if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
	yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 1497 "varsyntax_calc1.tab.c"
	break;
	case 27:
	#line 168 "varsyntax_calc1.y"
	@@ -1478,14 +1501,16 @@
	yyval.vval.hi = -yystack.l_mark[0].vval.lo;
	yyval.vval.lo = -yystack.l_mark[0].vval.hi;
	}
	+#line 1505 "varsyntax_calc1.tab.c"
	break;
	case 28:
	#line 173 "varsyntax_calc1.y"
	{
	yyval.vval = yystack.l_mark[-1].vval;
	}
	+#line 1512 "varsyntax_calc1.tab.c"
	break;
	-#line 1489 "varsyntax_calc1.tab.c"
	+#line 1514 "varsyntax_calc1.tab.c"
	default:
	break;
	}
	diff --git a/contrib/byacc/test/expr.oxout.y b/contrib/byacc/test/expr.oxout.y
	--- a/contrib/byacc/test/expr.oxout.y
	+++ b/contrib/byacc/test/expr.oxout.y
	@@ -183,8 +183,8 @@


	void yyyHandleOverflow(char which)
	- {char msg1,msg2;
	- long oldSize,newSize;
	+ {char msg1 = "?", msg2;
	+ long oldSize = 0, newSize;
	switch(which)
	{
	case yyySSALof :
	@@ -491,7 +491,7 @@
	}
	if (yyyCond(2) != yyyPass) {
	#line 23 "expr.Y"
	- printf("postfix: ")/* missing ; */
	+ printf("postfix: ");

	#line 497 "expr.oxout.y"
	}
	@@ -793,11 +793,11 @@
	static int yyyInitDone = 0;
	if (yyyInitDone) return;

	- if ((yyyRS = (struct yyyRSitem *)
	- calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(struct yyyRSitem))
	+ if ((yyyRS = (yyyRSitem *)
	+ calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(yyyRSitem))
	)
	==
	- ((struct yyyRSitem *) NULL)
	+ ((yyyRSitem *) NULL)
	)
	yyyfatal("malloc error in ox ready set space allocation\n");
	yyyRS++;
	@@ -852,7 +852,7 @@
	(yyyRCT *) calloc((size_t)yyyNattrbs, (size_t)sizeof(yyyRCT));
	if ((yyyOxStackItem)->node->refCountList == (yyyRCT ) NULL)
	yyyfatal("malloc error in ox reference count list space allocation\n");
	- (*yyyOxStackItem)->node->prodNum = yyyProdNum;
	+ (*yyyOxStackItem)->node->prodNum = (int) yyyProdNum;
	va_start(ap, yyval_OxAttrbs);
	for (i=1;i<=yyyRHSlength;i++)
	{yyySIT yaccStDum = va_arg(ap,struct yyyOxAttrbs )->yyyOxStackItem;
	@@ -953,9 +953,9 @@



	-void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *yylval)
	+void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *mylval)
	{yyyRCT *rcPdum;
	- yyySIT **yyyOxStackItem = &yylval->yyyOxAttrbs.yyyOxStackItem;
	+ yyySIT **yyyOxStackItem = &mylval->yyyOxAttrbs.yyyOxStackItem;
	(yyyOxStackItem) = (yyySIT ) malloc((size_t)sizeof(yyySIT));
	if ((yyyOxStackItem) == (yyySIT ) NULL)
	yyyfatal("malloc error in ox yacc semantic stack space allocation\n");
	diff --git a/contrib/byacc/test/run_lint.sh b/contrib/byacc/test/run_lint.sh
	--- a/contrib/byacc/test/run_lint.sh
	+++ b/contrib/byacc/test/run_lint.sh
	@@ -1,5 +1,5 @@
	#!/bin/sh
	-# $Id: run_lint.sh,v 1.3 2014/03/28 23:40:27 tom Exp $
	+# $Id: run_lint.sh,v 1.5 2022/11/06 20:56:42 tom Exp $
	# vi:ts=4 sw=4:

	# run lint on each of the ".c" files in the test directory
	@@ -13,16 +13,17 @@
	TEST_DIR=.
	fi

	-ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`
	+: "${FGREP:=grep -F}"
	+ifBTYACC=`$FGREP -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`

	-if test $ifBTYACC = 0; then
	+if test "$ifBTYACC" = 0; then
	REF_DIR=${TEST_DIR}/yacc
	else
	REF_DIR=${TEST_DIR}/btyacc
	fi

	-echo '** '`date`
	+echo "** `date`"
	for i in ${REF_DIR}/*.c
	do
	- make -f $PROG_DIR/makefile lint C_FILES=$i srcdir=$PROG_DIR
	+ make -f $PROG_DIR/makefile lint C_FILES="$i" srcdir="$PROG_DIR"
	done
	diff --git a/contrib/byacc/test/run_make.sh b/contrib/byacc/test/run_make.sh
	--- a/contrib/byacc/test/run_make.sh
	+++ b/contrib/byacc/test/run_make.sh
	@@ -1,5 +1,5 @@
	#!/bin/sh
	-# $Id: run_make.sh,v 1.18 2019/11/25 23:23:26 tom Exp $
	+# $Id: run_make.sh,v 1.21 2022/11/06 20:57:33 tom Exp $
	# vi:ts=4 sw=4:

	# do a test-compile on each of the ".c" files in the test-directory
	@@ -16,9 +16,10 @@
	fi
	THIS_DIR=`pwd`

	-ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`
	+: "${FGREP:=grep -F}"
	+ifBTYACC=`$FGREP -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`

	-if test $ifBTYACC = 0; then
	+if test "$ifBTYACC" = 0; then
	REF_DIR=${TEST_DIR}/yacc
	else
	REF_DIR=${TEST_DIR}/btyacc
	@@ -30,13 +31,15 @@
	C_FILE=`basename "$1"`
	O_FILE=`basename "$C_FILE" .c`.o
	shift
	- cd $REF_DIR
	- make -f $PROG_DIR/makefile srcdir=$PROG_DIR $O_FILE $*
	- test -f $O_FILE && rm $O_FILE
	- cd $THIS_DIR
	+ RETEST=`unset CDPATH; cd $TEST_DIR; pwd`
	+ cd "$REF_DIR"
	+ test -f "$I_FILE" && rm "$I_FILE"
	+ make -f "$PROG_DIR/makefile" EXTRA_CFLAGS=-I$RETEST srcdir="$PROG_DIR" "$O_FILE" "$@"
	+ test -f "$O_FILE" && rm "$O_FILE"
	+ cd "$THIS_DIR"
	}

	-echo '** '`date`
	+echo "** `date`"
	echo "** program is in $PROG_DIR"
	echo "** test-files in $REF_DIR"

	@@ -97,14 +100,14 @@

	case $input in
	${TEST_DIR}/pure_*)
	- if test -z `fgrep -i -l '%pure-parser' $input`
	+ if test -z "`$FGREP -i -l '%pure-parser' "$input"`"
	then
	echo "%pure-parser" >>run_make.y
	fi
	;;
	esac

	- sed -e '/^%expect/s,%expect.*,,' $input >>run_make.y
	+ sed -e '/^%expect/s,%expect.*,,' "$input" >>run_make.y

	case $BISON in
	[3-9].[0-9].[0-9])
	@@ -116,7 +119,7 @@
	esac
	if test -f "y.tab.c"
	then
	- sed -e '/^#line/s,"run_make.y","'$input'",' y.tab.c >run_make.c
	+ sed -e '/^#line/s,"run_make.y","'"$input"'",' y.tab.c >run_make.c

	rm -f y.tab.c

	@@ -158,11 +161,11 @@
	continue;
	;;
	*)
	- if fgrep -i '%pure-parser' $input >/dev/null \|\|
	- fgrep -i '%parse-param' $input >/dev/null \|\|
	- fgrep -i '%lex-param' $input >/dev/null \|\|
	- fgrep -i '%token-table' $input >/dev/null \|\|
	- fgrep 'YYLEX_PARAM' $input >/dev/null
	+ if $FGREP -i '%pure-parser' "$input" >/dev/null \|\|
	+ $FGREP -i '%parse-param' "$input" >/dev/null \|\|
	+ $FGREP -i '%lex-param' "$input" >/dev/null \|\|
	+ $FGREP -i '%token-table' "$input" >/dev/null \|\|
	+ $FGREP 'YYLEX_PARAM' "$input" >/dev/null
	then
	echo "... skipping $input"
	continue;
	@@ -170,12 +173,12 @@
	;;
	esac

	- sed -e '/^%expect/s,%expect.*,,' $input >>run_make.y
	+ sed -e '/^%expect/s,%expect.*,,' "$input" >>run_make.y

	$YACC run_make.y
	if test -f y.tab.c
	then
	- sed -e '/^#line/s,"run_make.y","'$input'",' y.tab.c >run_make.c
	+ sed -e '/^#line/s,"run_make.y","'"$input"'",' y.tab.c >run_make.c

	rm -f y.tab.c

	diff --git a/contrib/byacc/test/run_test.sh b/contrib/byacc/test/run_test.sh
	--- a/contrib/byacc/test/run_test.sh
	+++ b/contrib/byacc/test/run_test.sh
	@@ -1,5 +1,5 @@
	#!/bin/sh
	-# $Id: run_test.sh,v 1.31 2019/11/03 23:44:07 tom Exp $
	+# $Id: run_test.sh,v 1.37 2022/11/06 21:55:25 tom Exp $
	# vi:ts=4 sw=4:

	errors=0
	@@ -8,36 +8,38 @@
	# REF is the reference file against which to compare
	test_diffs() {
	# echo "...test_diffs $NEW vs $REF"
	- mv -f $NEW ${REF_DIR}/
	+ mv -f "$NEW" "${REF_DIR}/"
	CMP=${REF_DIR}/${NEW}
	- if test ! -f $CMP
	+ if test ! -f "$CMP"
	then
	echo "...not found $CMP"
	errors=1
	else
	- sed -e s,$NEW,$REF, \
	+ sed -e "s,$NEW,$REF," \
	-e "s%$YACC_escaped%YACC%" \
	-e "s%^yacc\>%YACC%" \
	-e "s%YACC:.option.$%YACC: error message%" \
	+ -e "s%yacc:.option.$%YACC: error message%" \
	-e "s%^Usage: yacc\>%Usage: YACC%" \
	-e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \
	-e '/#define YYPATCH/s/PATCH/CHECK/' \
	- -e 's,#line $[1-9][0-9]*$ "'$REF_DIR'/,#line \1 ",' \
	- -e 's,#line $[1-9][0-9]*$ "'$TEST_DIR'/,#line \1 ",' \
	- -e 's,$YACC:.* line [0-9][0-9]* of "$'$TEST_DIR/',\1./,' \
	- < $CMP >$tmpfile \
	- && mv $tmpfile $CMP
	- if test ! -f $REF
	+ -e 's,#line $[1-9][0-9]*$ "'"$REF_DIR"'/,#line \1 ",' \
	+ -e 's,#line $[1-9][0-9]*$ "'"$TEST_DIR"'/,#line \1 ",' \
	+ -e 's/^typedef $short\\|long$ YYINT;$/typedef int YYINT;/' \
	+ -e 's,$YACC:.* line [0-9][0-9]* of "$'"$TEST_DIR/"',\1./,' \
	+ < "$CMP" >"$tmpfile" \
	+ && mv "$tmpfile" "$CMP"
	+ if test ! -f "$REF"
	then
	- mv $CMP $REF
	+ mv "$CMP" "$REF"
	echo "...saved $REF"
	- elif ( cmp -s $REF $CMP )
	+ elif ( cmp -s "$REF" "$CMP" )
	then
	echo "...ok $REF"
	- rm -f $CMP
	+ rm -f "$CMP"
	else
	echo "...diff $REF"
	- diff -u $REF $CMP
	+ diff -c "$REF" "$CMP"
	errors=1
	fi
	fi
	@@ -48,7 +50,7 @@
	root=$1
	ROOT=test-$root
	shift 1
	- $YACC "$@" >$ROOT.output 2>$ROOT.error
	+ $YACC "$@" >"$ROOT.output" 2>"$ROOT.error"
	for type in .output .error
	do
	NEW=$ROOT$type
	@@ -67,9 +69,9 @@
	code=`echo "$1"\|sed -e 's/y$/c/' -e "s,${TEST_DIR}/,,"`
	if test "x$opts" = "x-"
	then
	- $YACC -o $ROOT.$code $opts <$1 >$ROOT.output 2>$ROOT.error
	+ $YACC -o "$ROOT.$code" $opts <$1 >"$ROOT.output" 2>"$ROOT.error"
	else
	- $YACC -o $ROOT.$code $opts $1 >$ROOT.output 2>$ROOT.error
	+ $YACC -o "$ROOT.$code" $opts $1 >"$ROOT.output" 2>"$ROOT.error"
	fi
	for type in .output .error .$code
	do
	@@ -92,12 +94,12 @@
	done
	head=`echo "$1"\|sed -e 's/y$/h/' -e "s,${TEST_DIR}/,,"`
	code=`echo "$1"\|sed -e 's/y$/c/' -e "s,${TEST_DIR}/,,"`
	- $YACC $opts -H $ROOT.$head $1 >$ROOT.output 2>$ROOT.error
	+ $YACC $opts -H "$ROOT.$head" $1 >"$ROOT.output" 2>"$ROOT.error"
	for name in prefix.tab.c y.tab.c
	do
	if test -f $name
	then
	- mv $name $ROOT.$code
	+ mv "$name" "$ROOT.$code"
	break
	fi
	done
	@@ -125,9 +127,10 @@

	tmpfile=temp$$

	-ifBTYACC=`fgrep -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?`
	+: "${FGREP:=grep -F}"
	+ifBTYACC=`$FGREP -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?`

	-if test $ifBTYACC = 0; then
	+if test "$ifBTYACC" = 0; then
	REF_DIR=${TEST_DIR}/yacc
	else
	REF_DIR=${TEST_DIR}/btyacc
	@@ -135,7 +138,7 @@

	rm -f ${REF_DIR}/test-*

	-echo '** '`date`
	+echo "** `date`"

	# Tests which do not need files
	MYFILE=nosuchfile
	@@ -200,16 +203,16 @@
	test_defines defines2 -d ${TEST_DIR}/calc.y
	test_defines defines3 -b prefix ${TEST_DIR}/calc.y

	-for input in ${TEST_DIR}/*.y
	+for input in "${TEST_DIR}"/*.y
	do
	case $input in
	test-*)
	echo "?? ignored $input"
	;;
	*)
	- root=`basename $input .y`
	+ root=`basename "$input" .y`
	ROOT="test-$root"
	- prefix=${root}_
	+ prefix=`echo "${root}_" \| sed -e 's/[.]/_/g'`

	OPTS=
	OPT2=
	@@ -217,7 +220,7 @@
	TYPE=".error .output .tab.c .tab.h"
	case $input in
	${TEST_DIR}/btyacc_*)
	- if test $ifBTYACC = 0; then continue; fi
	+ if test "$ifBTYACC" = 0; then continue; fi
	OPTS="$OPTS -B"
	prefix=`echo "$prefix" \| sed -e 's/^btyacc_//'`
	;;
	@@ -245,7 +248,7 @@
	;;
	${TEST_DIR}/inherit*\|\
	${TEST_DIR}/err_inherit*)
	- if test $ifBTYACC = 0; then continue; fi
	+ if test "$ifBTYACC" = 0; then continue; fi
	;;
	esac

	@@ -259,12 +262,12 @@
	if test -n "$output"
	then
	output="-o $output"
	- error=`basename $OOPT .c`.error
	+ error=`basename "$OOPT" .c`.error
	else
	error=${ROOT}${opt2}.error
	fi

	- $YACC $OPTS $opt2 -v -d $output $prefix -b $ROOT${opt2} $input 2>$error
	+ $YACC $OPTS $opt2 -v -d $output $prefix -b "$ROOT${opt2}" "$input" 2>"$error"
	for type in $TYPE
	do
	REF=${REF_DIR}/${root}${opt2}${type}
	@@ -282,7 +285,7 @@
	*)
	;;
	esac
	- NEW=`basename $OOPT .c`${type}
	+ NEW=`basename "$OOPT" .c`${type}
	case $NEW in
	test-*)
	;;
	@@ -290,13 +293,13 @@
	if test -f "$NEW"
	then
	REF=${REF_DIR}/$NEW
	- mv $NEW test-$NEW
	- NEW=test-$NEW
	+ mv "$NEW" "test-$NEW"
	+ NEW="test-$NEW"
	fi
	;;
	esac
	else
	- NEW=${ROOT}${opt2}${type}
	+ NEW="${ROOT}${opt2}${type}"
	fi
	test_diffs
	done
	diff --git a/contrib/byacc/test/yacc/big_b.error b/contrib/byacc/test/yacc/big_b.error
	--- a/contrib/byacc/test/yacc/big_b.error
	+++ b/contrib/byacc/test/yacc/big_b.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/big_l.error b/contrib/byacc/test/yacc/big_l.error
	--- a/contrib/byacc/test/yacc/big_l.error
	+++ b/contrib/byacc/test/yacc/big_l.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/calc.tab.c b/contrib/byacc/test/yacc/calc.tab.c
	--- a/contrib/byacc/test/yacc/calc.tab.c
	+++ b/contrib/byacc/test/yacc/calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -427,8 +427,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -554,64 +554,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 558 "calc.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 563 "calc.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 568 "calc.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 573 "calc.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 578 "calc.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 583 "calc.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 588 "calc.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 593 "calc.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 598 "calc.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 603 "calc.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 608 "calc.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 613 "calc.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 618 "calc.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 623 "calc.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 628 "calc.tab.c"
	break;
	-#line 615 "calc.tab.c"
	+#line 630 "calc.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc1.tab.h b/contrib/byacc/test/yacc/calc1.tab.h
	--- a/contrib/byacc/test/yacc/calc1.tab.h
	+++ b/contrib/byacc/test/yacc/calc1.tab.h
	@@ -8,7 +8,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	diff --git a/contrib/byacc/test/yacc/calc1.tab.c b/contrib/byacc/test/yacc/calc1.tab.c
	--- a/contrib/byacc/test/yacc/calc1.tab.c
	+++ b/contrib/byacc/test/yacc/calc1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -130,7 +130,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 31 "calc1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	int ival;
	double dval;
	@@ -564,8 +564,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -693,78 +693,91 @@
	{
	(void) printf("%15.8f\n", yystack.l_mark[-1].dval);
	}
	+#line 697 "calc1.tab.c"
	break;
	case 4:
	#line 61 "calc1.y"
	{
	(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi);
	}
	+#line 704 "calc1.tab.c"
	break;
	case 5:
	#line 65 "calc1.y"
	{
	dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval;
	}
	+#line 711 "calc1.tab.c"
	break;
	case 6:
	#line 69 "calc1.y"
	{
	vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval;
	}
	+#line 718 "calc1.tab.c"
	break;
	case 7:
	#line 73 "calc1.y"
	{
	yyerrok;
	}
	+#line 725 "calc1.tab.c"
	break;
	case 9:
	#line 80 "calc1.y"
	{
	yyval.dval = dreg[yystack.l_mark[0].ival];
	}
	+#line 732 "calc1.tab.c"
	break;
	case 10:
	#line 84 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
	}
	+#line 739 "calc1.tab.c"
	break;
	case 11:
	#line 88 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
	}
	+#line 746 "calc1.tab.c"
	break;
	case 12:
	#line 92 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
	}
	+#line 753 "calc1.tab.c"
	break;
	case 13:
	#line 96 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
	}
	+#line 760 "calc1.tab.c"
	break;
	case 14:
	#line 100 "calc1.y"
	{
	yyval.dval = -yystack.l_mark[0].dval;
	}
	+#line 767 "calc1.tab.c"
	break;
	case 15:
	#line 104 "calc1.y"
	{
	yyval.dval = yystack.l_mark[-1].dval;
	}
	+#line 774 "calc1.tab.c"
	break;
	case 16:
	#line 110 "calc1.y"
	{
	yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
	}
	+#line 781 "calc1.tab.c"
	break;
	case 17:
	#line 114 "calc1.y"
	@@ -777,12 +790,14 @@
	YYERROR;
	}
	}
	+#line 794 "calc1.tab.c"
	break;
	case 18:
	#line 124 "calc1.y"
	{
	yyval.vval = vreg[yystack.l_mark[0].ival];
	}
	+#line 801 "calc1.tab.c"
	break;
	case 19:
	#line 128 "calc1.y"
	@@ -790,6 +805,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
	}
	+#line 809 "calc1.tab.c"
	break;
	case 20:
	#line 133 "calc1.y"
	@@ -797,6 +813,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
	}
	+#line 817 "calc1.tab.c"
	break;
	case 21:
	#line 138 "calc1.y"
	@@ -804,6 +821,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
	}
	+#line 825 "calc1.tab.c"
	break;
	case 22:
	#line 143 "calc1.y"
	@@ -811,18 +829,21 @@
	yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
	}
	+#line 833 "calc1.tab.c"
	break;
	case 23:
	#line 148 "calc1.y"
	{
	yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 840 "calc1.tab.c"
	break;
	case 24:
	#line 152 "calc1.y"
	{
	yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 847 "calc1.tab.c"
	break;
	case 25:
	#line 156 "calc1.y"
	@@ -830,6 +851,7 @@
	if (dcheck(yystack.l_mark[0].vval)) YYERROR;
	yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 855 "calc1.tab.c"
	break;
	case 26:
	#line 161 "calc1.y"
	@@ -837,6 +859,7 @@
	if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
	yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 863 "calc1.tab.c"
	break;
	case 27:
	#line 166 "calc1.y"
	@@ -844,14 +867,16 @@
	yyval.vval.hi = -yystack.l_mark[0].vval.lo;
	yyval.vval.lo = -yystack.l_mark[0].vval.hi;
	}
	+#line 871 "calc1.tab.c"
	break;
	case 28:
	#line 171 "calc1.y"
	{
	yyval.vval = yystack.l_mark[-1].vval;
	}
	+#line 878 "calc1.tab.c"
	break;
	-#line 855 "calc1.tab.c"
	+#line 880 "calc1.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc2.tab.c b/contrib/byacc/test/yacc/calc2.tab.c
	--- a/contrib/byacc/test/yacc/calc2.tab.c
	+++ b/contrib/byacc/test/yacc/calc2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -440,8 +440,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -567,64 +567,79 @@
	case 3:
	#line 35 "calc2.y"
	{ yyerrok ; }
	+#line 571 "calc2.tab.c"
	break;
	case 4:
	#line 39 "calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 576 "calc2.tab.c"
	break;
	case 5:
	#line 41 "calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 581 "calc2.tab.c"
	break;
	case 6:
	#line 45 "calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 586 "calc2.tab.c"
	break;
	case 7:
	#line 47 "calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 591 "calc2.tab.c"
	break;
	case 8:
	#line 49 "calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 596 "calc2.tab.c"
	break;
	case 9:
	#line 51 "calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 601 "calc2.tab.c"
	break;
	case 10:
	#line 53 "calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 606 "calc2.tab.c"
	break;
	case 11:
	#line 55 "calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 611 "calc2.tab.c"
	break;
	case 12:
	#line 57 "calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 616 "calc2.tab.c"
	break;
	case 13:
	#line 59 "calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 621 "calc2.tab.c"
	break;
	case 14:
	#line 61 "calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 626 "calc2.tab.c"
	break;
	case 15:
	#line 63 "calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 631 "calc2.tab.c"
	break;
	case 17:
	#line 68 "calc2.y"
	{ yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 636 "calc2.tab.c"
	break;
	case 18:
	#line 70 "calc2.y"
	{ yyval = (base) yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 641 "calc2.tab.c"
	break;
	-#line 628 "calc2.tab.c"
	+#line 643 "calc2.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc3.tab.c b/contrib/byacc/test/yacc/calc3.tab.c
	--- a/contrib/byacc/test/yacc/calc3.tab.c
	+++ b/contrib/byacc/test/yacc/calc3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -448,8 +448,8 @@
	memset(&yyval, 0, sizeof(yyval));
	memset(&yylval, 0, sizeof(yylval));

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -575,64 +575,79 @@
	case 3:
	#line 38 "calc3.y"
	{ yyerrok ; }
	+#line 579 "calc3.tab.c"
	break;
	case 4:
	#line 42 "calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 584 "calc3.tab.c"
	break;
	case 5:
	#line 44 "calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 589 "calc3.tab.c"
	break;
	case 6:
	#line 48 "calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 594 "calc3.tab.c"
	break;
	case 7:
	#line 50 "calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 599 "calc3.tab.c"
	break;
	case 8:
	#line 52 "calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 604 "calc3.tab.c"
	break;
	case 9:
	#line 54 "calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 609 "calc3.tab.c"
	break;
	case 10:
	#line 56 "calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 614 "calc3.tab.c"
	break;
	case 11:
	#line 58 "calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 619 "calc3.tab.c"
	break;
	case 12:
	#line 60 "calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 624 "calc3.tab.c"
	break;
	case 13:
	#line 62 "calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 629 "calc3.tab.c"
	break;
	case 14:
	#line 64 "calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 634 "calc3.tab.c"
	break;
	case 15:
	#line 66 "calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 639 "calc3.tab.c"
	break;
	case 17:
	#line 71 "calc3.y"
	{ yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 644 "calc3.tab.c"
	break;
	case 18:
	#line 73 "calc3.y"
	{ yyval = (base) yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 649 "calc3.tab.c"
	break;
	-#line 636 "calc3.tab.c"
	+#line 651 "calc3.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_all.tab.c b/contrib/byacc/test/yacc/calc_code_all.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_all.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_all.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -455,8 +455,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -582,64 +582,79 @@
	case 3:
	#line 35 "calc_code_all.y"
	{ yyerrok ; }
	+#line 586 "calc_code_all.tab.c"
	break;
	case 4:
	#line 39 "calc_code_all.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 591 "calc_code_all.tab.c"
	break;
	case 5:
	#line 41 "calc_code_all.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 596 "calc_code_all.tab.c"
	break;
	case 6:
	#line 45 "calc_code_all.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 601 "calc_code_all.tab.c"
	break;
	case 7:
	#line 47 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 606 "calc_code_all.tab.c"
	break;
	case 8:
	#line 49 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 611 "calc_code_all.tab.c"
	break;
	case 9:
	#line 51 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 616 "calc_code_all.tab.c"
	break;
	case 10:
	#line 53 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 621 "calc_code_all.tab.c"
	break;
	case 11:
	#line 55 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 626 "calc_code_all.tab.c"
	break;
	case 12:
	#line 57 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 631 "calc_code_all.tab.c"
	break;
	case 13:
	#line 59 "calc_code_all.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 636 "calc_code_all.tab.c"
	break;
	case 14:
	#line 61 "calc_code_all.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 641 "calc_code_all.tab.c"
	break;
	case 15:
	#line 63 "calc_code_all.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 646 "calc_code_all.tab.c"
	break;
	case 17:
	#line 68 "calc_code_all.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 651 "calc_code_all.tab.c"
	break;
	case 18:
	#line 70 "calc_code_all.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 656 "calc_code_all.tab.c"
	break;
	-#line 643 "calc_code_all.tab.c"
	+#line 658 "calc_code_all.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_default.tab.c b/contrib/byacc/test/yacc/calc_code_default.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_default.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_default.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -435,8 +435,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -562,64 +562,79 @@
	case 3:
	#line 31 "calc_code_default.y"
	{ yyerrok ; }
	+#line 566 "calc_code_default.tab.c"
	break;
	case 4:
	#line 35 "calc_code_default.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 571 "calc_code_default.tab.c"
	break;
	case 5:
	#line 37 "calc_code_default.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 576 "calc_code_default.tab.c"
	break;
	case 6:
	#line 41 "calc_code_default.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 581 "calc_code_default.tab.c"
	break;
	case 7:
	#line 43 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 586 "calc_code_default.tab.c"
	break;
	case 8:
	#line 45 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 591 "calc_code_default.tab.c"
	break;
	case 9:
	#line 47 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 596 "calc_code_default.tab.c"
	break;
	case 10:
	#line 49 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 601 "calc_code_default.tab.c"
	break;
	case 11:
	#line 51 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 606 "calc_code_default.tab.c"
	break;
	case 12:
	#line 53 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 611 "calc_code_default.tab.c"
	break;
	case 13:
	#line 55 "calc_code_default.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 616 "calc_code_default.tab.c"
	break;
	case 14:
	#line 57 "calc_code_default.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 621 "calc_code_default.tab.c"
	break;
	case 15:
	#line 59 "calc_code_default.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 626 "calc_code_default.tab.c"
	break;
	case 17:
	#line 64 "calc_code_default.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 631 "calc_code_default.tab.c"
	break;
	case 18:
	#line 66 "calc_code_default.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 636 "calc_code_default.tab.c"
	break;
	-#line 623 "calc_code_default.tab.c"
	+#line 638 "calc_code_default.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_imports.tab.c b/contrib/byacc/test/yacc/calc_code_imports.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_imports.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_imports.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -427,8 +427,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -554,64 +554,79 @@
	case 3:
	#line 31 "calc_code_imports.y"
	{ yyerrok ; }
	+#line 558 "calc_code_imports.tab.c"
	break;
	case 4:
	#line 35 "calc_code_imports.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 563 "calc_code_imports.tab.c"
	break;
	case 5:
	#line 37 "calc_code_imports.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 568 "calc_code_imports.tab.c"
	break;
	case 6:
	#line 41 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 573 "calc_code_imports.tab.c"
	break;
	case 7:
	#line 43 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 578 "calc_code_imports.tab.c"
	break;
	case 8:
	#line 45 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 583 "calc_code_imports.tab.c"
	break;
	case 9:
	#line 47 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 588 "calc_code_imports.tab.c"
	break;
	case 10:
	#line 49 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 593 "calc_code_imports.tab.c"
	break;
	case 11:
	#line 51 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 598 "calc_code_imports.tab.c"
	break;
	case 12:
	#line 53 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 603 "calc_code_imports.tab.c"
	break;
	case 13:
	#line 55 "calc_code_imports.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 608 "calc_code_imports.tab.c"
	break;
	case 14:
	#line 57 "calc_code_imports.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 613 "calc_code_imports.tab.c"
	break;
	case 15:
	#line 59 "calc_code_imports.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 618 "calc_code_imports.tab.c"
	break;
	case 17:
	#line 64 "calc_code_imports.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 623 "calc_code_imports.tab.c"
	break;
	case 18:
	#line 66 "calc_code_imports.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 628 "calc_code_imports.tab.c"
	break;
	-#line 615 "calc_code_imports.tab.c"
	+#line 630 "calc_code_imports.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_provides.tab.c b/contrib/byacc/test/yacc/calc_code_provides.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_provides.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_provides.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -435,8 +435,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -562,64 +562,79 @@
	case 3:
	#line 31 "calc_code_provides.y"
	{ yyerrok ; }
	+#line 566 "calc_code_provides.tab.c"
	break;
	case 4:
	#line 35 "calc_code_provides.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 571 "calc_code_provides.tab.c"
	break;
	case 5:
	#line 37 "calc_code_provides.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 576 "calc_code_provides.tab.c"
	break;
	case 6:
	#line 41 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 581 "calc_code_provides.tab.c"
	break;
	case 7:
	#line 43 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 586 "calc_code_provides.tab.c"
	break;
	case 8:
	#line 45 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 591 "calc_code_provides.tab.c"
	break;
	case 9:
	#line 47 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 596 "calc_code_provides.tab.c"
	break;
	case 10:
	#line 49 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 601 "calc_code_provides.tab.c"
	break;
	case 11:
	#line 51 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 606 "calc_code_provides.tab.c"
	break;
	case 12:
	#line 53 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 611 "calc_code_provides.tab.c"
	break;
	case 13:
	#line 55 "calc_code_provides.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 616 "calc_code_provides.tab.c"
	break;
	case 14:
	#line 57 "calc_code_provides.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 621 "calc_code_provides.tab.c"
	break;
	case 15:
	#line 59 "calc_code_provides.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 626 "calc_code_provides.tab.c"
	break;
	case 17:
	#line 64 "calc_code_provides.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 631 "calc_code_provides.tab.c"
	break;
	case 18:
	#line 66 "calc_code_provides.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 636 "calc_code_provides.tab.c"
	break;
	-#line 623 "calc_code_provides.tab.c"
	+#line 638 "calc_code_provides.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_requires.tab.c b/contrib/byacc/test/yacc/calc_code_requires.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_requires.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_requires.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -435,8 +435,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -562,64 +562,79 @@
	case 3:
	#line 31 "calc_code_requires.y"
	{ yyerrok ; }
	+#line 566 "calc_code_requires.tab.c"
	break;
	case 4:
	#line 35 "calc_code_requires.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 571 "calc_code_requires.tab.c"
	break;
	case 5:
	#line 37 "calc_code_requires.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 576 "calc_code_requires.tab.c"
	break;
	case 6:
	#line 41 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 581 "calc_code_requires.tab.c"
	break;
	case 7:
	#line 43 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 586 "calc_code_requires.tab.c"
	break;
	case 8:
	#line 45 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 591 "calc_code_requires.tab.c"
	break;
	case 9:
	#line 47 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 596 "calc_code_requires.tab.c"
	break;
	case 10:
	#line 49 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 601 "calc_code_requires.tab.c"
	break;
	case 11:
	#line 51 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 606 "calc_code_requires.tab.c"
	break;
	case 12:
	#line 53 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 611 "calc_code_requires.tab.c"
	break;
	case 13:
	#line 55 "calc_code_requires.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 616 "calc_code_requires.tab.c"
	break;
	case 14:
	#line 57 "calc_code_requires.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 621 "calc_code_requires.tab.c"
	break;
	case 15:
	#line 59 "calc_code_requires.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 626 "calc_code_requires.tab.c"
	break;
	case 17:
	#line 64 "calc_code_requires.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 631 "calc_code_requires.tab.c"
	break;
	case 18:
	#line 66 "calc_code_requires.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 636 "calc_code_requires.tab.c"
	break;
	-#line 623 "calc_code_requires.tab.c"
	+#line 638 "calc_code_requires.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/calc_code_top.tab.c b/contrib/byacc/test/yacc/calc_code_top.tab.c
	--- a/contrib/byacc/test/yacc/calc_code_top.tab.c
	+++ b/contrib/byacc/test/yacc/calc_code_top.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -435,8 +435,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -562,64 +562,79 @@
	case 3:
	#line 31 "calc_code_top.y"
	{ yyerrok ; }
	+#line 566 "calc_code_top.tab.c"
	break;
	case 4:
	#line 35 "calc_code_top.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 571 "calc_code_top.tab.c"
	break;
	case 5:
	#line 37 "calc_code_top.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 576 "calc_code_top.tab.c"
	break;
	case 6:
	#line 41 "calc_code_top.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 581 "calc_code_top.tab.c"
	break;
	case 7:
	#line 43 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 586 "calc_code_top.tab.c"
	break;
	case 8:
	#line 45 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 591 "calc_code_top.tab.c"
	break;
	case 9:
	#line 47 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 596 "calc_code_top.tab.c"
	break;
	case 10:
	#line 49 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 601 "calc_code_top.tab.c"
	break;
	case 11:
	#line 51 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 606 "calc_code_top.tab.c"
	break;
	case 12:
	#line 53 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 611 "calc_code_top.tab.c"
	break;
	case 13:
	#line 55 "calc_code_top.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 616 "calc_code_top.tab.c"
	break;
	case 14:
	#line 57 "calc_code_top.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 621 "calc_code_top.tab.c"
	break;
	case 15:
	#line 59 "calc_code_top.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 626 "calc_code_top.tab.c"
	break;
	case 17:
	#line 64 "calc_code_top.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 631 "calc_code_top.tab.c"
	break;
	case 18:
	#line 66 "calc_code_top.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 636 "calc_code_top.tab.c"
	break;
	-#line 623 "calc_code_top.tab.c"
	+#line 638 "calc_code_top.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/code_calc.code.c b/contrib/byacc/test/yacc/code_calc.code.c
	--- a/contrib/byacc/test/yacc/code_calc.code.c
	+++ b/contrib/byacc/test/yacc/code_calc.code.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -336,8 +336,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -463,64 +463,79 @@
	case 3:
	#line 32 "code_calc.y"
	{ yyerrok ; }
	+#line 467 "code_calc.code.c"
	break;
	case 4:
	#line 36 "code_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 472 "code_calc.code.c"
	break;
	case 5:
	#line 38 "code_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 477 "code_calc.code.c"
	break;
	case 6:
	#line 42 "code_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 482 "code_calc.code.c"
	break;
	case 7:
	#line 44 "code_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 487 "code_calc.code.c"
	break;
	case 8:
	#line 46 "code_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 492 "code_calc.code.c"
	break;
	case 9:
	#line 48 "code_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 497 "code_calc.code.c"
	break;
	case 10:
	#line 50 "code_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 502 "code_calc.code.c"
	break;
	case 11:
	#line 52 "code_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 507 "code_calc.code.c"
	break;
	case 12:
	#line 54 "code_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 512 "code_calc.code.c"
	break;
	case 13:
	#line 56 "code_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 517 "code_calc.code.c"
	break;
	case 14:
	#line 58 "code_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 522 "code_calc.code.c"
	break;
	case 15:
	#line 60 "code_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 527 "code_calc.code.c"
	break;
	case 17:
	#line 65 "code_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 532 "code_calc.code.c"
	break;
	case 18:
	#line 67 "code_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 537 "code_calc.code.c"
	break;
	-#line 524 "code_calc.code.c"
	+#line 539 "code_calc.code.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/code_error.code.c b/contrib/byacc/test/yacc/code_error.code.c
	--- a/contrib/byacc/test/yacc/code_error.code.c
	+++ b/contrib/byacc/test/yacc/code_error.code.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -306,8 +306,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/defines1.calc.c b/contrib/byacc/test/yacc/defines1.calc.c
	--- a/contrib/byacc/test/yacc/defines1.calc.c
	+++ b/contrib/byacc/test/yacc/defines1.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -351,8 +351,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -478,64 +478,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 482 "y.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 487 "y.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 492 "y.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 497 "y.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 502 "y.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 507 "y.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 512 "y.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 517 "y.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 522 "y.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 527 "y.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 532 "y.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 537 "y.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 542 "y.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 547 "y.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 552 "y.tab.c"
	break;
	-#line 539 "y.tab.c"
	+#line 554 "y.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/defines2.calc.c b/contrib/byacc/test/yacc/defines2.calc.c
	--- a/contrib/byacc/test/yacc/defines2.calc.c
	+++ b/contrib/byacc/test/yacc/defines2.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -351,8 +351,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -478,64 +478,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 482 "y.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 487 "y.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 492 "y.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 497 "y.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 502 "y.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 507 "y.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 512 "y.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 517 "y.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 522 "y.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 527 "y.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 532 "y.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 537 "y.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 542 "y.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 547 "y.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 552 "y.tab.c"
	break;
	-#line 539 "y.tab.c"
	+#line 554 "y.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/defines3.calc.c b/contrib/byacc/test/yacc/defines3.calc.c
	--- a/contrib/byacc/test/yacc/defines3.calc.c
	+++ b/contrib/byacc/test/yacc/defines3.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -351,8 +351,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -478,64 +478,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 482 "prefix.tab.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 487 "prefix.tab.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 492 "prefix.tab.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 497 "prefix.tab.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 502 "prefix.tab.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 507 "prefix.tab.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 512 "prefix.tab.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 517 "prefix.tab.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 522 "prefix.tab.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 527 "prefix.tab.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 532 "prefix.tab.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 537 "prefix.tab.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 542 "prefix.tab.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 547 "prefix.tab.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 552 "prefix.tab.c"
	break;
	-#line 539 "prefix.tab.c"
	+#line 554 "prefix.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/empty.tab.c b/contrib/byacc/test/yacc/empty.tab.c
	--- a/contrib/byacc/test/yacc/empty.tab.c
	+++ b/contrib/byacc/test/yacc/empty.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -317,8 +317,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/err_syntax1.tab.c b/contrib/byacc/test/yacc/err_syntax1.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax1.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax10.tab.c b/contrib/byacc/test/yacc/err_syntax10.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax10.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax10.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -316,8 +316,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/err_syntax11.tab.c b/contrib/byacc/test/yacc/err_syntax11.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax11.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax11.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -322,8 +322,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/err_syntax12.tab.c b/contrib/byacc/test/yacc/err_syntax12.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax12.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax12.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -328,8 +328,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/err_syntax13.tab.c b/contrib/byacc/test/yacc/err_syntax13.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax13.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax13.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax14.tab.c b/contrib/byacc/test/yacc/err_syntax14.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax14.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax14.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax15.tab.c b/contrib/byacc/test/yacc/err_syntax15.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax15.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax15.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax16.tab.c b/contrib/byacc/test/yacc/err_syntax16.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax16.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax16.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax17.tab.c b/contrib/byacc/test/yacc/err_syntax17.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax17.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax17.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax18.tab.c b/contrib/byacc/test/yacc/err_syntax18.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax18.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax18.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -324,8 +324,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -451,8 +451,9 @@
	case 1:
	#line 9 "err_syntax18.y"
	{ yyval = yystack.l_mark[1]; }
	+#line 455 "err_syntax18.tab.c"
	break;
	-#line 456 "err_syntax18.tab.c"
	+#line 457 "err_syntax18.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/err_syntax19.tab.c b/contrib/byacc/test/yacc/err_syntax19.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax19.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax19.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax2.tab.c b/contrib/byacc/test/yacc/err_syntax2.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax2.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax20.tab.c b/contrib/byacc/test/yacc/err_syntax20.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax20.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax20.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -320,8 +320,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -447,8 +447,9 @@
	case 1:
	#line 12 "err_syntax20.y"
	{ yystack.l_mark[-1].rechk = 3; }
	+#line 451 "err_syntax20.tab.c"
	break;
	-#line 452 "err_syntax20.tab.c"
	+#line 453 "err_syntax20.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/err_syntax21.tab.c b/contrib/byacc/test/yacc/err_syntax21.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax21.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax21.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax22.tab.c b/contrib/byacc/test/yacc/err_syntax22.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax22.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax22.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax23.tab.c b/contrib/byacc/test/yacc/err_syntax23.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax23.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax23.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax24.tab.c b/contrib/byacc/test/yacc/err_syntax24.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax24.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax24.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax25.tab.c b/contrib/byacc/test/yacc/err_syntax25.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax25.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax25.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax26.tab.c b/contrib/byacc/test/yacc/err_syntax26.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax26.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax26.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax27.tab.c b/contrib/byacc/test/yacc/err_syntax27.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax27.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax27.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax3.tab.c b/contrib/byacc/test/yacc/err_syntax3.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax3.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax4.tab.c b/contrib/byacc/test/yacc/err_syntax4.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax4.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax4.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax5.tab.c b/contrib/byacc/test/yacc/err_syntax5.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax5.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax5.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax6.tab.c b/contrib/byacc/test/yacc/err_syntax6.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax6.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax6.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax7.tab.c b/contrib/byacc/test/yacc/err_syntax7.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax7.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax7.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax7a.tab.c b/contrib/byacc/test/yacc/err_syntax7a.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax7a.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax7a.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax7b.tab.c b/contrib/byacc/test/yacc/err_syntax7b.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax7b.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax7b.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax8.tab.c b/contrib/byacc/test/yacc/err_syntax8.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax8.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax8.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax8a.tab.c b/contrib/byacc/test/yacc/err_syntax8a.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax8a.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax8a.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/err_syntax9.tab.c b/contrib/byacc/test/yacc/err_syntax9.tab.c
	--- a/contrib/byacc/test/yacc/err_syntax9.tab.c
	+++ b/contrib/byacc/test/yacc/err_syntax9.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	diff --git a/contrib/byacc/test/yacc/error.tab.c b/contrib/byacc/test/yacc/error.tab.c
	--- a/contrib/byacc/test/yacc/error.tab.c
	+++ b/contrib/byacc/test/yacc/error.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -322,8 +322,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.h b/contrib/byacc/test/yacc/expr.oxout.tab.h
	--- a/contrib/byacc/test/yacc/expr.oxout.tab.h
	+++ b/contrib/byacc/test/yacc/expr.oxout.tab.h
	@@ -6,10 +6,10 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union {
	+typedef union YYSTYPE {
	struct yyyOxAttrbs {
	struct yyyStackItem *yyyOxStackItem;
	} yyyOxAttrbs;
	} YYSTYPE;
	#endif /* !YYSTYPE_IS_DECLARED */
	-extern YYSTYPE expr.oxout_lval;
	+extern YYSTYPE expr_oxout_lval;
	diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.c b/contrib/byacc/test/yacc/expr.oxout.tab.c
	--- a/contrib/byacc/test/yacc/expr.oxout.tab.c
	+++ b/contrib/byacc/test/yacc/expr.oxout.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -15,85 +15,85 @@
	#define YYEOF 0

	#ifndef yyparse
	-#define yyparse expr.oxout_parse
	+#define yyparse expr_oxout_parse
	#endif /* yyparse */

	#ifndef yylex
	-#define yylex expr.oxout_lex
	+#define yylex expr_oxout_lex
	#endif /* yylex */

	#ifndef yyerror
	-#define yyerror expr.oxout_error
	+#define yyerror expr_oxout_error
	#endif /* yyerror */

	#ifndef yychar
	-#define yychar expr.oxout_char
	+#define yychar expr_oxout_char
	#endif /* yychar */

	#ifndef yyval
	-#define yyval expr.oxout_val
	+#define yyval expr_oxout_val
	#endif /* yyval */

	#ifndef yylval
	-#define yylval expr.oxout_lval
	+#define yylval expr_oxout_lval
	#endif /* yylval */

	#ifndef yydebug
	-#define yydebug expr.oxout_debug
	+#define yydebug expr_oxout_debug
	#endif /* yydebug */

	#ifndef yynerrs
	-#define yynerrs expr.oxout_nerrs
	+#define yynerrs expr_oxout_nerrs
	#endif /* yynerrs */

	#ifndef yyerrflag
	-#define yyerrflag expr.oxout_errflag
	+#define yyerrflag expr_oxout_errflag
	#endif /* yyerrflag */

	#ifndef yylhs
	-#define yylhs expr.oxout_lhs
	+#define yylhs expr_oxout_lhs
	#endif /* yylhs */

	#ifndef yylen
	-#define yylen expr.oxout_len
	+#define yylen expr_oxout_len
	#endif /* yylen */

	#ifndef yydefred
	-#define yydefred expr.oxout_defred
	+#define yydefred expr_oxout_defred
	#endif /* yydefred */

	#ifndef yydgoto
	-#define yydgoto expr.oxout_dgoto
	+#define yydgoto expr_oxout_dgoto
	#endif /* yydgoto */

	#ifndef yysindex
	-#define yysindex expr.oxout_sindex
	+#define yysindex expr_oxout_sindex
	#endif /* yysindex */

	#ifndef yyrindex
	-#define yyrindex expr.oxout_rindex
	+#define yyrindex expr_oxout_rindex
	#endif /* yyrindex */

	#ifndef yygindex
	-#define yygindex expr.oxout_gindex
	+#define yygindex expr_oxout_gindex
	#endif /* yygindex */

	#ifndef yytable
	-#define yytable expr.oxout_table
	+#define yytable expr_oxout_table
	#endif /* yytable */

	#ifndef yycheck
	-#define yycheck expr.oxout_check
	+#define yycheck expr_oxout_check
	#endif /* yycheck */

	#ifndef yyname
	-#define yyname expr.oxout_name
	+#define yyname expr_oxout_name
	#endif /* yyname */

	#ifndef yyrule
	-#define yyrule expr.oxout_rule
	+#define yyrule expr_oxout_rule
	#endif /* yyrule */
	-#define YYPREFIX "expr.oxout_"
	+#define YYPREFIX "expr_oxout_"

	#define YYPURE 0

	@@ -117,7 +117,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 31 "expr.oxout.y"
	-typedef union {
	+typedef union YYSTYPE {
	struct yyyOxAttrbs {
	struct yyyStackItem *yyyOxStackItem;
	} yyyOxAttrbs;
	@@ -179,32 +179,32 @@
	#define CONST 258
	#define YYERRCODE 256
	typedef int YYINT;
	-static const YYINT expr.oxout_lhs[] = { -1,
	+static const YYINT expr_oxout_lhs[] = { -1,
	2, 0, 1, 3, 3, 3, 3, 3, 3, 3,
	};
	-static const YYINT expr.oxout_len[] = { 2,
	+static const YYINT expr_oxout_len[] = { 2,
	0, 2, 1, 3, 3, 3, 3, 3, 1, 1,
	};
	-static const YYINT expr.oxout_defred[] = { 1,
	+static const YYINT expr_oxout_defred[] = { 1,
	0, 0, 9, 10, 0, 2, 0, 0, 0, 0,
	0, 0, 8, 0, 0, 4, 0,
	};
	-static const YYINT expr.oxout_dgoto[] = { 1,
	+static const YYINT expr_oxout_dgoto[] = { 1,
	6, 2, 7,
	};
	-static const YYINT expr.oxout_sindex[] = { 0,
	+static const YYINT expr_oxout_sindex[] = { 0,
	0, -40, 0, 0, -40, 0, -18, -24, -40, -40,
	-40, -40, 0, -37, -37, 0, -39,
	};
	-static const YYINT expr.oxout_rindex[] = { 0,
	+static const YYINT expr_oxout_rindex[] = { 0,
	0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
	0, 0, 0, 2, 8, 0, 1,
	};
	-static const YYINT expr.oxout_gindex[] = { 0,
	+static const YYINT expr_oxout_gindex[] = { 0,
	0, 0, 4,
	};
	#define YYTABLESIZE 218
	-static const YYINT expr.oxout_table[] = { 5,
	+static const YYINT expr_oxout_table[] = { 5,
	6, 5, 11, 0, 11, 3, 0, 7, 8, 12,
	0, 0, 14, 15, 16, 17, 13, 11, 9, 0,
	10, 0, 12, 11, 9, 0, 10, 0, 12, 0,
	@@ -228,7 +228,7 @@
	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	0, 0, 0, 0, 0, 0, 3, 4,
	};
	-static const YYINT expr.oxout_check[] = { 40,
	+static const YYINT expr_oxout_check[] = { 40,
	0, 0, 42, -1, 42, 0, -1, 0, 5, 47,
	-1, -1, 9, 10, 11, 12, 41, 42, 43, -1,
	45, -1, 47, 42, 43, -1, 45, -1, 47, -1,
	@@ -260,7 +260,7 @@
	#define YYUNDFTOKEN 264
	#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a))
	#if YYDEBUG
	-static const char *const expr.oxout_name[] = {
	+static const char *const expr_oxout_name[] = {

	"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	0,0,0,0,0,0,"'('","')'","'*'","'+'",0,"'-'",0,"'/'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	@@ -271,7 +271,7 @@
	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"ID",
	"CONST",0,0,0,0,0,"illegal-symbol",
	};
	-static const char *const expr.oxout_rule[] = {
	+static const char *const expr_oxout_rule[] = {
	"$accept : yyyAugNonterm",
	"$$1 :",
	"yyyAugNonterm : $$1 s",
	@@ -382,8 +382,8 @@


	void yyyHandleOverflow(char which)
	- {char msg1,msg2;
	- long oldSize,newSize;
	+ {char msg1 = "?", msg2;
	+ long oldSize = 0, newSize;
	switch(which)
	{
	case yyySSALof :
	@@ -690,7 +690,7 @@
	}
	if (yyyCond(2) != yyyPass) {
	#line 23 "expr.Y"
	- printf("postfix: ")/* missing ; */
	+ printf("postfix: ");

	#line 497 "expr.oxout.y"
	}
	@@ -992,11 +992,11 @@
	static int yyyInitDone = 0;
	if (yyyInitDone) return;

	- if ((yyyRS = (struct yyyRSitem *)
	- calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(struct yyyRSitem))
	+ if ((yyyRS = (yyyRSitem *)
	+ calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(yyyRSitem))
	)
	==
	- ((struct yyyRSitem *) NULL)
	+ ((yyyRSitem *) NULL)
	)
	yyyfatal("malloc error in ox ready set space allocation\n");
	yyyRS++;
	@@ -1051,7 +1051,7 @@
	(yyyRCT *) calloc((size_t)yyyNattrbs, (size_t)sizeof(yyyRCT));
	if ((yyyOxStackItem)->node->refCountList == (yyyRCT ) NULL)
	yyyfatal("malloc error in ox reference count list space allocation\n");
	- (*yyyOxStackItem)->node->prodNum = yyyProdNum;
	+ (*yyyOxStackItem)->node->prodNum = (int) yyyProdNum;
	va_start(ap, yyval_OxAttrbs);
	for (i=1;i<=yyyRHSlength;i++)
	{yyySIT yaccStDum = va_arg(ap,struct yyyOxAttrbs )->yyyOxStackItem;
	@@ -1152,9 +1152,9 @@



	-void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *yylval)
	+void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *mylval)
	{yyyRCT *rcPdum;
	- yyySIT **yyyOxStackItem = &yylval->yyyOxAttrbs.yyyOxStackItem;
	+ yyySIT **yyyOxStackItem = &mylval->yyyOxAttrbs.yyyOxStackItem;
	(yyyOxStackItem) = (yyySIT ) malloc((size_t)sizeof(yyySIT));
	if ((yyyOxStackItem) == (yyySIT ) NULL)
	yyyfatal("malloc error in ox yacc semantic stack space allocation\n");
	@@ -1718,8 +1718,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1845,62 +1845,72 @@
	case 1:
	#line 64 "expr.oxout.y"
	{yyyYoxInit();}
	+#line 1849 "expr.oxout.tab.c"
	break;
	case 2:
	#line 66 "expr.oxout.y"
	{
	yyyDecorate(); yyyExecuteRRsection(yystack.l_mark[0].yyyOxAttrbs.yyyOxStackItem->node);
	}
	+#line 1856 "expr.oxout.tab.c"
	break;
	case 3:
	#line 73 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(1,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(1,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1863 "expr.oxout.tab.c"
	break;
	case 4:
	#line 80 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(2,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(2,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1870 "expr.oxout.tab.c"
	break;
	case 5:
	#line 87 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(3,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(3,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1877 "expr.oxout.tab.c"
	break;
	case 6:
	#line 94 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(4,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(4,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1884 "expr.oxout.tab.c"
	break;
	case 7:
	#line 101 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(5,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(5,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1891 "expr.oxout.tab.c"
	break;
	case 8:
	#line 108 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(6,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(6,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1898 "expr.oxout.tab.c"
	break;
	case 9:
	#line 114 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(7,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(7,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1905 "expr.oxout.tab.c"
	break;
	case 10:
	#line 121 "expr.oxout.y"
	{if(yyyYok){
	yyyGenIntNode(8,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);
	yyyAdjustINRC(8,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}}
	+#line 1912 "expr.oxout.tab.c"
	break;
	-#line 1904 "expr.oxout.tab.c"
	+#line 1914 "expr.oxout.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/grammar.tab.c b/contrib/byacc/test/yacc/grammar.tab.c
	--- a/contrib/byacc/test/yacc/grammar.tab.c
	+++ b/contrib/byacc/test/yacc/grammar.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -1166,8 +1166,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -1295,12 +1295,14 @@
	{
	yyerrok;
	}
	+#line 1299 "grammar.tab.c"
	break;
	case 11:
	#line 382 "grammar.y"
	{
	yyerrok;
	}
	+#line 1306 "grammar.tab.c"
	break;
	case 13:
	#line 393 "grammar.y"
	@@ -1310,12 +1312,14 @@
	* have generated.
	*/
	}
	+#line 1316 "grammar.tab.c"
	break;
	case 14:
	#line 400 "grammar.y"
	{
	/* empty */
	}
	+#line 1323 "grammar.tab.c"
	break;
	case 15:
	#line 407 "grammar.y"
	@@ -1329,6 +1333,7 @@
	free_decl_spec(&yystack.l_mark[-1].decl_spec);
	end_typedef();
	}
	+#line 1337 "grammar.tab.c"
	break;
	case 16:
	#line 418 "grammar.y"
	@@ -1345,6 +1350,7 @@
	free_decl_spec(&yystack.l_mark[-2].decl_spec);
	end_typedef();
	}
	+#line 1354 "grammar.tab.c"
	break;
	case 17:
	#line 432 "grammar.y"
	@@ -1352,24 +1358,28 @@
	cur_decl_spec_flags = yystack.l_mark[0].decl_spec.flags;
	free_decl_spec(&yystack.l_mark[0].decl_spec);
	}
	+#line 1362 "grammar.tab.c"
	break;
	case 18:
	#line 437 "grammar.y"
	{
	end_typedef();
	}
	+#line 1369 "grammar.tab.c"
	break;
	case 19:
	#line 444 "grammar.y"
	{
	begin_typedef();
	}
	+#line 1376 "grammar.tab.c"
	break;
	case 20:
	#line 448 "grammar.y"
	{
	begin_typedef();
	}
	+#line 1383 "grammar.tab.c"
	break;
	case 23:
	#line 460 "grammar.y"
	@@ -1384,6 +1394,7 @@
	new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
	free_declarator(yystack.l_mark[0].declarator);
	}
	+#line 1398 "grammar.tab.c"
	break;
	case 24:
	#line 472 "grammar.y"
	@@ -1395,6 +1406,7 @@
	new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
	free_declarator(yystack.l_mark[0].declarator);
	}
	+#line 1410 "grammar.tab.c"
	break;
	case 25:
	#line 484 "grammar.y"
	@@ -1408,6 +1420,7 @@
	func_params->begin_comment = cur_file->begin_comment;
	func_params->end_comment = cur_file->end_comment;
	}
	+#line 1424 "grammar.tab.c"
	break;
	case 26:
	#line 495 "grammar.y"
	@@ -1434,6 +1447,7 @@
	free_decl_spec(&yystack.l_mark[-4].decl_spec);
	free_declarator(yystack.l_mark[-3].declarator);
	}
	+#line 1451 "grammar.tab.c"
	break;
	case 28:
	#line 520 "grammar.y"
	@@ -1446,6 +1460,7 @@
	func_params->begin_comment = cur_file->begin_comment;
	func_params->end_comment = cur_file->end_comment;
	}
	+#line 1464 "grammar.tab.c"
	break;
	case 29:
	#line 530 "grammar.y"
	@@ -1464,6 +1479,7 @@
	free_decl_spec(&decl_spec);
	free_declarator(yystack.l_mark[-4].declarator);
	}
	+#line 1483 "grammar.tab.c"
	break;
	case 36:
	#line 561 "grammar.y"
	@@ -1472,114 +1488,133 @@
	free(yystack.l_mark[-1].decl_spec.text);
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 1492 "grammar.tab.c"
	break;
	case 40:
	#line 576 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1499 "grammar.tab.c"
	break;
	case 41:
	#line 580 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_EXTERN);
	}
	+#line 1506 "grammar.tab.c"
	break;
	case 42:
	#line 584 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1513 "grammar.tab.c"
	break;
	case 43:
	#line 588 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_STATIC);
	}
	+#line 1520 "grammar.tab.c"
	break;
	case 44:
	#line 592 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_INLINE);
	}
	+#line 1527 "grammar.tab.c"
	break;
	case 45:
	#line 596 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_JUNK);
	}
	+#line 1534 "grammar.tab.c"
	break;
	case 46:
	#line 603 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
	}
	+#line 1541 "grammar.tab.c"
	break;
	case 47:
	#line 607 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1548 "grammar.tab.c"
	break;
	case 48:
	#line 611 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_FLOAT);
	}
	+#line 1555 "grammar.tab.c"
	break;
	case 49:
	#line 615 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1562 "grammar.tab.c"
	break;
	case 50:
	#line 619 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1569 "grammar.tab.c"
	break;
	case 51:
	#line 623 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_SHORT);
	}
	+#line 1576 "grammar.tab.c"
	break;
	case 52:
	#line 627 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1583 "grammar.tab.c"
	break;
	case 53:
	#line 631 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1590 "grammar.tab.c"
	break;
	case 54:
	#line 635 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1597 "grammar.tab.c"
	break;
	case 55:
	#line 639 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
	}
	+#line 1604 "grammar.tab.c"
	break;
	case 56:
	#line 643 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1611 "grammar.tab.c"
	break;
	case 57:
	#line 647 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1618 "grammar.tab.c"
	break;
	case 58:
	#line 651 "grammar.y"
	@@ -1589,12 +1624,14 @@
	if (s != NULL)
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
	}
	+#line 1628 "grammar.tab.c"
	break;
	case 61:
	#line 663 "grammar.y"
	{
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
	}
	+#line 1635 "grammar.tab.c"
	break;
	case 62:
	#line 667 "grammar.y"
	@@ -1607,6 +1644,7 @@
	if (s != NULL)
	new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
	}
	+#line 1648 "grammar.tab.c"
	break;
	case 63:
	#line 680 "grammar.y"
	@@ -1616,6 +1654,7 @@
	(void)sprintf(s = buf, "%.s %.s", TEXT_LEN, yystack.l_mark[-2].text.text, TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
	}
	+#line 1658 "grammar.tab.c"
	break;
	case 64:
	#line 687 "grammar.y"
	@@ -1625,6 +1664,7 @@
	(void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 1668 "grammar.tab.c"
	break;
	case 65:
	#line 694 "grammar.y"
	@@ -1632,30 +1672,35 @@
	(void)sprintf(buf, "%.s %.s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text);
	new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 1676 "grammar.tab.c"
	break;
	case 66:
	#line 702 "grammar.y"
	{
	imply_typedef(yyval.text.text);
	}
	+#line 1683 "grammar.tab.c"
	break;
	case 67:
	#line 706 "grammar.y"
	{
	imply_typedef(yyval.text.text);
	}
	+#line 1690 "grammar.tab.c"
	break;
	case 68:
	#line 713 "grammar.y"
	{
	new_decl_list(&yyval.decl_list, yystack.l_mark[0].declarator);
	}
	+#line 1697 "grammar.tab.c"
	break;
	case 69:
	#line 717 "grammar.y"
	{
	add_decl_list(&yyval.decl_list, &yystack.l_mark[-2].decl_list, yystack.l_mark[0].declarator);
	}
	+#line 1704 "grammar.tab.c"
	break;
	case 70:
	#line 724 "grammar.y"
	@@ -1667,6 +1712,7 @@
	}
	cur_declarator = yyval.declarator;
	}
	+#line 1716 "grammar.tab.c"
	break;
	case 71:
	#line 733 "grammar.y"
	@@ -1677,6 +1723,7 @@
	fputs(" =", cur_file->tmp_file);
	}
	}
	+#line 1727 "grammar.tab.c"
	break;
	case 73:
	#line 745 "grammar.y"
	@@ -1686,6 +1733,7 @@
	(void)sprintf(s = buf, "enum %.*s", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
	}
	+#line 1737 "grammar.tab.c"
	break;
	case 74:
	#line 752 "grammar.y"
	@@ -1695,6 +1743,7 @@
	(void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text);
	new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 1747 "grammar.tab.c"
	break;
	case 75:
	#line 759 "grammar.y"
	@@ -1702,6 +1751,7 @@
	(void)sprintf(buf, "enum %.*s", TEXT_LEN, yystack.l_mark[0].text.text);
	new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
	}
	+#line 1755 "grammar.tab.c"
	break;
	case 76:
	#line 767 "grammar.y"
	@@ -1709,6 +1759,7 @@
	imply_typedef("enum");
	yyval.text = yystack.l_mark[0].text;
	}
	+#line 1763 "grammar.tab.c"
	break;
	case 79:
	#line 780 "grammar.y"
	@@ -1720,12 +1771,14 @@
	yyval.declarator->begin = yystack.l_mark[-1].text.begin;
	yyval.declarator->pointer = TRUE;
	}
	+#line 1775 "grammar.tab.c"
	break;
	case 81:
	#line 793 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin);
	}
	+#line 1782 "grammar.tab.c"
	break;
	case 82:
	#line 797 "grammar.y"
	@@ -1736,6 +1789,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-2].text.begin;
	}
	+#line 1793 "grammar.tab.c"
	break;
	case 83:
	#line 805 "grammar.y"
	@@ -1745,6 +1799,7 @@
	free(yyval.declarator->text);
	yyval.declarator->text = xstrdup(buf);
	}
	+#line 1803 "grammar.tab.c"
	break;
	case 84:
	#line 812 "grammar.y"
	@@ -1755,6 +1810,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 1814 "grammar.tab.c"
	break;
	case 85:
	#line 820 "grammar.y"
	@@ -1765,6 +1821,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_TRADITIONAL;
	}
	+#line 1825 "grammar.tab.c"
	break;
	case 86:
	#line 831 "grammar.y"
	@@ -1772,6 +1829,7 @@
	(void)sprintf(yyval.text.text, "%.s", TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	}
	+#line 1833 "grammar.tab.c"
	break;
	case 87:
	#line 836 "grammar.y"
	@@ -1779,6 +1837,7 @@
	(void)sprintf(yyval.text.text, "%.s%.*s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-2].text.begin;
	}
	+#line 1841 "grammar.tab.c"
	break;
	case 88:
	#line 844 "grammar.y"
	@@ -1786,6 +1845,7 @@
	strcpy(yyval.text.text, "");
	yyval.text.begin = 0L;
	}
	+#line 1849 "grammar.tab.c"
	break;
	case 90:
	#line 853 "grammar.y"
	@@ -1794,6 +1854,7 @@
	yyval.text.begin = yystack.l_mark[0].decl_spec.begin;
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 1858 "grammar.tab.c"
	break;
	case 91:
	#line 859 "grammar.y"
	@@ -1802,24 +1863,28 @@
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	free(yystack.l_mark[0].decl_spec.text);
	}
	+#line 1867 "grammar.tab.c"
	break;
	case 93:
	#line 869 "grammar.y"
	{
	add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, "...");
	}
	+#line 1874 "grammar.tab.c"
	break;
	case 94:
	#line 876 "grammar.y"
	{
	new_param_list(&yyval.param_list, yystack.l_mark[0].parameter);
	}
	+#line 1881 "grammar.tab.c"
	break;
	case 95:
	#line 880 "grammar.y"
	{
	add_param_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].parameter);
	}
	+#line 1888 "grammar.tab.c"
	break;
	case 96:
	#line 887 "grammar.y"
	@@ -1827,6 +1892,7 @@
	check_untagged(&yystack.l_mark[-1].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
	}
	+#line 1896 "grammar.tab.c"
	break;
	case 97:
	#line 892 "grammar.y"
	@@ -1834,6 +1900,7 @@
	check_untagged(&yystack.l_mark[-1].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
	}
	+#line 1904 "grammar.tab.c"
	break;
	case 98:
	#line 897 "grammar.y"
	@@ -1841,12 +1908,14 @@
	check_untagged(&yystack.l_mark[0].decl_spec);
	yyval.parameter = new_parameter(&yystack.l_mark[0].decl_spec, (Declarator *)0);
	}
	+#line 1912 "grammar.tab.c"
	break;
	case 99:
	#line 905 "grammar.y"
	{
	new_ident_list(&yyval.param_list);
	}
	+#line 1919 "grammar.tab.c"
	break;
	case 101:
	#line 913 "grammar.y"
	@@ -1854,18 +1923,21 @@
	new_ident_list(&yyval.param_list);
	add_ident_list(&yyval.param_list, &yyval.param_list, yystack.l_mark[0].text.text);
	}
	+#line 1927 "grammar.tab.c"
	break;
	case 102:
	#line 918 "grammar.y"
	{
	add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].text.text);
	}
	+#line 1934 "grammar.tab.c"
	break;
	case 103:
	#line 925 "grammar.y"
	{
	yyval.text = yystack.l_mark[0].text;
	}
	+#line 1941 "grammar.tab.c"
	break;
	case 104:
	#line 929 "grammar.y"
	@@ -1878,12 +1950,14 @@
	(void)sprintf(yyval.text.text, "&%.*s", TEXT_LEN, yystack.l_mark[0].text.text);
	yyval.text.begin = yystack.l_mark[-1].text.begin;
	}
	+#line 1954 "grammar.tab.c"
	break;
	case 105:
	#line 942 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
	}
	+#line 1961 "grammar.tab.c"
	break;
	case 106:
	#line 946 "grammar.y"
	@@ -1894,6 +1968,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-1].text.begin;
	}
	+#line 1972 "grammar.tab.c"
	break;
	case 108:
	#line 958 "grammar.y"
	@@ -1904,6 +1979,7 @@
	yyval.declarator->text = xstrdup(buf);
	yyval.declarator->begin = yystack.l_mark[-2].text.begin;
	}
	+#line 1983 "grammar.tab.c"
	break;
	case 109:
	#line 966 "grammar.y"
	@@ -1913,12 +1989,14 @@
	free(yyval.declarator->text);
	yyval.declarator->text = xstrdup(buf);
	}
	+#line 1993 "grammar.tab.c"
	break;
	case 110:
	#line 973 "grammar.y"
	{
	yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
	}
	+#line 2000 "grammar.tab.c"
	break;
	case 111:
	#line 977 "grammar.y"
	@@ -1929,6 +2007,7 @@
	yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2011 "grammar.tab.c"
	break;
	case 112:
	#line 985 "grammar.y"
	@@ -1938,6 +2017,7 @@
	yyval.declarator->head = (yystack.l_mark[-2].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-2].declarator->head;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2021 "grammar.tab.c"
	break;
	case 113:
	#line 992 "grammar.y"
	@@ -1951,6 +2031,7 @@
	yyval.declarator->head = yyval.declarator;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2035 "grammar.tab.c"
	break;
	case 114:
	#line 1003 "grammar.y"
	@@ -1963,8 +2044,9 @@
	yyval.declarator->head = yyval.declarator;
	yyval.declarator->func_def = FUNC_ANSI;
	}
	+#line 2048 "grammar.tab.c"
	break;
	-#line 1968 "grammar.tab.c"
	+#line 2050 "grammar.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/help.error b/contrib/byacc/test/yacc/help.error
	--- a/contrib/byacc/test/yacc/help.error
	+++ b/contrib/byacc/test/yacc/help.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/no_b_opt.error b/contrib/byacc/test/yacc/no_b_opt.error
	--- a/contrib/byacc/test/yacc/no_b_opt.error
	+++ b/contrib/byacc/test/yacc/no_b_opt.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/no_output2.error b/contrib/byacc/test/yacc/no_output2.error
	--- a/contrib/byacc/test/yacc/no_output2.error
	+++ b/contrib/byacc/test/yacc/no_output2.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/no_p_opt.error b/contrib/byacc/test/yacc/no_p_opt.error
	--- a/contrib/byacc/test/yacc/no_p_opt.error
	+++ b/contrib/byacc/test/yacc/no_p_opt.error
	@@ -5,6 +5,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -18,3 +19,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/nostdin.error b/contrib/byacc/test/yacc/nostdin.error
	--- a/contrib/byacc/test/yacc/nostdin.error
	+++ b/contrib/byacc/test/yacc/nostdin.error
	@@ -4,6 +4,7 @@
	-b file_prefix set filename prefix (default "y.")
	-B create a backtracking parser
	-d write definitions (.tab.h)
	+ -h print this help-message
	-H defines_file write definitions to defines_file
	-i write interface (y.tab.i)
	-g write a graphical description
	@@ -17,3 +18,13 @@
	-t add debugging support
	-v write description (y.output)
	-V show version information and exit
	+
	+Long options:
	+ --defines -H
	+ --file-prefix -b
	+ --graph -g
	+ --help -h
	+ --name-prefix -p
	+ --no-lines -l
	+ --output -o
	+ --version -V
	diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.h b/contrib/byacc/test/yacc/ok_syntax1.tab.h
	--- a/contrib/byacc/test/yacc/ok_syntax1.tab.h
	+++ b/contrib/byacc/test/yacc/ok_syntax1.tab.h
	@@ -20,7 +20,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	char * cval;
	int ival;
	diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.c b/contrib/byacc/test/yacc/ok_syntax1.tab.c
	--- a/contrib/byacc/test/yacc/ok_syntax1.tab.c
	+++ b/contrib/byacc/test/yacc/ok_syntax1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -117,7 +117,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 43 "ok_syntax1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	char * cval;
	int ival;
	@@ -472,8 +472,8 @@
	memset(&yyval, 0, sizeof(yyval));
	memset(&yylval, 0, sizeof(yylval));

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -599,64 +599,79 @@
	case 3:
	#line 66 "ok_syntax1.y"
	{ yyerrok ; }
	+#line 603 "ok_syntax1.tab.c"
	break;
	case 4:
	#line 70 "ok_syntax1.y"
	{ printf("%d\n",yystack.l_mark[0].ival);}
	+#line 608 "ok_syntax1.tab.c"
	break;
	case 5:
	#line 72 "ok_syntax1.y"
	{ regs[yystack.l_mark[-2].ival] = yystack.l_mark[0].ival; }
	+#line 613 "ok_syntax1.tab.c"
	break;
	case 6:
	#line 76 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-1].ival; }
	+#line 618 "ok_syntax1.tab.c"
	break;
	case 7:
	#line 78 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival + yystack.l_mark[0].ival; }
	+#line 623 "ok_syntax1.tab.c"
	break;
	case 8:
	#line 80 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival - yystack.l_mark[0].ival; }
	+#line 628 "ok_syntax1.tab.c"
	break;
	case 9:
	#line 82 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival * yystack.l_mark[0].ival; }
	+#line 633 "ok_syntax1.tab.c"
	break;
	case 10:
	#line 84 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival / yystack.l_mark[0].ival; }
	+#line 638 "ok_syntax1.tab.c"
	break;
	case 11:
	#line 86 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival % yystack.l_mark[0].ival; }
	+#line 643 "ok_syntax1.tab.c"
	break;
	case 12:
	#line 88 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival & yystack.l_mark[0].ival; }
	+#line 648 "ok_syntax1.tab.c"
	break;
	case 13:
	#line 90 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[-2].ival \| yystack.l_mark[0].ival; }
	+#line 653 "ok_syntax1.tab.c"
	break;
	case 14:
	#line 92 "ok_syntax1.y"
	{ yyval.ival = - yystack.l_mark[0].ival; }
	+#line 658 "ok_syntax1.tab.c"
	break;
	case 15:
	#line 94 "ok_syntax1.y"
	{ yyval.ival = regs[yystack.l_mark[0].ival]; }
	+#line 663 "ok_syntax1.tab.c"
	break;
	case 17:
	#line 99 "ok_syntax1.y"
	{ yyval.ival = yystack.l_mark[0].ival; (*base) = (yystack.l_mark[0].ival==0) ? 8 : 10; }
	+#line 668 "ok_syntax1.tab.c"
	break;
	case 18:
	#line 101 "ok_syntax1.y"
	{ yyval.ival = (base) yystack.l_mark[-1].ival + yystack.l_mark[0].ival; }
	+#line 673 "ok_syntax1.tab.c"
	break;
	-#line 660 "ok_syntax1.tab.c"
	+#line 675 "ok_syntax1.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/pure_calc.tab.c b/contrib/byacc/test/yacc/pure_calc.tab.c
	--- a/contrib/byacc/test/yacc/pure_calc.tab.c
	+++ b/contrib/byacc/test/yacc/pure_calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -444,8 +444,8 @@
	memset(&yyval, 0, sizeof(yyval));
	memset(&yylval, 0, sizeof(yylval));

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -571,64 +571,79 @@
	case 3:
	#line 34 "pure_calc.y"
	{ yyerrok ; }
	+#line 575 "pure_calc.tab.c"
	break;
	case 4:
	#line 38 "pure_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 580 "pure_calc.tab.c"
	break;
	case 5:
	#line 40 "pure_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 585 "pure_calc.tab.c"
	break;
	case 6:
	#line 44 "pure_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 590 "pure_calc.tab.c"
	break;
	case 7:
	#line 46 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 595 "pure_calc.tab.c"
	break;
	case 8:
	#line 48 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 600 "pure_calc.tab.c"
	break;
	case 9:
	#line 50 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 605 "pure_calc.tab.c"
	break;
	case 10:
	#line 52 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 610 "pure_calc.tab.c"
	break;
	case 11:
	#line 54 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 615 "pure_calc.tab.c"
	break;
	case 12:
	#line 56 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 620 "pure_calc.tab.c"
	break;
	case 13:
	#line 58 "pure_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 625 "pure_calc.tab.c"
	break;
	case 14:
	#line 60 "pure_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 630 "pure_calc.tab.c"
	break;
	case 15:
	#line 62 "pure_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 635 "pure_calc.tab.c"
	break;
	case 17:
	#line 67 "pure_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 640 "pure_calc.tab.c"
	break;
	case 18:
	#line 69 "pure_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 645 "pure_calc.tab.c"
	break;
	-#line 632 "pure_calc.tab.c"
	+#line 647 "pure_calc.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/pure_error.tab.c b/contrib/byacc/test/yacc/pure_error.tab.c
	--- a/contrib/byacc/test/yacc/pure_error.tab.c
	+++ b/contrib/byacc/test/yacc/pure_error.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -341,8 +341,8 @@
	memset(&yyval, 0, sizeof(yyval));
	memset(&yylval, 0, sizeof(yylval));

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/quote_calc-s.tab.c b/contrib/byacc/test/yacc/quote_calc-s.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc-s.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -442,8 +442,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -569,64 +569,79 @@
	case 3:
	#line 35 "quote_calc.y"
	{ yyerrok ; }
	+#line 573 "quote_calc-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 578 "quote_calc-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 583 "quote_calc-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 588 "quote_calc-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 593 "quote_calc-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 598 "quote_calc-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 603 "quote_calc-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 608 "quote_calc-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 613 "quote_calc-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 618 "quote_calc-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 623 "quote_calc-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 628 "quote_calc-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 633 "quote_calc-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 638 "quote_calc-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 643 "quote_calc-s.tab.c"
	break;
	-#line 630 "quote_calc-s.tab.c"
	+#line 645 "quote_calc-s.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc.tab.c b/contrib/byacc/test/yacc/quote_calc.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -448,8 +448,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -575,64 +575,79 @@
	case 3:
	#line 35 "quote_calc.y"
	{ yyerrok ; }
	+#line 579 "quote_calc.tab.c"
	break;
	case 4:
	#line 39 "quote_calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 584 "quote_calc.tab.c"
	break;
	case 5:
	#line 41 "quote_calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 589 "quote_calc.tab.c"
	break;
	case 6:
	#line 45 "quote_calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 594 "quote_calc.tab.c"
	break;
	case 7:
	#line 47 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 599 "quote_calc.tab.c"
	break;
	case 8:
	#line 49 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 604 "quote_calc.tab.c"
	break;
	case 9:
	#line 51 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 609 "quote_calc.tab.c"
	break;
	case 10:
	#line 53 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 614 "quote_calc.tab.c"
	break;
	case 11:
	#line 55 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 619 "quote_calc.tab.c"
	break;
	case 12:
	#line 57 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 624 "quote_calc.tab.c"
	break;
	case 13:
	#line 59 "quote_calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 629 "quote_calc.tab.c"
	break;
	case 14:
	#line 61 "quote_calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 634 "quote_calc.tab.c"
	break;
	case 15:
	#line 63 "quote_calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 639 "quote_calc.tab.c"
	break;
	case 17:
	#line 68 "quote_calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 644 "quote_calc.tab.c"
	break;
	case 18:
	#line 70 "quote_calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 649 "quote_calc.tab.c"
	break;
	-#line 636 "quote_calc.tab.c"
	+#line 651 "quote_calc.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc2-s.tab.c b/contrib/byacc/test/yacc/quote_calc2-s.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc2-s.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc2-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -442,8 +442,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -569,64 +569,79 @@
	case 3:
	#line 35 "quote_calc2.y"
	{ yyerrok ; }
	+#line 573 "quote_calc2-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 578 "quote_calc2-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 583 "quote_calc2-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 588 "quote_calc2-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 593 "quote_calc2-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 598 "quote_calc2-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 603 "quote_calc2-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 608 "quote_calc2-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 613 "quote_calc2-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 618 "quote_calc2-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 623 "quote_calc2-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 628 "quote_calc2-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 633 "quote_calc2-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc2.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 638 "quote_calc2-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc2.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 643 "quote_calc2-s.tab.c"
	break;
	-#line 630 "quote_calc2-s.tab.c"
	+#line 645 "quote_calc2-s.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc2.tab.c b/contrib/byacc/test/yacc/quote_calc2.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc2.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc2.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -448,8 +448,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -575,64 +575,79 @@
	case 3:
	#line 35 "quote_calc2.y"
	{ yyerrok ; }
	+#line 579 "quote_calc2.tab.c"
	break;
	case 4:
	#line 39 "quote_calc2.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 584 "quote_calc2.tab.c"
	break;
	case 5:
	#line 41 "quote_calc2.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 589 "quote_calc2.tab.c"
	break;
	case 6:
	#line 45 "quote_calc2.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 594 "quote_calc2.tab.c"
	break;
	case 7:
	#line 47 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 599 "quote_calc2.tab.c"
	break;
	case 8:
	#line 49 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 604 "quote_calc2.tab.c"
	break;
	case 9:
	#line 51 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 609 "quote_calc2.tab.c"
	break;
	case 10:
	#line 53 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 614 "quote_calc2.tab.c"
	break;
	case 11:
	#line 55 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 619 "quote_calc2.tab.c"
	break;
	case 12:
	#line 57 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 624 "quote_calc2.tab.c"
	break;
	case 13:
	#line 59 "quote_calc2.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 629 "quote_calc2.tab.c"
	break;
	case 14:
	#line 61 "quote_calc2.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 634 "quote_calc2.tab.c"
	break;
	case 15:
	#line 63 "quote_calc2.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 639 "quote_calc2.tab.c"
	break;
	case 17:
	#line 68 "quote_calc2.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 644 "quote_calc2.tab.c"
	break;
	case 18:
	#line 70 "quote_calc2.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 649 "quote_calc2.tab.c"
	break;
	-#line 636 "quote_calc2.tab.c"
	+#line 651 "quote_calc2.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc3-s.tab.c b/contrib/byacc/test/yacc/quote_calc3-s.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc3-s.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc3-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -443,8 +443,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -570,64 +570,79 @@
	case 3:
	#line 35 "quote_calc3.y"
	{ yyerrok ; }
	+#line 574 "quote_calc3-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 579 "quote_calc3-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 584 "quote_calc3-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 589 "quote_calc3-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 594 "quote_calc3-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 599 "quote_calc3-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 604 "quote_calc3-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 609 "quote_calc3-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 614 "quote_calc3-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 619 "quote_calc3-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 624 "quote_calc3-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 629 "quote_calc3-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 634 "quote_calc3-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc3.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 639 "quote_calc3-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc3.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 644 "quote_calc3-s.tab.c"
	break;
	-#line 631 "quote_calc3-s.tab.c"
	+#line 646 "quote_calc3-s.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc3.tab.c b/contrib/byacc/test/yacc/quote_calc3.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc3.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc3.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -443,8 +443,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -570,64 +570,79 @@
	case 3:
	#line 35 "quote_calc3.y"
	{ yyerrok ; }
	+#line 574 "quote_calc3.tab.c"
	break;
	case 4:
	#line 39 "quote_calc3.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 579 "quote_calc3.tab.c"
	break;
	case 5:
	#line 41 "quote_calc3.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 584 "quote_calc3.tab.c"
	break;
	case 6:
	#line 45 "quote_calc3.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 589 "quote_calc3.tab.c"
	break;
	case 7:
	#line 47 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 594 "quote_calc3.tab.c"
	break;
	case 8:
	#line 49 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 599 "quote_calc3.tab.c"
	break;
	case 9:
	#line 51 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 604 "quote_calc3.tab.c"
	break;
	case 10:
	#line 53 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 609 "quote_calc3.tab.c"
	break;
	case 11:
	#line 55 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 614 "quote_calc3.tab.c"
	break;
	case 12:
	#line 57 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 619 "quote_calc3.tab.c"
	break;
	case 13:
	#line 59 "quote_calc3.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 624 "quote_calc3.tab.c"
	break;
	case 14:
	#line 61 "quote_calc3.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 629 "quote_calc3.tab.c"
	break;
	case 15:
	#line 63 "quote_calc3.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 634 "quote_calc3.tab.c"
	break;
	case 17:
	#line 68 "quote_calc3.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 639 "quote_calc3.tab.c"
	break;
	case 18:
	#line 70 "quote_calc3.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 644 "quote_calc3.tab.c"
	break;
	-#line 631 "quote_calc3.tab.c"
	+#line 646 "quote_calc3.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc4-s.tab.c b/contrib/byacc/test/yacc/quote_calc4-s.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc4-s.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc4-s.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -443,8 +443,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -570,64 +570,79 @@
	case 3:
	#line 35 "quote_calc4.y"
	{ yyerrok ; }
	+#line 574 "quote_calc4-s.tab.c"
	break;
	case 4:
	#line 39 "quote_calc4.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 579 "quote_calc4-s.tab.c"
	break;
	case 5:
	#line 41 "quote_calc4.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 584 "quote_calc4-s.tab.c"
	break;
	case 6:
	#line 45 "quote_calc4.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 589 "quote_calc4-s.tab.c"
	break;
	case 7:
	#line 47 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 594 "quote_calc4-s.tab.c"
	break;
	case 8:
	#line 49 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 599 "quote_calc4-s.tab.c"
	break;
	case 9:
	#line 51 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 604 "quote_calc4-s.tab.c"
	break;
	case 10:
	#line 53 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 609 "quote_calc4-s.tab.c"
	break;
	case 11:
	#line 55 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 614 "quote_calc4-s.tab.c"
	break;
	case 12:
	#line 57 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 619 "quote_calc4-s.tab.c"
	break;
	case 13:
	#line 59 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 624 "quote_calc4-s.tab.c"
	break;
	case 14:
	#line 61 "quote_calc4.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 629 "quote_calc4-s.tab.c"
	break;
	case 15:
	#line 63 "quote_calc4.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 634 "quote_calc4-s.tab.c"
	break;
	case 17:
	#line 68 "quote_calc4.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 639 "quote_calc4-s.tab.c"
	break;
	case 18:
	#line 70 "quote_calc4.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 644 "quote_calc4-s.tab.c"
	break;
	-#line 631 "quote_calc4-s.tab.c"
	+#line 646 "quote_calc4-s.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/quote_calc4.tab.c b/contrib/byacc/test/yacc/quote_calc4.tab.c
	--- a/contrib/byacc/test/yacc/quote_calc4.tab.c
	+++ b/contrib/byacc/test/yacc/quote_calc4.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -443,8 +443,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -570,64 +570,79 @@
	case 3:
	#line 35 "quote_calc4.y"
	{ yyerrok ; }
	+#line 574 "quote_calc4.tab.c"
	break;
	case 4:
	#line 39 "quote_calc4.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 579 "quote_calc4.tab.c"
	break;
	case 5:
	#line 41 "quote_calc4.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 584 "quote_calc4.tab.c"
	break;
	case 6:
	#line 45 "quote_calc4.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 589 "quote_calc4.tab.c"
	break;
	case 7:
	#line 47 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 594 "quote_calc4.tab.c"
	break;
	case 8:
	#line 49 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 599 "quote_calc4.tab.c"
	break;
	case 9:
	#line 51 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 604 "quote_calc4.tab.c"
	break;
	case 10:
	#line 53 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 609 "quote_calc4.tab.c"
	break;
	case 11:
	#line 55 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 614 "quote_calc4.tab.c"
	break;
	case 12:
	#line 57 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 619 "quote_calc4.tab.c"
	break;
	case 13:
	#line 59 "quote_calc4.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 624 "quote_calc4.tab.c"
	break;
	case 14:
	#line 61 "quote_calc4.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 629 "quote_calc4.tab.c"
	break;
	case 15:
	#line 63 "quote_calc4.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 634 "quote_calc4.tab.c"
	break;
	case 17:
	#line 68 "quote_calc4.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 639 "quote_calc4.tab.c"
	break;
	case 18:
	#line 70 "quote_calc4.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 644 "quote_calc4.tab.c"
	break;
	-#line 631 "quote_calc4.tab.c"
	+#line 646 "quote_calc4.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/rename_debug.c b/contrib/byacc/test/yacc/rename_debug.c
	--- a/contrib/byacc/test/yacc/rename_debug.c
	+++ b/contrib/byacc/test/yacc/rename_debug.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -202,8 +202,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/contrib/byacc/test/yacc/stdin1.calc.c b/contrib/byacc/test/yacc/stdin1.calc.c
	--- a/contrib/byacc/test/yacc/stdin1.calc.c
	+++ b/contrib/byacc/test/yacc/stdin1.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -351,8 +351,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -478,64 +478,79 @@
	case 3:
	#line 28 "(null)"
	{ yyerrok ; }
	+#line 482 "stdin1.calc.c"
	break;
	case 4:
	#line 32 "(null)"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 487 "stdin1.calc.c"
	break;
	case 5:
	#line 34 "(null)"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 492 "stdin1.calc.c"
	break;
	case 6:
	#line 38 "(null)"
	{ yyval = yystack.l_mark[-1]; }
	+#line 497 "stdin1.calc.c"
	break;
	case 7:
	#line 40 "(null)"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 502 "stdin1.calc.c"
	break;
	case 8:
	#line 42 "(null)"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 507 "stdin1.calc.c"
	break;
	case 9:
	#line 44 "(null)"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 512 "stdin1.calc.c"
	break;
	case 10:
	#line 46 "(null)"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 517 "stdin1.calc.c"
	break;
	case 11:
	#line 48 "(null)"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 522 "stdin1.calc.c"
	break;
	case 12:
	#line 50 "(null)"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 527 "stdin1.calc.c"
	break;
	case 13:
	#line 52 "(null)"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 532 "stdin1.calc.c"
	break;
	case 14:
	#line 54 "(null)"
	{ yyval = - yystack.l_mark[0]; }
	+#line 537 "stdin1.calc.c"
	break;
	case 15:
	#line 56 "(null)"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 542 "stdin1.calc.c"
	break;
	case 17:
	#line 61 "(null)"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 547 "stdin1.calc.c"
	break;
	case 18:
	#line 63 "(null)"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 552 "stdin1.calc.c"
	break;
	-#line 539 "stdin1.calc.c"
	+#line 554 "stdin1.calc.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/stdin2.calc.c b/contrib/byacc/test/yacc/stdin2.calc.c
	--- a/contrib/byacc/test/yacc/stdin2.calc.c
	+++ b/contrib/byacc/test/yacc/stdin2.calc.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -351,8 +351,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -478,64 +478,79 @@
	case 3:
	#line 28 "calc.y"
	{ yyerrok ; }
	+#line 482 "stdin2.calc.c"
	break;
	case 4:
	#line 32 "calc.y"
	{ printf("%d\n",yystack.l_mark[0]);}
	+#line 487 "stdin2.calc.c"
	break;
	case 5:
	#line 34 "calc.y"
	{ regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
	+#line 492 "stdin2.calc.c"
	break;
	case 6:
	#line 38 "calc.y"
	{ yyval = yystack.l_mark[-1]; }
	+#line 497 "stdin2.calc.c"
	break;
	case 7:
	#line 40 "calc.y"
	{ yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
	+#line 502 "stdin2.calc.c"
	break;
	case 8:
	#line 42 "calc.y"
	{ yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
	+#line 507 "stdin2.calc.c"
	break;
	case 9:
	#line 44 "calc.y"
	{ yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
	+#line 512 "stdin2.calc.c"
	break;
	case 10:
	#line 46 "calc.y"
	{ yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
	+#line 517 "stdin2.calc.c"
	break;
	case 11:
	#line 48 "calc.y"
	{ yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
	+#line 522 "stdin2.calc.c"
	break;
	case 12:
	#line 50 "calc.y"
	{ yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
	+#line 527 "stdin2.calc.c"
	break;
	case 13:
	#line 52 "calc.y"
	{ yyval = yystack.l_mark[-2] \| yystack.l_mark[0]; }
	+#line 532 "stdin2.calc.c"
	break;
	case 14:
	#line 54 "calc.y"
	{ yyval = - yystack.l_mark[0]; }
	+#line 537 "stdin2.calc.c"
	break;
	case 15:
	#line 56 "calc.y"
	{ yyval = regs[yystack.l_mark[0]]; }
	+#line 542 "stdin2.calc.c"
	break;
	case 17:
	#line 61 "calc.y"
	{ yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
	+#line 547 "stdin2.calc.c"
	break;
	case 18:
	#line 63 "calc.y"
	{ yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
	+#line 552 "stdin2.calc.c"
	break;
	-#line 539 "stdin2.calc.c"
	+#line 554 "stdin2.calc.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
	--- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
	+++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
	@@ -8,7 +8,7 @@
	#endif
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	-typedef union
	+typedef union YYSTYPE
	{
	int ival; /* dreg & vreg array index values*/
	double dval; /* floating point values*/
	diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
	--- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
	+++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
	@@ -3,8 +3,8 @@
	/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */

	#define YYBYACC 1
	-#define YYMAJOR 1
	-#define YYMINOR 9
	+#define YYMAJOR 2
	+#define YYMINOR 0
	#define YYCHECK "yyyymmdd"

	#define YYEMPTY (-1)
	@@ -131,7 +131,7 @@
	#ifndef YYSTYPE_IS_DECLARED
	#define YYSTYPE_IS_DECLARED 1
	#line 32 "varsyntax_calc1.y"
	-typedef union
	+typedef union YYSTYPE
	{
	int ival; /* dreg & vreg array index values*/
	double dval; /* floating point values*/
	@@ -565,8 +565,8 @@
	}
	#endif

	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	@@ -694,78 +694,91 @@
	{
	(void) printf("%15.8f\n", yystack.l_mark[-1].dval);
	}
	+#line 698 "varsyntax_calc1.tab.c"
	break;
	case 4:
	#line 63 "varsyntax_calc1.y"
	{
	(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi);
	}
	+#line 705 "varsyntax_calc1.tab.c"
	break;
	case 5:
	#line 67 "varsyntax_calc1.y"
	{
	dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval;
	}
	+#line 712 "varsyntax_calc1.tab.c"
	break;
	case 6:
	#line 71 "varsyntax_calc1.y"
	{
	vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval;
	}
	+#line 719 "varsyntax_calc1.tab.c"
	break;
	case 7:
	#line 75 "varsyntax_calc1.y"
	{
	yyerrok;
	}
	+#line 726 "varsyntax_calc1.tab.c"
	break;
	case 9:
	#line 82 "varsyntax_calc1.y"
	{
	yyval.dval = dreg[yystack.l_mark[0].ival]; /* $$ & $1 are sufficient here*/
	}
	+#line 733 "varsyntax_calc1.tab.c"
	break;
	case 10:
	#line 86 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
	}
	+#line 740 "varsyntax_calc1.tab.c"
	break;
	case 11:
	#line 90 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
	}
	+#line 747 "varsyntax_calc1.tab.c"
	break;
	case 12:
	#line 94 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
	}
	+#line 754 "varsyntax_calc1.tab.c"
	break;
	case 13:
	#line 98 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
	}
	+#line 761 "varsyntax_calc1.tab.c"
	break;
	case 14:
	#line 102 "varsyntax_calc1.y"
	{
	yyval.dval = -yystack.l_mark[0].dval;
	}
	+#line 768 "varsyntax_calc1.tab.c"
	break;
	case 15:
	#line 106 "varsyntax_calc1.y"
	{
	yyval.dval = yystack.l_mark[-1].dval;
	}
	+#line 775 "varsyntax_calc1.tab.c"
	break;
	case 16:
	#line 112 "varsyntax_calc1.y"
	{
	yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
	}
	+#line 782 "varsyntax_calc1.tab.c"
	break;
	case 17:
	#line 116 "varsyntax_calc1.y"
	@@ -778,12 +791,14 @@
	YYERROR;
	}
	}
	+#line 795 "varsyntax_calc1.tab.c"
	break;
	case 18:
	#line 126 "varsyntax_calc1.y"
	{
	yyval.vval = vreg[yystack.l_mark[0].ival];
	}
	+#line 802 "varsyntax_calc1.tab.c"
	break;
	case 19:
	#line 130 "varsyntax_calc1.y"
	@@ -791,6 +806,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
	}
	+#line 810 "varsyntax_calc1.tab.c"
	break;
	case 20:
	#line 135 "varsyntax_calc1.y"
	@@ -798,6 +814,7 @@
	yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
	yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
	}
	+#line 818 "varsyntax_calc1.tab.c"
	break;
	case 21:
	#line 140 "varsyntax_calc1.y"
	@@ -805,6 +822,7 @@
	yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
	}
	+#line 826 "varsyntax_calc1.tab.c"
	break;
	case 22:
	#line 145 "varsyntax_calc1.y"
	@@ -812,18 +830,21 @@
	yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
	yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
	}
	+#line 834 "varsyntax_calc1.tab.c"
	break;
	case 23:
	#line 150 "varsyntax_calc1.y"
	{
	yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 841 "varsyntax_calc1.tab.c"
	break;
	case 24:
	#line 154 "varsyntax_calc1.y"
	{
	yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 848 "varsyntax_calc1.tab.c"
	break;
	case 25:
	#line 158 "varsyntax_calc1.y"
	@@ -831,6 +852,7 @@
	if (dcheck(yystack.l_mark[0].vval)) YYERROR;
	yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
	}
	+#line 856 "varsyntax_calc1.tab.c"
	break;
	case 26:
	#line 163 "varsyntax_calc1.y"
	@@ -838,6 +860,7 @@
	if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
	yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
	}
	+#line 864 "varsyntax_calc1.tab.c"
	break;
	case 27:
	#line 168 "varsyntax_calc1.y"
	@@ -845,14 +868,16 @@
	yyval.vval.hi = -yystack.l_mark[0].vval.lo;
	yyval.vval.lo = -yystack.l_mark[0].vval.hi;
	}
	+#line 872 "varsyntax_calc1.tab.c"
	break;
	case 28:
	#line 173 "varsyntax_calc1.y"
	{
	yyval.vval = yystack.l_mark[-1].vval;
	}
	+#line 879 "varsyntax_calc1.tab.c"
	break;
	-#line 856 "varsyntax_calc1.tab.c"
	+#line 881 "varsyntax_calc1.tab.c"
	}
	yystack.s_mark -= yym;
	yystate = *yystack.s_mark;
	diff --git a/contrib/byacc/verbose.c b/contrib/byacc/verbose.c
	--- a/contrib/byacc/verbose.c
	+++ b/contrib/byacc/verbose.c
	@@ -1,4 +1,4 @@
	-/* $Id: verbose.c,v 1.12 2016/06/07 00:22:05 tom Exp $ */
	+/* $Id: verbose.c,v 1.14 2021/05/20 23:57:23 tom Exp $ */

	#include "defs.h"

	@@ -36,9 +36,10 @@
	if (SRtotal \|\| RRtotal)
	log_conflicts();

	- fprintf(verbose_file, "\n\n%d terminals, %d nonterminals\n", ntokens,
	- nvars);
	- fprintf(verbose_file, "%d grammar rules, %d states\n", nrules - 2, nstates);
	+ fprintf(verbose_file, "\n\n%ld terminals, %ld nonterminals\n",
	+ (long)ntokens, (long)nvars);
	+ fprintf(verbose_file, "%ld grammar rules, %ld states\n",
	+ (long)(nrules - 2), (long)nstates);
	#if defined(YYBTYACC)
	{ /* print out the grammar symbol # and parser internal symbol # for each
	symbol as an aide to writing the implementation for YYDESTRUCT_CALL()
	@@ -92,14 +93,14 @@
	{
	fprintf(verbose_file, "State %d contains ", i);
	if (SRconflicts[i] > 0)
	- fprintf(verbose_file, "%d shift/reduce conflict%s",
	- SRconflicts[i],
	+ fprintf(verbose_file, "%ld shift/reduce conflict%s",
	+ (long)SRconflicts[i],
	PLURAL(SRconflicts[i]));
	if (SRconflicts[i] && RRconflicts[i])
	fprintf(verbose_file, ", ");
	if (RRconflicts[i] > 0)
	- fprintf(verbose_file, "%d reduce/reduce conflict%s",
	- RRconflicts[i],
	+ fprintf(verbose_file, "%ld reduce/reduce conflict%s",
	+ (long)RRconflicts[i],
	PLURAL(RRconflicts[i]));
	fprintf(verbose_file, ".\n");
	}
	@@ -147,20 +148,20 @@
	if (state == final_state && symbol == 0)
	{
	fprintf(verbose_file, "%d: shift/reduce conflict \
	-(accept, reduce %d) on $end\n", state, p->number - 2);
	+(accept, reduce %ld) on $end\n", state, (long)(p->number - 2));
	}
	else
	{
	if (act == SHIFT)
	{
	fprintf(verbose_file, "%d: shift/reduce conflict \
	-(shift %d, reduce %d) on %s\n", state, number, p->number - 2,
	+(shift %ld, reduce %ld) on %s\n", state, (long)number, (long)(p->number - 2),
	symbol_name[symbol]);
	}
	else
	{
	fprintf(verbose_file, "%d: reduce/reduce conflict \
	-(reduce %d, reduce %d) on %s\n", state, number - 2, p->number - 2,
	+(reduce %ld, reduce %ld) on %s\n", state, (long)(number - 2), (long)(p->number - 2),
	symbol_name[symbol]);
	}
	}
	@@ -172,18 +173,14 @@
	print_core(int state)
	{
	int i;
	- int k;
	- int rule;
	- core *statep;
	- Value_t *sp;
	- Value_t *sp1;
	-
	- statep = state_table[state];
	- k = statep->nitems;
	+ core *statep = state_table[state];
	+ int k = statep->nitems;

	for (i = 0; i < k; i++)
	{
	- sp1 = sp = ritem + statep->items[i];
	+ int rule;
	+ Value_t *sp = ritem + statep->items[i];
	+ Value_t *sp1 = sp;

	while (*sp >= 0)
	++sp;
	@@ -200,7 +197,7 @@
	fprintf(verbose_file, " %s", symbol_name[*sp]);
	sp++;
	}
	- fprintf(verbose_file, " (%d)\n", -2 - *sp);
	+ fprintf(verbose_file, " (%ld)\n", (long)(-2 - *sp));
	}
	}

	@@ -241,8 +238,8 @@
	for (i = 0; i < nnulls; ++i)
	{
	j = null_rules[i];
	- fprintf(verbose_file, "\t%s : . (%d)\n", symbol_name[rlhs[j]],
	- j - 2);
	+ fprintf(verbose_file, "\t%s : . (%ld)\n", symbol_name[rlhs[j]],
	+ (long)(j - 2));
	}
	fprintf(verbose_file, "\n");
	}
	@@ -252,7 +249,6 @@
	{
	action *p;
	shifts *sp;
	- int as;

	if (stateno == final_state)
	fprintf(verbose_file, "\t$end accept\n");
	@@ -267,7 +263,8 @@
	sp = shift_table[stateno];
	if (sp && sp->nshifts > 0)
	{
	- as = accessing_symbol[sp->shift[sp->nshifts - 1]];
	+ int as = accessing_symbol[sp->shift[sp->nshifts - 1]];
	+
	if (ISVAR(as))
	print_gotos(stateno);
	}
	@@ -291,8 +288,8 @@
	for (; p; p = p->next)
	{
	if (p->action_code == SHIFT && p->suppressed == 0)
	- fprintf(verbose_file, "\t%s shift %d\n",
	- symbol_name[p->symbol], p->number);
	+ fprintf(verbose_file, "\t%s shift %ld\n",
	+ symbol_name[p->symbol], (long)p->number);
	#if defined(YYBTYACC)
	if (backtrack && p->action_code == SHIFT && p->suppressed == 1)
	fprintf(verbose_file, "\t%s [trial] shift %d\n",
	@@ -305,7 +302,7 @@
	static void
	print_reductions(action *p, int defred2)
	{
	- int k, anyreds;
	+ int anyreds;
	action *q;

	anyreds = 0;
	@@ -326,7 +323,8 @@
	{
	if (p->action_code == REDUCE && p->number != defred2)
	{
	- k = p->number - 2;
	+ int k = p->number - 2;
	+
	if (p->suppressed == 0)
	fprintf(verbose_file, "\t%s reduce %d\n",
	symbol_name[p->symbol], k);
	@@ -346,8 +344,7 @@
	static void
	print_gotos(int stateno)
	{
	- int i, k;
	- int as;
	+ int i;
	Value_t *to_state2;
	shifts *sp;

	@@ -356,8 +353,9 @@
	to_state2 = sp->shift;
	for (i = 0; i < sp->nshifts; ++i)
	{
	- k = to_state2[i];
	- as = accessing_symbol[k];
	+ int k = to_state2[i];
	+ int as = accessing_symbol[k];
	+
	if (ISVAR(as))
	fprintf(verbose_file, "\t%s goto %d\n", symbol_name[as], k);
	}
	diff --git a/contrib/byacc/warshall.c b/contrib/byacc/warshall.c
	--- a/contrib/byacc/warshall.c
	+++ b/contrib/byacc/warshall.c
	@@ -1,4 +1,4 @@
	-/* $Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp $ */
	+/* $Id: warshall.c,v 1.9 2020/09/22 20:17:00 tom Exp $ */

	#include "defs.h"

	@@ -10,7 +10,6 @@
	unsigned *rowj;
	unsigned *rp;
	unsigned *rend;
	- unsigned *ccol;
	unsigned *relend;
	unsigned *cword;
	unsigned *rowi;
	@@ -23,12 +22,13 @@
	rowi = R;
	while (rowi < relend)
	{
	- ccol = cword;
	+ unsigned *ccol = cword;
	+
	rowj = R;

	while (rowj < relend)
	{
	- if (*ccol & (1u << i))
	+ if (*ccol & (1U << i))
	{
	rp = rowi;
	rend = rowj + rowsize;
	@@ -70,7 +70,7 @@
	rp = R;
	while (rp < relend)
	{
	- *rp \|= (1u << i);
	+ *rp \|= (1U << i);
	if (++i >= BITS_PER_WORD)
	{
	i = 0;
	diff --git a/contrib/byacc/yacc.1 b/contrib/byacc/yacc.1
	--- a/contrib/byacc/yacc.1
	+++ b/contrib/byacc/yacc.1
	@@ -1,4 +1,4 @@
	-.\" $Id: yacc.1,v 1.33 2020/03/30 23:36:40 tom Exp $
	+.\" $Id: yacc.1,v 1.42 2022/11/06 17:07:16 tom Exp $
	.\"
	.\" .TH YACC 1 "July\ 15,\ 1990"
	.\" .UC 6
	@@ -27,11 +27,11 @@
	.ie n .IP \(bu 4
	.el .IP \(bu 2
	..
	-.TH YACC 1 "November 19, 2019" "Berkeley Yacc" "User Commands"
	+.TH YACC 1 "November 6, 2022" "Berkeley Yacc" "User Commands"
	.SH NAME
	\*N \- an LALR(1) parser generator
	.SH SYNOPSIS
	-.B \*n [ \-BdgilLPrtvVy ] [ \-b
	+.B \*n [ \-BdghilLPrtvVy ] [ \-b
	.I file_prefix
	.B ] [ \-H
	.I defines_file
	@@ -54,7 +54,7 @@
	.PP
	The following options are available:
	.TP 5
	-\fB\-b \fP\fIfile_prefix\fR
	+\fB\-b \fIfile_prefix\fR
	The
	.B \-b
	option changes the prefix prepended to the output file names to
	@@ -72,7 +72,10 @@
	to be written.
	It contains #define's for the token identifiers.
	.TP
	-\fB\-H \fP\fIdefines_file\fR
	+.B \-h
	+print a usage message to the standard error.
	+.TP
	+\fB\-H \fIdefines_file\fR
	causes #define's for the token identifiers
	to be written to the given \fIdefines_file\fP rather
	than the \fBy.tab.h\fP file used by the \fB\-d\fP option.
	@@ -117,13 +120,13 @@
	enable position processing,
	e.g., \(``%locations\('' (compile-time configuration for \fBbtyacc\fP).
	.TP
	-\fB\-o \fP\fIoutput_file\fR
	+\fB\-o \fIoutput_file\fR
	specify the filename for the parser file.
	If this option is not given, the output filename is
	the file prefix concatenated with the file suffix, e.g., \fBy.tab.c\fP.
	This overrides the \fB\-b\fP option.
	.TP
	-\fB\-p \fP\fIsymbol_prefix\fR
	+\fB\-p \fIsymbol_prefix\fR
	The
	.B \-p
	option changes the prefix prepended to yacc-generated symbols to
	@@ -133,7 +136,7 @@
	.B yy.
	.TP
	.B \-P
	-create a reentrant parser, e.g., \(``%pure-parser\(''.
	+create a reentrant parser, e.g., \(``%pure\-parser\(''.
	.TP
	.B \-r
	The
	@@ -152,7 +155,7 @@
	a \(``\fB%token\fP\('' statement,
	to more closely match original \fByacc\fP behavior.
	.IP
	-Normally when \fByacc\fP sees a line such as
	+Normally when \fB\*n\fP sees a line such as
	.Ex
	%token OP_ADD "ADD"
	.Ee
	@@ -180,6 +183,11 @@
	option changes the preprocessor directives generated by
	.B \*n
	so that debugging statements will be incorporated in the compiled code.
	+.IP
	+\fB\*N\fR sends debugging output to the standard output
	+(compatible with both the original \fByacc\fP and \fBbtyacc\fP),
	+while \fBbtyacc\fP writes debugging output to the standard error
	+(like \fBbison\fP).
	.TP
	.B \-v
	The
	@@ -192,11 +200,11 @@
	print the version number to the standard output.
	.TP
	.B \-y
	-\fByacc\fP ignores this option,
	+\fB\*n\fP ignores this option,
	which bison supports for ostensible POSIX compatibility.
	.PP
	The \fIfilename\fP parameter is not optional.
	-However, \fByacc\fP accepts a single \(``\-\('' to read the grammar
	+However, \fB\n\fP accepts a single \(``\-\*('' to read the grammar
	from the standard input.
	A double \(``\-\-\('' marker denotes the end of options.
	A single \fIfilename\fP parameter is expected after a \(``\-\-\('' marker.
	@@ -204,6 +212,7 @@
	.B \*N
	provides some extensions for
	compatibility with bison and other implementations of yacc.
	+It accepts several \fIlong options\fP which have equivalents in \*n.
	The \fB%destructor\fP and \fB%locations\fP features are available
	only if \fB\*n\fP has been configured and compiled to support the
	back-tracking (\fBbtyacc\fP) functionality.
	@@ -234,6 +243,9 @@
	\fB\*n\fP inserts those into the corresponding code- or defines-file
	in the order that they appear in the source file.
	.TP
	+\fB %debug\fP
	+This has the same effect as the \(``\-t\('' command-line option.
	+.TP
	\fB %destructor\fP { \fIcode\fP } \fIsymbol+\fP
	defines code that is invoked when a symbol is automatically
	discarded during error recovery.
	@@ -252,7 +264,7 @@
	The bracketed \fIcode\fP is invoked whenever the parser discards one of
	the symbols.
	Within \fIcode\fP, \(``\fB$$\fP\('' or
	-\(``\fB$<tag>$\fP\('' designates the semantic value associated with the
	+\(``\fB$<\fItag\fB>$\fR\('' designates the semantic value associated with the
	discarded symbol, and \(``\fB@$\fP\('' designates its location (see
	\fB%locations\fP directive).
	.IP
	@@ -276,23 +288,26 @@
	for grammar symbols that have no declared semantic type tag.
	.RE
	.TP
	+\fB %empty\fP
	+ignored by \fB\*n\fP.
	+.TP
	\fB %expect\fP \fInumber\fP
	-tells \fByacc\fP the expected number of shift/reduce conflicts.
	+tells \fB\*n\fP the expected number of shift/reduce conflicts.
	That makes it only report the number if it differs.
	.TP
	-\fB %expect-rr\fP \fInumber\fP
	-tell \fByacc\fP the expected number of reduce/reduce conflicts.
	+\fB %expect\-rr\fP \fInumber\fP
	+tell \fB\*n\fP the expected number of reduce/reduce conflicts.
	That makes it only report the number if it differs.
	This is (unlike bison) allowable in LALR parsers.
	.TP
	\fB %locations\fP
	-tells \fByacc\fP to enable management of position information associated
	+tells \fB\*n\fP to enable management of position information associated
	with each token, provided by the lexer in the global variable \fByylloc\fP,
	similar to management of semantic value information provided in \fByylval\fP.
	.IP
	As for semantic values, locations can be referenced within actions using
	-\fB@$\fP to refer to the location of the left hand side symbol, and \fB@N\fP
	-(\fBN\fP an integer) to refer to the location of one of the right hand side
	+\fB@$\fP to refer to the location of the left hand side symbol, and \fB@\fIN\fR
	+(\fIN\fP an integer) to refer to the location of one of the right hand side
	symbols.
	Also as for semantic values, when a rule is matched, a default
	action is used the compute the location represented by \fB@$\fP as the
	@@ -320,23 +335,23 @@
	redefined by the user.
	.IP
	This directive adds a \fBYYLTYPE\fP parameter to \fByyerror()\fP.
	-If the \fB%pure-parser\fP directive is present,
	+If the \fB%pure\-parser\fP directive is present,
	a \fBYYLTYPE\fP parameter is added to \fByylex()\fP calls.
	.TP
	-\fB %lex-param\fP { \fIargument-declaration\fP }
	+\fB %lex\-param\fP { \fIargument-declaration\fP }
	By default, the lexer accepts no parameters, e.g., \fByylex()\fP.
	Use this directive to add parameter declarations for your customized lexer.
	.TP
	-\fB %parse-param\fP { \fIargument-declaration\fP }
	+\fB %parse\-param\fP { \fIargument-declaration\fP }
	By default, the parser accepts no parameters, e.g., \fByyparse()\fP.
	Use this directive to add parameter declarations for your customized parser.
	.TP
	-\fB %pure-parser\fP
	+\fB %pure\-parser\fP
	Most variables (other than \fByydebug\fP and \fByynerrs\fP) are
	allocated on the stack within \fByyparse\fP, making the parser reasonably
	reentrant.
	.TP
	-\fB %token-table\fP
	+\fB %token\-table\fP
	Make the parser's names for tokens available in the \fByytname\fP array.
	However,
	.B \*n
	@@ -382,14 +397,14 @@
	Bison's support for \(``%expect\('' is broken in more than one release.
	For best results using bison, delete that directive.
	.bP
	-Bison has no equivalent for some of \fByacc\fP's command-line options,
	+Bison has no equivalent for some of \fB\*n\fP's command-line options,
	relying on directives embedded in the grammar file.
	.bP
	Bison's \(``\fB\-y\fP\('' option does not affect bison's lack of support for
	features of AT&T yacc which were deemed obsolescent.
	.bP
	\fBYacc\fP accepts multiple parameters
	-with \fB%lex-param\fP and \fB%parse-param\fP in two forms
	+with \fB%lex\-param\fP and \fB%parse\-param\fP in two forms
	.Ex
	{type1 name1} {type2 name2} ...
	{type1 name1, type2 name2 ...}
	@@ -398,7 +413,7 @@
	Bison accepts the latter (though undocumented), but depending on the
	release may generate bad code.
	.bP
	-Like bison, \fByacc\fP will add parameters specified via \fB%parse-param\fP
	+Like bison, \fB\*n\fP will add parameters specified via \fB%parse\-param\fP
	to \fByyparse\fP, \fByyerror\fP and (if configured for back-tracking)
	to the destructor declared using \fB%destructor\fP.
	Bison puts the additional parameters \fIfirst\fP for
	diff --git a/contrib/byacc/yaccpar.c b/contrib/byacc/yaccpar.c
	--- a/contrib/byacc/yaccpar.c
	+++ b/contrib/byacc/yaccpar.c
	@@ -2,7 +2,7 @@
	* @Id: skel2c,v 1.4 2016/06/07 00:26:09 tom Exp @
	*/

	-/* @Id: yaccpar.skel,v 1.10 2018/05/06 21:28:14 Guy.Harris Exp @ */
	+/* @Id: yaccpar.skel,v 1.11 2021/06/19 20:45:25 tom Exp @ */

	#include "defs.h"

	@@ -227,8 +227,8 @@

	const char *const body_3[] =
	{
	- " yym = 0;",
	- " yyn = 0;",
	+ " /* yym is set below */",
	+ " /* yyn is set below */",
	" yynerrs = 0;",
	" yyerrflag = 0;",
	" yychar = YYEMPTY;",
	diff --git a/contrib/byacc/yaccpar.skel b/contrib/byacc/yaccpar.skel
	--- a/contrib/byacc/yaccpar.skel
	+++ b/contrib/byacc/yaccpar.skel
	@@ -1,4 +1,4 @@
	-/* $Id: yaccpar.skel,v 1.10 2018/05/06 21:28:14 Guy.Harris Exp $ */
	+/* $Id: yaccpar.skel,v 1.12 2021/08/08 19:55:43 tom Exp $ */

	#include "defs.h"

	@@ -174,8 +174,8 @@
	memset(&yylval, 0, sizeof(yylval));

	%% body_3
	- yym = 0;
	- yyn = 0;
	+ /* yym is set below */
	+ /* yyn is set below */
	yynerrs = 0;
	yyerrflag = 0;
	yychar = YYEMPTY;
	diff --git a/usr.bin/yacc/config.h b/usr.bin/yacc/config.h
	--- a/usr.bin/yacc/config.h
	+++ b/usr.bin/yacc/config.h
	@@ -3,22 +3,22 @@
	/* config_h.in. Generated automatically from configure.in by autoheader. */

	/* Define to noreturn-attribute for gcc */
	-/* #undef GCC_NORETURN */
	+#define GCC_NORETURN __attribute__((noreturn))

	/* Define to 1 if the compiler supports gcc-like printf attribute. */
	-/* #undef GCC_PRINTF */
	+#define GCC_PRINTF 1

	/* Define to printf-attribute for gcc */
	-/* #undef GCC_PRINTFLIKE */
	+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))

	/* Define to 1 if the compiler supports gcc-like scanf attribute. */
	-/* #undef GCC_SCANF */
	+#define GCC_SCANF 1

	/* Define to sscanf-attribute for gcc */
	-/* #undef GCC_SCANFLIKE */
	+#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))

	/* Define to unused-attribute for gcc */
	-/* #undef GCC_UNUSED */
	+#define GCC_UNUSED __attribute__((unused))

	/* Define if you have the <fcntl.h> header file. */
	#define HAVE_FCNTL_H 1
	@@ -53,6 +53,9 @@
	/* Define if you have the <stdlib.h> header file. */
	#define HAVE_STDLIB_H 1

	+/* Define if <stdnoreturn.h> header is available and working */
	+/* #undef HAVE_STDNORETURN_H */
	+
	/* Define if you have the <strings.h> header file. */
	#define HAVE_STRINGS_H 1

	@@ -86,8 +89,11 @@
	/* Define if you have the ANSI C header files. */
	#define STDC_HEADERS 1

	+/* Define if C11 _Noreturn keyword is supported */
	+/* #undef STDC_NORETURN */
	+
	/* Define to the system name. */
	-#define SYSTEM_NAME "freebsd13.0"
	+#define SYSTEM_NAME "freebsd14.0"

	/* "Define to 1 if you want to use dbmalloc for testing." */
	/* #undef USE_DBMALLOC */
	@@ -99,7 +105,7 @@
	/* #undef USE_VALGRIND */

	/* Define to 1 to enable backtracking extension */
	-/* #undef YYBTYACC */
	+#define YYBTYACC 1

	/* Define to 1 if you want to perform memory-leak testing. */
	/* #undef YY_NO_LEAKS */

File Metadata

Mime Type: text/plain
Expires: Sun, Feb 8, 7:09 PM (15 h, 5 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: d8/99/e6525ccbe5f945541284bb4e857d
Default Alt Text: D38421.id116714.diff (1008 KB)

D38421.id116714.diffNo OneTemporaryActions

D38421.id116714.diffView Options

File Metadata

Event Timeline

D38421.id116714.diff
No OneTemporary
Actions

D38421.id116714.diff
View Options