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

yacc: fix handling of CPP guards when no header is generated

Browse Source 
When no header was to be generated, Bison would issue:

  /* In a future release of Bison, this section will be replaced
     by #include "".  */
  #ifndef YY_
  # define YY_

It now properly generates nothing.

* data/c.m4 (b4_cpp_guard_open, b4_cpp_guard_close): Issue nothing when
the file name is empty.
* data/yacc.c: Do not generate the above comment when there is no header
to generate.
* NEWS: Update.
This commit is contained in:
Akim Demaille
2012-09-21 11:10:37 +02:00
parent 53425dbfaa
commit 6b4cb804b5
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NEWS
View File

@@ -2,6 +2,17 @@ GNU Bison NEWS
* Noteworthy changes in release ?.? (????-??-??) [?] * Noteworthy changes in release ?.? (????-??-??) [?]
** Bug fixes
Bugs in the test suite have been fixed.
Some errors in translations have been addressed, and --help now directs
users to the appropriate place to report them.
Stray Info files shipped by accident are removed.
Incorrect definitions of YY_, issued by yacc.c when no parser header is
generated, are removed.
* Noteworthy changes in release 2.6.2 (2012-08-03) [stable] * Noteworthy changes in release 2.6.2 (2012-08-03) [stable]

8
data/c.m4
View File

@@ -36,13 +36,15 @@ m4_define([b4_cpp_guard],
# b4_cpp_guard_open(FILE) # b4_cpp_guard_open(FILE)
# b4_cpp_guard_close(FILE) # b4_cpp_guard_close(FILE)
# ------------------------ # ------------------------
# Open/close CPP inclusion guards for FILE. # If FILE does not expand to nothing, open/close CPP inclusion guards for FILE.
m4_define([b4_cpp_guard_open], m4_define([b4_cpp_guard_open],
[m4_ifval(m4_quote($1),
[#ifndef b4_cpp_guard([$1]) [#ifndef b4_cpp_guard([$1])
# define b4_cpp_guard([$1])]) # define b4_cpp_guard([$1])])])
m4_define([b4_cpp_guard_close], m4_define([b4_cpp_guard_close],
[#endif b4_comment([!b4_cpp_guard([$1])])]) [m4_ifval(m4_quote($1),
[#endif b4_comment([!b4_cpp_guard([$1])])])])
## ---------------- ## ## ---------------- ##

6
data/yacc.c
View File

@@ -345,9 +345,11 @@ m4_if(b4_api_prefix, [yy], [],
# define YYERROR_VERBOSE ]b4_error_verbose_flag[ # define YYERROR_VERBOSE ]b4_error_verbose_flag[
#endif #endif
/* In a future release of Bison, this section will be replaced ]m4_ifval(m4_quote(b4_spec_defines_file),
[[/* In a future release of Bison, this section will be replaced
by #include "@basename(]b4_spec_defines_file[@)". */ by #include "@basename(]b4_spec_defines_file[@)". */
]b4_shared_declarations[ ]])dnl
b4_shared_declarations[
/* Copy the second part of user declarations. */ /* Copy the second part of user declarations. */
]b4_user_post_prologue ]b4_user_post_prologue