small but important bugfixes for the Java skeleton

[bison.git] / data / lalr1.java

diff --git a/data/lalr1.java b/data/lalr1.java
index fc2d8484b5c2d8946e9b7ceacaed1afcaca75c58..df87d7ba4cfd6746bb1a81c7843c911eddb8cd60 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -2,20 +2,18 @@
 
 # Copyright (C) 2007 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This program 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 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # This program 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.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_include(b4_pkgdatadir/[java.m4])
 
@@ -121,13 +119,12 @@ b4_token_enums(b4_tokens)
     /**
      * Method to retrieve the semantic value of the last scanned token.
      * @@return the semantic value of the last scanned token.  */
-    ]b4_yystype[ getLVal ();]
+    ]b4_yystype[ getLVal ();
 
     /**
      * Entry point for the scanner.  Returns the token identifier corresponding
-     * to the next token and ]b4_pure_if([prepares to return], [stores])[
-     * the semantic value]b4_locations_if([ and beginning/ending positions])[
-     * of the token. 
+     * to the next token and prepares to return the semantic value
+     * ]b4_locations_if([and beginning/ending positions ])[of the token. 
      * @@return the token identifier corresponding to the next token. */
     int yylex () ]b4_maybe_throws([b4_lex_throws])[;
 
@@ -208,7 +205,7 @@ b4_lexer_if([[
 
   ]b4_locations_if([
   protected final void yyerror (String s) {
-    yylexer.yyerror ((Location)null, s);
+    yylexer.yyerror ((]b4_location_type[)null, s);
   }
   protected final void yyerror (]b4_position_type[ loc, String s) {
     yylexer.yyerror (new ]b4_location_type[ (loc), s);
@@ -417,7 +414,7 @@ b4_lexer_if([[
     yycdebug (s + (yytype < yyntokens_ ? " token " : " nterm ")
              + yytname_[yytype] + " ("]b4_locations_if([
              + yylocationp + ": "])[
-             + (yyvaluep == null ? "(null)" : yyvaluep) + ")");
+             + (yyvaluep == null ? "(null)" : yyvaluep.toString ()) + ")");
   }
 
   /**