diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-01 14:49:23 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-01 14:49:23 +0900 |
| commit | c2f08eec49906e23b1a7b8d0bfea57b90e3b04b1 (patch) | |
| tree | 2a5a7768a36b4ccb7c8f1424e68d3bc7932d300a | |
| parent | 8dfed95e7809386a585b1de8ec189a9e79a411ee (diff) | |
| download | byacc-c2f08eec49906e23b1a7b8d0bfea57b90e3b04b1.tar.gz byacc-c2f08eec49906e23b1a7b8d0bfea57b90e3b04b1.tar.bz2 byacc-c2f08eec49906e23b1a7b8d0bfea57b90e3b04b1.zip | |
Imported Upstream version 20210619upstream/20210619
106 files changed, 545 insertions, 442 deletions
@@ -1,3 +1,76 @@ +2021-06-19 Thomas E. Dickey <dickey@invisible-island.net> + + * configure: regen + + * aclocal.m4: resync with my-autoconf + + * test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, yaccpar.c: + regen + + * btyaccpar.skel, yaccpar.skel: cancel unused assignments + + * output.c: gcc warning + + * test/run_test.sh, test/run_lint.sh, test/run_make.sh: + shellcheck-warnings + +2021-06-19 jannick0 + + * test/run_test.sh: changes suggested at + https://github.com/jannick0/byacc-snapshots/tree/YYINT-fix-20210520 + +2021-06-19 Thomas E. Dickey <dickey@invisible-island.net> + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + +2021-06-13 Thomas E. Dickey <dickey@invisible-island.net> + + * aclocal.m4: resync with my-autoconf + +2021-05-24 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-05-24 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + config.guess: fix shellcheck warning SC2154 + + While, according to Plan 9 documentation, the environment variable + $cputype is set to the name of the kernel's CPU's architecture, + shellcheck warns that cputype is referenced but not assigned. + Be on the safe side and do not use cputype if it is not defined + or empty. + + * config.guess (*:Plan9:*:*): Fix shellcheck warning SC2154. + + * config.guess: 2021-05-24 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + config.guess: remove redundant quotes in case commands + + According to the GNU Autoconf Portable Shell Programming manual, + the Bourne shell does not systematically split variables and back-quoted + expressions, in particular on the right-hand side of assignments and in + the argument of 'case'. + + The change is made automatically using the following command: + $ sed -E -i 's/(\<case )"(\$[^"]+)"( in\>)/\1\2\3/' config.guess + + * config.guess: Simplify case commands by removing quotes around the + argument. + + Suggested-by: Jacob Bachmeyer <jcb@gnu.org> + + * config.guess: 2021-05-24 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + config.guess: simplify exit status workaround on alphaev67-dec-osf5.1 + + Commit 29865ea8a5622cdd80b7a69a0afa78004b4cd311 introduced an exit trap + reset before exiting to avoid a spurious non-zero exit status on + alphaev67-dec-osf5.1. Simplify that code a bit by moving the exit trap + reset around. + + * config.guess (alpha:OSF1:*:*): Reset exit trap earlier. + * doc/config.guess.1: Regenerate. + 2021-05-20 Thomas E. Dickey <dickey@invisible-island.net> * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c, test/btyacc/code_error.code.c, test/btyacc/code_error.tab.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c: @@ -1,4 +1,4 @@ -MANIFEST for byacc-20210520, version t20210520 +MANIFEST for byacc-20210619, version t20210619 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 @@ -1 +1 @@ -20210520 +20210619 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.53 2021/05/01 21:49:36 tom Exp $ +dnl $Id: aclocal.m4,v 1.55 2021/06/19 23:17:30 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2020,2021 Thomas E. Dickey @@ -394,7 +394,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -424,7 +424,7 @@ AC_TRY_COMPILE( #include <stdlib.h> #include <X11/Intrinsic.h> ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( @@ -823,7 +823,7 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 7 updated: 2021/01/01 13:31:04 +dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h @@ -836,7 +836,7 @@ for cf_header in stdio.h stdlib.h unistd.h getopt.h do AC_TRY_COMPILE([ #include <$cf_header>], -[int x = optind; char *y = optarg], +[int x = optind; char *y = optarg; (void)x; (void)y], [cf_cv_getopt_header=$cf_header break]) done @@ -1196,19 +1196,29 @@ AC_DEFUN([CF_MSG_LOG],[ echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NO_LEAKS_OPTION version: 8 updated: 2021/01/05 20:05:09 +dnl CF_NO_LEAKS_OPTION version: 9 updated: 2021/06/13 19:45:41 dnl ------------------ dnl see CF_WITH_NO_LEAKS +dnl +dnl $1 = option/name +dnl $2 = help-text +dnl $3 = symbol to define if the option is set +dnl $4 = additional actions to take if the option is set AC_DEFUN([CF_NO_LEAKS_OPTION],[ AC_MSG_CHECKING(if you want to use $1 for testing) AC_ARG_WITH($1, [$2], - [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ + [case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_$1=yes + AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ $4 ]) - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_$1=yes], + ;; + esac], [with_$1=]) AC_MSG_RESULT(${with_$1:-no}) diff --git a/btyaccpar.c b/btyaccpar.c index 64a9feb..37d897f 100644 --- a/btyaccpar.c +++ b/btyaccpar.c @@ -2,7 +2,7 @@ * @Id: skel2c,v 1.4 2016/06/07 00:26:09 tom Exp @ */ -/* @Id: btyaccpar.skel,v 1.10 2018/05/25 01:03:46 tom Exp @ */ +/* @Id: btyaccpar.skel,v 1.11 2018/06/10 00:41:06 Tom.Shields Exp @ */ #include "defs.h" @@ -485,11 +485,11 @@ const char *const body_3[] = "#endif /* YYBTYACC */", #endif /* defined(YYBTYACC) */ " yym = 0;", - " yyn = 0;", + " /* yyn is set below */", " yynerrs = 0;", " yyerrflag = 0;", " yychar = YYEMPTY;", - " yystate = 0;", + " /* yystate is set below */", "", "#if YYPURE", " memset(&yystack, 0, sizeof(yystack));", diff --git a/btyaccpar.skel b/btyaccpar.skel index 009942e..2c69b44 100644 --- a/btyaccpar.skel +++ b/btyaccpar.skel @@ -1,4 +1,4 @@ -/* $Id: btyaccpar.skel,v 1.11 2018/06/10 00:41:06 Tom.Shields Exp $ */ +/* $Id: btyaccpar.skel,v 1.12 2021/06/19 20:46:31 tom Exp $ */ #include "defs.h" @@ -410,11 +410,11 @@ YYPARSE_DECL() yyps->save = 0; %%endif yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/config.guess b/config.guess index ec94a10..9c65c6c 100755 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright 2021 Thomas E. Dickey # Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2021-04-21' +timestamp='2021-05-24' # 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 @@ -137,7 +137,7 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) LIBC=unknown @@ -177,7 +177,7 @@ esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -193,7 +193,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; @@ -209,7 +209,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; @@ -230,7 +230,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -241,7 +241,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -301,6 +301,8 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo mips-dec-osf1 exit ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -314,7 +316,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -352,10 +354,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -436,7 +435,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; @@ -450,7 +449,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -666,18 +665,18 @@ EOF exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 @@ -878,7 +877,7 @@ EOF exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) @@ -902,7 +901,7 @@ EOF echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) echo i586-pc-interix"$UNAME_RELEASE" exit ;; @@ -1439,10 +1438,9 @@ EOF # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else + elif test "x${cputype-}" != x; then UNAME_MACHINE="$cputype" fi echo "$UNAME_MACHINE"-unknown-plan9 @@ -1473,7 +1471,7 @@ EOF exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1640,7 +1638,7 @@ test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <<EOF @@ -5173,7 +5173,7 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -int x = optind; char *y = optarg +int x = optind; char *y = optarg; (void)x; (void)y ; return 0; } @@ -5910,18 +5910,23 @@ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dmalloc=yes cat >>confdefs.h <<EOF #define USE_DMALLOC 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_dmalloc=yes + ;; + esac else with_dmalloc= fi; -echo "$as_me:5924: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:5929: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6035,23 +6040,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6038: checking for dmalloc.h" >&5 + echo "$as_me:6043: 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 6044 "configure" +#line 6049 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:6048: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6053: \"$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:6054: \$? = $ac_status" >&5 + echo "$as_me:6059: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6070,11 +6075,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6073: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6078: 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:6077: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6082: 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 @@ -6082,7 +6087,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6085 "configure" +#line 6090 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6101,16 +6106,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6107: \$? = $ac_status" >&5 + echo "$as_me:6112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6110: \"$ac_try\"") >&5 + { (eval echo "$as_me:6115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6113: \$? = $ac_status" >&5 + echo "$as_me:6118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6121,7 +6126,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6124: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6129: 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 @@ -6136,24 +6141,29 @@ fi fi -echo "$as_me:6139: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:6144: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dbmalloc=yes cat >>confdefs.h <<EOF #define USE_DBMALLOC 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_dbmalloc=yes + ;; + esac else with_dbmalloc= fi; -echo "$as_me:6156: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6166: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6267,23 +6277,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6270: checking for dbmalloc.h" >&5 + echo "$as_me:6280: 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 6276 "configure" +#line 6286 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:6280: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6290: \"$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:6286: \$? = $ac_status" >&5 + echo "$as_me:6296: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6302,11 +6312,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6305: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6315: 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:6309: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6319: 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 @@ -6314,7 +6324,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6317 "configure" +#line 6327 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6333,16 +6343,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6336: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6339: \$? = $ac_status" >&5 + echo "$as_me:6349: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6342: \"$ac_try\"") >&5 + { (eval echo "$as_me:6352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6345: \$? = $ac_status" >&5 + echo "$as_me:6355: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6353,7 +6363,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6356: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6366: 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 @@ -6368,24 +6378,29 @@ fi fi -echo "$as_me:6371: checking if you want to use valgrind for testing" >&5 +echo "$as_me:6381: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. if test "${with_valgrind+set}" = set; then withval="$with_valgrind" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_valgrind=yes cat >>confdefs.h <<EOF #define USE_VALGRIND 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_valgrind=yes + ;; + esac else with_valgrind= fi; -echo "$as_me:6388: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6403: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -6498,7 +6513,7 @@ fi ;; esac -echo "$as_me:6501: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6516: 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. @@ -6509,7 +6524,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:6512: result: $with_no_leaks" >&5 +echo "$as_me:6527: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -6526,7 +6541,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:6529: checking for $ac_word" >&5 +echo "$as_me:6544: 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 @@ -6543,7 +6558,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:6546: found $ac_dir/$ac_word" >&5 + echo "$as_me:6561: found $ac_dir/$ac_word" >&5 break fi done @@ -6555,10 +6570,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6558: result: $GROFF_PATH" >&5 + echo "$as_me:6573: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6561: result: no" >&5 + echo "$as_me:6576: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6566,7 +6581,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:6569: checking for $ac_word" >&5 +echo "$as_me:6584: 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 @@ -6583,7 +6598,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:6586: found $ac_dir/$ac_word" >&5 + echo "$as_me:6601: found $ac_dir/$ac_word" >&5 break fi done @@ -6594,10 +6609,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:6597: result: $NROFF_PATH" >&5 + echo "$as_me:6612: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:6600: result: no" >&5 + echo "$as_me:6615: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6607,7 +6622,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:6610: checking for $ac_word" >&5 +echo "$as_me:6625: 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 @@ -6624,7 +6639,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:6627: found $ac_dir/$ac_word" >&5 + echo "$as_me:6642: found $ac_dir/$ac_word" >&5 break fi done @@ -6636,10 +6651,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:6639: result: $TBL_PATH" >&5 + echo "$as_me:6654: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:6642: result: no" >&5 + echo "$as_me:6657: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6659,7 +6674,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:6662: checking for $ac_word" >&5 +echo "$as_me:6677: 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 @@ -6676,7 +6691,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:6679: found $ac_dir/$ac_word" >&5 + echo "$as_me:6694: found $ac_dir/$ac_word" >&5 break fi done @@ -6688,16 +6703,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6691: result: $cf_man2html" >&5 + echo "$as_me:6706: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6694: result: no" >&5 + echo "$as_me:6709: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:6700: checking for the modified Earl Hood script" >&5 + echo "$as_me:6715: 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 @@ -6706,7 +6721,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:6709: result: $cf_man2html_ok" >&5 + echo "$as_me:6724: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6715,7 +6730,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6718: checking for program to convert manpage to html" >&5 +echo "$as_me:6733: 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. @@ -6730,11 +6745,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6733: result: man2html" >&5 + echo "$as_me:6748: 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:6737: checking for $ac_word" >&5 +echo "$as_me:6752: 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 @@ -6751,7 +6766,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:6754: found $ac_dir/$ac_word" >&5 + echo "$as_me:6769: found $ac_dir/$ac_word" >&5 break fi done @@ -6763,10 +6778,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6766: result: $cf_man2html" >&5 + echo "$as_me:6781: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6769: result: no" >&5 + echo "$as_me:6784: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6774,11 +6789,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6777: result: $cf_man2html" >&5 + echo "$as_me:6792: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6781: result: $cf_man2html" >&5 + echo "$as_me:6796: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6819,12 +6834,12 @@ else # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:6822: checking if nroff is really groff" >&5 + echo "$as_me:6837: checking if nroff is really groff" >&5 echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6 cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`" test -n "$cf_check_groff" && cf_check_groff=yes test -n "$cf_check_groff" || cf_check_groff=no - echo "$as_me:6827: result: $cf_check_groff" >&5 + echo "$as_me:6842: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -6855,14 +6870,14 @@ case ".$cf_man2html" in cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6858: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:6873: 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:6865: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:6880: 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 @@ -6880,10 +6895,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:6883: result: $cf_man2html_top_bot" >&5 + echo "$as_me:6898: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:6886: checking for pagesize to use" >&5 + echo "$as_me:6901: 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 @@ -6908,7 +6923,7 @@ CF_EOF test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:6911: result: $cf_man2html_page" >&5 + echo "$as_me:6926: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <<CF_EOF @@ -6927,13 +6942,13 @@ fi chmod 700 $MAN2HTML_TEMP -echo "$as_me:6930: checking for ANSI C header files" >&5 +echo "$as_me:6945: 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 6936 "configure" +#line 6951 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6941,13 +6956,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:6944: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6959: \"$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:6950: \$? = $ac_status" >&5 + echo "$as_me:6965: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6969,7 +6984,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 6972 "configure" +#line 6987 "configure" #include "confdefs.h" #include <string.h> @@ -6987,7 +7002,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 6990 "configure" +#line 7005 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7008,7 +7023,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 7011 "configure" +#line 7026 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -7034,15 +7049,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7037: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7040: \$? = $ac_status" >&5 + echo "$as_me:7055: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7042: \"$ac_try\"") >&5 + { (eval echo "$as_me:7057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7045: \$? = $ac_status" >&5 + echo "$as_me:7060: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7055,7 +7070,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:7058: result: $ac_cv_header_stdc" >&5 +echo "$as_me:7073: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -7071,28 +7086,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:7074: checking for $ac_header" >&5 +echo "$as_me:7089: 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 7080 "configure" +#line 7095 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7086: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7089: \$? = $ac_status" >&5 + echo "$as_me:7104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7092: \"$ac_try\"") >&5 + { (eval echo "$as_me:7107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7095: \$? = $ac_status" >&5 + echo "$as_me:7110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -7102,7 +7117,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7120: 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 @@ -7112,13 +7127,13 @@ EOF fi done -echo "$as_me:7115: checking for mode_t" >&5 +echo "$as_me:7130: 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 7121 "configure" +#line 7136 "configure" #include "confdefs.h" $ac_includes_default int @@ -7133,16 +7148,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7139: \$? = $ac_status" >&5 + echo "$as_me:7154: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7142: \"$ac_try\"") >&5 + { (eval echo "$as_me:7157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7145: \$? = $ac_status" >&5 + echo "$as_me:7160: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -7152,7 +7167,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7155: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:7170: 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 : @@ -7245,7 +7260,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:7248: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7263: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -7421,7 +7436,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7424: error: ambiguous option: $1 + { { echo "$as_me:7439: 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;} @@ -7440,7 +7455,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7443: error: unrecognized option: $1 + -*) { { echo "$as_me:7458: 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;} @@ -7477,7 +7492,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:7480: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:7495: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7747,7 +7762,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7750: creating $ac_file" >&5 + { echo "$as_me:7765: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7765,7 +7780,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:7768: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7783: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7778,7 +7793,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7781: error: cannot find input file: $f" >&5 + { { echo "$as_me:7796: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7794,7 +7809,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:7797: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:7812: 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;} @@ -7803,7 +7818,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:7806: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:7821: 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;} @@ -7840,7 +7855,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:7843: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:7858: 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;} @@ -7851,7 +7866,7 @@ $ac_seen" >&2;} ${EGREP-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:7854: WARNING: Some variables may not be substituted: + { echo "$as_me:7869: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -7900,7 +7915,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:7903: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:7918: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -7911,7 +7926,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:7914: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7929: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7924,7 +7939,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7927: error: cannot find input file: $f" >&5 + { { echo "$as_me:7942: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8042,7 +8057,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:8045: $ac_file is unchanged" >&5 + { echo "$as_me:8060: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.95 2021/05/20 23:57:23 tom Exp $ */ +/* $Id: output.c,v 1.96 2021/06/19 19:51:49 tom Exp $ */ #include "defs.h" @@ -858,7 +858,7 @@ pack_vector(int vector) ok = 1; for (k = 0; ok && k < t; k++) { - loc = j + from[k]; + loc = (Value_t)(j + from[k]); if (loc >= maxtable - 1) { if (loc >= MAXTABLE - 1) @@ -897,7 +897,7 @@ pack_vector(int vector) { for (k = 0; k < t; k++) { - loc = j + from[k]; + loc = (Value_t)(j + from[k]); table[loc] = to[k]; check[loc] = from[k]; if (loc > high) diff --git a/package/byacc.spec b/package/byacc.spec index 20ebe49..d66d334 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 20210520 +%define AppVersion 20210619 %define UseProgram yacc -# $Id: byacc.spec,v 1.55 2021/05/20 23:47:46 tom Exp $ +# $Id: byacc.spec,v 1.56 2021/06/19 18:06:48 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index 510b3f9..8a7b90a 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +byacc (20210619) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Jun 2021 14:06:48 -0400 + byacc (20210520) unstable; urgency=low * maintenance updates diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index ade63a6..656683f 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 20210520 +%define AppVersion 20210619 %define UseProgram yacc -# $Id: mingw-byacc.spec,v 1.33 2021/05/20 19:25:00 tom Exp $ +# $Id: mingw-byacc.spec,v 1.34 2021/06/19 18:06:48 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index 699637e..b21bb1b 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-20210520 +DISTNAME= byacc-20210619 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.invisible-island.net/byacc/ diff --git a/test/btyacc/btyacc_calc1.tab.c b/test/btyacc/btyacc_calc1.tab.c index 3f704f4..1d49396 100644 --- a/test/btyacc/btyacc_calc1.tab.c +++ b/test/btyacc/btyacc_calc1.tab.c @@ -839,11 +839,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/btyacc_demo.tab.c b/test/btyacc/btyacc_demo.tab.c index 4e98858..f612ab6 100644 --- a/test/btyacc/btyacc_demo.tab.c +++ b/test/btyacc/btyacc_demo.tab.c @@ -1342,11 +1342,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/btyacc_destroy1.tab.c b/test/btyacc/btyacc_destroy1.tab.c index d423fe0..e92e8ea 100644 --- a/test/btyacc/btyacc_destroy1.tab.c +++ b/test/btyacc/btyacc_destroy1.tab.c @@ -674,11 +674,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/btyacc_destroy2.tab.c b/test/btyacc/btyacc_destroy2.tab.c index a49a6b0..6078819 100644 --- a/test/btyacc/btyacc_destroy2.tab.c +++ b/test/btyacc/btyacc_destroy2.tab.c @@ -674,11 +674,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/btyacc_destroy3.tab.c b/test/btyacc/btyacc_destroy3.tab.c index 9e23ca9..8e5c771 100644 --- a/test/btyacc/btyacc_destroy3.tab.c +++ b/test/btyacc/btyacc_destroy3.tab.c @@ -674,11 +674,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc.tab.c b/test/btyacc/calc.tab.c index f6d35f7..09b0a20 100644 --- a/test/btyacc/calc.tab.c +++ b/test/btyacc/calc.tab.c @@ -669,11 +669,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc1.tab.c b/test/btyacc/calc1.tab.c index d155667..691f28e 100644 --- a/test/btyacc/calc1.tab.c +++ b/test/btyacc/calc1.tab.c @@ -813,11 +813,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc2.tab.c b/test/btyacc/calc2.tab.c index 1d7ad9d..2ccca8c 100644 --- a/test/btyacc/calc2.tab.c +++ b/test/btyacc/calc2.tab.c @@ -682,11 +682,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc3.tab.c b/test/btyacc/calc3.tab.c index 0ad86ef..f4e01f6 100644 --- a/test/btyacc/calc3.tab.c +++ b/test/btyacc/calc3.tab.c @@ -696,11 +696,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_all.tab.c b/test/btyacc/calc_code_all.tab.c index 21a2ffd..bf316ce 100644 --- a/test/btyacc/calc_code_all.tab.c +++ b/test/btyacc/calc_code_all.tab.c @@ -697,11 +697,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_default.tab.c b/test/btyacc/calc_code_default.tab.c index bda0455..5d0e27f 100644 --- a/test/btyacc/calc_code_default.tab.c +++ b/test/btyacc/calc_code_default.tab.c @@ -677,11 +677,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_imports.tab.c b/test/btyacc/calc_code_imports.tab.c index 9a34727..66c4066 100644 --- a/test/btyacc/calc_code_imports.tab.c +++ b/test/btyacc/calc_code_imports.tab.c @@ -669,11 +669,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_provides.tab.c b/test/btyacc/calc_code_provides.tab.c index 0b5eeee..991510e 100644 --- a/test/btyacc/calc_code_provides.tab.c +++ b/test/btyacc/calc_code_provides.tab.c @@ -677,11 +677,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_requires.tab.c b/test/btyacc/calc_code_requires.tab.c index 4588cab..2f69d77 100644 --- a/test/btyacc/calc_code_requires.tab.c +++ b/test/btyacc/calc_code_requires.tab.c @@ -677,11 +677,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/calc_code_top.tab.c b/test/btyacc/calc_code_top.tab.c index aa610dc..9902dcd 100644 --- a/test/btyacc/calc_code_top.tab.c +++ b/test/btyacc/calc_code_top.tab.c @@ -677,11 +677,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/code_calc.code.c b/test/btyacc/code_calc.code.c index 52f068d..2e7c7fa 100644 --- a/test/btyacc/code_calc.code.c +++ b/test/btyacc/code_calc.code.c @@ -542,11 +542,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/code_error.code.c b/test/btyacc/code_error.code.c index f48e6ff..4cf4716 100644 --- a/test/btyacc/code_error.code.c +++ b/test/btyacc/code_error.code.c @@ -512,11 +512,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/defines1.calc.c b/test/btyacc/defines1.calc.c index 4f2d934..6d9c6d1 100644 --- a/test/btyacc/defines1.calc.c +++ b/test/btyacc/defines1.calc.c @@ -576,11 +576,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/defines2.calc.c b/test/btyacc/defines2.calc.c index 4f2d934..6d9c6d1 100644 --- a/test/btyacc/defines2.calc.c +++ b/test/btyacc/defines2.calc.c @@ -576,11 +576,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/defines3.calc.c b/test/btyacc/defines3.calc.c index 2fd7e43..699ad7a 100644 --- a/test/btyacc/defines3.calc.c +++ b/test/btyacc/defines3.calc.c @@ -576,11 +576,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/empty.tab.c b/test/btyacc/empty.tab.c index d3def15..ca4c2af 100644 --- a/test/btyacc/empty.tab.c +++ b/test/btyacc/empty.tab.c @@ -531,11 +531,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_inherit3.tab.c b/test/btyacc/err_inherit3.tab.c index ada2809..acaf447 100644 --- a/test/btyacc/err_inherit3.tab.c +++ b/test/btyacc/err_inherit3.tab.c @@ -631,11 +631,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_inherit4.tab.c b/test/btyacc/err_inherit4.tab.c index 705f6b1..507d221 100644 --- a/test/btyacc/err_inherit4.tab.c +++ b/test/btyacc/err_inherit4.tab.c @@ -629,11 +629,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_syntax10.tab.c b/test/btyacc/err_syntax10.tab.c index 0150299..99a6e52 100644 --- a/test/btyacc/err_syntax10.tab.c +++ b/test/btyacc/err_syntax10.tab.c @@ -530,11 +530,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_syntax11.tab.c b/test/btyacc/err_syntax11.tab.c index 8d6443d..a8dffa1 100644 --- a/test/btyacc/err_syntax11.tab.c +++ b/test/btyacc/err_syntax11.tab.c @@ -536,11 +536,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_syntax12.tab.c b/test/btyacc/err_syntax12.tab.c index 2c18b25..a3091e1 100644 --- a/test/btyacc/err_syntax12.tab.c +++ b/test/btyacc/err_syntax12.tab.c @@ -542,11 +542,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_syntax18.tab.c b/test/btyacc/err_syntax18.tab.c index ee82f93..7c2f247 100644 --- a/test/btyacc/err_syntax18.tab.c +++ b/test/btyacc/err_syntax18.tab.c @@ -539,11 +539,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/err_syntax20.tab.c b/test/btyacc/err_syntax20.tab.c index 60528bb..ebcb4b5 100644 --- a/test/btyacc/err_syntax20.tab.c +++ b/test/btyacc/err_syntax20.tab.c @@ -534,11 +534,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/error.tab.c b/test/btyacc/error.tab.c index 78f95d2..9bc78ac 100644 --- a/test/btyacc/error.tab.c +++ b/test/btyacc/error.tab.c @@ -535,11 +535,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/expr.oxout.tab.c b/test/btyacc/expr.oxout.tab.c index 3de0148..9b10da7 100644 --- a/test/btyacc/expr.oxout.tab.c +++ b/test/btyacc/expr.oxout.tab.c @@ -1955,11 +1955,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/grammar.tab.c b/test/btyacc/grammar.tab.c index 005fb20..7d81447 100644 --- a/test/btyacc/grammar.tab.c +++ b/test/btyacc/grammar.tab.c @@ -1509,11 +1509,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/inherit0.tab.c b/test/btyacc/inherit0.tab.c index 5022218..3d88303 100644 --- a/test/btyacc/inherit0.tab.c +++ b/test/btyacc/inherit0.tab.c @@ -554,11 +554,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/inherit1.tab.c b/test/btyacc/inherit1.tab.c index 1f9f64b..10a5b42 100644 --- a/test/btyacc/inherit1.tab.c +++ b/test/btyacc/inherit1.tab.c @@ -575,11 +575,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/inherit2.tab.c b/test/btyacc/inherit2.tab.c index c672f16..b2ad5ca 100644 --- a/test/btyacc/inherit2.tab.c +++ b/test/btyacc/inherit2.tab.c @@ -630,11 +630,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/ok_syntax1.tab.c b/test/btyacc/ok_syntax1.tab.c index b7e9e7d..37a5db0 100644 --- a/test/btyacc/ok_syntax1.tab.c +++ b/test/btyacc/ok_syntax1.tab.c @@ -719,11 +719,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/pure_calc.tab.c b/test/btyacc/pure_calc.tab.c index 379a8f1..ceb11a3 100644 --- a/test/btyacc/pure_calc.tab.c +++ b/test/btyacc/pure_calc.tab.c @@ -692,11 +692,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/pure_error.tab.c b/test/btyacc/pure_error.tab.c index 43672cc..bb70a48 100644 --- a/test/btyacc/pure_error.tab.c +++ b/test/btyacc/pure_error.tab.c @@ -560,11 +560,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc-s.tab.c b/test/btyacc/quote_calc-s.tab.c index c2ad0a6..cbf43e6 100644 --- a/test/btyacc/quote_calc-s.tab.c +++ b/test/btyacc/quote_calc-s.tab.c @@ -687,11 +687,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc.tab.c b/test/btyacc/quote_calc.tab.c index 4e96a45..05b9743 100644 --- a/test/btyacc/quote_calc.tab.c +++ b/test/btyacc/quote_calc.tab.c @@ -693,11 +693,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc2-s.tab.c b/test/btyacc/quote_calc2-s.tab.c index 19d01d5..f584af8 100644 --- a/test/btyacc/quote_calc2-s.tab.c +++ b/test/btyacc/quote_calc2-s.tab.c @@ -687,11 +687,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc2.tab.c b/test/btyacc/quote_calc2.tab.c index 500f7d9..5cc845e 100644 --- a/test/btyacc/quote_calc2.tab.c +++ b/test/btyacc/quote_calc2.tab.c @@ -693,11 +693,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc3-s.tab.c b/test/btyacc/quote_calc3-s.tab.c index 34246b7..ca39161 100644 --- a/test/btyacc/quote_calc3-s.tab.c +++ b/test/btyacc/quote_calc3-s.tab.c @@ -688,11 +688,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc3.tab.c b/test/btyacc/quote_calc3.tab.c index 0fda00e..76b7036 100644 --- a/test/btyacc/quote_calc3.tab.c +++ b/test/btyacc/quote_calc3.tab.c @@ -688,11 +688,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc4-s.tab.c b/test/btyacc/quote_calc4-s.tab.c index 7d75046..507571d 100644 --- a/test/btyacc/quote_calc4-s.tab.c +++ b/test/btyacc/quote_calc4-s.tab.c @@ -688,11 +688,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/quote_calc4.tab.c b/test/btyacc/quote_calc4.tab.c index a75e2bb..4999164 100644 --- a/test/btyacc/quote_calc4.tab.c +++ b/test/btyacc/quote_calc4.tab.c @@ -688,11 +688,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/rename_debug.c b/test/btyacc/rename_debug.c index 9a2a550..67e4c24 100644 --- a/test/btyacc/rename_debug.c +++ b/test/btyacc/rename_debug.c @@ -398,11 +398,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/stdin1.calc.c b/test/btyacc/stdin1.calc.c index 6d52cd9..0423c0d 100644 --- a/test/btyacc/stdin1.calc.c +++ b/test/btyacc/stdin1.calc.c @@ -576,11 +576,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/stdin2.calc.c b/test/btyacc/stdin2.calc.c index e20dce6..893ded5 100644 --- a/test/btyacc/stdin2.calc.c +++ b/test/btyacc/stdin2.calc.c @@ -576,11 +576,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/btyacc/varsyntax_calc1.tab.c b/test/btyacc/varsyntax_calc1.tab.c index 9a2f6fb..00e91cf 100644 --- a/test/btyacc/varsyntax_calc1.tab.c +++ b/test/btyacc/varsyntax_calc1.tab.c @@ -814,11 +814,11 @@ YYPARSE_DECL() yyps->save = 0; #endif /* YYBTYACC */ yym = 0; - yyn = 0; + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/run_lint.sh b/test/run_lint.sh index cdf7739..6b8f289 100755 --- a/test/run_lint.sh +++ b/test/run_lint.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_lint.sh,v 1.3 2014/03/28 23:40:27 tom Exp $ +# $Id: run_lint.sh,v 1.4 2021/06/19 19:30:10 tom Exp $ # vi:ts=4 sw=4: # run lint on each of the ".c" files in the test directory @@ -13,16 +13,16 @@ else TEST_DIR=. fi -ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` +ifBTYACC=`grep -F -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` -if test $ifBTYACC = 0; then +if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc else REF_DIR=${TEST_DIR}/btyacc fi -echo '** '`date` +echo "** `date`" for i in ${REF_DIR}/*.c do - make -f $PROG_DIR/makefile lint C_FILES=$i srcdir=$PROG_DIR + make -f $PROG_DIR/makefile lint C_FILES="$i" srcdir="$PROG_DIR" done diff --git a/test/run_make.sh b/test/run_make.sh index 77cf633..03f188e 100755 --- a/test/run_make.sh +++ b/test/run_make.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_make.sh,v 1.18 2019/11/25 23:23:26 tom Exp $ +# $Id: run_make.sh,v 1.19 2021/06/19 19:27:47 tom Exp $ # vi:ts=4 sw=4: # do a test-compile on each of the ".c" files in the test-directory @@ -16,9 +16,9 @@ else fi THIS_DIR=`pwd` -ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` +ifBTYACC=`grep -F -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` -if test $ifBTYACC = 0; then +if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc else REF_DIR=${TEST_DIR}/btyacc @@ -30,13 +30,13 @@ run_make() { C_FILE=`basename "$1"` O_FILE=`basename "$C_FILE" .c`.o shift - cd $REF_DIR - make -f $PROG_DIR/makefile srcdir=$PROG_DIR $O_FILE $* - test -f $O_FILE && rm $O_FILE - cd $THIS_DIR + cd "$REF_DIR" + make -f "$PROG_DIR/makefile" srcdir="$PROG_DIR" "$O_FILE" "$@" + test -f "$O_FILE" && rm "$O_FILE" + cd "$THIS_DIR" } -echo '** '`date` +echo "** `date`" echo "** program is in $PROG_DIR" echo "** test-files in $REF_DIR" @@ -97,14 +97,14 @@ then case $input in ${TEST_DIR}/pure_*) - if test -z `fgrep -i -l '%pure-parser' $input` + if test -z "`grep -F -i -l '%pure-parser' "$input"`" then echo "%pure-parser" >>run_make.y fi ;; esac - sed -e '/^%expect/s,%expect.*,,' $input >>run_make.y + sed -e '/^%expect/s,%expect.*,,' "$input" >>run_make.y case $BISON in [3-9].[0-9]*.[0-9]*) @@ -116,7 +116,7 @@ then esac if test -f "y.tab.c" then - sed -e '/^#line/s,"run_make.y","'$input'",' y.tab.c >run_make.c + sed -e '/^#line/s,"run_make.y","'"$input"'",' y.tab.c >run_make.c rm -f y.tab.c @@ -158,11 +158,11 @@ then continue; ;; *) - if fgrep -i '%pure-parser' $input >/dev/null || - fgrep -i '%parse-param' $input >/dev/null || - fgrep -i '%lex-param' $input >/dev/null || - fgrep -i '%token-table' $input >/dev/null || - fgrep 'YYLEX_PARAM' $input >/dev/null + if grep -F -i '%pure-parser' "$input" >/dev/null || + grep -F -i '%parse-param' "$input" >/dev/null || + grep -F -i '%lex-param' "$input" >/dev/null || + grep -F -i '%token-table' "$input" >/dev/null || + grep -F 'YYLEX_PARAM' "$input" >/dev/null then echo "... skipping $input" continue; @@ -170,12 +170,12 @@ then ;; esac - sed -e '/^%expect/s,%expect.*,,' $input >>run_make.y + sed -e '/^%expect/s,%expect.*,,' "$input" >>run_make.y $YACC run_make.y if test -f y.tab.c then - sed -e '/^#line/s,"run_make.y","'$input'",' y.tab.c >run_make.c + sed -e '/^#line/s,"run_make.y","'"$input"'",' y.tab.c >run_make.c rm -f y.tab.c diff --git a/test/run_test.sh b/test/run_test.sh index 908a7d0..2877164 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_test.sh,v 1.31 2019/11/03 23:44:07 tom Exp $ +# $Id: run_test.sh,v 1.33 2021/06/19 19:33:05 tom Exp $ # vi:ts=4 sw=4: errors=0 @@ -8,36 +8,37 @@ errors=0 # REF is the reference file against which to compare test_diffs() { # echo "...test_diffs $NEW vs $REF" - mv -f $NEW ${REF_DIR}/ + mv -f "$NEW" "${REF_DIR}/" CMP=${REF_DIR}/${NEW} - if test ! -f $CMP + if test ! -f "$CMP" then echo "...not found $CMP" errors=1 else - sed -e s,$NEW,$REF, \ + sed -e "s,$NEW,$REF," \ -e "s%$YACC_escaped%YACC%" \ -e "s%^yacc\>%YACC%" \ -e "s%YACC:.*option.*$%YACC: error message%" \ -e "s%^Usage: yacc\>%Usage: YACC%" \ -e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \ -e '/#define YYPATCH/s/PATCH/CHECK/' \ - -e 's,#line \([1-9][0-9]*\) "'$REF_DIR'/,#line \1 ",' \ - -e 's,#line \([1-9][0-9]*\) "'$TEST_DIR'/,#line \1 ",' \ - -e 's,\(YACC:.* line [0-9][0-9]* of "\)'$TEST_DIR/',\1./,' \ - < $CMP >$tmpfile \ - && mv $tmpfile $CMP - if test ! -f $REF + -e 's,#line \([1-9][0-9]*\) "'"$REF_DIR"'/,#line \1 ",' \ + -e 's,#line \([1-9][0-9]*\) "'"$TEST_DIR"'/,#line \1 ",' \ + -e 's/^typedef \(short\|long\) YYINT;$/typedef int YYINT;/' \ + -e 's,\(YACC:.* line [0-9][0-9]* of "\)'"$TEST_DIR/"',\1./,' \ + < "$CMP" >"$tmpfile" \ + && mv "$tmpfile" "$CMP" + if test ! -f "$REF" then - mv $CMP $REF + mv "$CMP" "$REF" echo "...saved $REF" - elif ( cmp -s $REF $CMP ) + elif ( cmp -s "$REF" "$CMP" ) then echo "...ok $REF" - rm -f $CMP + rm -f "$CMP" else echo "...diff $REF" - diff -u $REF $CMP + diff -u "$REF" "$CMP" errors=1 fi fi @@ -48,7 +49,7 @@ test_flags() { root=$1 ROOT=test-$root shift 1 - $YACC "$@" >$ROOT.output 2>$ROOT.error + $YACC "$@" >"$ROOT.output" 2>"$ROOT.error" for type in .output .error do NEW=$ROOT$type @@ -67,9 +68,9 @@ test_stdin() { code=`echo "$1"|sed -e 's/y$/c/' -e "s,${TEST_DIR}/,,"` if test "x$opts" = "x-" then - $YACC -o $ROOT.$code $opts <$1 >$ROOT.output 2>$ROOT.error + $YACC -o "$ROOT.$code" $opts <$1 >"$ROOT.output" 2>"$ROOT.error" else - $YACC -o $ROOT.$code $opts $1 >$ROOT.output 2>$ROOT.error + $YACC -o "$ROOT.$code" $opts $1 >"$ROOT.output" 2>"$ROOT.error" fi for type in .output .error .$code do @@ -92,12 +93,12 @@ test_defines() { done head=`echo "$1"|sed -e 's/y$/h/' -e "s,${TEST_DIR}/,,"` code=`echo "$1"|sed -e 's/y$/c/' -e "s,${TEST_DIR}/,,"` - $YACC $opts -H $ROOT.$head $1 >$ROOT.output 2>$ROOT.error + $YACC $opts -H "$ROOT.$head" $1 >"$ROOT.output" 2>"$ROOT.error" for name in prefix.tab.c y.tab.c do if test -f $name then - mv $name $ROOT.$code + mv "$name" "$ROOT.$code" break fi done @@ -125,9 +126,9 @@ YACC_escaped=`echo "$PROG_DIR/yacc" | sed -e 's/\./\\\./g'` tmpfile=temp$$ -ifBTYACC=`fgrep -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?` +ifBTYACC=`grep -F -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?` -if test $ifBTYACC = 0; then +if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc else REF_DIR=${TEST_DIR}/btyacc @@ -135,7 +136,7 @@ fi rm -f ${REF_DIR}/test-* -echo '** '`date` +echo "** `date`" # Tests which do not need files MYFILE=nosuchfile @@ -200,14 +201,14 @@ test_defines defines1 ${TEST_DIR}/calc.y test_defines defines2 -d ${TEST_DIR}/calc.y test_defines defines3 -b prefix ${TEST_DIR}/calc.y -for input in ${TEST_DIR}/*.y +for input in "${TEST_DIR}"/*.y do case $input in test-*) echo "?? ignored $input" ;; *) - root=`basename $input .y` + root=`basename "$input" .y` ROOT="test-$root" prefix=${root}_ @@ -217,7 +218,7 @@ do TYPE=".error .output .tab.c .tab.h" case $input in ${TEST_DIR}/btyacc_*) - if test $ifBTYACC = 0; then continue; fi + if test "$ifBTYACC" = 0; then continue; fi OPTS="$OPTS -B" prefix=`echo "$prefix" | sed -e 's/^btyacc_//'` ;; @@ -245,7 +246,7 @@ do ;; ${TEST_DIR}/inherit*|\ ${TEST_DIR}/err_inherit*) - if test $ifBTYACC = 0; then continue; fi + if test "$ifBTYACC" = 0; then continue; fi ;; esac @@ -259,12 +260,12 @@ do if test -n "$output" then output="-o $output" - error=`basename $OOPT .c`.error + error=`basename "$OOPT" .c`.error else error=${ROOT}${opt2}.error fi - $YACC $OPTS $opt2 -v -d $output $prefix -b $ROOT${opt2} $input 2>$error + $YACC $OPTS $opt2 -v -d $output $prefix -b "$ROOT${opt2}" "$input" 2>"$error" for type in $TYPE do REF=${REF_DIR}/${root}${opt2}${type} @@ -282,7 +283,7 @@ do *) ;; esac - NEW=`basename $OOPT .c`${type} + NEW=`basename "$OOPT" .c`${type} case $NEW in test-*) ;; @@ -290,13 +291,13 @@ do if test -f "$NEW" then REF=${REF_DIR}/$NEW - mv $NEW test-$NEW - NEW=test-$NEW + mv "$NEW" "test-$NEW" + NEW="test-$NEW" fi ;; esac else - NEW=${ROOT}${opt2}${type} + NEW="${ROOT}${opt2}${type}" fi test_diffs done diff --git a/test/yacc/calc.tab.c b/test/yacc/calc.tab.c index 211a0ac..2e0afee 100644 --- a/test/yacc/calc.tab.c +++ b/test/yacc/calc.tab.c @@ -427,12 +427,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc1.tab.c b/test/yacc/calc1.tab.c index dd6a79e..07d4d90 100644 --- a/test/yacc/calc1.tab.c +++ b/test/yacc/calc1.tab.c @@ -564,12 +564,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc2.tab.c b/test/yacc/calc2.tab.c index 62b1227..1f9e908 100644 --- a/test/yacc/calc2.tab.c +++ b/test/yacc/calc2.tab.c @@ -440,12 +440,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc3.tab.c b/test/yacc/calc3.tab.c index b5cb450..5a206ca 100644 --- a/test/yacc/calc3.tab.c +++ b/test/yacc/calc3.tab.c @@ -448,12 +448,12 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_all.tab.c b/test/yacc/calc_code_all.tab.c index 6b1f1fa..3d80873 100644 --- a/test/yacc/calc_code_all.tab.c +++ b/test/yacc/calc_code_all.tab.c @@ -455,12 +455,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_default.tab.c b/test/yacc/calc_code_default.tab.c index abfd8aa..e86fefc 100644 --- a/test/yacc/calc_code_default.tab.c +++ b/test/yacc/calc_code_default.tab.c @@ -435,12 +435,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_imports.tab.c b/test/yacc/calc_code_imports.tab.c index f576887..546dc71 100644 --- a/test/yacc/calc_code_imports.tab.c +++ b/test/yacc/calc_code_imports.tab.c @@ -427,12 +427,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_provides.tab.c b/test/yacc/calc_code_provides.tab.c index 9bb7dd0..00dc9cb 100644 --- a/test/yacc/calc_code_provides.tab.c +++ b/test/yacc/calc_code_provides.tab.c @@ -435,12 +435,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_requires.tab.c b/test/yacc/calc_code_requires.tab.c index 9187786..a8ae025 100644 --- a/test/yacc/calc_code_requires.tab.c +++ b/test/yacc/calc_code_requires.tab.c @@ -435,12 +435,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/calc_code_top.tab.c b/test/yacc/calc_code_top.tab.c index 976ea8c..18c4456 100644 --- a/test/yacc/calc_code_top.tab.c +++ b/test/yacc/calc_code_top.tab.c @@ -435,12 +435,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/code_calc.code.c b/test/yacc/code_calc.code.c index eab93d5..ebc66a8 100644 --- a/test/yacc/code_calc.code.c +++ b/test/yacc/code_calc.code.c @@ -336,12 +336,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/code_error.code.c b/test/yacc/code_error.code.c index 1ea8357..30b300e 100644 --- a/test/yacc/code_error.code.c +++ b/test/yacc/code_error.code.c @@ -306,12 +306,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/defines1.calc.c b/test/yacc/defines1.calc.c index 0d03567..833145f 100644 --- a/test/yacc/defines1.calc.c +++ b/test/yacc/defines1.calc.c @@ -351,12 +351,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/defines2.calc.c b/test/yacc/defines2.calc.c index 0d03567..833145f 100644 --- a/test/yacc/defines2.calc.c +++ b/test/yacc/defines2.calc.c @@ -351,12 +351,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/defines3.calc.c b/test/yacc/defines3.calc.c index a15c93d..daa290a 100644 --- a/test/yacc/defines3.calc.c +++ b/test/yacc/defines3.calc.c @@ -351,12 +351,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/empty.tab.c b/test/yacc/empty.tab.c index a3224c6..6ba70ad 100644 --- a/test/yacc/empty.tab.c +++ b/test/yacc/empty.tab.c @@ -317,12 +317,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/err_syntax10.tab.c b/test/yacc/err_syntax10.tab.c index 72d49ff..739e93b 100644 --- a/test/yacc/err_syntax10.tab.c +++ b/test/yacc/err_syntax10.tab.c @@ -316,12 +316,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/err_syntax11.tab.c b/test/yacc/err_syntax11.tab.c index f918322..4159e07 100644 --- a/test/yacc/err_syntax11.tab.c +++ b/test/yacc/err_syntax11.tab.c @@ -322,12 +322,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/err_syntax12.tab.c b/test/yacc/err_syntax12.tab.c index 19c2ac8..80097fa 100644 --- a/test/yacc/err_syntax12.tab.c +++ b/test/yacc/err_syntax12.tab.c @@ -328,12 +328,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/err_syntax18.tab.c b/test/yacc/err_syntax18.tab.c index 8c353e2..fab30df 100644 --- a/test/yacc/err_syntax18.tab.c +++ b/test/yacc/err_syntax18.tab.c @@ -324,12 +324,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/err_syntax20.tab.c b/test/yacc/err_syntax20.tab.c index 36a4a4a..7f08c32 100644 --- a/test/yacc/err_syntax20.tab.c +++ b/test/yacc/err_syntax20.tab.c @@ -320,12 +320,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/error.tab.c b/test/yacc/error.tab.c index e6be842..1b082a4 100644 --- a/test/yacc/error.tab.c +++ b/test/yacc/error.tab.c @@ -322,12 +322,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/expr.oxout.tab.c b/test/yacc/expr.oxout.tab.c index 569a1d7..143c1f7 100644 --- a/test/yacc/expr.oxout.tab.c +++ b/test/yacc/expr.oxout.tab.c @@ -1718,12 +1718,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/grammar.tab.c b/test/yacc/grammar.tab.c index 8464db9..91a6789 100644 --- a/test/yacc/grammar.tab.c +++ b/test/yacc/grammar.tab.c @@ -1166,12 +1166,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/ok_syntax1.tab.c b/test/yacc/ok_syntax1.tab.c index b31cc72..ba107d0 100644 --- a/test/yacc/ok_syntax1.tab.c +++ b/test/yacc/ok_syntax1.tab.c @@ -472,12 +472,12 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/pure_calc.tab.c b/test/yacc/pure_calc.tab.c index 82674e0..935d43d 100644 --- a/test/yacc/pure_calc.tab.c +++ b/test/yacc/pure_calc.tab.c @@ -444,12 +444,12 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/pure_error.tab.c b/test/yacc/pure_error.tab.c index 247537e..28bca39 100644 --- a/test/yacc/pure_error.tab.c +++ b/test/yacc/pure_error.tab.c @@ -341,12 +341,12 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc-s.tab.c b/test/yacc/quote_calc-s.tab.c index 715bae7..1ba9601 100644 --- a/test/yacc/quote_calc-s.tab.c +++ b/test/yacc/quote_calc-s.tab.c @@ -442,12 +442,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc.tab.c b/test/yacc/quote_calc.tab.c index 422794e..2159ff8 100644 --- a/test/yacc/quote_calc.tab.c +++ b/test/yacc/quote_calc.tab.c @@ -448,12 +448,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc2-s.tab.c b/test/yacc/quote_calc2-s.tab.c index 6ed0ae2..9a07950 100644 --- a/test/yacc/quote_calc2-s.tab.c +++ b/test/yacc/quote_calc2-s.tab.c @@ -442,12 +442,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc2.tab.c b/test/yacc/quote_calc2.tab.c index cbd9748..2768685 100644 --- a/test/yacc/quote_calc2.tab.c +++ b/test/yacc/quote_calc2.tab.c @@ -448,12 +448,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc3-s.tab.c b/test/yacc/quote_calc3-s.tab.c index 52133b4..e088c9e 100644 --- a/test/yacc/quote_calc3-s.tab.c +++ b/test/yacc/quote_calc3-s.tab.c @@ -443,12 +443,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc3.tab.c b/test/yacc/quote_calc3.tab.c index 62d1927..653a471 100644 --- a/test/yacc/quote_calc3.tab.c +++ b/test/yacc/quote_calc3.tab.c @@ -443,12 +443,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc4-s.tab.c b/test/yacc/quote_calc4-s.tab.c index 4b5563d..cc6fcc1 100644 --- a/test/yacc/quote_calc4-s.tab.c +++ b/test/yacc/quote_calc4-s.tab.c @@ -443,12 +443,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/quote_calc4.tab.c b/test/yacc/quote_calc4.tab.c index d0e8f23..0ef7817 100644 --- a/test/yacc/quote_calc4.tab.c +++ b/test/yacc/quote_calc4.tab.c @@ -443,12 +443,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/rename_debug.c b/test/yacc/rename_debug.c index 24bbaf5..70e8a61 100644 --- a/test/yacc/rename_debug.c +++ b/test/yacc/rename_debug.c @@ -202,12 +202,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/stdin1.calc.c b/test/yacc/stdin1.calc.c index bbe924b..78ee918 100644 --- a/test/yacc/stdin1.calc.c +++ b/test/yacc/stdin1.calc.c @@ -351,12 +351,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/stdin2.calc.c b/test/yacc/stdin2.calc.c index 3788239..18bfcd3 100644 --- a/test/yacc/stdin2.calc.c +++ b/test/yacc/stdin2.calc.c @@ -351,12 +351,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); diff --git a/test/yacc/varsyntax_calc1.tab.c b/test/yacc/varsyntax_calc1.tab.c index ef1635a..21f961e 100644 --- a/test/yacc/varsyntax_calc1.tab.c +++ b/test/yacc/varsyntax_calc1.tab.c @@ -565,12 +565,12 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); @@ -227,12 +227,12 @@ const char *const init_vars[] = const char *const body_3[] = { - " yym = 0;", - " yyn = 0;", + " /* yym is set below */", + " /* yyn is set below */", " yynerrs = 0;", " yyerrflag = 0;", " yychar = YYEMPTY;", - " yystate = 0;", + " /* yystate is set below */", "", "#if YYPURE", " memset(&yystack, 0, sizeof(yystack));", diff --git a/yaccpar.skel b/yaccpar.skel index 32e2d15..47ef71b 100644 --- a/yaccpar.skel +++ b/yaccpar.skel @@ -1,4 +1,4 @@ -/* $Id: yaccpar.skel,v 1.10 2018/05/06 21:28:14 Guy.Harris Exp $ */ +/* $Id: yaccpar.skel,v 1.11 2021/06/19 20:45:25 tom Exp $ */ #include "defs.h" @@ -174,12 +174,12 @@ YYPARSE_DECL() memset(&yylval, 0, sizeof(yylval)); %% body_3 - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; - yystate = 0; + /* yystate is set below */ #if YYPURE memset(&yystack, 0, sizeof(yystack)); |