* doc/bison.texinfo (Calc++ Scanner): The flex behavior is an

incompatibility, not a bug.  Mention that it wasn't fixed as of
flex 2.5.33.

ChangeLog

@@ -1,3 +1,9 @@
+2006-05-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* doc/bison.texinfo (Calc++ Scanner): The flex behavior is an
+	incompatibility, not a bug.  Mention that it wasn't fixed as of
+	flex 2.5.33.
+
 2006-05-11  Akim Demaille  <akim@lrde.epita.fr>
 
 	* examples/extexi: Enforce the precedence of concatenation over
@@ -10,6 +16,17 @@
 	with the member "token".
 	Reported by Martin Nylin.
 
+2006-05-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* data/glr.c: Switch to Bison 2.2 special-exception language in
+	the copyright notice.  Use more-regular format for titles and
+	copyright notices.
+	* data/glr.cc: Likewise.
+	* data/location.cc: Likewise.
+	* data/yacc.cc: Likewise.
+	* doc/bison.texinfo (Conditions): Document this.
+	* NEWS: likewise.  Upgrade version to 2.2.
+
 2006-04-27  Akim Demaille  <akim@lrde.epita.fr>
 
 	* data/glr.cc: Remove dead code.

doc/bison.texinfo

@@ -7583,10 +7583,14 @@ parser's to get the set of defined tokens.
 # include <string>
 # include "calc++-driver.hh"
 # include "calc++-parser.hh"
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-  <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
+
+/* Work around an incompatibility in flex (at least versions
+   2.5.31 through 2.5.33): it generates code that does
+   not conform to C89.  See Debian bug 333231
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
 # undef yywrap
 # define yywrap() 1
+
 /* By default yylex returns int, we use token_type.
    Unfortunately yyterminate by default returns 0, which is
    not of token_type.  */