final 2.4 patches

[Joel E. Denny]

I pushed these and a v2.4 tag.  Release to follow.

>From ed4d67dcbe00ca687a6de988aada4ab90a6e03fa Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 2 Nov 2008 16:54:45 -0500
Subject: [PATCH] Say %language is experimental.

We're thinking of extending it's effect on output file naming.  See the
thread at
<http://lists.gnu.org/archive/html/bison-patches/2008-10/msg00003.html>.
* NEWS: Say it's experimental.
* doc/bison.texinfo (Decl Summary): Say it's experimental, and so don't
recommend it over %skeleton for now.
(Bison Options): Likewise.
(C++ Bison Interface): Use %skeleton not %language.
(Calc++ Parser): Use %skeleton not %language.
* src/getargs.c (usage): Say it's experimental.
 
diff --git a/NEWS b/NEWS
index 53334d6..b11333a 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,13 @@ Bison News
 
 Changes in version ?.? (????-??-??):
 
-*
+* %language is an experimental feature.
+
+  We first introduced this feature in test release 2.3b as a cleaner
+  alternative to %skeleton.  Since then, we have discussed the possibility of
+  modifying its effect on Bison's output file names.  Thus, in this release,
+  we consider %language to be an experimental feature that will likely evolve
+  in future releases.
 
 Changes in version 2.3b (2008-05-27):
 
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index c6fc0a5..71e9a16 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4838,7 +4838,7 @@ already defined, so that the debugging facilities are 
compiled.
 Define a variable to adjust Bison's behavior.
 The possible choices for @var{variable}, as well as their meanings, depend on
 the selected target language and/or the parser skeleton (@pxref{Decl
-Summary,,%language}).
+Summary,,%language}, @pxref{Decl Summary,,%skeleton}).
 
 Bison will warn if a @var{variable} is defined multiple times.
 
@@ -5051,6 +5051,9 @@ chosen as if the input file were named @address@hidden
 Specify the programming language for the generated parser.  Currently
 supported languages include C, C++, and Java.
 @var{language} is case-insensitive.
+
+This directive is experimental and its effect may be modified in future
+releases.
 @end deffn
 
 @deffn {Directive} %locations
@@ -5111,10 +5114,10 @@ Require a Version of Bison}.
 @deffn {Directive} %skeleton "@var{file}"
 Specify the skeleton to use.
 
-You probably don't need this option unless you are developing Bison.
-You should use @code{%language} if you want to specify the skeleton for a
-different language, because it is clearer and because it will always choose the
-correct skeleton for non-deterministic or push parsers.
address@hidden You probably don't need this option unless you are developing 
Bison.
address@hidden You should use @code{%language} if you want to specify the 
skeleton for a
address@hidden different language, because it is clearer and because it will 
always choose the
address@hidden correct skeleton for non-deterministic or push parsers.
 
 If @var{file} does not contain a @code{/}, @var{file} is the name of a skeleton
 file in the Bison installation directory.
@@ -7837,6 +7840,9 @@ Specify the programming language for the generated 
parser, as if
 Summary}).  Currently supported languages include C, C++, and Java.
 @var{language} is case-insensitive.
 
+This option is experimental and its effect may be modified in future
+releases.
+
 @item --locations
 Pretend that @code{%locations} was specified.  @xref{Decl Summary}.
 
@@ -7858,10 +7864,10 @@ parser file, treating it as an independent source file 
in its own right.
 Specify the skeleton to use, similar to @code{%skeleton}
 (@pxref{Decl Summary, , Bison Declaration Summary}).
 
-You probably don't need this option unless you are developing Bison.
-You should use @option{--language} if you want to specify the skeleton for a
-different language, because it is clearer and because it will always
-choose the correct skeleton for non-deterministic or push parsers.
address@hidden You probably don't need this option unless you are developing 
Bison.
address@hidden You should use @option{--language} if you want to specify the 
skeleton for a
address@hidden different language, because it is clearer and because it will 
always
address@hidden choose the correct skeleton for non-deterministic or push 
parsers.
 
 If @var{file} does not contain a @code{/}, @var{file} is the name of a skeleton
 file in the Bison installation directory.
