Re: [PATCH] First of Di-An's Java patches

[Paolo Bonzini]

Joel E. Denny wrote:
> On Fri, 31 Oct 2008, Paolo Bonzini wrote:
> 
>> Di-an's copyright assignment is now through.
> 
> I saw that.  That was fast.
> 
>> I'm pushing the attached
>> JavaDoc fixes; should I push his other Java patches (only those) on the
>> grounds that they anyway only touch experimental features?
> 
> I haven't had a chance to review them and won't have time soon.  If they 
> only touch the Java skeleton, do as you wish.

I squashed this on top and pushed it.

Paolo

diff --git a/data/java.m4 b/data/java.m4
index e9dbdc4..b3dbd3b 100644
--- a/data/java.m4
+++ b/data/java.m4
@@ -84,10 +84,7 @@ m4_define([b4_lexer_if],
 # b4_identification
 # -----------------
 m4_define([b4_identification],
-[/** Always <tt>true</tt>, identifies Bison output.  */
-  public static final boolean bison = true;
-
-  /** Version number for the Bison executable that generated this parser.  */
+[  /** Version number for the Bison executable that generated this parser.  */
   public static final String bisonVersion = "b4_version";
 
   /** Name of the skeleton that generated this parser.  */
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 1365290..c6fc0a5 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -8775,10 +8775,9 @@ in.  Thus the @code{%debug} and @code{%token-table} 
directives and the
 @option{-t}/@option{--debug} and @option{-k}/@option{--token-table}
 options have no effect.  This may change in the future to eliminate
 unused code in the generated parser, so use @code{%debug} and
address@hidden explicitly if needed.
-Also, perhaps the @code{%token-table} directive should enable some
-public interface to access the token names and codes.
-
address@hidden explicitly if needed.  Also, in the future the
address@hidden directive might enable a public interface to
+access the token names and codes.
 
 @node Java Semantic Values
 @subsection Java Semantic Values
@@ -8813,8 +8812,8 @@ is not a subclass of ASTNode, will cause a compile-time 
error.
 Types used in the directives may be qualified with a package name.
 Primitive data types are accepted for Java version 1.5 or later.  Note
 that in this case the autoboxing feature of Java 1.5 will be used.
-Currently, generic types may not be used, as the use of angle brackets
-conflict.
+Generic types may not be used; this is due to a limitation in the
+implementation of Bison, and may change in future releases.
 
 Java parsers do not support @code{%destructor}, since the language
 adopts garbage collection.  The parser will try to hold references
@@ -8899,12 +8898,8 @@ these inner class/interface, and the members described 
in the interface
 below, all the other members and fields are preceded with a @code{yy} or
 @code{YY} prefix to avoid clashes with user code.
 
address@hidden FIXME: Clarify Java public interface.
-The status of the following constants and variables are undetermined;
-they may be removed, yy-prefixed, or added to the public interface:
address@hidden (should be removed: in C/C++, you can conditionally compile
-based on @code{YYBISON}, but no such facility exists for Java),
address@hidden, @code{bisonSkeleton} and @code{errorVerbose}.
address@hidden FIXME: The following constants and variables are still 
undocumented:
address@hidden @code{bisonVersion}, @code{bisonSkeleton} and 
@code{errorVerbose}.
 
 The parser class can be extended using the @code{%parse-param}
 directive. Each occurrence of the directive will add a @code{protected
@@ -9147,7 +9142,8 @@ Interface}).
 @end table
 
 Other @code{%code} blocks are not supported in Java parsers.
-In particular, some @address@hidden @dots{} address@hidden are silently 
dropped.
+In particular, @address@hidden @dots{} address@hidden blocks should not be used
+and may give an error in future versions of Bison.
 
 The epilogue has the same meaning as in C/C++ code and it can
 be used to define other classes used by the parser @emph{outside}