diff options
168 files changed, 1680 insertions, 1912 deletions
@@ -1,3 +1,58 @@ +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-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 @@ -1708,7 +1763,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). @@ -0,0 +1,10 @@ + Berkeley Yacc is distributed with no warranty whatever. The author +and any other contributors take no responsibility for the 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. @@ -1,8 +1,9 @@ -MANIFEST for byacc-20200330, version t20200330 +MANIFEST for byacc-20200910, version t20200910 -------------------------------------------------------------------------------- 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 @@ -105,6 +106,30 @@ test/btyacc/calc3.error reference output for testing 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 +140,18 @@ test/btyacc/code_error.error reference output for testing 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 +400,12 @@ test/btyacc/rename_debug.error reference output for testing 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 +416,16 @@ test/btyacc_demo.y testcase for btyacc 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 @@ -455,6 +503,30 @@ test/yacc/calc3.error reference output for testing 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.error reference output for testing 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.error reference output for testing 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 @@ -1 +1 @@ -20200330 +20200910 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.48 2020/03/10 22:53:47 tom Exp $ +dnl $Id: aclocal.m4,v 1.49 2020/09/10 14:49:09 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2019,2020 Thomas E. Dickey @@ -54,10 +54,11 @@ define([CF_ACVERSION_COMPARE], [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: 14 updated: 2020/04/04 16:16:13 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 @@ -158,6 +159,12 @@ dnl Allow user to disable a normally-on option. 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 @@ -280,7 +287,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 +dnl CF_CLANG_COMPILER version: 3 updated: 2020/08/28 04:10:22 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 @@ -311,6 +318,10 @@ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) fi + +if test "x$CLANG_COMPILER" = "xyes" ; then + CF_APPEND_TEXT(CFLAGS,-Wno-error=implicit-function-declaration) +fi ]) dnl --------------------------------------------------------------------------- dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47 @@ -433,14 +444,78 @@ if test "$with_no_leaks" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47 +dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21 +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], + [with_warnings=yes], + [with_warnings=no]) +AC_MSG_RESULT($with_warnings) +if test "$with_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: 2 updated: 2020/08/28 15:08:28 +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_VERBOSE(repairing $1: [$]$1) + cf_temp_flags= + for cf_temp_scan in [$]$1 + do + case "x$cf_temp_scan" in + (x-Werror=*) + CF_APPEND_TEXT(EXTRA_CFLAGS,"$cf_temp_scan") + ;; + (*) + CF_APPEND_TEXT(cf_temp_flags,"$cf_temp_scan") + ;; + esac + done + $1="$cf_temp_flags" + CF_VERBOSE(... fixed [$]$1) + CF_VERBOSE(... extra $EXTRA_CFLAGS) + ;; + esac +fi +AC_SUBST(EXTRA_CFLAGS) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21 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 +if ( test "$GCC" = yes || test "$GXX" = yes ) then cat > conftest.i <<EOF #ifndef GCC_PRINTF @@ -560,7 +635,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) 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: 38 updated: 2020/08/28 15:08:28 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: @@ -603,7 +678,7 @@ then 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 +701,6 @@ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" 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" @@ -1561,29 +1635,6 @@ CF_NO_LEAKS_OPTION(valgrind, [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 --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, @@ -1,4 +1,4 @@ -/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp $ */ +/* $Id: closure.c,v 1.12 2020/09/10 17:22:08 tom Exp $ */ #include "defs.h" @@ -21,7 +21,6 @@ set_EFF(void) { unsigned *row; int symbol; - Value_t *sp; int rowsize; int i; int rule; @@ -32,7 +31,7 @@ set_EFF(void) 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 +55,7 @@ void set_first_derives(void) { unsigned *rrow; - unsigned *vrow; int j; - unsigned k; unsigned cword = 0; Value_t *rp; @@ -77,8 +74,9 @@ set_first_derives(void) rrow = first_derives + ntokens * rulesetsize; 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) @@ -111,7 +109,6 @@ void closure(Value_t *nucleus, int n) { unsigned ruleno; - unsigned word; unsigned i; Value_t *csp; unsigned *dsp; @@ -120,7 +117,6 @@ closure(Value_t *nucleus, int n) Value_t *csend; unsigned *rsend; - int symbol; Value_t itemno; rulesetsize = WORDSIZE(nrules); @@ -131,7 +127,8 @@ closure(Value_t *nucleus, int n) csend = nucleus + n; for (csp = nucleus; csp < csend; ++csp) { - symbol = ritem[*csp]; + int symbol = ritem[*csp]; + if (ISVAR(symbol)) { dsp = first_derives + symbol * rulesetsize; @@ -146,7 +143,8 @@ closure(Value_t *nucleus, int n) csp = nucleus; for (rsp = ruleset; rsp < rsend; ++rsp) { - word = *rsp; + unsigned word = *rsp; + if (word) { for (i = 0; i < BITS_PER_WORD; ++i) diff --git a/config.guess b/config.guess index 95b16c7..92bfc33 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-12-21' +timestamp='2020-04-26' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -1095,7 +1095,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1629,6 +1639,12 @@ 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 and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +EOF + +year=`echo $timestamp | sed 's,-.*,,'` +# shellcheck disable=SC2003 +if test "`expr "\`date +%Y\`" - "$year"`" -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 +1672,7 @@ UNAME_RELEASE = "$UNAME_RELEASE" UNAME_SYSTEM = "$UNAME_SYSTEM" UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-06-30' +timestamp='2020-06-28' # 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 @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -124,28 +124,27 @@ case $1 in ;; *-*-*-*) 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 +153,7 @@ case $1 in case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ case $1 in # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ case $1 in | 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 +190,451 @@ case $1 in 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 +686,17 @@ case $basic_machine in 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 +706,7 @@ case $basic_machine in dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -712,7 +715,7 @@ case $basic_machine in elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -725,7 +728,7 @@ case $basic_machine in 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 +771,36 @@ case $basic_machine in i*86v32) cpu=`echo "$1" | sed -e 's/86.*/86/'` vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) 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 +811,26 @@ case $basic_machine in *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 +841,12 @@ case $basic_machine in 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 +883,12 @@ case $basic_machine in 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 +905,7 @@ case $basic_machine in w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -955,11 +958,11 @@ case $cpu-$vendor in # 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 @@ -1003,7 +1006,7 @@ case $cpu-$vendor in 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 +1015,7 @@ case $cpu-$vendor in ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1025,7 +1028,7 @@ case $cpu-$vendor in ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1035,7 +1038,7 @@ case $cpu-$vendor in ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1045,7 +1048,7 @@ case $cpu-$vendor in ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1105,7 +1108,7 @@ case $cpu-$vendor in # 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 +1119,7 @@ case $cpu-$vendor in vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1138,16 +1141,12 @@ case $cpu-$vendor in 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} ;; *) @@ -1229,6 +1228,7 @@ case $cpu-$vendor in | pyramid \ | riscv | riscv32 | riscv64 \ | 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 \ @@ -1275,8 +1275,43 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if [ x$basic_os != x ] then + +# First recognize some ad-hoc caes, 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|'` + ;; + nto-qnx*) + kernel=nto + os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <<EOF +$basic_os +EOF + ;; + # 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. @@ -1296,9 +1331,6 @@ case $os in 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 @@ -1322,10 +1354,7 @@ case $os in 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. - ;; - scout) + sco*v* | scout) # Don't match below ;; sco*) @@ -1334,41 +1363,6 @@ case $os in 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) @@ -1381,31 +1375,19 @@ case $os in 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*) @@ -1475,18 +1457,12 @@ case $os in 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 +1479,11 @@ case $os in ;; 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 +1496,7 @@ else # 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 +1508,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1705,84 +1675,169 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi | eabihf | gnueabi | gnueabihf) + ;; + # 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* | 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* \ + | 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* ) + ;; + # 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-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -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*) + ;; + nto-qnx*) + ;; + *-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: @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.23 . +# From configure.in Revision: 1.25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20200111. +# Generated by Autoconf 2.52.20200802. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -702,7 +702,7 @@ Optional Features: --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 + --enable-warnings test: turn on gcc compiler warnings --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 @@ -778,7 +778,7 @@ This file contains any messages produced by compilers while 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.20200802. Invocation command line was $ $0 $@ @@ -1965,7 +1965,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$CLANG_COMPILER" >&6 fi -echo "$as_me:1968: checking for $CC option to accept ANSI C" >&5 +if test "x$CLANG_COMPILER" = "xyes" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}-Wno-error=implicit-function-declaration" + +fi + +echo "$as_me:1975: 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 @@ -1973,7 +1980,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1976 "configure" +#line 1983 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2022,16 +2029,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2025: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2032: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2028: \$? = $ac_status" >&5 + echo "$as_me:2035: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2031: \"$ac_try\"") >&5 + { (eval echo "$as_me:2038: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2034: \$? = $ac_status" >&5 + echo "$as_me:2041: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2048,10 +2055,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2051: result: none needed" >&5 + echo "$as_me:2058: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2054: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2061: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2059,13 +2066,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2062: checking \$CFLAGS variable" >&5 +echo "$as_me:2069: 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:2073: 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:2075: 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= @@ -2173,18 +2180,18 @@ fi done ;; (*) - echo "$as_me:2176: result: ok" >&5 + echo "$as_me:2183: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2181: checking \$CC variable" >&5 +echo "$as_me:2188: 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:2192: 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:2194: 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/[ ]*[ ]-[^ ].*//'` @@ -2301,24 +2308,24 @@ fi 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}:2311: 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}:2315: 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}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2316: result: ok" >&5 + echo "$as_me:2323: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2328: 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 +2345,11 @@ fi 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:2348: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2345: result: no" >&5 + echo "$as_me:2352: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2359,7 +2366,7 @@ fi # 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:2369: 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 +2415,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2411: result: $INSTALL" >&5 +echo "$as_me:2418: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2419,7 +2426,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2422: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2429: 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 @@ -2446,7 +2453,7 @@ else fi fi -echo "$as_me:2449: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2456: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2457,7 +2464,7 @@ for ac_prog in exctags ctags 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:2467: 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 +2479,7 @@ for ac_dir in $ac_dummy; do 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:2482: found $ac_dir/$ac_word" >&5 break done @@ -2480,10 +2487,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2483: result: $CTAGS" >&5 + echo "$as_me:2490: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2486: result: no" >&5 + echo "$as_me:2493: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2494,7 +2501,7 @@ for ac_prog in exetags etags 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:2504: 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 +2516,7 @@ for ac_dir in $ac_dummy; do 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:2519: found $ac_dir/$ac_word" >&5 break done @@ -2517,10 +2524,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2520: result: $ETAGS" >&5 + echo "$as_me:2527: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2523: result: no" >&5 + echo "$as_me:2530: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2529,7 +2536,7 @@ done # 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:2539: 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 +2551,7 @@ for ac_dir in $ac_dummy; do 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:2554: found $ac_dir/$ac_word" >&5 break done @@ -2553,17 +2560,17 @@ fi 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:2563: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2559: result: no" >&5 + echo "$as_me:2566: 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:2573: 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 +2585,7 @@ for ac_dir in $ac_dummy; do 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:2588: found $ac_dir/$ac_word" >&5 break done @@ -2587,10 +2594,10 @@ fi 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:2597: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2593: result: no" >&5 + echo "$as_me:2600: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2614,7 +2621,7 @@ for ac_prog in mawk gawk nawk awk 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:2624: 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 +2636,7 @@ for ac_dir in $ac_dummy; do 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:2639: found $ac_dir/$ac_word" >&5 break done @@ -2637,17 +2644,17 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2640: result: $AWK" >&5 + echo "$as_me:2647: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2643: result: no" >&5 + echo "$as_me:2650: 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:2657: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } @@ -2655,7 +2662,7 @@ for ac_prog in lint cppcheck splint 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:2665: 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 +2677,7 @@ for ac_dir in $ac_dummy; do 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:2680: found $ac_dir/$ac_word" >&5 break done @@ -2678,10 +2685,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2681: result: $LINT" >&5 + echo "$as_me:2688: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2684: result: no" >&5 + echo "$as_me:2691: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2694,14 +2701,14 @@ case "x$LINT" in ;; esac -echo "$as_me:2697: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:2704: 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" +#line 2711 "configure" #include "confdefs.h" #include <stdio.h> int @@ -2720,16 +2727,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2723: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2726: \$? = $ac_status" >&5 + echo "$as_me:2733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2729: \"$ac_try\"") >&5 + { (eval echo "$as_me:2736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2732: \$? = $ac_status" >&5 + echo "$as_me:2739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_visible=no else @@ -2740,7 +2747,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2743: result: $cf_cv_posix_visible" >&5 +echo "$as_me:2750: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -2785,14 +2792,14 @@ case $host_os in cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:2788: checking if this is the GNU C library" >&5 +echo "$as_me:2795: 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" +#line 2802 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2811,16 +2818,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2814: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2817: \$? = $ac_status" >&5 + echo "$as_me:2824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2820: \"$ac_try\"") >&5 + { (eval echo "$as_me:2827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2823: \$? = $ac_status" >&5 + echo "$as_me:2830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_library=yes else @@ -2831,7 +2838,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2834: result: $cf_cv_gnu_library" >&5 +echo "$as_me:2841: 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 +2846,7 @@ if test x$cf_cv_gnu_library = xyes; then # 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:2849: 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 @@ -2851,7 +2858,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2854 "configure" +#line 2861 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2870,16 +2877,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2873: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2876: \$? = $ac_status" >&5 + echo "$as_me:2883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2879: \"$ac_try\"") >&5 + { (eval echo "$as_me:2886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2882: \$? = $ac_status" >&5 + echo "$as_me:2889: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_library_219=yes else @@ -2891,12 +2898,12 @@ 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:2901: 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:2906: 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 @@ -3001,7 +3008,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 3004 "configure" +#line 3011 "configure" #include "confdefs.h" #include <limits.h> @@ -3021,16 +3028,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3031: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3027: \$? = $ac_status" >&5 + echo "$as_me:3034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3030: \"$ac_try\"") >&5 + { (eval echo "$as_me:3037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3033: \$? = $ac_status" >&5 + echo "$as_me:3040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -3041,7 +3048,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3044: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:3051: 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 +3057,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 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:3060: 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" +#line 3067 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3072,16 +3079,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3082: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3078: \$? = $ac_status" >&5 + echo "$as_me:3085: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3081: \"$ac_try\"") >&5 + { (eval echo "$as_me:3088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3084: \$? = $ac_status" >&5 + echo "$as_me:3091: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3188,7 +3195,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 3191 "configure" +#line 3198 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3203,16 +3210,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3206: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3213: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3209: \$? = $ac_status" >&5 + echo "$as_me:3216: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3212: \"$ac_try\"") >&5 + { (eval echo "$as_me:3219: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3215: \$? = $ac_status" >&5 + echo "$as_me:3222: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3227,12 +3234,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3230: result: $cf_cv_gnu_source" >&5 +echo "$as_me:3237: 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:3242: 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 @@ -3242,7 +3249,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3245 "configure" +#line 3252 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3257,16 +3264,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3260: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3267: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3263: \$? = $ac_status" >&5 + echo "$as_me:3270: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3266: \"$ac_try\"") >&5 + { (eval echo "$as_me:3273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3269: \$? = $ac_status" >&5 + echo "$as_me:3276: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_default_source=no else @@ -3277,7 +3284,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3280: result: $cf_cv_default_source" >&5 +echo "$as_me:3287: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -3314,16 +3321,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ 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:3324: 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}:3330: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3326 "configure" +#line 3333 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3338,16 +3345,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3348: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3344: \$? = $ac_status" >&5 + echo "$as_me:3351: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3347: \"$ac_try\"") >&5 + { (eval echo "$as_me:3354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3350: \$? = $ac_status" >&5 + echo "$as_me:3357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3368,7 +3375,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3371 "configure" +#line 3378 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3383,16 +3390,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3386: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3393: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3389: \$? = $ac_status" >&5 + echo "$as_me:3396: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3392: \"$ac_try\"") >&5 + { (eval echo "$as_me:3399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3395: \$? = $ac_status" >&5 + echo "$as_me:3402: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3403,7 +3410,7 @@ fi 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}:3413: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3411,10 +3418,10 @@ echo "${as_me:-configure}:3406: testing ifdef from value $cf_POSIX_C_SOURCE ..." 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}:3421: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3417 "configure" +#line 3424 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3429,16 +3436,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3432: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3435: \$? = $ac_status" >&5 + echo "$as_me:3442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3438: \"$ac_try\"") >&5 + { (eval echo "$as_me:3445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3441: \$? = $ac_status" >&5 + echo "$as_me:3448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3454,7 +3461,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3457: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3464: 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 @@ -3594,14 +3601,14 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:3597: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3604: 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" +#line 3611 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3620,16 +3627,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3623: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3626: \$? = $ac_status" >&5 + echo "$as_me:3633: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3629: \"$ac_try\"") >&5 + { (eval echo "$as_me:3636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3632: \$? = $ac_status" >&5 + echo "$as_me:3639: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3641,7 +3648,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3644 "configure" +#line 3651 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3660,16 +3667,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3670: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3666: \$? = $ac_status" >&5 + echo "$as_me:3673: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3669: \"$ac_try\"") >&5 + { (eval echo "$as_me:3676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3672: \$? = $ac_status" >&5 + echo "$as_me:3679: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3684,7 +3691,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3687: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3694: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3814,16 +3821,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ 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:3824: 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}:3830: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3826 "configure" +#line 3833 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3838,16 +3845,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3844: \$? = $ac_status" >&5 + echo "$as_me:3851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3847: \"$ac_try\"") >&5 + { (eval echo "$as_me:3854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3850: \$? = $ac_status" >&5 + echo "$as_me:3857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3868,7 +3875,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3871 "configure" +#line 3878 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3883,16 +3890,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3886: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3893: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3889: \$? = $ac_status" >&5 + echo "$as_me:3896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3892: \"$ac_try\"") >&5 + { (eval echo "$as_me:3899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3895: \$? = $ac_status" >&5 + echo "$as_me:3902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3903,7 +3910,7 @@ fi 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}:3913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3911,10 +3918,10 @@ echo "${as_me:-configure}:3906: testing ifdef from value $cf_POSIX_C_SOURCE ..." 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}:3921: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3917 "configure" +#line 3924 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3929,16 +3936,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3932: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3939: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3935: \$? = $ac_status" >&5 + echo "$as_me:3942: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3938: \"$ac_try\"") >&5 + { (eval echo "$as_me:3945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3941: \$? = $ac_status" >&5 + echo "$as_me:3948: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3954,7 +3961,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3957: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3964: 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 @@ -4148,7 +4155,7 @@ done 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}:4158: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4158,7 +4165,7 @@ fi 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}:4168: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4168,7 +4175,7 @@ fi 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}:4178: 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" @@ -4178,10 +4185,10 @@ fi 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:4188: 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" +#line 4191 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4196,16 +4203,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4202: \$? = $ac_status" >&5 + echo "$as_me:4209: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4205: \"$ac_try\"") >&5 + { (eval echo "$as_me:4212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4208: \$? = $ac_status" >&5 + echo "$as_me:4215: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4214,12 +4221,12 @@ 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 + echo "$as_me:4224: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 4222 "configure" +#line 4229 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4234,16 +4241,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4237: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4240: \$? = $ac_status" >&5 + echo "$as_me:4247: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4243: \"$ac_try\"") >&5 + { (eval echo "$as_me:4250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4246: \$? = $ac_status" >&5 + echo "$as_me:4253: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4254,19 +4261,19 @@ fi 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:4264: 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:4269: 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" +#line 4276 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4285,16 +4292,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4295: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4291: \$? = $ac_status" >&5 + echo "$as_me:4298: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4294: \"$ac_try\"") >&5 + { (eval echo "$as_me:4301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4297: \$? = $ac_status" >&5 + echo "$as_me:4304: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4306,7 +4313,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 4309 "configure" +#line 4316 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4325,16 +4332,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4328: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4335: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4331: \$? = $ac_status" >&5 + echo "$as_me:4338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4334: \"$ac_try\"") >&5 + { (eval echo "$as_me:4341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4337: \$? = $ac_status" >&5 + echo "$as_me:4344: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4349,7 +4356,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4352: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4359: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4474,7 +4481,7 @@ 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 +echo "$as_me:4484: 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 @@ -4495,18 +4502,18 @@ do # 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" +#line 4505 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4503: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4510: \"$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:4509: \$? = $ac_status" >&5 + echo "$as_me:4516: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4529,17 +4536,17 @@ 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" +#line 4539 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4536: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4543: \"$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:4542: \$? = $ac_status" >&5 + echo "$as_me:4549: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4576,7 +4583,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:4579: result: $CPP" >&5 +echo "$as_me:4586: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4586,18 +4593,18 @@ do # 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" +#line 4596 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4594: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4601: \"$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:4600: \$? = $ac_status" >&5 + echo "$as_me:4607: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4620,17 +4627,17 @@ 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" +#line 4630 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4627: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4634: \"$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:4633: \$? = $ac_status" >&5 + echo "$as_me:4640: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4658,7 +4665,7 @@ 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:4668: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -4673,23 +4680,23 @@ 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 "$as_me:4683: 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 4682 "configure" +#line 4689 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4686: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4693: \"$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:4692: \$? = $ac_status" >&5 + echo "$as_me:4699: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4708,7 +4715,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4711: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4718: 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 @@ -4723,23 +4730,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4726: checking for $ac_header" >&5 +echo "$as_me:4733: 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" +#line 4739 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4736: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4743: \"$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 + echo "$as_me:4749: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4758,7 +4765,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4761: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4768: 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 @@ -4768,7 +4775,7 @@ EOF fi done -echo "$as_me:4771: checking for working mkstemp" >&5 +echo "$as_me:4778: 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 @@ -4779,7 +4786,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 4782 "configure" +#line 4789 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4820,15 +4827,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4823: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4826: \$? = $ac_status" >&5 + echo "$as_me:4833: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4828: \"$ac_try\"") >&5 + { (eval echo "$as_me:4835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4831: \$? = $ac_status" >&5 + echo "$as_me:4838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -4843,16 +4850,16 @@ 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:4853: 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:4856: 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" +#line 4862 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -4883,16 +4890,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4886: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4889: \$? = $ac_status" >&5 + echo "$as_me:4896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4892: \"$ac_try\"") >&5 + { (eval echo "$as_me:4899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4895: \$? = $ac_status" >&5 + echo "$as_me:4902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -4902,7 +4909,7 @@ ac_cv_func_mkstemp=no fi 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:4912: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -4917,23 +4924,23 @@ fi 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:4927: 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" +#line 4933 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4930: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4937: \"$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:4936: \$? = $ac_status" >&5 + echo "$as_me:4943: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4952,7 +4959,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4955: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4962: 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 @@ -4962,7 +4969,7 @@ EOF fi done -echo "$as_me:4965: checking for header declaring getopt variables" >&5 +echo "$as_me:4972: 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 @@ -4972,7 +4979,7 @@ 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" +#line 4982 "configure" #include "confdefs.h" #include <$cf_header> @@ -4985,16 +4992,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4988: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4995: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4991: \$? = $ac_status" >&5 + echo "$as_me:4998: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4994: \"$ac_try\"") >&5 + { (eval echo "$as_me:5001: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4997: \$? = $ac_status" >&5 + echo "$as_me:5004: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -5006,7 +5013,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5009: result: $cf_cv_getopt_header" >&5 +echo "$as_me:5016: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -5026,13 +5033,13 @@ fi 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:5036: 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" +#line 5042 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5063,16 +5070,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5066: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5073: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5069: \$? = $ac_status" >&5 + echo "$as_me:5076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5072: \"$ac_try\"") >&5 + { (eval echo "$as_me:5079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5075: \$? = $ac_status" >&5 + echo "$as_me:5082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5082,7 +5089,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5085: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5092: 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 @@ -5092,7 +5099,7 @@ EOF fi done -echo "$as_me:5095: checking for maximum table size" >&5 +echo "$as_me:5102: 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 +5109,12 @@ if test "${with_max_table_size+set}" = set; then fi; if test -n "$with_max_table_size" then - echo "$as_me:5105: result: $with_max_table_size" >&5 + echo "$as_me:5112: 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:5117: 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,11 +5124,11 @@ cat >>confdefs.h <<EOF EOF else - echo "$as_me:5120: result: default" >&5 + echo "$as_me:5127: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:5124: checking if backtracking extension is wanted" >&5 +echo "$as_me:5131: 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. @@ -5129,7 +5136,7 @@ if test "${enable_btyacc+set}" = set; then enableval="$enable_btyacc" fi; -echo "$as_me:5132: result: $enable_btyacc" >&5 +echo "$as_me:5139: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "yes"; then @@ -5144,21 +5151,255 @@ fi 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 +if ( test "$GCC" = yes || test "$GXX" = yes ) +then + case $CFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:5161: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS + do + case "x$cf_temp_scan" in + (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 + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +echo "${as_me:-configure}:5184: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:5188: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +if ( test "$GCC" = yes || test "$GXX" = yes ) +then + case $CPPFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:5200: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS + do + case "x$cf_temp_scan" in + (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 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:5223: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:5227: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +if ( test "$GCC" = yes || test "$GXX" = yes ) +then + case $LDFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:5239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS + do + case "x$cf_temp_scan" in + (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 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:5262: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:5266: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +echo "$as_me:5272: 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 + with_warnings=yes + else + with_warnings=no + fi else - cf_opt_with_warnings=no + enableval=no + 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 +echo "$as_me:5289: result: $with_warnings" >&5 +echo "${ECHO_T}$with_warnings" >&6 +if test "$with_warnings" = "yes" +then -if test "$GCC" = yes +if test "x$have_x" = xyes; then echo "skipping X-const check"; fi +cat > conftest.$ac_ext <<EOF +#line 5296 "${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:5312: 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:5328: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5331: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:5333: 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:5341: 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:5364: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5367: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:5369: 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}:5377: 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}:5387: 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* + +fi + +if ( test "$GCC" = yes || test "$GXX" = yes ) then cat > conftest.i <<EOF #ifndef GCC_PRINTF @@ -5176,10 +5417,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:5179: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:5420: 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}" +#line 5423 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -5228,12 +5469,12 @@ EOF ;; esac - if { (eval echo "$as_me:5231: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5234: \$? = $ac_status" >&5 + echo "$as_me:5475: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:5236: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:5477: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -5292,117 +5533,9 @@ fi rm -rf conftest* 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" -fi -rm -rf conftest* - -fi fi -echo "$as_me:5405: checking if you want to see long compiling messages" >&5 +echo "$as_me:5538: 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,10 +5569,10 @@ else ECHO_CC='' fi; -echo "$as_me:5439: result: $enableval" >&5 +echo "$as_me:5572: 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:5575: 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. @@ -5456,7 +5589,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:5459: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:5592: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -5570,23 +5703,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:5573: checking for dmalloc.h" >&5 + echo "$as_me:5706: 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" +#line 5712 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:5583: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5716: \"$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:5589: \$? = $ac_status" >&5 + echo "$as_me:5722: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5605,11 +5738,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5608: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:5741: 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 -echo "$as_me:5612: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:5745: 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 @@ -5617,7 +5750,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5620 "configure" +#line 5753 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5636,16 +5769,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5772: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5642: \$? = $ac_status" >&5 + echo "$as_me:5775: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5645: \"$ac_try\"") >&5 + { (eval echo "$as_me:5778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5648: \$? = $ac_status" >&5 + echo "$as_me:5781: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -5656,7 +5789,7 @@ fi 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:5792: 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 cat >>confdefs.h <<EOF @@ -5671,7 +5804,7 @@ fi fi -echo "$as_me:5674: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:5807: 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. @@ -5688,7 +5821,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:5691: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:5824: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -5802,23 +5935,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:5805: checking for dbmalloc.h" >&5 + echo "$as_me:5938: 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" +#line 5944 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:5815: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5948: \"$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:5821: \$? = $ac_status" >&5 + echo "$as_me:5954: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5837,11 +5970,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5840: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:5973: 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 -echo "$as_me:5844: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:5977: 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 @@ -5849,7 +5982,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5852 "configure" +#line 5985 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5868,16 +6001,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6004: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5874: \$? = $ac_status" >&5 + echo "$as_me:6007: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5877: \"$ac_try\"") >&5 + { (eval echo "$as_me:6010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5880: \$? = $ac_status" >&5 + echo "$as_me:6013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -5888,7 +6021,7 @@ fi 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:6024: 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 cat >>confdefs.h <<EOF @@ -5903,7 +6036,7 @@ fi fi -echo "$as_me:5906: checking if you want to use valgrind for testing" >&5 +echo "$as_me:6039: 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. @@ -5920,7 +6053,7 @@ EOF else with_valgrind= fi; -echo "$as_me:5923: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6056: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -6033,7 +6166,7 @@ fi ;; esac -echo "$as_me:6036: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6169: 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. @@ -6043,7 +6176,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:6046: result: $with_no_leaks" >&5 +echo "$as_me:6179: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -6060,7 +6193,7 @@ fi # 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:6196: 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 +6210,7 @@ for ac_dir in $ac_dummy; do 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:6213: found $ac_dir/$ac_word" >&5 break fi done @@ -6089,10 +6222,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6092: result: $GROFF_PATH" >&5 + echo "$as_me:6225: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6095: result: no" >&5 + echo "$as_me:6228: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6100,7 +6233,7 @@ for ac_prog in nroff mandoc 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:6236: 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 +6250,7 @@ for ac_dir in $ac_dummy; do 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:6253: found $ac_dir/$ac_word" >&5 break fi done @@ -6128,10 +6261,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:6131: result: $NROFF_PATH" >&5 + echo "$as_me:6264: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:6134: result: no" >&5 + echo "$as_me:6267: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6141,7 +6274,7 @@ test -n "$NROFF_PATH" || NROFF_PATH="no" # 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:6277: 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 +6291,7 @@ for ac_dir in $ac_dummy; do 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:6294: found $ac_dir/$ac_word" >&5 break fi done @@ -6170,10 +6303,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:6173: result: $TBL_PATH" >&5 + echo "$as_me:6306: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:6176: result: no" >&5 + echo "$as_me:6309: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6193,7 +6326,7 @@ case "x${with_man2html}" in (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:6329: 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 +6343,7 @@ for ac_dir in $ac_dummy; do 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:6346: found $ac_dir/$ac_word" >&5 break fi done @@ -6222,16 +6355,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6225: result: $cf_man2html" >&5 + echo "$as_me:6358: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6228: result: no" >&5 + echo "$as_me:6361: 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:6367: 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 +6373,7 @@ echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 cf_man2html=no cf_man2html_ok=no fi - echo "$as_me:6243: result: $cf_man2html_ok" >&5 + echo "$as_me:6376: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6249,7 +6382,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6252: checking for program to convert manpage to html" >&5 +echo "$as_me:6385: 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 +6397,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6267: result: man2html" >&5 + echo "$as_me:6400: 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:6404: 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 +6418,7 @@ for ac_dir in $ac_dummy; do 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:6421: found $ac_dir/$ac_word" >&5 break fi done @@ -6297,10 +6430,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6300: result: $cf_man2html" >&5 + echo "$as_me:6433: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6303: result: no" >&5 + echo "$as_me:6436: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6308,11 +6441,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6311: result: $cf_man2html" >&5 + echo "$as_me:6444: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6315: result: $cf_man2html" >&5 + echo "$as_me:6448: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6376,14 +6509,14 @@ case ".$cf_man2html" in 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:6512: 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:6519: 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 @@ -6401,10 +6534,10 @@ CF_EOF 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:6537: 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:6540: 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 @@ -6429,7 +6562,7 @@ CF_EOF 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:6565: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <<CF_EOF @@ -6448,13 +6581,13 @@ fi chmod 700 $MAN2HTML_TEMP -echo "$as_me:6451: checking for ANSI C header files" >&5 +echo "$as_me:6584: 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" +#line 6590 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6462,13 +6595,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:6465: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6598: \"$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 + echo "$as_me:6604: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6490,7 +6623,7 @@ 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" +#line 6626 "configure" #include "confdefs.h" #include <string.h> @@ -6508,7 +6641,7 @@ 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" +#line 6644 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6529,7 +6662,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 6532 "configure" +#line 6665 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -6555,15 +6688,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6558: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6691: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6561: \$? = $ac_status" >&5 + echo "$as_me:6694: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6563: \"$ac_try\"") >&5 + { (eval echo "$as_me:6696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6566: \$? = $ac_status" >&5 + echo "$as_me:6699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6576,7 +6709,7 @@ 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 "$as_me:6712: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -6592,28 +6725,28 @@ 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 "$as_me:6728: 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" +#line 6734 "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 +if { (eval echo "$as_me:6740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6610: \$? = $ac_status" >&5 + echo "$as_me:6743: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6613: \"$ac_try\"") >&5 + { (eval echo "$as_me:6746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6616: \$? = $ac_status" >&5 + echo "$as_me:6749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -6623,7 +6756,7 @@ 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 "$as_me:6759: 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 @@ -6633,13 +6766,13 @@ EOF fi done -echo "$as_me:6636: checking for mode_t" >&5 +echo "$as_me:6769: 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" +#line 6775 "configure" #include "confdefs.h" $ac_includes_default int @@ -6654,16 +6787,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6657: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6790: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6660: \$? = $ac_status" >&5 + echo "$as_me:6793: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6663: \"$ac_try\"") >&5 + { (eval echo "$as_me:6796: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6666: \$? = $ac_status" >&5 + echo "$as_me:6799: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else @@ -6673,7 +6806,7 @@ ac_cv_type_mode_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6676: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:6809: 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 : @@ -6766,7 +6899,7 @@ DEFS=-DHAVE_CONFIG_H : ${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:6902: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -6779,6 +6912,8 @@ debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -6895,7 +7030,7 @@ 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.20200802, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -6939,7 +7074,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:6942: error: ambiguous option: $1 + { { echo "$as_me:7077: 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 +7093,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:6961: error: unrecognized option: $1 + -*) { { echo "$as_me:7096: 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,7 +7112,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20200111, executed with +This file was extended by $as_me 2.52.20200802, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -6995,7 +7130,7 @@ do # 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:7133: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7258,7 +7393,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7261: creating $ac_file" >&5 + { echo "$as_me:7396: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7276,7 +7411,7 @@ echo "$as_me: creating $ac_file" >&6;} -) 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:7414: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7289,7 +7424,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7292: error: cannot find input file: $f" >&5 + { { echo "$as_me:7427: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7305,7 +7440,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then 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:7443: 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;} @@ -7314,7 +7449,7 @@ $ac_seen" >&2;} fi 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:7452: 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;} @@ -7351,7 +7486,7 @@ s,@INSTALL@,$ac_INSTALL,;t t 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: + { echo "$as_me:7489: 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;} @@ -7362,7 +7497,7 @@ $ac_seen" >&2;} 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: + { echo "$as_me:7500: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -7411,7 +7546,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) 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:7549: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -7422,7 +7557,7 @@ echo "$as_me: creating $ac_file" >&6;} -) 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:7560: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7435,7 +7570,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7438: error: cannot find input file: $f" >&5 + { { echo "$as_me:7573: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7553,7 +7688,7 @@ cat >>$CONFIG_STATUS <<\EOF 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 + { echo "$as_me:7691: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 7a719ca..2fe8901 100644 --- a/configure.in +++ b/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.25 2020/09/10 18:07:42 tom Exp $ +AC_PREREQ(2.52.20200802) +AC_REVISION($Revision: 1.25 $) AC_INIT(main.c) AC_CONFIG_HEADER(config.h:config_h.in) @@ -53,7 +53,7 @@ else fi AC_SUBST(SKELETON) -CF_WITH_WARNINGS(Wwrite-strings) +CF_ENABLE_WARNINGS(Wwrite-strings,yes) CF_DISABLE_ECHO CF_DISABLE_LEAKS CF_WITH_MAN2HTML @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.65 2019/11/19 23:47:49 tom Exp $ */ +/* $Id: defs.h,v 1.66 2020/09/10 20:21:20 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) @@ -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 @@ static void 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 @@ graph_state(int stateno) 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--) @@ -1,4 +1,4 @@ -/* $Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp $ */ +/* $Id: lalr.c,v 1.13 2020/09/10 17:26:21 tom Exp $ */ #include "defs.h" @@ -183,7 +183,6 @@ set_goto_map(void) 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 @@ set_goto_map(void) 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 @@ set_goto_map(void) 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 @@ initialize_F(void) Value_t *rp; Value_t **reads; int nedges; - int stateno; int symbol; int nwords; @@ -298,7 +295,8 @@ initialize_F(void) 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 @@ build_relations(void) 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 @@ build_relations(void) 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 @@ transpose(Value_t **R2, int n) Value_t *nedges; Value_t *sp; int i; - int k; nedges = NEW2(n, Value_t); @@ -494,7 +488,8 @@ transpose(Value_t **R2, int n) 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 @@ traverse(int i) void lalr_leaks(void) { - int i; - if (includes != 0) { + int i; + for (i = 0; i < ngotos; i++) { free(includes[i]); @@ -1,4 +1,4 @@ -/* $Id: lr0.c,v 1.19 2016/06/07 00:21:53 tom Exp $ */ +/* $Id: lr0.c,v 1.20 2020/09/10 17:30:37 tom Exp $ */ #include "defs.h" @@ -44,7 +44,6 @@ allocate_itemsets(void) { Value_t *itemp; Value_t *item_end; - int symbol; int i; int count; int max; @@ -56,7 +55,8 @@ allocate_itemsets(void) item_end = ritem + nitems; for (itemp = ritem; itemp < item_end; itemp++) { - symbol = *itemp; + int symbol = *itemp; + if (symbol >= 0) { count++; @@ -94,7 +94,6 @@ static void append_states(void) { int i; - int j; Value_t symbol; #ifdef TRACE @@ -102,8 +101,9 @@ append_states(void) #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 @@ get_state(int symbol) { int key; Value_t *isp1; - Value_t *isp2; Value_t *iend; core *sp; - int found; int n; #ifdef TRACE @@ -180,11 +178,14 @@ get_state(int symbol) 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 @@ new_itemsets(void) 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 @@ new_itemsets(void) 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 @@ new_itemsets(void) ksp = kernel_base[symbol]; } - *ksp++ = (Value_t)(i + 1); + *ksp++ = (Value_t)(j + 1); kernel_end[symbol] = ksp; } } @@ -435,16 +436,14 @@ save_reductions(void) { 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 @@ save_reductions(void) if (count) { + Value_t *rp2; + Value_t *rend; + p = (reductions *)allocate((sizeof(reductions) + (unsigned)(count - 1) * sizeof(Value_t))); @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.69 2019/11/25 23:24:36 Tom.Shields Exp $ */ +/* $Id: main.c,v 1.70 2020/09/10 17:32:55 tom Exp $ */ #include <signal.h> #if !defined(_WIN32) || defined(__MINGW32__) @@ -628,10 +628,8 @@ open_tmpfile(const char *label) #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 +652,9 @@ open_tmpfile(const char *label) result = 0; if (name != 0) { + int fd; + const char *mark; + mode_t save_umask = umask(0177); if ((mark = strrchr(label, '_')) == 0) @@ -1,4 +1,4 @@ -/* $Id: mkpar.c,v 1.16 2019/11/04 01:23:02 tom Exp $ */ +/* $Id: mkpar.c,v 1.17 2020/09/10 17:37:33 tom Exp $ */ #include "defs.h" @@ -76,18 +76,19 @@ get_shifts(int stateno) 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 @@ static action * 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 @@ add_reduce(action *actions, 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]; @@ -226,7 +228,6 @@ static void remove_conflicts(void) { int i; - int symbol; action *p, *pref = 0; SRtotal = 0; @@ -235,9 +236,10 @@ remove_conflicts(void) 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 @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.92 2019/11/20 00:55:05 tom Exp $ */ +/* $Id: output.c,v 1.94 2020/09/10 20:24:30 tom Exp $ */ #include "defs.h" @@ -372,11 +372,11 @@ output_yydefred(void) static void output_accessing_symbols(void) { - int i, j; - int *translate; - if (nstates != 0) { + int i, j; + int *translate; + translate = TMALLOC(int, nstates); NO_SPACE(translate); @@ -791,11 +791,9 @@ static int 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 @@ matching_vector(int vector) 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); @@ -913,7 +917,6 @@ pack_table(void) { int i; Value_t place; - int state; base = NEW2(nvectors, Value_t); pos = NEW2(nentries, Value_t); @@ -930,7 +933,7 @@ pack_table(void) for (i = 0; i < nentries; i++) { - state = matching_vector(i); + int state = matching_vector(i); if (state < 0) place = (Value_t)pack_vector(i); @@ -1225,7 +1228,6 @@ static void output_defines(FILE * fp) { int c, i; - char *s; if (fp == defines_file) { @@ -1234,7 +1236,8 @@ output_defines(FILE * fp) 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 "); diff --git a/package/byacc.spec b/package/byacc.spec index 64fea87..8ca009d 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,9 +1,9 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc %define AltProgram btyacc -%define AppVersion 20200330 +%define AppVersion 20200910 %define UseProgram yacc -# $Id: byacc.spec,v 1.49 2020/03/30 23:31:42 tom Exp $ +# $Id: byacc.spec,v 1.50 2020/09/10 14:45:10 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index 6342bcf..ca25213 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +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/package/debian/compat b/package/debian/compat index 7ed6ff8..b4de394 100644 --- a/package/debian/compat +++ b/package/debian/compat @@ -1 +1 @@ -5 +11 diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index ad107d5..aae780e 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,8 +1,8 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc -%define AppVersion 20200330 +%define AppVersion 20200910 %define UseProgram yacc -# $Id: mingw-byacc.spec,v 1.29 2020/03/30 23:31:42 tom Exp $ +# $Id: mingw-byacc.spec,v 1.30 2020/09/10 14:45:10 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index 90936e6..2b67771 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $ # -DISTNAME= byacc-20200330 +DISTNAME= byacc-20200910 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.invisible-island.net/byacc/ @@ -1,4 +1,4 @@ -/* $Id: reader.c,v 1.79 2020/03/30 23:54:13 tom Exp $ */ +/* $Id: reader.c,v 1.84 2020/09/10 20:26:13 tom Exp $ */ #include "defs.h" @@ -185,7 +185,7 @@ line_directive(void) 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))) @@ -261,11 +261,12 @@ static void 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) @@ -493,11 +494,12 @@ keyword(void) { int c; char *t_cptr = cptr; - struct keyword *key; c = *++cptr; if (isalpha(UCH(c))) { + struct keyword *key; + cinc = 0; for (;;) { @@ -587,7 +589,6 @@ static char * copy_string(int quote) { struct mstring *temp = msnew(); - int c; struct ainfo a; a.a_lineno = lineno; a.a_line = dup_line(); @@ -595,7 +596,8 @@ copy_string(int quote) for (;;) { - c = *cptr++; + int c = *cptr++; + mputc(temp, c); if (c == quote) { @@ -726,7 +728,7 @@ copy_code(void) if (pos == -1 || !check_key(pos)) { syntax_error(lineno, line, cptr); - return; + /*NOTREACHED */ } } } @@ -758,7 +760,7 @@ copy_code(void) if (line == NULL) { unexpected_EOF(); - return; + /*NOTREACHED */ } continue; case '\n': @@ -1142,17 +1144,21 @@ copy_param(int k) { 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); + tmp = TREALLOC(char, buf, buf_size); + NO_SPACE(tmp); + buf = tmp; } - NO_SPACE(buf); if (curly) { if ((state == 2) && (c == L_CURL)) @@ -1203,13 +1209,21 @@ copy_param(int k) 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 +1447,6 @@ get_literal(void) static int is_reserved(char *name) { - char *s; - if (strcmp(name, ".") == 0 || strcmp(name, "$accept") == 0 || strcmp(name, "$end") == 0) @@ -1442,7 +1454,8 @@ is_reserved(char *name) if (name[0] == '$' && name[1] == '$' && isdigit(UCH(name[2]))) { - s = name + 3; + char *s = name + 3; + while (isdigit(UCH(*s))) ++s; if (*s == NUL) @@ -1690,14 +1703,14 @@ static void 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 +1805,15 @@ declare_start(void) 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 != '%') @@ -2127,7 +2140,7 @@ compile_arg(char **theptr, char *yyvaltag) { char *p = *theptr; struct mstring *c = msnew(); - int i, j, n; + int i, n; Value_t *offsets = NULL, maxoffset; bucket **rhs; @@ -2141,6 +2154,8 @@ compile_arg(char **theptr, char *yyvaltag) } if (maxoffset > 0) { + int j; + offsets = TMALLOC(Value_t, maxoffset + 1); NO_SPACE(offsets); @@ -2230,7 +2245,7 @@ can_elide_arg(char **theptr, char *yyvaltag) { 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,6 +2265,8 @@ can_elide_arg(char **theptr, char *yyvaltag) } if (maxoffset > 0) { + int j; + offsets = TMALLOC(Value_t, maxoffset + 1); NO_SPACE(offsets); @@ -2370,7 +2387,6 @@ advance_to_start(void) { int c; bucket *bp; - char *s_cptr; int s_lineno; #if defined(YYBTYACC) char *args = NULL; @@ -2379,6 +2395,8 @@ advance_to_start(void) for (;;) { + char *s_cptr; + c = nextc(); if (c != '%') break; @@ -2457,12 +2475,12 @@ start_rule(bucket *bp, int s_lineno) 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) @@ -3150,7 +3168,6 @@ static void copy_destructor(void) { char *code_text; - int c; struct ainfo a; bucket *bp; @@ -3158,7 +3175,7 @@ copy_destructor(void) for (;;) { - c = nextc(); + int c = nextc(); if (c == EOF) unexpected_EOF(); if (c == '<') @@ -3362,14 +3379,13 @@ mark_symbol(void) 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)) @@ -3426,7 +3442,8 @@ static void 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 +3457,9 @@ pack_names(void) 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 +3488,14 @@ check_symbols(void) 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 +3706,6 @@ pack_grammar(void) { int i; Value_t j; - Assoc_t assoc; - Value_t prec2; ritem = TMALLOC(Value_t, nitems); NO_SPACE(ritem); @@ -3720,6 +3736,9 @@ pack_grammar(void) j = 4; for (i = 3; i < nrules; ++i) { + Assoc_t assoc; + Value_t prec2; + #if defined(YYBTYACC) if (plhs[i]->args > 0) { @@ -3811,11 +3830,11 @@ finalize_destructors(void) { 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) diff --git a/test/btyacc/btyacc_calc1.tab.c b/test/btyacc/btyacc_calc1.tab.c index 3929012..c2ce351 100644 --- a/test/btyacc/btyacc_calc1.tab.c +++ b/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) diff --git a/test/btyacc/btyacc_demo.tab.c b/test/btyacc/btyacc_demo.tab.c index cdffc07..d4197f8 100644 --- a/test/btyacc/btyacc_demo.tab.c +++ b/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) diff --git a/test/btyacc/btyacc_destroy1.tab.c b/test/btyacc/btyacc_destroy1.tab.c index d445b88..6eeccbe 100644 --- a/test/btyacc/btyacc_destroy1.tab.c +++ b/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) diff --git a/test/btyacc/btyacc_destroy2.tab.c b/test/btyacc/btyacc_destroy2.tab.c index 59a08e9..75779ce 100644 --- a/test/btyacc/btyacc_destroy2.tab.c +++ b/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) diff --git a/test/btyacc/btyacc_destroy3.tab.c b/test/btyacc/btyacc_destroy3.tab.c index 136f2f6..aef7f86 100644 --- a/test/btyacc/btyacc_destroy3.tab.c +++ b/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) diff --git a/test/btyacc/calc.tab.c b/test/btyacc/calc.tab.c index eed4721..f7cbed3 100644 --- a/test/btyacc/calc.tab.c +++ b/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) diff --git a/test/btyacc/calc1.tab.c b/test/btyacc/calc1.tab.c index b919f8c..ac519a7 100644 --- a/test/btyacc/calc1.tab.c +++ b/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) diff --git a/test/btyacc/calc2.tab.c b/test/btyacc/calc2.tab.c index 3d83628..a3a5794 100644 --- a/test/btyacc/calc2.tab.c +++ b/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) diff --git a/test/btyacc/calc3.tab.c b/test/btyacc/calc3.tab.c index ad4aa5b..73df2f4 100644 --- a/test/btyacc/calc3.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_all.tab.c b/test/btyacc/calc_code_all.tab.c index 5f8b705..79b5f92 100644 --- a/test/btyacc/calc_code_all.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_default.tab.c b/test/btyacc/calc_code_default.tab.c index 2bd9791..88108e8 100644 --- a/test/btyacc/calc_code_default.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_imports.tab.c b/test/btyacc/calc_code_imports.tab.c index d918317..58f7fa4 100644 --- a/test/btyacc/calc_code_imports.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_provides.tab.c b/test/btyacc/calc_code_provides.tab.c index e617348..559ffb9 100644 --- a/test/btyacc/calc_code_provides.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_requires.tab.c b/test/btyacc/calc_code_requires.tab.c index 95a093c..1ad1103 100644 --- a/test/btyacc/calc_code_requires.tab.c +++ b/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) diff --git a/test/btyacc/calc_code_top.tab.c b/test/btyacc/calc_code_top.tab.c index 11c16f5..ac993dd 100644 --- a/test/btyacc/calc_code_top.tab.c +++ b/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) diff --git a/test/btyacc/code_calc.code.c b/test/btyacc/code_calc.code.c index 3e8dc96..69c223e 100644 --- a/test/btyacc/code_calc.code.c +++ b/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) diff --git a/test/btyacc/code_error.code.c b/test/btyacc/code_error.code.c index df0dc1a..cd27bb6 100644 --- a/test/btyacc/code_error.code.c +++ b/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) diff --git a/test/btyacc/defines1.calc.c b/test/btyacc/defines1.calc.c index ff8fcc6..f22d5e1 100644 --- a/test/btyacc/defines1.calc.c +++ b/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) diff --git a/test/btyacc/defines2.calc.c b/test/btyacc/defines2.calc.c index ff8fcc6..f22d5e1 100644 --- a/test/btyacc/defines2.calc.c +++ b/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) diff --git a/test/btyacc/defines3.calc.c b/test/btyacc/defines3.calc.c index cfcd0f8..66ee333 100644 --- a/test/btyacc/defines3.calc.c +++ b/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) diff --git a/test/btyacc/empty.tab.c b/test/btyacc/empty.tab.c index 0603419..8544a10 100644 --- a/test/btyacc/empty.tab.c +++ b/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) diff --git a/test/btyacc/err_inherit1.tab.c b/test/btyacc/err_inherit1.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_inherit1.tab.c +++ b/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/test/btyacc/err_inherit2.tab.c b/test/btyacc/err_inherit2.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_inherit2.tab.c +++ b/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/test/btyacc/err_inherit3.tab.c b/test/btyacc/err_inherit3.tab.c index c352747..68720bf 100644 --- a/test/btyacc/err_inherit3.tab.c +++ b/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) diff --git a/test/btyacc/err_inherit4.tab.c b/test/btyacc/err_inherit4.tab.c index 0af9419..a9f599a 100644 --- a/test/btyacc/err_inherit4.tab.c +++ b/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) diff --git a/test/btyacc/err_inherit5.tab.c b/test/btyacc/err_inherit5.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_inherit5.tab.c +++ b/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/test/btyacc/err_syntax1.tab.c b/test/btyacc/err_syntax1.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax1.tab.c +++ b/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/test/btyacc/err_syntax10.tab.c b/test/btyacc/err_syntax10.tab.c index b386d18..b75222f 100644 --- a/test/btyacc/err_syntax10.tab.c +++ b/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) diff --git a/test/btyacc/err_syntax11.tab.c b/test/btyacc/err_syntax11.tab.c index 1c09621..ae01b80 100644 --- a/test/btyacc/err_syntax11.tab.c +++ b/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) diff --git a/test/btyacc/err_syntax12.tab.c b/test/btyacc/err_syntax12.tab.c index 86fe5aa..0ccb479 100644 --- a/test/btyacc/err_syntax12.tab.c +++ b/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) diff --git a/test/btyacc/err_syntax13.tab.c b/test/btyacc/err_syntax13.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax13.tab.c +++ b/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/test/btyacc/err_syntax14.tab.c b/test/btyacc/err_syntax14.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax14.tab.c +++ b/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/test/btyacc/err_syntax15.tab.c b/test/btyacc/err_syntax15.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax15.tab.c +++ b/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/test/btyacc/err_syntax16.tab.c b/test/btyacc/err_syntax16.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax16.tab.c +++ b/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/test/btyacc/err_syntax17.tab.c b/test/btyacc/err_syntax17.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax17.tab.c +++ b/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/test/btyacc/err_syntax18.tab.c b/test/btyacc/err_syntax18.tab.c index 0b6fb87..8244222 100644 --- a/test/btyacc/err_syntax18.tab.c +++ b/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) diff --git a/test/btyacc/err_syntax19.tab.c b/test/btyacc/err_syntax19.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax19.tab.c +++ b/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/test/btyacc/err_syntax2.tab.c b/test/btyacc/err_syntax2.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax2.tab.c +++ b/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/test/btyacc/err_syntax20.tab.c b/test/btyacc/err_syntax20.tab.c index 62f0ee3..8351add 100644 --- a/test/btyacc/err_syntax20.tab.c +++ b/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) diff --git a/test/btyacc/err_syntax21.tab.c b/test/btyacc/err_syntax21.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax21.tab.c +++ b/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/test/btyacc/err_syntax22.tab.c b/test/btyacc/err_syntax22.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax22.tab.c +++ b/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/test/btyacc/err_syntax23.tab.c b/test/btyacc/err_syntax23.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax23.tab.c +++ b/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/test/btyacc/err_syntax24.tab.c b/test/btyacc/err_syntax24.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax24.tab.c +++ b/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/test/btyacc/err_syntax25.tab.c b/test/btyacc/err_syntax25.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax25.tab.c +++ b/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/test/btyacc/err_syntax26.tab.c b/test/btyacc/err_syntax26.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax26.tab.c +++ b/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/test/btyacc/err_syntax27.tab.c b/test/btyacc/err_syntax27.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax27.tab.c +++ b/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/test/btyacc/err_syntax3.tab.c b/test/btyacc/err_syntax3.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax3.tab.c +++ b/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/test/btyacc/err_syntax4.tab.c b/test/btyacc/err_syntax4.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax4.tab.c +++ b/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/test/btyacc/err_syntax5.tab.c b/test/btyacc/err_syntax5.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax5.tab.c +++ b/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/test/btyacc/err_syntax6.tab.c b/test/btyacc/err_syntax6.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax6.tab.c +++ b/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/test/btyacc/err_syntax7.tab.c b/test/btyacc/err_syntax7.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax7.tab.c +++ b/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/test/btyacc/err_syntax7a.tab.c b/test/btyacc/err_syntax7a.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax7a.tab.c +++ b/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/test/btyacc/err_syntax7b.tab.c b/test/btyacc/err_syntax7b.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax7b.tab.c +++ b/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/test/btyacc/err_syntax8.tab.c b/test/btyacc/err_syntax8.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax8.tab.c +++ b/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/test/btyacc/err_syntax8a.tab.c b/test/btyacc/err_syntax8a.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax8a.tab.c +++ b/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/test/btyacc/err_syntax9.tab.c b/test/btyacc/err_syntax9.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/btyacc/err_syntax9.tab.c +++ b/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/test/btyacc/error.tab.c b/test/btyacc/error.tab.c index 66148f6..f300fb2 100644 --- a/test/btyacc/error.tab.c +++ b/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) diff --git a/test/btyacc/expr.oxout.tab.c b/test/btyacc/expr.oxout.tab.c index 48d81a6..527311a 100644 --- a/test/btyacc/expr.oxout.tab.c +++ b/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) diff --git a/test/btyacc/grammar.tab.c b/test/btyacc/grammar.tab.c index 5d51d60..433be20 100644 --- a/test/btyacc/grammar.tab.c +++ b/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) diff --git a/test/btyacc/inherit0.tab.c b/test/btyacc/inherit0.tab.c index 725e105..6612682 100644 --- a/test/btyacc/inherit0.tab.c +++ b/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) diff --git a/test/btyacc/inherit1.tab.c b/test/btyacc/inherit1.tab.c index c51f932..1f72c3d 100644 --- a/test/btyacc/inherit1.tab.c +++ b/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) diff --git a/test/btyacc/inherit2.tab.c b/test/btyacc/inherit2.tab.c index d2fa359..f6cbd02 100644 --- a/test/btyacc/inherit2.tab.c +++ b/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) diff --git a/test/btyacc/ok_syntax1.tab.c b/test/btyacc/ok_syntax1.tab.c index 62662b1..dcabf60 100644 --- a/test/btyacc/ok_syntax1.tab.c +++ b/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) diff --git a/test/btyacc/pure_calc.tab.c b/test/btyacc/pure_calc.tab.c index e48c974..b54329a 100644 --- a/test/btyacc/pure_calc.tab.c +++ b/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) diff --git a/test/btyacc/pure_error.tab.c b/test/btyacc/pure_error.tab.c index 1860f54..e939d95 100644 --- a/test/btyacc/pure_error.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc-s.tab.c b/test/btyacc/quote_calc-s.tab.c index ddef2f7..78cd571 100644 --- a/test/btyacc/quote_calc-s.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc.tab.c b/test/btyacc/quote_calc.tab.c index 95f023c..bf68507 100644 --- a/test/btyacc/quote_calc.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc2-s.tab.c b/test/btyacc/quote_calc2-s.tab.c index de64730..af49092 100644 --- a/test/btyacc/quote_calc2-s.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc2.tab.c b/test/btyacc/quote_calc2.tab.c index cfd7d7f..3f580f6 100644 --- a/test/btyacc/quote_calc2.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc3-s.tab.c b/test/btyacc/quote_calc3-s.tab.c index 235dc8d..746118e 100644 --- a/test/btyacc/quote_calc3-s.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc3.tab.c b/test/btyacc/quote_calc3.tab.c index 16daf6a..8a1980e 100644 --- a/test/btyacc/quote_calc3.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc4-s.tab.c b/test/btyacc/quote_calc4-s.tab.c index b3266cf..30a5930 100644 --- a/test/btyacc/quote_calc4-s.tab.c +++ b/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) diff --git a/test/btyacc/quote_calc4.tab.c b/test/btyacc/quote_calc4.tab.c index 1950fd8..8d4076f 100644 --- a/test/btyacc/quote_calc4.tab.c +++ b/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) diff --git a/test/btyacc/rename_debug.c b/test/btyacc/rename_debug.c index 2c7986e..1401ff6 100644 --- a/test/btyacc/rename_debug.c +++ b/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) diff --git a/test/btyacc/stdin1.calc.c b/test/btyacc/stdin1.calc.c index b1dab72..fed0f27 100644 --- a/test/btyacc/stdin1.calc.c +++ b/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) diff --git a/test/btyacc/stdin2.calc.c b/test/btyacc/stdin2.calc.c index bf84b59..61d855e 100644 --- a/test/btyacc/stdin2.calc.c +++ b/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) diff --git a/test/btyacc/varsyntax_calc1.tab.c b/test/btyacc/varsyntax_calc1.tab.c index bd2bdd5..c0133d3 100644 --- a/test/btyacc/varsyntax_calc1.tab.c +++ b/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) diff --git a/test/calc.tab.c b/test/calc.tab.c deleted file mode 100644 index 1f3a81f..0000000 --- a/test/calc.tab.c +++ /dev/null @@ -1,668 +0,0 @@ -#ifndef lint -static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; -#endif - -#define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 - -#define YYEMPTY (-1) -#define yyclearin (yychar = YYEMPTY) -#define yyerrok (yyerrflag = 0) -#define YYRECOVERING() (yyerrflag != 0) - - -#ifndef yyparse -#define yyparse calc_parse -#endif /* yyparse */ - -#ifndef yylex -#define yylex calc_lex -#endif /* yylex */ - -#ifndef yyerror -#define yyerror calc_error -#endif /* yyerror */ - -#ifndef yychar -#define yychar calc_char -#endif /* yychar */ - -#ifndef yyval -#define yyval calc_val -#endif /* yyval */ - -#ifndef yylval -#define yylval calc_lval -#endif /* yylval */ - -#ifndef yydebug -#define yydebug calc_debug -#endif /* yydebug */ - -#ifndef yynerrs -#define yynerrs calc_nerrs -#endif /* yynerrs */ - -#ifndef yyerrflag -#define yyerrflag calc_errflag -#endif /* yyerrflag */ - -#ifndef yylhs -#define yylhs calc_lhs -#endif /* yylhs */ - -#ifndef yylen -#define yylen calc_len -#endif /* yylen */ - -#ifndef yydefred -#define yydefred calc_defred -#endif /* yydefred */ - -#ifndef yydgoto -#define yydgoto calc_dgoto -#endif /* yydgoto */ - -#ifndef yysindex -#define yysindex calc_sindex -#endif /* yysindex */ - -#ifndef yyrindex -#define yyrindex calc_rindex -#endif /* yyrindex */ - -#ifndef yygindex -#define yygindex calc_gindex -#endif /* yygindex */ - -#ifndef yytable -#define yytable calc_table -#endif /* yytable */ - -#ifndef yycheck -#define yycheck calc_check -#endif /* yycheck */ - -#ifndef yyname -#define yyname calc_name -#endif /* yyname */ - -#ifndef yyrule -#define yyrule calc_rule -#endif /* yyrule */ -#define YYPREFIX "calc_" - -#define YYPURE 0 - -#line 2 "calc.y" -# include <stdio.h> -# include <ctype.h> - -int regs[26]; -int base; - -extern int yylex(void); -static void yyerror(const char *s); - -#line 109 "calc.tab.c" - -#ifndef YYSTYPE -typedef int YYSTYPE; -#endif - -/* compatibility with bison */ -#ifdef YYPARSE_PARAM -/* compatibility with FreeBSD */ -# ifdef YYPARSE_PARAM_TYPE -# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM) -# else -# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM) -# endif -#else -# define YYPARSE_DECL() yyparse(void) -#endif - -/* Parameters sent to lex. */ -#ifdef YYLEX_PARAM -# define YYLEX_DECL() yylex(void *YYLEX_PARAM) -# define YYLEX yylex(YYLEX_PARAM) -#else -# define YYLEX_DECL() yylex(void) -# define YYLEX yylex() -#endif - -/* Parameters sent to yyerror. */ -#ifndef YYERROR_DECL -#define YYERROR_DECL() yyerror(const char *s) -#endif -#ifndef YYERROR_CALL -#define YYERROR_CALL(msg) yyerror(msg) -#endif - -extern int YYPARSE_DECL(); - -#define DIGIT 257 -#define LETTER 258 -#define UMINUS 259 -#define YYERRCODE 256 -static const short calc_lhs[] = { -1, - 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 3, -}; -static const short calc_len[] = { 2, - 0, 3, 3, 1, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 1, 1, 1, 2, -}; -static const short calc_defred[] = { 1, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 3, - 0, 15, 14, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 18, 0, 6, 0, 0, 0, 0, 9, - 10, 11, -}; -static const short calc_dgoto[] = { 1, - 7, 8, 9, -}; -static const short calc_sindex[] = { 0, - -40, -7, 0, -55, -38, -38, 1, -29, -247, 0, - -38, 0, 0, 22, 0, -38, -38, -38, -38, -38, - -38, -38, 0, -29, 0, 51, 60, -20, -20, 0, - 0, 0, -}; -static const short calc_rindex[] = { 0, - 0, 0, 0, 2, 0, 0, 0, 9, -9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 10, 0, -6, 14, 5, 13, 0, - 0, 0, -}; -static const short calc_gindex[] = { 0, - 0, 65, 0, -}; -#define YYTABLESIZE 220 -static const short calc_table[] = { 6, - 16, 6, 10, 13, 5, 11, 5, 22, 17, 23, - 15, 15, 20, 18, 7, 19, 22, 21, 4, 5, - 0, 20, 8, 12, 0, 0, 21, 16, 16, 0, - 0, 16, 16, 16, 13, 16, 0, 16, 15, 15, - 0, 0, 7, 15, 15, 7, 15, 7, 15, 7, - 8, 12, 0, 8, 12, 8, 0, 8, 22, 17, - 0, 0, 25, 20, 18, 0, 19, 0, 21, 13, - 14, 0, 0, 0, 0, 24, 0, 0, 0, 0, - 26, 27, 28, 29, 30, 31, 32, 22, 17, 0, - 0, 0, 20, 18, 16, 19, 22, 21, 0, 0, - 0, 20, 18, 0, 19, 0, 21, 0, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 13, 0, 0, - 0, 0, 0, 0, 0, 15, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, 8, 12, 0, 0, - 0, 0, 0, 0, 0, 16, 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, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2, 3, 4, 3, 12, -}; -static const short calc_check[] = { 40, - 10, 40, 10, 10, 45, 61, 45, 37, 38, 257, - 10, 10, 42, 43, 10, 45, 37, 47, 10, 10, - -1, 42, 10, 10, -1, -1, 47, 37, 38, -1, - -1, 41, 42, 43, 41, 45, -1, 47, 37, 38, - -1, -1, 38, 42, 43, 41, 45, 43, 47, 45, - 38, 38, -1, 41, 41, 43, -1, 45, 37, 38, - -1, -1, 41, 42, 43, -1, 45, -1, 47, 5, - 6, -1, -1, -1, -1, 11, -1, -1, -1, -1, - 16, 17, 18, 19, 20, 21, 22, 37, 38, -1, - -1, -1, 42, 43, 124, 45, 37, 47, -1, -1, - -1, 42, 43, -1, 45, -1, 47, -1, -1, -1, - -1, -1, -1, -1, 124, -1, -1, 124, -1, -1, - -1, -1, -1, -1, -1, 124, -1, -1, 124, -1, - -1, -1, -1, -1, -1, -1, 124, 124, -1, -1, - -1, -1, -1, -1, -1, 124, -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, -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, -1, -1, - -1, -1, -1, -1, -1, 256, 257, 258, 257, 258, -}; -#define YYFINAL 1 -#ifndef YYDEBUG -#define YYDEBUG 0 -#endif -#define YYMAXTOKEN 259 -#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) -#if YYDEBUG -static const char *yyname[] = { - -"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,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,0,0,0,0,"DIGIT","LETTER","UMINUS","illegal-symbol", -}; -static const char *yyrule[] = { -"$accept : list", -"list :", -"list : list stat '\\n'", -"list : list error '\\n'", -"stat : expr", -"stat : LETTER '=' expr", -"expr : '(' expr ')'", -"expr : expr '+' expr", -"expr : expr '-' expr", -"expr : expr '*' expr", -"expr : expr '/' expr", -"expr : expr '%' expr", -"expr : expr '&' expr", -"expr : expr '|' expr", -"expr : '-' expr", -"expr : LETTER", -"expr : number", -"number : DIGIT", -"number : number DIGIT", - -}; -#endif - -int yydebug; -int yynerrs; - -int yyerrflag; -int yychar; -YYSTYPE yyval; -YYSTYPE yylval; - -/* define the initial stack-sizes */ -#ifdef YYSTACKSIZE -#undef YYMAXDEPTH -#define YYMAXDEPTH YYSTACKSIZE -#else -#ifdef YYMAXDEPTH -#define YYSTACKSIZE YYMAXDEPTH -#else -#define YYSTACKSIZE 10000 -#define YYMAXDEPTH 10000 -#endif -#endif - -#define YYINITSTACKSIZE 200 - -typedef struct { - unsigned stacksize; - short *s_base; - short *s_mark; - short *s_last; - YYSTYPE *l_base; - YYSTYPE *l_mark; -} YYSTACKDATA; -/* variables for the parser stack */ -static YYSTACKDATA yystack; -#line 66 "calc.y" - /* start of programs */ - -int -main (void) -{ - while(!feof(stdin)) { - yyparse(); - } - return 0; -} - -static void -yyerror(const char *s) -{ - fprintf(stderr, "%s\n", s); -} - -int -yylex(void) -{ - /* lexical analysis routine */ - /* returns LETTER for a lower case letter, yylval = 0 through 25 */ - /* return DIGIT for a digit, yylval = 0 through 9 */ - /* all other characters are returned immediately */ - - int c; - - while( (c=getchar()) == ' ' ) { /* skip blanks */ } - - /* c is now nonblank */ - - if( islower( c )) { - yylval = c - 'a'; - return ( LETTER ); - } - if( isdigit( c )) { - yylval = c - '0'; - return ( DIGIT ); - } - return( c ); -} -#line 347 "calc.tab.c" - -#if YYDEBUG -#include <stdio.h> /* needed for printf */ -#endif - -#include <stdlib.h> /* needed for malloc, etc */ -#include <string.h> /* needed for memset */ - -/* allocate initial stack or double stack size, up to YYMAXDEPTH */ -static int yygrowstack(YYSTACKDATA *data) -{ - int i; - unsigned newsize; - short *newss; - YYSTYPE *newvs; - - if ((newsize = data->stacksize) == 0) - newsize = YYINITSTACKSIZE; - else if (newsize >= YYMAXDEPTH) - return -1; - else if ((newsize *= 2) > YYMAXDEPTH) - newsize = YYMAXDEPTH; - - i = (int) (data->s_mark - data->s_base); - newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); - if (newss == 0) - return -1; - - data->s_base = newss; - data->s_mark = newss + i; - - newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs)); - if (newvs == 0) - return -1; - - data->l_base = newvs; - data->l_mark = newvs + i; - - data->stacksize = newsize; - data->s_last = data->s_base + newsize - 1; - return 0; -} - -#if YYPURE || defined(YY_NO_LEAKS) -static void yyfreestack(YYSTACKDATA *data) -{ - free(data->s_base); - free(data->l_base); - memset(data, 0, sizeof(*data)); -} -#else -#define yyfreestack(data) /* nothing */ -#endif - -#define YYABORT goto yyabort -#define YYREJECT goto yyabort -#define YYACCEPT goto yyaccept -#define YYERROR goto yyerrlab - -int -YYPARSE_DECL() -{ - int yym, yyn, yystate; -#if YYDEBUG - const char *yys; - - if ((yys = getenv("YYDEBUG")) != 0) - { - yyn = *yys; - if (yyn >= '0' && yyn <= '9') - yydebug = yyn - '0'; - } -#endif - - yynerrs = 0; - yyerrflag = 0; - yychar = YYEMPTY; - yystate = 0; - -#if YYPURE - memset(&yystack, 0, sizeof(yystack)); -#endif - - if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow; - yystack.s_mark = yystack.s_base; - yystack.l_mark = yystack.l_base; - yystate = 0; - *yystack.s_mark = 0; - -yyloop: - if ((yyn = yydefred[yystate]) != 0) goto yyreduce; - if (yychar < 0) - { - if ((yychar = YYLEX) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - } - if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, shifting to state %d\n", - YYPREFIX, yystate, yytable[yyn]); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - yystate = yytable[yyn]; - *++yystack.s_mark = yytable[yyn]; - *++yystack.l_mark = yylval; - yychar = YYEMPTY; - if (yyerrflag > 0) --yyerrflag; - goto yyloop; - } - if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { - yyn = yytable[yyn]; - goto yyreduce; - } - if (yyerrflag) goto yyinrecovery; - - yyerror("syntax error"); - - goto yyerrlab; - -yyerrlab: - ++yynerrs; - -yyinrecovery: - if (yyerrflag < 3) - { - yyerrflag = 3; - for (;;) - { - if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, error recovery shifting\ - to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - yystate = yytable[yyn]; - *++yystack.s_mark = yytable[yyn]; - *++yystack.l_mark = yylval; - goto yyloop; - } - else - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: error recovery discarding state %d\n", - YYPREFIX, *yystack.s_mark); -#endif - if (yystack.s_mark <= yystack.s_base) goto yyabort; - --yystack.s_mark; - --yystack.l_mark; - } - } - } - else - { - if (yychar == 0) goto yyabort; -#if YYDEBUG - if (yydebug) - { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, error recovery discards token %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - yychar = YYEMPTY; - goto yyloop; - } - -yyreduce: -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, reducing by rule %d (%s)\n", - YYPREFIX, yystate, yyn, yyrule[yyn]); -#endif - yym = yylen[yyn]; - if (yym) - yyval = yystack.l_mark[1-yym]; - else - memset(&yyval, 0, sizeof yyval); - switch (yyn) - { -case 3: -#line 28 "calc.y" - { yyerrok ; } -break; -case 4: -#line 32 "calc.y" - { printf("%d\n",yystack.l_mark[0]);} -break; -case 5: -#line 34 "calc.y" - { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } -break; -case 6: -#line 38 "calc.y" - { yyval = yystack.l_mark[-1]; } -break; -case 7: -#line 40 "calc.y" - { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } -break; -case 8: -#line 42 "calc.y" - { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } -break; -case 9: -#line 44 "calc.y" - { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } -break; -case 10: -#line 46 "calc.y" - { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } -break; -case 11: -#line 48 "calc.y" - { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } -break; -case 12: -#line 50 "calc.y" - { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } -break; -case 13: -#line 52 "calc.y" - { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } -break; -case 14: -#line 54 "calc.y" - { yyval = - yystack.l_mark[0]; } -break; -case 15: -#line 56 "calc.y" - { yyval = regs[yystack.l_mark[0]]; } -break; -case 17: -#line 61 "calc.y" - { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } -break; -case 18: -#line 63 "calc.y" - { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } -break; -#line 609 "calc.tab.c" - } - yystack.s_mark -= yym; - yystate = *yystack.s_mark; - yystack.l_mark -= yym; - yym = yylhs[yyn]; - if (yystate == 0 && yym == 0) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state 0 to\ - state %d\n", YYPREFIX, YYFINAL); -#endif - yystate = YYFINAL; - *++yystack.s_mark = YYFINAL; - *++yystack.l_mark = yyval; - if (yychar < 0) - { - if ((yychar = YYLEX) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, YYFINAL, yychar, yys); - } -#endif - } - if (yychar == 0) goto yyaccept; - goto yyloop; - } - if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yystate) - yystate = yytable[yyn]; - else - yystate = yydgoto[yym]; -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state %d \ -to state %d\n", YYPREFIX, *yystack.s_mark, yystate); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - *++yystack.s_mark = (short) yystate; - *++yystack.l_mark = yyval; - goto yyloop; - -yyoverflow: - yyerror("yacc stack overflow"); - -yyabort: - yyfreestack(&yystack); - return (1); - -yyaccept: - yyfreestack(&yystack); - return (0); -} diff --git a/test/yacc/calc.tab.c b/test/yacc/calc.tab.c index 817bd00..aeac3fb 100644 --- a/test/yacc/calc.tab.c +++ b/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) diff --git a/test/yacc/calc1.tab.c b/test/yacc/calc1.tab.c index eda1d00..ad7dbfb 100644 --- a/test/yacc/calc1.tab.c +++ b/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) diff --git a/test/yacc/calc2.tab.c b/test/yacc/calc2.tab.c index e2ab6f0..f232b50 100644 --- a/test/yacc/calc2.tab.c +++ b/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) diff --git a/test/yacc/calc3.tab.c b/test/yacc/calc3.tab.c index bfabb4a..0ee121f 100644 --- a/test/yacc/calc3.tab.c +++ b/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) diff --git a/test/yacc/calc_code_all.tab.c b/test/yacc/calc_code_all.tab.c index c17272f..f17bb91 100644 --- a/test/yacc/calc_code_all.tab.c +++ b/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) diff --git a/test/yacc/calc_code_default.tab.c b/test/yacc/calc_code_default.tab.c index 275c0da..af10ee0 100644 --- a/test/yacc/calc_code_default.tab.c +++ b/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) diff --git a/test/yacc/calc_code_imports.tab.c b/test/yacc/calc_code_imports.tab.c index 1ef6ad0..8adce07 100644 --- a/test/yacc/calc_code_imports.tab.c +++ b/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) diff --git a/test/yacc/calc_code_provides.tab.c b/test/yacc/calc_code_provides.tab.c index 3d2555f..052aab3 100644 --- a/test/yacc/calc_code_provides.tab.c +++ b/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) diff --git a/test/yacc/calc_code_requires.tab.c b/test/yacc/calc_code_requires.tab.c index 50eb05c..6a0abac 100644 --- a/test/yacc/calc_code_requires.tab.c +++ b/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) diff --git a/test/yacc/calc_code_top.tab.c b/test/yacc/calc_code_top.tab.c index c5e4e3f..fbcba6b 100644 --- a/test/yacc/calc_code_top.tab.c +++ b/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) diff --git a/test/yacc/code_calc.code.c b/test/yacc/code_calc.code.c index a1d4f4b..d5875d4 100644 --- a/test/yacc/code_calc.code.c +++ b/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) diff --git a/test/yacc/code_error.code.c b/test/yacc/code_error.code.c index b117ce6..b5fec73 100644 --- a/test/yacc/code_error.code.c +++ b/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) diff --git a/test/yacc/defines1.calc.c b/test/yacc/defines1.calc.c index f7ee674..cfb06c8 100644 --- a/test/yacc/defines1.calc.c +++ b/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) diff --git a/test/yacc/defines2.calc.c b/test/yacc/defines2.calc.c index f7ee674..cfb06c8 100644 --- a/test/yacc/defines2.calc.c +++ b/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) diff --git a/test/yacc/defines3.calc.c b/test/yacc/defines3.calc.c index 538726b..469df78 100644 --- a/test/yacc/defines3.calc.c +++ b/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) diff --git a/test/yacc/empty.tab.c b/test/yacc/empty.tab.c index e338655..e06cab8 100644 --- a/test/yacc/empty.tab.c +++ b/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) diff --git a/test/yacc/err_syntax1.tab.c b/test/yacc/err_syntax1.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax1.tab.c +++ b/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/test/yacc/err_syntax10.tab.c b/test/yacc/err_syntax10.tab.c index e4b1578..9cede3a 100644 --- a/test/yacc/err_syntax10.tab.c +++ b/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) diff --git a/test/yacc/err_syntax11.tab.c b/test/yacc/err_syntax11.tab.c index 070661e..28dadef 100644 --- a/test/yacc/err_syntax11.tab.c +++ b/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) diff --git a/test/yacc/err_syntax12.tab.c b/test/yacc/err_syntax12.tab.c index 7c6c63e..6379e81 100644 --- a/test/yacc/err_syntax12.tab.c +++ b/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) diff --git a/test/yacc/err_syntax13.tab.c b/test/yacc/err_syntax13.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax13.tab.c +++ b/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/test/yacc/err_syntax14.tab.c b/test/yacc/err_syntax14.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax14.tab.c +++ b/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/test/yacc/err_syntax15.tab.c b/test/yacc/err_syntax15.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax15.tab.c +++ b/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/test/yacc/err_syntax16.tab.c b/test/yacc/err_syntax16.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax16.tab.c +++ b/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/test/yacc/err_syntax17.tab.c b/test/yacc/err_syntax17.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax17.tab.c +++ b/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/test/yacc/err_syntax18.tab.c b/test/yacc/err_syntax18.tab.c index 6038c14..e57edbe 100644 --- a/test/yacc/err_syntax18.tab.c +++ b/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) diff --git a/test/yacc/err_syntax19.tab.c b/test/yacc/err_syntax19.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax19.tab.c +++ b/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/test/yacc/err_syntax2.tab.c b/test/yacc/err_syntax2.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax2.tab.c +++ b/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/test/yacc/err_syntax20.tab.c b/test/yacc/err_syntax20.tab.c index ea9fc87..081e614 100644 --- a/test/yacc/err_syntax20.tab.c +++ b/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) diff --git a/test/yacc/err_syntax21.tab.c b/test/yacc/err_syntax21.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax21.tab.c +++ b/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/test/yacc/err_syntax22.tab.c b/test/yacc/err_syntax22.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax22.tab.c +++ b/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/test/yacc/err_syntax23.tab.c b/test/yacc/err_syntax23.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax23.tab.c +++ b/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/test/yacc/err_syntax24.tab.c b/test/yacc/err_syntax24.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax24.tab.c +++ b/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/test/yacc/err_syntax25.tab.c b/test/yacc/err_syntax25.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax25.tab.c +++ b/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/test/yacc/err_syntax26.tab.c b/test/yacc/err_syntax26.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax26.tab.c +++ b/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/test/yacc/err_syntax27.tab.c b/test/yacc/err_syntax27.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax27.tab.c +++ b/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/test/yacc/err_syntax3.tab.c b/test/yacc/err_syntax3.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax3.tab.c +++ b/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/test/yacc/err_syntax4.tab.c b/test/yacc/err_syntax4.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax4.tab.c +++ b/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/test/yacc/err_syntax5.tab.c b/test/yacc/err_syntax5.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax5.tab.c +++ b/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/test/yacc/err_syntax6.tab.c b/test/yacc/err_syntax6.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax6.tab.c +++ b/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/test/yacc/err_syntax7.tab.c b/test/yacc/err_syntax7.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax7.tab.c +++ b/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/test/yacc/err_syntax7a.tab.c b/test/yacc/err_syntax7a.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax7a.tab.c +++ b/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/test/yacc/err_syntax7b.tab.c b/test/yacc/err_syntax7b.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax7b.tab.c +++ b/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/test/yacc/err_syntax8.tab.c b/test/yacc/err_syntax8.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax8.tab.c +++ b/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/test/yacc/err_syntax8a.tab.c b/test/yacc/err_syntax8a.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax8a.tab.c +++ b/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/test/yacc/err_syntax9.tab.c b/test/yacc/err_syntax9.tab.c index 6c35f23..f0d4d2c 100644 --- a/test/yacc/err_syntax9.tab.c +++ b/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/test/yacc/error.tab.c b/test/yacc/error.tab.c index 93d9011..23b7693 100644 --- a/test/yacc/error.tab.c +++ b/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) diff --git a/test/yacc/expr.oxout.tab.c b/test/yacc/expr.oxout.tab.c index 0edef3a..11b41b4 100644 --- a/test/yacc/expr.oxout.tab.c +++ b/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) diff --git a/test/yacc/grammar.tab.c b/test/yacc/grammar.tab.c index 399e0f8..02fceed 100644 --- a/test/yacc/grammar.tab.c +++ b/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) diff --git a/test/yacc/ok_syntax1.tab.c b/test/yacc/ok_syntax1.tab.c index c1bbc4f..2bff0c8 100644 --- a/test/yacc/ok_syntax1.tab.c +++ b/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) diff --git a/test/yacc/pure_calc.tab.c b/test/yacc/pure_calc.tab.c index ee47ce6..2e105ff 100644 --- a/test/yacc/pure_calc.tab.c +++ b/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) diff --git a/test/yacc/pure_error.tab.c b/test/yacc/pure_error.tab.c index 91bbed6..a5658aa 100644 --- a/test/yacc/pure_error.tab.c +++ b/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) diff --git a/test/yacc/quote_calc-s.tab.c b/test/yacc/quote_calc-s.tab.c index fa9d703..0932b32 100644 --- a/test/yacc/quote_calc-s.tab.c +++ b/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) diff --git a/test/yacc/quote_calc.tab.c b/test/yacc/quote_calc.tab.c index 3ddf2ff..c5733d0 100644 --- a/test/yacc/quote_calc.tab.c +++ b/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) diff --git a/test/yacc/quote_calc2-s.tab.c b/test/yacc/quote_calc2-s.tab.c index 43d2682..ed1584f 100644 --- a/test/yacc/quote_calc2-s.tab.c +++ b/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) diff --git a/test/yacc/quote_calc2.tab.c b/test/yacc/quote_calc2.tab.c index 1699b7f..6a6606c 100644 --- a/test/yacc/quote_calc2.tab.c +++ b/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) diff --git a/test/yacc/quote_calc3-s.tab.c b/test/yacc/quote_calc3-s.tab.c index 351d530..79628ca 100644 --- a/test/yacc/quote_calc3-s.tab.c +++ b/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) diff --git a/test/yacc/quote_calc3.tab.c b/test/yacc/quote_calc3.tab.c index 7479855..076cd97 100644 --- a/test/yacc/quote_calc3.tab.c +++ b/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) diff --git a/test/yacc/quote_calc4-s.tab.c b/test/yacc/quote_calc4-s.tab.c index d3e6adc..c90371d 100644 --- a/test/yacc/quote_calc4-s.tab.c +++ b/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) diff --git a/test/yacc/quote_calc4.tab.c b/test/yacc/quote_calc4.tab.c index db3aef2..4b5db03 100644 --- a/test/yacc/quote_calc4.tab.c +++ b/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) diff --git a/test/yacc/rename_debug.c b/test/yacc/rename_debug.c index 909063a..5199c45 100644 --- a/test/yacc/rename_debug.c +++ b/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) diff --git a/test/yacc/stdin1.calc.c b/test/yacc/stdin1.calc.c index 96b39d6..3904e81 100644 --- a/test/yacc/stdin1.calc.c +++ b/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) diff --git a/test/yacc/stdin2.calc.c b/test/yacc/stdin2.calc.c index ce2de31..a308587 100644 --- a/test/yacc/stdin2.calc.c +++ b/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) diff --git a/test/yacc/varsyntax_calc1.tab.c b/test/yacc/varsyntax_calc1.tab.c index b66d44f..e92f365 100644 --- a/test/yacc/varsyntax_calc1.tab.c +++ b/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) @@ -1,4 +1,4 @@ -/* $Id: verbose.c,v 1.12 2016/06/07 00:22:05 tom Exp $ */ +/* $Id: verbose.c,v 1.13 2020/09/10 17:57:34 tom Exp $ */ #include "defs.h" @@ -172,18 +172,14 @@ static void 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; @@ -252,7 +248,6 @@ print_actions(int stateno) { action *p; shifts *sp; - int as; if (stateno == final_state) fprintf(verbose_file, "\t$end accept\n"); @@ -267,7 +262,8 @@ print_actions(int stateno) 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); } @@ -305,7 +301,7 @@ print_shifts(action *p) static void print_reductions(action *p, int defred2) { - int k, anyreds; + int anyreds; action *q; anyreds = 0; @@ -326,7 +322,8 @@ print_reductions(action *p, int defred2) { 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 +343,7 @@ print_reductions(action *p, int defred2) static void print_gotos(int stateno) { - int i, k; - int as; + int i; Value_t *to_state2; shifts *sp; @@ -356,8 +352,9 @@ print_gotos(int stateno) 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); } @@ -1,4 +1,4 @@ -/* $Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp $ */ +/* $Id: warshall.c,v 1.8 2020/09/10 17:31:42 tom Exp $ */ #include "defs.h" @@ -10,7 +10,6 @@ transitive_closure(unsigned *R, int n) unsigned *rowj; unsigned *rp; unsigned *rend; - unsigned *ccol; unsigned *relend; unsigned *cword; unsigned *rowi; @@ -23,7 +22,8 @@ transitive_closure(unsigned *R, int n) rowi = R; while (rowi < relend) { - ccol = cword; + unsigned *ccol = cword; + rowj = R; while (rowj < relend) @@ -1,4 +1,4 @@ -.\" $Id: yacc.1,v 1.33 2020/03/30 23:36:40 tom Exp $ +.\" $Id: yacc.1,v 1.35 2020/09/10 19:30:12 tom Exp $ .\" .\" .TH YACC 1 "July\ 15,\ 1990" .\" .UC 6 @@ -27,7 +27,7 @@ .ie n .IP \(bu 4 .el .IP \(bu 2 .. -.TH YACC 1 "November 19, 2019" "Berkeley Yacc" "User Commands" +.TH YACC 1 "September 10, 2020" "Berkeley Yacc" "User Commands" .SH NAME \*N \- an LALR(1) parser generator .SH SYNOPSIS @@ -133,7 +133,7 @@ The default prefix is the string .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 @@ -280,7 +280,7 @@ for grammar symbols that have no declared semantic type tag. tells \fByacc\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 +\fB %expect\-rr\fP \fInumber\fP tell \fByacc\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. @@ -320,23 +320,23 @@ the rule, before the associated action is executed; this macro can be 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 @@ -389,7 +389,7 @@ 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 +398,7 @@ with \fB%lex-param\fP and \fB%parse-param\fP in two forms 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, \fByacc\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 |