@@ -8009,13 +8015,13 @@ int yyparse (void);
 
 @node C++ Bison Interface
 @subsection C++ Bison Interface
address@hidden - %language "C++"
address@hidden - %skeleton "lalr1.cc"
 @c - Always pure
 @c - initial action
 
-The C++ @acronym{LALR}(1) parser is selected using the language directive,
address@hidden "C++"}, or the synonymous command-line option
address@hidden
+The C++ @acronym{LALR}(1) parser is selected using the skeleton directive,
address@hidden "lalr1.c"}, or the synonymous command-line option
address@hidden
 @xref{Decl Summary}.
 
 When run, @command{bison} will create several entities in the @samp{yy}
@@ -8409,7 +8415,7 @@ the grammar for.
 
 @comment file: calc++-parser.yy
 @example
-%language "C++"                          /*  -*- C++ -*- */
+%skeleton "lalr1.cc"                          /*  -*- C++ -*- */
 %require "@value{VERSION}"
 %defines
 %define parser_class_name "calcxx_parser"
diff --git a/src/getargs.c b/src/getargs.c
index 8eecb5f..c9fc9bf 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -272,6 +272,7 @@ Operation modes:\n\
       fputs (_("\
 Parser:\n\
   -L, --language=LANGUAGE    specify the output programming language\n\
+                             (this is an experimental feature)\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\
       --locations            enable locations computation\n\
-- 
1.5.4.3


>From 241fda7a8d1b4bee368798867c87c635ee074a5d Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 2 Nov 2008 16:55:14 -0500
Subject: [PATCH] Prepare for next release.

* NEWS: Briefly mention changes since 2.3b.
* README: Say GNU m4 1.4.6, which we've been requiring in release
announcements already, not 1.4.3, which breaks the build.

diff --git a/NEWS b/NEWS
index b11333a..ce771d8 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ Changes in version ?.? (????-??-??):
   we consider %language to be an experimental feature that will likely evolve
   in future releases.
 
+* Forward compatibility with GNU M4 has been improved.
+
+* Several bugs in the C++ skeleton and the experimental Java skeleton have been
+  fixed.
+
 Changes in version 2.3b (2008-05-27):
 
 * The quotes around NAME that used to be required in the following directive
diff --git a/README b/README
index 11e9c6f..498671f 100644
--- a/README
+++ b/README
@@ -7,14 +7,14 @@ frequently asked questions.  The documentation is also 
available in
 PDF and HTML, provided you have a recent version of Texinfo installed:
 run "make pdf" or "make html".
 
-Bison requires GNU m4 1.4.3 or later.  See:
+Bison requires GNU m4 1.4.6 or later.  See:
 
-ftp://ftp.gnu.org/gnu/m4/m4-1.4.3.tar.gz
+ftp://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz
 
-Bison can work with pre-1.4.3 distributions of GNU m4 if they are
+Bison can work with pre-1.4.6 distributions of GNU m4 if they are
 sufficiently patched, but if you encounter a bug with an older
 distribution and report a bug we will probably suggest that you
-upgrade to 1.4.3 as the first step in trying to fix it.
+upgrade to 1.4.6 as the first step in trying to fix it.
 
 Please send bug reports to <address@hidden>.  Please include the
 version number from `bison --version', and a complete, self-contained
-- 
1.5.4.3


>From bfb40910e3dddc04fa7a1f3adfec4990f58415bb Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 2 Nov 2008 16:55:49 -0500
Subject: [PATCH] * NEWS: Version 2.4.

diff --git a/NEWS b/NEWS
index ce771d8..7af6969 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-Changes in version ?.? (????-??-??):
+Changes in version 2.4 (2008-11-02):
 
 * %language is an experimental feature.
 
-- 
1.5.4.3