Date: Wed, 8 Jan 2014 08:08:22 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260445 - in head/contrib/byacc: . package package/debian test Message-ID: <201401080808.s0888Mj6055679@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jan 8 08:08:22 2014 New Revision: 260445 URL: http://svnweb.freebsd.org/changeset/base/260445 Log: Import byacc 20140101 which imports %token-table from bison allowing to build ntpd Modified: head/contrib/byacc/CHANGES head/contrib/byacc/VERSION head/contrib/byacc/aclocal.m4 head/contrib/byacc/config.guess head/contrib/byacc/config.sub head/contrib/byacc/configure head/contrib/byacc/configure.in head/contrib/byacc/defs.h head/contrib/byacc/main.c head/contrib/byacc/makefile.in head/contrib/byacc/output.c head/contrib/byacc/package/byacc.spec head/contrib/byacc/package/debian/changelog head/contrib/byacc/reader.c head/contrib/byacc/skeleton.c head/contrib/byacc/test/calc.tab.c head/contrib/byacc/test/calc1.tab.c head/contrib/byacc/test/calc2.tab.c head/contrib/byacc/test/calc3.tab.c head/contrib/byacc/test/code_calc.code.c head/contrib/byacc/test/code_calc.tab.c head/contrib/byacc/test/code_error.code.c head/contrib/byacc/test/code_error.tab.c head/contrib/byacc/test/error.tab.c head/contrib/byacc/test/ftp.tab.c head/contrib/byacc/test/grammar.tab.c head/contrib/byacc/test/pure_calc.tab.c head/contrib/byacc/test/pure_error.tab.c head/contrib/byacc/test/quote_calc-s.tab.c head/contrib/byacc/test/quote_calc.tab.c head/contrib/byacc/test/quote_calc2-s.tab.c head/contrib/byacc/test/quote_calc2.tab.c head/contrib/byacc/test/quote_calc3-s.tab.c head/contrib/byacc/test/quote_calc3.tab.c head/contrib/byacc/test/quote_calc4-s.tab.c head/contrib/byacc/test/quote_calc4.tab.c head/contrib/byacc/yacc.1 Directory Properties: head/contrib/byacc/ (props changed) Modified: head/contrib/byacc/CHANGES ============================================================================== --- head/contrib/byacc/CHANGES Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/CHANGES Wed Jan 8 08:08:22 2014 (r260445) @@ -1,3 +1,48 @@ +2014-01-01 Thomas E. Dickey <tom@invisible-island.net> + + * yacc.1: document %token-table, improve presentation of double-quotes + + * VERSION, package/byacc.spec, package/debian/changelog: bump + + * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_calc.tab.c, test/code_error.code.c, test/code_error.tab.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: + regen + + * output.c, skeleton.c: + amend the last change so that yytname is #define'd as needed rather than + permanent - to avoid breaking cproto for instance. + +2014-01-01 Christos.Zoulas + + * output.c, defs.h, main.c, reader.c, skeleton.c: + changes to build ntpd using byacc: + - rename yyname[] to yytname[] + - add YYTRANSLATE() macro + - recognize bison's %token-table declaration + +2014-01-01 Thomas E. Dickey <tom@invisible-island.net> + + * configure: regen + + * yacc.1: s/EE/XE/ to work around groff bug on Debian 6 + + * makefile.in: use CF_MAKE_DOCS + + * aclocal.m4: add CF_MAKE_DOCS + + * configure.in: use CF_MAKE_DOCS + +2013-12-26 Thomas E. Dickey <tom@invisible-island.net> + + * config.guess: 2013-11-29 + +2013-11-19 Thomas E. Dickey <tom@invisible-island.net> + + * aclocal.m4: resync with my-autoconf (fixes for clang and mingw) + +2013-10-25 Thomas E. Dickey <tom@invisible-island.net> + + * config.sub: 2013-10-01 + 2013-09-25 Thomas E. Dickey <tom@invisible-island.net> * reader.c: fix two loop-limits found by clang 3.3 --analyze Modified: head/contrib/byacc/VERSION ============================================================================== --- head/contrib/byacc/VERSION Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/VERSION Wed Jan 8 08:08:22 2014 (r260445) @@ -1 +1 @@ -20130925 +20140101 Modified: head/contrib/byacc/aclocal.m4 ============================================================================== --- head/contrib/byacc/aclocal.m4 Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/aclocal.m4 Wed Jan 8 08:08:22 2014 (r260445) @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.31 2013/09/25 23:15:41 tom Exp $ +dnl $Id: aclocal.m4,v 1.33 2014/01/01 14:08:07 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- -dnl Copyright 2004-2012,2013 Thomas E. Dickey +dnl Copyright 2004-2013,2014 Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -232,7 +232,7 @@ if test ".$system_name" != ".$cf_cv_syst fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 +dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -243,7 +243,7 @@ dnl ensure that it is not mistaken for g dnl the wrappers for gcc and g++ warnings. dnl dnl $1 = GCC (default) or GXX -dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS +dnl $2 = CLANG_COMPILER (default) dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_CLANG_COMPILER],[ ifelse([$2],,CLANG_COMPILER,[$2])=no @@ -449,7 +449,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 +dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -521,10 +521,14 @@ then EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -532,7 +536,7 @@ then Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST $1 + Wundef $cf_gcc_warnings $cf_warn_CONST $1 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" if AC_TRY_EVAL(ac_compile); then @@ -634,6 +638,60 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147 - fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_MAKE_DOCS version: 2 updated: 2013/01/02 20:04:08 +dnl ------------ +dnl $1 = name(s) to generate rules for +dnl $2 = suffix of corresponding manpages used as input. +define([CF_MAKE_DOCS],[ +test -z "$cf_make_docs" && cf_make_docs=0 + +cf_output=makefile +test -f "$cf_output" || cf_output=Makefile + +if test "$cf_make_docs" = 0 +then +cat >>$cf_output <<"CF_EOF" +################################################################################ +.SUFFIXES : .html .$2 .man .ps .pdf .txt + +.$2.html : + GROFF_NO_SGR=stupid [$](SHELL) -c "tbl [$]*.$2 | groff -P -o0 -I$*_ -Thtml -man" >[$]@ + +.$2.ps : + [$](SHELL) -c "tbl [$]*.$2 | groff -man" >[$]@ + +.$2.txt : + GROFF_NO_SGR=stupid [$](SHELL) -c "tbl [$]*.$2 | nroff -Tascii -man | col -bx" >[$]@ + +.ps.pdf : + ps2pdf [$]*.ps + +CF_EOF + cf_make_docs=1 +fi + +for cf_name in $1 +do +cat >>$cf_output <<CF_EOF +################################################################################ +docs-$cf_name \\ +docs :: $cf_name.html \\ + $cf_name.pdf \\ + $cf_name.ps \\ + $cf_name.txt + +clean \\ +docs-clean :: + rm -f $cf_name.html $cf_name.pdf $cf_name.ps $cf_name.txt + +$cf_name.html : $cf_name.$2 +$cf_name.pdf : $cf_name.ps +$cf_name.ps : $cf_name.$2 +$cf_name.txt : $cf_name.$2 +CF_EOF +done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32 dnl ------------ dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have @@ -671,7 +729,7 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05 +dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -680,7 +738,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) Modified: head/contrib/byacc/config.guess ============================================================================== --- head/contrib/byacc/config.guess Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/config.guess Wed Jan 8 08:08:22 2014 (r260445) @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2013-11-29' # 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 @@ -1260,16 +1260,26 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; Modified: head/contrib/byacc/config.sub ============================================================================== --- head/contrib/byacc/config.sub Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/config.sub Wed Jan 8 08:08:22 2014 (r260445) @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-09-05' +timestamp='2013-10-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -265,6 +265,7 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -381,6 +382,7 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ Modified: head/contrib/byacc/configure ============================================================================== --- head/contrib/byacc/configure Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/configure Wed Jan 8 08:08:22 2014 (r260445) @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.14 . +# From configure.in Revision: 1.15 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20121002. # @@ -2112,7 +2112,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) @@ -4191,10 +4191,14 @@ echo "$as_me: checking for $CC warning o EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -4202,15 +4206,15 @@ echo "$as_me: checking for $CC warning o Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST Wwrite-strings + Wundef $cf_gcc_warnings $cf_warn_CONST Wwrite-strings do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:4208: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4212: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4211: \$? = $ac_status" >&5 + echo "$as_me:4215: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4213: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4217: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4221,7 +4225,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4224: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4228: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4231,7 +4235,7 @@ echo "${as_me:-configure}:4224: testing [12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4234: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4238: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4247,7 +4251,7 @@ rm -rf conftest* fi fi -echo "$as_me:4250: checking if you want to see long compiling messages" >&5 +echo "$as_me:4254: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -4281,10 +4285,10 @@ else ECHO_CC='' fi; -echo "$as_me:4284: result: $enableval" >&5 +echo "$as_me:4288: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:4287: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:4291: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -4301,7 +4305,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:4304: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:4308: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -4395,23 +4399,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:4398: checking for dmalloc.h" >&5 + echo "$as_me:4402: 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 4404 "configure" +#line 4408 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:4408: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4412: \"$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:4414: \$? = $ac_status" >&5 + echo "$as_me:4418: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4430,11 +4434,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4433: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:4437: 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:4437: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:4441: 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 @@ -4442,7 +4446,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4445 "configure" +#line 4449 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4461,16 +4465,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4464: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4468: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4467: \$? = $ac_status" >&5 + echo "$as_me:4471: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4470: \"$ac_try\"") >&5 + { (eval echo "$as_me:4474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4473: \$? = $ac_status" >&5 + echo "$as_me:4477: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -4481,7 +4485,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4484: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:4488: 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 @@ -4496,7 +4500,7 @@ fi fi -echo "$as_me:4499: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:4503: 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. @@ -4513,7 +4517,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:4516: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:4520: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -4607,23 +4611,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:4610: checking for dbmalloc.h" >&5 + echo "$as_me:4614: 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 4616 "configure" +#line 4620 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:4620: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4624: \"$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:4626: \$? = $ac_status" >&5 + echo "$as_me:4630: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4642,11 +4646,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4645: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:4649: 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:4649: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:4653: 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 @@ -4654,7 +4658,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4657 "configure" +#line 4661 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4673,16 +4677,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4676: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4680: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4679: \$? = $ac_status" >&5 + echo "$as_me:4683: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4682: \"$ac_try\"") >&5 + { (eval echo "$as_me:4686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4685: \$? = $ac_status" >&5 + echo "$as_me:4689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -4693,7 +4697,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4696: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:4700: 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 @@ -4708,7 +4712,7 @@ fi fi -echo "$as_me:4711: checking if you want to use valgrind for testing" >&5 +echo "$as_me:4715: 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. @@ -4725,7 +4729,7 @@ EOF else with_valgrind= fi; -echo "$as_me:4728: result: ${with_valgrind:-no}" >&5 +echo "$as_me:4732: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -4818,7 +4822,7 @@ fi ;; esac -echo "$as_me:4821: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:4825: 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. @@ -4828,7 +4832,7 @@ if test "${enable_leaks+set}" = set; the else : ${with_no_leaks:=no} fi; -echo "$as_me:4831: result: $with_no_leaks" >&5 +echo "$as_me:4835: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -4924,7 +4928,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:4927: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4931: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -5097,7 +5101,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:5100: error: ambiguous option: $1 + { { echo "$as_me:5104: 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;} @@ -5116,7 +5120,7 @@ Try \`$0 --help' for more information." ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:5119: error: unrecognized option: $1 + -*) { { echo "$as_me:5123: 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;} @@ -5153,7 +5157,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:5156: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:5160: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -5386,7 +5390,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:5389: creating $ac_file" >&5 + { echo "$as_me:5393: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5404,7 +5408,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:5407: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5411: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5417,7 +5421,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5420: error: cannot find input file: $f" >&5 + { { echo "$as_me:5424: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5433,7 +5437,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:5436: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:5440: 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;} @@ -5442,7 +5446,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:5445: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:5449: 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;} @@ -5479,7 +5483,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:5482: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:5486: 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;} @@ -5490,7 +5494,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:5493: WARNING: Some variables may not be substituted: + { echo "$as_me:5497: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -5539,7 +5543,7 @@ for ac_file in : $CONFIG_HEADERS; do tes * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:5542: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:5546: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -5550,7 +5554,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:5553: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5557: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5563,7 +5567,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5566: error: cannot find input file: $f" >&5 + { { echo "$as_me:5570: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5681,7 +5685,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:5684: $ac_file is unchanged" >&5 + { echo "$as_me:5688: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -5748,3 +5752,51 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi +test -z "$cf_make_docs" && cf_make_docs=0 + +cf_output=makefile +test -f "$cf_output" || cf_output=Makefile + +if test "$cf_make_docs" = 0 +then +cat >>$cf_output <<"CF_EOF" +################################################################################ +.SUFFIXES : .html .1 .man .ps .pdf .txt + +.1.html : + GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.1 | groff -P -o0 -Iyacc,1_ -Thtml -man" >$@ + +.1.ps : + $(SHELL) -c "tbl $*.1 | groff -man" >$@ + +.1.txt : + GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.1 | nroff -Tascii -man | col -bx" >$@ + +.ps.pdf : + ps2pdf $*.ps + +CF_EOF + cf_make_docs=1 +fi + +for cf_name in yacc +do +cat >>$cf_output <<CF_EOF +################################################################################ +docs-$cf_name \\ +docs :: $cf_name.html \\ + $cf_name.pdf \\ + $cf_name.ps \\ + $cf_name.txt + +clean \\ +docs-clean :: + rm -f $cf_name.html $cf_name.pdf $cf_name.ps $cf_name.txt + +$cf_name.html : $cf_name.1 +$cf_name.pdf : $cf_name.ps +$cf_name.ps : $cf_name.1 +$cf_name.txt : $cf_name.1 +CF_EOF +done + Modified: head/contrib/byacc/configure.in ============================================================================== --- head/contrib/byacc/configure.in Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/configure.in Wed Jan 8 08:08:22 2014 (r260445) @@ -1,7 +1,7 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 1.14 2012/10/03 23:41:36 tom Exp $ +dnl $Id: configure.in,v 1.15 2014/01/01 14:07:34 tom Exp $ AC_PREREQ(2.52.20011201) -AC_REVISION($Revision: 1.14 $) +AC_REVISION($Revision: 1.15 $) AC_INIT(main.c) AC_CONFIG_HEADER(config.h:config_h.in) @@ -24,3 +24,4 @@ CF_DISABLE_LEAKS ### output makefile AC_OUTPUT(makefile) +CF_MAKE_DOCS(yacc,1) Modified: head/contrib/byacc/defs.h ============================================================================== --- head/contrib/byacc/defs.h Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/defs.h Wed Jan 8 08:08:22 2014 (r260445) @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.37 2012/05/26 15:23:00 tom Exp $ */ +/* $Id: defs.h,v 1.38 2014/01/01 14:23:27 Christos.Zoulas Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -104,6 +104,7 @@ #define PARSE_PARAM 13 #define LEX_PARAM 14 #define POSIX_YACC 15 +#define TOKEN_TABLE 16 /* symbol classes */ @@ -248,6 +249,7 @@ extern int lineno; extern int outline; extern int exit_code; extern int pure_parser; +extern int token_table; extern const char *const banner[]; extern const char *const xdecls[]; Modified: head/contrib/byacc/main.c ============================================================================== --- head/contrib/byacc/main.c Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/main.c Wed Jan 8 08:08:22 2014 (r260445) @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.40 2012/09/29 13:11:00 Adrian.Bunk Exp $ */ +/* $Id: main.c,v 1.41 2014/01/01 14:23:27 Christos.Zoulas Exp $ */ #include <signal.h> #include <unistd.h> /* for _exit() */ @@ -87,6 +87,7 @@ short *symbol_prec; char *symbol_assoc; int pure_parser; +int token_table; int exit_code; Value_t *ritem; Modified: head/contrib/byacc/makefile.in ============================================================================== --- head/contrib/byacc/makefile.in Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/makefile.in Wed Jan 8 08:08:22 2014 (r260445) @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.18 2012/09/29 13:10:15 Adrian.Bunk Exp $ +# $Id: makefile.in,v 1.19 2014/01/01 14:09:43 tom Exp $ # # UNIX template-makefile for Berkeley Yacc @@ -100,7 +100,7 @@ uninstall: - rm -f $(mandir)/$(actual_man) ################################################################################ -.SUFFIXES : $o .i .html .$(manext) .cat .ps .pdf .txt +.SUFFIXES : $o .i .c$o: @RULE_CC@ @@ -110,21 +110,6 @@ uninstall: @RULE_CC@ @ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@ -.$(manext).cat : - - nroff -man $(srcdir)/$(THIS).$(manext) >$@ - -.$(manext).html : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man" >$@ - -.$(manext).ps : - $(SHELL) -c "tbl $*.$(manext) | groff -man" >$@ - -.$(manext).txt : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | nroff -Tascii -man | col -bx" >$@ - -.ps.pdf : - ps2pdf $*.ps - ################################################################################ $(THIS)$x : $(OBJS) @@ -133,27 +118,17 @@ $(THIS)$x : $(OBJS) mostlyclean : - rm -f core .nfs* *$o *.bak *.BAK *.out -clean : mostlyclean +clean :: mostlyclean - rm -f $(THIS)$x -distclean : clean +distclean :: clean - rm -f config.log config.cache config.status config.h makefile - - rm -f *.html *.cat *.pdf *.ps *.txt - cd test && rm -f test-* -realclean: distclean +realclean :: distclean - rm -f tags TAGS ################################################################################ -docs :: $(THIS).html \ - $(THIS).pdf \ - $(THIS).ps \ - $(THIS).txt -$(THIS).html : $(THIS).$(manext) -$(THIS).pdf : $(THIS).ps -$(THIS).ps : $(THIS).$(manext) -$(THIS).txt : $(THIS).$(manext) -################################################################################ check: $(THIS)$x $(SHELL) $(testdir)/run_test.sh $(testdir) Modified: head/contrib/byacc/output.c ============================================================================== --- head/contrib/byacc/output.c Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/output.c Wed Jan 8 08:08:22 2014 (r260445) @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.45 2013/03/05 00:29:17 tom Exp $ */ +/* $Id: output.c,v 1.47 2014/01/01 17:22:38 tom Exp $ */ #include "defs.h" @@ -921,23 +921,42 @@ output_debug(void) ++outline; fprintf(code_file, "#define YYMAXTOKEN %d\n", max); + fprintf(code_file, "#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? " + "(YYMAXTOKEN + 1) : (a))\n"); - symnam = TMALLOC(const char *, max + 1); + symnam = TMALLOC(const char *, max + 2); NO_SPACE(symnam); /* Note that it is not necessary to initialize the element */ /* symnam[max]. */ - for (i = 0; i < max; ++i) + for (i = 0; i <= max; ++i) symnam[i] = 0; for (i = ntokens - 1; i >= 2; --i) symnam[symbol_value[i]] = symbol_name[i]; symnam[0] = "end-of-file"; + symnam[max + 1] = "illegal-symbol"; - output_line("#if YYDEBUG"); + /* + * bison's yytname[] array is roughly the same as byacc's yyname[] array. + * The difference is that byacc does not predefine "$end", "$error" or + * "$undefined". + * + * If the grammar declares "%token-table", define symbol "yytname" so + * an application such as ntpd can build. + */ + if (token_table) + { + output_line("#undef yytname"); + output_line("#define yytname yyname"); + } + else + { + output_line("#if YYDEBUG"); + } start_str_table("name"); j = 80; - for (i = 0; i <= max; ++i) + for (i = 0; i <= max + 1; ++i) { if ((s = symnam[i]) != 0) { @@ -1058,6 +1077,8 @@ output_debug(void) end_table(); FREE(symnam); + if (token_table) + output_line("#if YYDEBUG"); start_str_table("rule"); for (i = 2; i < nrules; ++i) { Modified: head/contrib/byacc/package/byacc.spec ============================================================================== --- head/contrib/byacc/package/byacc.spec Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/package/byacc.spec Wed Jan 8 08:08:22 2014 (r260445) @@ -1,8 +1,8 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc -%define AppVersion 20130925 +%define AppVersion 20140101 %define UseProgram yacc -# $XTermId: byacc.spec,v 1.17 2013/09/25 22:41:54 tom Exp $ +# $XTermId: byacc.spec,v 1.18 2014/01/01 17:26:25 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 Modified: head/contrib/byacc/package/debian/changelog ============================================================================== --- head/contrib/byacc/package/debian/changelog Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/package/debian/changelog Wed Jan 8 08:08:22 2014 (r260445) @@ -1,3 +1,9 @@ +byacc (20140101) unstable; urgency=low + + * yytname[] changes + + -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 01 Jan 2014 10:02:12 -0500 + byacc (20130925) unstable; urgency=low * increase default stack-size Modified: head/contrib/byacc/reader.c ============================================================================== --- head/contrib/byacc/reader.c Wed Jan 8 08:06:56 2014 (r260444) +++ head/contrib/byacc/reader.c Wed Jan 8 08:08:22 2014 (r260445) @@ -1,4 +1,4 @@ -/* $Id: reader.c,v 1.37 2013/09/25 23:46:18 tom Exp $ */ +/* $Id: reader.c,v 1.38 2014/01/01 14:23:27 Christos.Zoulas Exp $ */ #include "defs.h" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401080808.s0888Mj6055679>