Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 02:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* bootstrap.conf (gnulib_modules): Add config-h.

Browse Source 
* djgpp/subpipe.c: Include <config.h> unconditionally; don't
worry about HAVE_CONFIG_H.
* lib/abitset.c: Likewise.
* lib/bitset.c: Likewise.
* lib/bitset_stats.c: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/ebitset.c: Likewise.
* lib/get-errno.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* lib/vbitset.c: Likewise.
* lib/bitset.c: Include "bitset.h" first, to test interface.
* lib/bitset_stats.c: Include "bitset_stats.h" first.
* lib/bitsetv-print.c: Include "bitsetv-print.h" first.
* lib/bitsetv.c: Include "bitsetv.h" first.
* lib/get-errno.c: Include "get-errno.h" first.
* m4/.cvsignore: Add config-h.m4.
* tests/actions.at (Default %printer and %destructor for ...):
Adjust expected line numbers in output to reflect removal of #if
HAVE_CONFIG_H lines.
* tests/glr-regression.at (Missed %merge type warnings when ...):
Likewise.
* tests/regression.at (Braced code in declaration in rules section):
Likewise.
* tests/atlocal.in (CPPFLAGS): Don't define HAVE_CONFIG_H.
* tests/local.at (AT_DATA_GRAMMAR_PROLOGUE):
Include <config.h> unconditionally.
This commit is contained in:
Paul Eggert
2006-10-13 05:00:26 +00:00
parent 46356ea426
commit 231ed89af1
20 changed files with 71 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@@ -1,5 +1,36 @@
2006-10-12 Paul Eggert <eggert@cs.ucla.edu> 2006-10-12 Paul Eggert <eggert@cs.ucla.edu>
* bootstrap.conf (gnulib_modules): Add config-h.
* djgpp/subpipe.c: Include <config.h> unconditionally; don't
worry about HAVE_CONFIG_H.
* lib/abitset.c: Likewise.
* lib/bitset.c: Likewise.
* lib/bitset_stats.c: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/ebitset.c: Likewise.
* lib/get-errno.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* lib/vbitset.c: Likewise.
* lib/bitset.c: Include "bitset.h" first, to test interface.
* lib/bitset_stats.c: Include "bitset_stats.h" first.
* lib/bitsetv-print.c: Include "bitsetv-print.h" first.
* lib/bitsetv.c: Include "bitsetv.h" first.
* lib/get-errno.c: Include "get-errno.h" first.
* m4/.cvsignore: Add config-h.m4.
* tests/actions.at (Default %printer and %destructor for ...):
Adjust expected line numbers in output to reflect removal of #if
HAVE_CONFIG_H lines.
* tests/glr-regression.at (Missed %merge type warnings when ...):
Likewise.
* tests/regression.at (Braced code in declaration in rules section):
Likewise.
* tests/atlocal.in (CPPFLAGS): Don't define HAVE_CONFIG_H.
* tests/local.at (AT_DATA_GRAMMAR_PROLOGUE):
Include <config.h> unconditionally.
* bootstrap: Sync from coreutils, as follows: * bootstrap: Sync from coreutils, as follows:
2006-10-11 Paul Eggert <eggert@cs.ucla.edu> 2006-10-11 Paul Eggert <eggert@cs.ucla.edu>

2
bootstrap.conf
View File

@@ -20,7 +20,7 @@
# gnulib modules used by this package. # gnulib modules used by this package.
gnulib_modules=' gnulib_modules='
argmatch configmake dirname error extensions fopen-safer argmatch config-h configmake dirname error extensions fopen-safer
getopt gettext hash inttypes malloc mbswidth obstack quote getopt gettext hash inttypes malloc mbswidth obstack quote
quotearg stdbool stpcpy strerror strtoul strverscmp unistd quotearg stdbool stpcpy strerror strtoul strverscmp unistd
unistd-safer unlocked-io verify xalloc xalloc-die xstrndup unistd-safer unlocked-io verify xalloc xalloc-die xstrndup

4
djgpp/subpipe.c
View File

@@ -19,9 +19,7 @@
/* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */ /* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "subpipe.h" #include "subpipe.h"

4
lib/abitset.c
View File

@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "abitset.h" #include "abitset.h"
#include <stddef.h> #include <stddef.h>

7
lib/bitset.c
View File

@@ -16,13 +16,12 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif #include "bitset.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "bitset.h"
#include "abitset.h" #include "abitset.h"
#include "lbitset.h" #include "lbitset.h"
#include "ebitset.h" #include "ebitset.h"

7
lib/bitset_stats.c
View File

@@ -23,16 +23,15 @@
operations get vectored through here and we then call the appropriate operations get vectored through here and we then call the appropriate
routines. */ routines. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif #include "bitset_stats.h"
#include "bbitset.h" #include "bbitset.h"
#include "abitset.h" #include "abitset.h"
#include "ebitset.h" #include "ebitset.h"
#include "lbitset.h" #include "lbitset.h"
#include "vbitset.h" #include "vbitset.h"
#include "bitset_stats.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

7
lib/bitsetv-print.c
View File

