small but important bugfixes for the Java skeleton

2008-10-08  Di-an Jan  <dianj@freeshell.org>  (tiny change)

	Small but important bugfixes for the Java skeleton.
	* data/lalr1.java (yyerror): Change Location to b4_location_type.
	(yy_symbol_print): Call toString on yyvaluep.

diff --git a/ChangeLog b/ChangeLog
index 9fdee763ffae18b2e63358c83f79d1a77d122e88..3c86081b1c70b46670ee4648d72f96a9b7d9398d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Di-an Jan  <dianj@freeshell.org>  (tiny change)
+
+       Small but important bugfixes for the Java skeleton.
+       * data/lalr1.java (yyerror): Change Location to b4_location_type.
+       (yy_symbol_print): Call toString on yyvaluep.
+

 2008-08-29  Akim Demaille  <demaille@gostai.com>
 
        Clarify UPDATED use.
 2008-08-29  Akim Demaille  <demaille@gostai.com>
 
        Clarify UPDATED use.

diff --git a/THANKS b/THANKS
index 3842f6c3de9077eae573fd7eac5818f25d03f54f..7b16cf3cbc6f2851bb1722e62f612c9d341cecf2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -25,6 +25,7 @@ Cris van Pelt             cris@amf03054.office.wxs.nl
 Daniel Hagerty            hag@gnu.org
 David J. MacKenzie        djm@gnu.org
 Derek M. Jones            derek@knosof.co.uk
 Daniel Hagerty            hag@gnu.org
 David J. MacKenzie        djm@gnu.org
 Derek M. Jones            derek@knosof.co.uk

+Di-an Jan                 dianj@freeshell.org

 Dick Streefland           dick.streefland@altium.nl
 Enrico Scholz             enrico.scholz@informatik.tu-chemnitz.de
 Eric Blake                ebb9@byu.net
 Dick Streefland           dick.streefland@altium.nl
 Enrico Scholz             enrico.scholz@informatik.tu-chemnitz.de
 Eric Blake                ebb9@byu.net

diff --git a/data/lalr1.java b/data/lalr1.java
index 89d4b1eac33f9ebfca874450434089a29bbc95b9..df87d7ba4cfd6746bb1a81c7843c911eddb8cd60 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -205,7 +205,7 @@ b4_lexer_if([[
 
   ]b4_locations_if([
   protected final void yyerror (String s) {
 
   ]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);
   }
   protected final void yyerror (]b4_position_type[ loc, String s) {
     yylexer.yyerror (new ]b4_location_type[ (loc), s);


@@ -414,7 +414,7 @@ b4_lexer_if([[
     yycdebug (s + (yytype < yyntokens_ ? " token " : " nterm ")
              + yytname_[yytype] + " ("]b4_locations_if([
              + yylocationp + ": "])[
     yycdebug (s + (yytype < yyntokens_ ? " token " : " nterm ")
              + yytname_[yytype] + " ("]b4_locations_if([
              + yylocationp + ": "])[

-             + (yyvaluep == null ? "(null)" : yyvaluep) + ")");
+             + (yyvaluep == null ? "(null)" : yyvaluep.toString ()) + ")");

   }
 
   /**
   }
 
   /**