tests: use $PERL instead of perl

[bison.git] / data / lalr1.java

diff --git a/data/lalr1.java b/data/lalr1.java
index f7f2ba365b8798e3e4331e1d2dbb0cede3487b96..d1410a10cf806b6598d71e90c44bc1d38a1e22a5 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -25,7 +25,7 @@ m4_ifval(m4_defn([b4_symbol_destructors]),
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007-2011])
+             [2007-2012])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
@@ -458,12 +458,10 @@ b4_lexer_if([[
     yyerrstatus_ = 0;
 
 ]m4_ifdef([b4_initial_action], [
-m4_pushdef([b4_at_dollar],     [yylloc])dnl
-m4_pushdef([b4_dollar_dollar], [yylval])dnl
-    /* User initialization code.  */
-    b4_user_initial_action
-m4_popdef([b4_dollar_dollar])dnl
-m4_popdef([b4_at_dollar])])dnl
+b4_dollar_pushdef([yylval], [], [yylloc])dnl
+/* User initialization code.  */
+b4_user_initial_action
+b4_dollar_popdef])[]dnl
 
   [  /* Initialize the stack.  */
     yystack.push (yystate, yylval]b4_locations_if([, yylloc])[);
@@ -642,7 +640,7 @@ m4_popdef([b4_at_dollar])])dnl
              }
 
            /* Pop the current state because it cannot handle the error token.  */
-           if (yystack.height == 1)
+           if (yystack.height == 0)
              return false;
 
            ]b4_locations_if([yyerrloc = yystack.locationAt (0);])[