@@ -15,12 +15,11 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif #include "bitsetv-print.h"
#include <stdlib.h> #include <stdlib.h>
#include "bitsetv-print.h"
/*--------------------------------------------------------. /*--------------------------------------------------------.
| Display the MATRIX array of SIZE bitsets of size SIZE. | | Display the MATRIX array of SIZE bitsets of size SIZE. |

7
lib/bitsetv.c
View File

@@ -15,12 +15,11 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif #include "bitsetv.h"
#include <stdlib.h> #include <stdlib.h>
#include "bitsetv.h"
/* Create a vector of N_VECS bitsets, each of N_BITS, and of /* Create a vector of N_VECS bitsets, each of N_BITS, and of

5
lib/ebitset.c
View File

@@ -16,11 +16,10 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "ebitset.h" #include "ebitset.h"
#include "obstack.h" #include "obstack.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

8
lib/get-errno.c
View File

@@ -18,14 +18,12 @@
/* Written by Paul Eggert. */ /* Written by Paul Eggert. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <errno.h>
#include "get-errno.h" #include "get-errno.h"
#include <errno.h>
/* Get and set errno. A source file that needs to set or get errno, /* Get and set errno. A source file that needs to set or get errno,
but doesn't need to test for specific errno values, can use these but doesn't need to test for specific errno values, can use these
functions to avoid namespace pollution. For example, a file that functions to avoid namespace pollution. For example, a file that

5
lib/lbitset.c
View File

@@ -16,11 +16,10 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "lbitset.h" #include "lbitset.h"
#include "obstack.h" #include "obstack.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>

4
lib/subpipe.c
View File

@@ -19,9 +19,7 @@
/* Written by Paul Eggert <eggert@twinsun.com> /* Written by Paul Eggert <eggert@twinsun.com>
and Florian Krohm <florian@edamail.fishkill.ibm.com>. */ and Florian Krohm <florian@edamail.fishkill.ibm.com>. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "subpipe.h" #include "subpipe.h"

4
lib/timevar.c
View File

@@ -16,9 +16,7 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#if IN_GCC #if IN_GCC

5
lib/vbitset.c
View File

@@ -16,11 +16,10 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "vbitset.h" #include "vbitset.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

1
m4/.cvsignore
View File

@@ -1,5 +1,6 @@
absolute-header.m4 absolute-header.m4
argmatch.m4 argmatch.m4
config-h.m4
dirname.m4 dirname.m4
dos.m4 dos.m4
double-slash-root.m4 double-slash-root.m4

2
tests/actions.at
View File

@@ -896,7 +896,7 @@ Default destructor for 'S' @ 1.
]], ]],
[[Starting parse [[Starting parse
Entering state 0 Entering state 0
Reducing stack by rule 1 (line 37): Reducing stack by rule 1 (line 35):
-> $$ = nterm start (1.1-1.1: Default printer for 'S' @ 1) -> $$ = nterm start (1.1-1.1: Default printer for 'S' @ 1)
Stack now 0 Stack now 0
Entering state 1 Entering state 1

2
tests/atlocal.in
View File

@@ -11,7 +11,7 @@ CC='@CC@'
CFLAGS='@O0CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@' CFLAGS='@O0CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@'
# We need `config.h'. # We need `config.h'.
CPPFLAGS="-DHAVE_CONFIG_H=1 -I$abs_top_builddir/lib @CPPFLAGS@" CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
# Is the compiler GCC? # Is the compiler GCC?
GCC='@GCC@' GCC='@GCC@'

8
tests/glr-regression.at
View File

@@ -1760,10 +1760,10 @@ main (void)
]]) ]])
AT_CHECK([[bison -o glr-regr18.c glr-regr18.y]], 1, [], AT_CHECK([[bison -o glr-regr18.c glr-regr18.y]], 1, [],
[glr-regr18.y:28.18-24: result type clash on merge function `merge': <type2> != <type1> [glr-regr18.y:26.18-24: result type clash on merge function `merge': <type2> != <type1>
glr-regr18.y:27.18-24: previous declaration glr-regr18.y:25.18-24: previous declaration
glr-regr18.y:29.13-19: result type clash on merge function `merge': <type3> != <type2> glr-regr18.y:27.13-19: result type clash on merge function `merge': <type3> != <type2>
glr-regr18.y:28.18-24: previous declaration glr-regr18.y:26.18-24: previous declaration
]) ])
AT_CLEANUP AT_CLEANUP

14
tests/local.at
View File

@@ -64,7 +64,7 @@ m4_pushdef([AT_PURE_AND_LOC_IF],
m4_pushdef([AT_GLR_OR_PARAM_IF], m4_pushdef([AT_GLR_OR_PARAM_IF],
[m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])]) [m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
m4_pushdef([AT_NAME_PREFIX], m4_pushdef([AT_NAME_PREFIX],
[m4_bmatch([$3], [%name-prefix=".*"], [m4_bmatch([$3], [%name-prefix=".*"],
[m4_bregexp([$3], [name-prefix="\([^"]*\)"], [\1])], [m4_bregexp([$3], [name-prefix="\([^"]*\)"], [\1])],
[yy])]) [yy])])
# yyerror receives the location if %location & %pure & (%glr or %parse-param). # yyerror receives the location if %location & %pure & (%glr or %parse-param).
@@ -148,13 +148,11 @@ m4_popdef([AT_LALR1_CC_IF])
# meant to be compiled. # meant to be compiled.
m4_define([AT_DATA_GRAMMAR_PROLOGUE], m4_define([AT_DATA_GRAMMAR_PROLOGUE],
[[%{ [[%{
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h> /* We don't need perfect functions for these tests. */
/* We don't need perfect functions for these tests. */ #undef malloc
# undef malloc #undef memcmp
# undef memcmp #undef realloc
# undef realloc
#endif
%}] %}]
]) ])

2
tests/regression.at
View File

@@ -1105,7 +1105,7 @@ AT_PARSER_CHECK([./input], 0,
]], ]],
[[Starting parse [[Starting parse
Entering state 0 Entering state 0
Reducing stack by rule 1 (line 22): Reducing stack by rule 1 (line 20):
-> $$ = nterm start () -> $$ = nterm start ()
Stack now 0 Stack now 0
Entering state 1 Entering state 1