Merge remote-tracking branch 'origin/maint'

* origin/maint:
  headers: move CPP guards into YY_*_INCLUDED to avoid collisions
  minor changes.

Conflicts:
	doc/bison.texi
	tests/headers.at
This commit is contained in:
Akim Demaille
2012-10-01 14:00:23 +02:00
4 changed files with 45 additions and 13 deletions

13
NEWS
View File

@@ -250,7 +250,7 @@ GNU Bison NEWS
Incorrect definitions of YY_, issued by yacc.c when no parser header is
generated, are removed.
** Changes in the format of errors and exceptions output
** Changes in the format of error messages
This used to be the format of many error reports:
@@ -262,6 +262,17 @@ GNU Bison NEWS
foo.y:5.10-25: result type clash on merge function 'merge': <t3> != <t2>
foo.y:4.13-27: previous declaration
** Header guards (yacc.c, glr.c, glr.cc)
In order to avoid collisions, the header guards are now
YY_<PREFIX>_<FILE>_INCLUDED, instead of merely <PREFIX>_<FILE>.
For instance the header generated from
%define api.prefix "calc"
%defines "lib/parse.h"
will use YY_CALC_LIB_PARSE_H_INCLUDED as guard.
* Noteworthy changes in release 2.6.2 (2012-08-03) [stable]
** Bug fixes