* TODO: Multiple %union is now implemented, so remove it from

the wishlist.

diff --git a/ChangeLog b/ChangeLog
index 9a5ce08773162b3fdbbf7e06f9f6162f18615fb9..788ca409b25dd8d18ae3198f84732b1aa3cb639b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * NEWS: Document the fact that multiple %unions are now allowed.
        * doc/bison.texinfo (Union Decl): Likewise.
+       * TODO: This feature is now implemented, so remove it from
+       the wishlist.
 
        * Makefile.maint: Merge with coreutils Makefile.maint.
        (CVS_LIST): Use build-aux version if available.

diff --git a/TODO b/TODO
index a44f64ece477177531dc7e42dd733d5b37d12751..573e0867e69a4014bf598b5adc20979f30e23e65 100644 (file)
--- a/TODO
+++ b/TODO
@@ -92,27 +92,6 @@ It should be improved, in particular when using Bison features such as
 locations, and YYPARSE_PARAMS.  For the time being, it is almost
 recommended to yyprint to steal internal variables...
 
-** Several %unions
-I think this is a pleasant (but useless currently) feature, but in the
-future, I want a means to %include other bits of grammars, and _then_
-it will be important for the various bits to define their needs in
-%union.
-
-When implementing multiple-%union support, bare the following in mind:
-
-- when --yacc, this must be flagged as an error.  Don't make it fatal
-  though.
-
-- The #line must now appear *inside* the definition of yystype.
-  Something like
-
-       {
-       #line 12 "foo.y"
-         int ival;
-       #line 23 "foo.y"
-         char *sval;
-       }
-
 ** %if and the like
 It should be possible to have %if/%else/%endif.  The implementation is
 not clear: should it be lexical or syntactic.  Vadim Maslow thinks it
@@ -345,16 +324,17 @@ the parser with a means to create the (visual) parse tree.
 
 -----
 
-Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation,
+Inc.
 
-This file is part of GNU Bison.
+This file is part of Bison, the GNU Compiler Compiler.
 
-GNU Bison is free software; you can redistribute it and/or modify
+Bison is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU Bison is distributed in the hope that it will be useful,
+Bison is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.