Re: [PATCH] maint: fix an erroneous include

[Akim Demaille]

Le 3 oct. 2012 à 16:05, Akim Demaille a écrit :

> commit a2b3f10183008612c4350e072d5611e0b6a8a462
> Author: Theophile Ranquet <address@hidden>
> Date:   Wed Oct 3 15:26:56 2012 +0000
> 
>    maint: fix an erroneous include
> 
>    This fixes test 130 (Several parsers).
> 
>    * data/location.cc: Include <iostream> rather than <iosfwd> since
>    we really need << on strings for instance.
>    * NEWS: Document this.
> 
>    Signed-off-by: Akim Demaille <address@hidden>

I also needed this to pacify the build farm.

diff --git a/README-hacking b/README-hacking
index bb91ac0..26391e9 100644
--- a/README-hacking
+++ b/README-hacking
@@ -168,6 +168,19 @@ decide whether to update.
 ** make check
 Use liberally.
 
+** Typical errors
+If the test suite shows failures such as the following one
+
+  .../bison/lib/getopt.h:196:8: error: redefinition of 'struct option'
+  /usr/include/getopt.h:54:8: error: previous definition of 'struct option'
+
+it probably means that some file was compiled without
+AT_DATA_SOURCE_PROLOGUE.  This error is due to the fact that our -I options
+pick up gnulib's replacement headers, such as getopt.h, and this will go
+wrong if config.h was not included first.
+
+See tests/local.at for details.
+
 ** make maintainer-check-valgrind
 This target uses valgrind both to check bison, and the generated parsers.
 
diff --git a/THANKS b/THANKS
index 09d6736..f742e8f 100644
--- a/THANKS
+++ b/THANKS
@@ -93,6 +93,7 @@ R Blake                   address@hidden
 Raja R Harinath           address@hidden
 Ralf Wildenhues           address@hidden
 Richard Stallman          address@hidden
+Rob Vermaas               address@hidden
 Robert Anisko             address@hidden
 Satya Kiran Popuri        address@hidden
 Sebastian Setzer          address@hidden
diff --git a/data/location.cc b/data/location.cc
index 0673f4c..92b6d09 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -159,8 +159,6 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[
 
-# include <iostream>
-# include <string>
 # include "position.hh"
 
 ]b4_namespace_open[
diff --git a/tests/headers.at b/tests/headers.at
index 91fdb95..8e70a7e 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -249,6 +249,7 @@ for h in *.h *.hh
 do
   # No shell expansion with AT_DATA.
   cat >$h.cc <<EOF
+AT_DATA_SOURCE_PROLOGUE
 #include "$h"
 #include "$h"
 EOF