From ddf17a6e0e6b5999a9f59128121347856dbe2e1b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 9 Oct 2008 21:26:29 +0200 Subject: [PATCH] small but important bugfixes for the Java skeleton 2008-10-08 Di-an Jan (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. --- ChangeLog | 6 ++++++ THANKS | 1 + data/lalr1.java | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fdee763..3c86081b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-08 Di-an Jan (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 Clarify UPDATED use. diff --git a/THANKS b/THANKS index 3842f6c3..7b16cf3c 100644 --- 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 +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 diff --git a/data/lalr1.java b/data/lalr1.java index 89d4b1ea..df87d7ba 100644 --- a/data/lalr1.java +++ b/data/lalr1.java @@ -205,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); @@ -414,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 ()) + ")"); } /** -- 2.45.2