yacc.c: instead of duplicating y.tab.h inside y.tac.c, include it.

This is already what glr.c and lalr1.cc do.

* data/yacc.c: here.

diff --git a/NEWS b/NEWS
index 393538c753f8ade04882b2a59d23992accdc20ad..fd51b61b61163388870c814ba33de6ac0f3e636e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,20 @@ GNU Bison NEWS
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 

+** Future changes:
+
+  The next major release will drop support for generating parsers in K&R C,
+  and remove the definition of yystype (removal announced since Bison
+  1.875).
+
+** Changes in regular C parsers (yacc.c):
+
+*** The generated header is included
+
+  Instead of duplicating the content of the generated header (definition of
+  YYSTYPE, yyltype etc.), the generated parser now includes it, as was
+  already the case for GLR or C++ parsers.
+

 * Noteworthy changes in release 2.5.1 (2012-06-05) [stable]
 
 ** Future changes:
 * Noteworthy changes in release 2.5.1 (2012-06-05) [stable]
 
 ** Future changes:

diff --git a/data/glr.c b/data/glr.c
index 7ebc65c0e7e6ddcf595752138aef984668e2661d..223aa1e9a6f75d55ca22a0c0b5852db60d66a240 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -203,7 +203,7 @@ m4_if(b4_prefix, [yy], [],
 ]b4_null_define[
 
 ]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
 ]b4_null_define[
 
 ]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],

-              [b4_shared_declarations])[
+               [b4_shared_declarations])[

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

diff --git a/data/yacc.c b/data/yacc.c
index 079e488c4741842671dec07b16485b3c9fddff38..d5000da0a58f0f5292e61d00f7ec98f6459d05de 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -319,7 +319,8 @@ m4_if(b4_prefix, [yy], [],
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 

-]b4_shared_declarations[
+]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
+               [b4_shared_declarations])[

 
 /* Copy the second part of user declarations.  */
 ]b4_user_post_prologue
 
 /* Copy the second part of user declarations.  */
 ]b4_user_post_prologue