* data/glr.c (b4_shared_declarations): Put start-header first,

before any #includes that we generate, so that feature-test
macros work.  Problem reported by Michael Deutschmann in
<http://lists.gnu.org/archive/html/bug-bison/2006-09/msg00004.html>.
* data/lalr1.cc: Likewise.
* doc/bison.texinfo (Prologue): Document that feature-test macros
should be defined before any Bison declarations.
* tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Put defns
that depend on location.hh after, not before, Bison decls, since
we now include location.hh after the first user prologue.

diff --git a/ChangeLog b/ChangeLog
index dde03052818835b0cf1edda155aefb508c884900..16802bb43d374b930ec4e930a77dab954026f874 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,27 @@
 2006-09-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * data/glr.c (b4_shared_declarations): Put start-header first,
+       before any #includes that we generate, so that feature-test
+       macros work.  Problem reported by Michael Deutschmann in
+       <http://lists.gnu.org/archive/html/bug-bison/2006-09/msg00004.html>.
+       * data/lalr1.cc: Likewise.
+       * doc/bison.texinfo (Prologue): Document that feature-test macros
+       should be defined before any Bison declarations.
+       * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Put defns
+       that depend on location.hh after, not before, Bison decls, since
+       we now include location.hh after the first user prologue.
+
        * doc/bison.texinfo (Calc++ Parser): Fix memory leak reported by
        Sander Brandenburg in
        <http://lists.gnu.org/archive/html/bug-bison/2006-09/msg00002.html>.
        Also, fix minor white space and comment issues.
+       (Prologue): Mention that it's better to define feature-test macros
+       before Bison declarations.  Problem reported by Michael Deutschmann.
+
+       * README-cvs: Fix typo: "&" should be "&&".  Problem reported
+       by Jim Meyering.
+       * m4/.cvsignore: Add argmatch.m4.  Remove obstack.m4, strerror_r.m4.
+       This adjusts to recent gnulib changes.
 
 2006-09-04  Joel E. Denny  <jdenny@ces.clemson.edu>
 

diff --git a/data/glr.cc b/data/glr.cc
index 59b9e3dd81b5478722d8e0837356d48a93610639..a3cafe8e0a05d27197e1ffb4d264d1306bc5a685 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -221,6 +221,10 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_user_start_header])[
+
 #include <string>
 #include <iostream>
 
@@ -233,10 +237,6 @@ namespace ]b4_namespace[
   class location;
 }
 
-]m4_ifdef([b4_start_header],
-[[/* Copy the %start-header blocks.  */
-]b4_user_start_header])[
-
 #include "location.hh"
 
 /* Enabling traces.  */

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 377659e54100c6e56174310dad31b4742b317933..737342818b459fbe9fec7c3a4a3b5cc449be2901 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -43,6 +43,10 @@ dnl FIXME: This is wrong, we want computed header guards.
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_user_start_header])[
+
 #include <string>
 #include <iostream>
 #include "stack.hh"
@@ -53,12 +57,7 @@ namespace ]b4_namespace[
   class location;
 }
 
-]m4_ifdef([b4_start_header],
-[[/* Copy the %start-header blocks.  */
-]b4_user_start_header])[
-
-]dnl Include location.hh here: it might depend on headers included above.
-[#include "location.hh"
+#include "location.hh"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index cf95066a9f87e1d6f986a5c499c3a593537ecc3d..013847b5d884e5d9ea3a854f4d8fd79762417868 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -2649,6 +2649,7 @@ can be done with two @var{Prologue} blocks, one before and one after the
 
 @smallexample
 %@{
+  #define _GNU_SOURCE
   #include <stdio.h>
   #include "ptypes.h"
 %@}
@@ -2666,6 +2667,13 @@ can be done with two @var{Prologue} blocks, one before and one after the
 @dots{}
 @end smallexample
 
+When in doubt, it is usually safer to put prologue code before all
+Bison declarations, rather than after.  For example, any definitions
+of feature test macros like @code{_GNU_SOURCE} or
+@code{_POSIX_C_SOURCE} should appear before all Bison declarations, as
+feature test macros can affect the behavior of Bison-generated
+@code{#include} directives.
+
 @findex %before-header
 @findex %start-header
 @findex %after-header

diff --git a/tests/actions.at b/tests/actions.at
index e1b2cb9950fd67f3c74ba2ab31d4cf6c2e1c8077..6f52b0693cd775c454c7f82519eb5d321e9ef869 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -190,7 +190,7 @@ m4_ifval([$6], [%union
   int ival;
 }])
 AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])
-m4_ifval([$6], [[%end-header {]], [[%start-header {]])
+m4_ifval([$6], [[%end-header {]], [[%after-header {]])
 AT_LALR1_CC_IF([typedef yy::location YYLTYPE;
                 m4_ifval([$6], , [#define YYSTYPE int])])
 [static int yylex (]AT_LEX_FORMALS[);