Replace m4/warning.m4 with warnings module.

[bison.git] / data / lalr1.java

diff --git a/data/lalr1.java b/data/lalr1.java
index 89d4b1eac33f9ebfca874450434089a29bbc95b9..3358545d226afd5bc104ab4173434ec8847a9458 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
 # Java skeleton for Bison -*- autoconf -*-
 

-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.

 
 # 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
 
 # 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


@@ -23,25 +23,46 @@ m4_ifval(m4_defn([b4_symbol_destructors]),
         [])
 
 m4_divert_push(0)dnl
         [])
 
 m4_divert_push(0)dnl

-@output(b4_parser_file_name@)
+@output(b4_parser_file_name@)@

 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],

-  [2007])
+  [2007, 2008])

 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */

-]b4_pre_prologue
+]b4_user_pre_prologue
+b4_user_post_prologue

 b4_percent_code_get([[imports]])
 [/**
 b4_percent_code_get([[imports]])
 [/**

- * A Bison parser, automatically generated from <tt>@ofile@</tt>.
+ * A Bison parser, automatically generated from <tt>]m4_bpatsubst(b4_file_name, [^"\(.*\)"$], [\1])[</tt>.

  *
  * @@author LALR (1) parser skeleton written by Paolo Bonzini.
  */
  *
  * @@author LALR (1) parser skeleton written by Paolo Bonzini.
  */

-]b4_public_if([public ])b4_abstract_if([abstract ])[class ]b4_parser_class_name[
+]b4_percent_define_get3([annotations], [], [ ])dnl
+b4_public_if([public ])dnl
+b4_abstract_if([abstract ])dnl
+b4_final_if([final ])dnl
+b4_strictfp_if([strictfp ])dnl
+[class ]b4_parser_class_name[]dnl
+b4_percent_define_get3([extends], [ extends ])dnl
+b4_percent_define_get3([implements], [ implements ])[

 {
   ]b4_identification[
 {
   ]b4_identification[

-
+]b4_error_verbose_if([[

   /** True if verbose error messages are enabled.  */
   /** True if verbose error messages are enabled.  */

-  public boolean errorVerbose = ]b4_flag_value([error_verbose]);
+  private boolean yyErrorVerbose = true;
+
+  /**
+   * Return whether verbose error messages are enabled.
+   */
+  public final boolean getErrorVerbose() { return yyErrorVerbose; }
+
+  /**
+   * Set the verbosity of error messages.
+   * @@param verbose True to request verbose error messages.
+   */
+  public final void setErrorVerbose(boolean verbose)
+  { yyErrorVerbose = verbose; }
+]])

 
 b4_locations_if([[
   /**
 
 b4_locations_if([[
   /**


@@ -57,7 +78,7 @@ b4_locations_if([[
     public ]b4_position_type[ end;
 
     /**
     public ]b4_position_type[ end;
 
     /**

-     * Create a ]b4_location_type[ denoting an empty range located at
+     * Create a <code>]b4_location_type[</code> denoting an empty range located at

      * a given point.
      * @@param loc The position at which the range is anchored.  */
     public ]b4_location_type[ (]b4_position_type[ loc) {
      * a given point.
      * @@param loc The position at which the range is anchored.  */
     public ]b4_location_type[ (]b4_position_type[ loc) {


@@ -67,7 +88,7 @@ b4_locations_if([[
     /**
      * Create a <code>]b4_location_type[</code> from the endpoints of the range.
      * @@param begin The first position included in the range.
     /**
      * Create a <code>]b4_location_type[</code> from the endpoints of the range.
      * @@param begin The first position included in the range.

-     * @@param begin The first position beyond the range.  */
+     * @@param end   The first position beyond the range.  */

     public ]b4_location_type[ (]b4_position_type[ begin, ]b4_position_type[ end) {
       this.begin = begin;
       this.end = end;
     public ]b4_location_type[ (]b4_position_type[ begin, ]b4_position_type[ end) {
       this.begin = begin;
       this.end = end;


@@ -87,11 +108,6 @@ b4_locations_if([[
 
 ]])
 
 
 ]])
 

-[  /** Token returned by the scanner to signal the end of its input.  */
-  public static final int EOF = 0;]
-
-b4_token_enums(b4_tokens)
-

   b4_locations_if([[
   private ]b4_location_type[ yylloc (YYStack rhs, int n)
   {
   b4_locations_if([[
   private ]b4_location_type[ yylloc (YYStack rhs, int n)
   {


@@ -99,13 +115,18 @@ b4_token_enums(b4_tokens)
       return new ]b4_location_type[ (rhs.locationAt (1).begin, rhs.locationAt (n).end);
     else
       return new ]b4_location_type[ (rhs.locationAt (0).end);
       return new ]b4_location_type[ (rhs.locationAt (1).begin, rhs.locationAt (n).end);
     else
       return new ]b4_location_type[ (rhs.locationAt (0).end);

-  }]])
+  }]])[

 
   /**
    * Communication interface between the scanner and the Bison-generated
    * parser <tt>]b4_parser_class_name[</tt>.
    */
   public interface Lexer {
 
   /**
    * Communication interface between the scanner and the Bison-generated
    * parser <tt>]b4_parser_class_name[</tt>.
    */
   public interface Lexer {

+    /** Token returned by the scanner to signal the end of its input.  */
+    public static final int EOF = 0;
+
+]b4_token_enums(b4_tokens)[
+

     ]b4_locations_if([[/**
      * Method to retrieve the beginning position of the last scanned token.
      * @@return the position at which the last scanned token starts.  */
     ]b4_locations_if([[/**
      * Method to retrieve the beginning position of the last scanned token.
      * @@return the position at which the last scanned token starts.  */


@@ -124,19 +145,18 @@ b4_token_enums(b4_tokens)
     /**
      * Entry point for the scanner.  Returns the token identifier corresponding
      * to the next token and prepares to return the semantic value
     /**
      * Entry point for the scanner.  Returns the token identifier corresponding
      * to the next token and prepares to return the semantic value

-     * ]b4_locations_if([and beginning/ending positions ])[of the token. 
+     * ]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])[;
 
     /**
      * Entry point for error reporting.  Emits an error
      * @@return the token identifier corresponding to the next token. */
     int yylex () ]b4_maybe_throws([b4_lex_throws])[;
 
     /**
      * Entry point for error reporting.  Emits an error

-     * ]b4_locations_if([ referring to the given location])[in a user-defined
-     * way.
+     * ]b4_locations_if([referring to the given location ])[in a user-defined way.

      *
      *

-     * ]b4_locations_if([loc], [[The location of the element to which the
+     * ]b4_locations_if([[@@param loc The location of the element to which the

      *                error message is related]])[
      *                error message is related]])[

-     * @@param s The string for the error message.  */
-     void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String s);]
+     * @@param msg The string for the error message.  */
+     void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String msg);]

   }
 
   b4_lexer_if([[private class YYLexer implements Lexer {
   }
 
   b4_lexer_if([[private class YYLexer implements Lexer {


@@ -152,7 +172,9 @@ b4_lexer_if([[
   /**
    * Instantiates the Bison-generated parser.
    */
   /**
    * Instantiates the Bison-generated parser.
    */

-  public ]b4_parser_class_name (b4_parse_param_decl([b4_lex_param_decl])[) {
+  public ]b4_parser_class_name (b4_parse_param_decl([b4_lex_param_decl])[) ]b4_maybe_throws([b4_init_throws])[
+  {
+    ]b4_percent_code_get([[init]])[

     this.yylexer = new YYLexer(]b4_lex_param_call[);
     ]b4_parse_param_cons[
   }
     this.yylexer = new YYLexer(]b4_lex_param_call[);
     ]b4_parse_param_cons[
   }


@@ -160,9 +182,11 @@ b4_lexer_if([[
 
   /**
    * Instantiates the Bison-generated parser.
 
   /**
    * Instantiates the Bison-generated parser.

-   * @@param yylex The scanner that will supply tokens to the parser.
+   * @@param yylexer The scanner that will supply tokens to the parser.

    */
    */

-  b4_lexer_if([[protected]], [[public]]) b4_parser_class_name[ (]b4_parse_param_decl([[Lexer yylexer]])[) {
+  b4_lexer_if([[protected]], [[public]]) b4_parser_class_name[ (]b4_parse_param_decl([[Lexer yylexer]])[) ]b4_maybe_throws([b4_init_throws])[
+  {
+    ]b4_percent_code_get([[init]])[

     this.yylexer = yylexer;
     ]b4_parse_param_cons[
   }
     this.yylexer = yylexer;
     ]b4_parse_param_cons[
   }


@@ -196,20 +220,35 @@ b4_lexer_if([[
    */
   public final void setDebugLevel(int level) { yydebug = level; }
 
    */
   public final void setDebugLevel(int level) { yydebug = level; }
 

-  private final int yylex () ]b4_maybe_throws([b4_lex_throws]) [{
-    return yylexer.yylex ();
+  /**
+   * Print an error message via the lexer.
+   *]b4_locations_if([[ Use a <code>null</code> location.]])[
+   * @@param msg The error message.
+   */
+  public final void yyerror (String msg)
+  {
+    yylexer.yyerror (]b4_locations_if([[(]b4_location_type[)null, ]])[msg);

   }
   }

-  protected final void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String s) {
-    yylexer.yyerror (]b4_locations_if([loc, ])[s);
+]b4_locations_if([[
+  /**
+   * Print an error message via the lexer.
+   * @@param loc The location associated with the message.
+   * @@param msg The error message.
+   */
+  public final void yyerror (]b4_location_type[ loc, String msg)
+  {
+    yylexer.yyerror (loc, msg);

   }
 
   }
 

-  ]b4_locations_if([
-  protected final void yyerror (String s) {
-    yylexer.yyerror ((Location)null, s);
-  }
-  protected final void yyerror (]b4_position_type[ loc, String s) {
-    yylexer.yyerror (new ]b4_location_type[ (loc), s);
-  }])
+  /**
+   * Print an error message via the lexer.
+   * @@param pos The position associated with the message.
+   * @@param msg The error message.
+   */
+  public final void yyerror (]b4_position_type[ pos, String msg)
+  {
+    yylexer.yyerror (new ]b4_location_type[ (pos), msg);
+  }]])

 
   [protected final void yycdebug (String s) {
     if (yydebug > 0)
 
   [protected final void yycdebug (String s) {
     if (yydebug > 0)


@@ -223,11 +262,11 @@ b4_lexer_if([[
 
     public int size = 16;
     public int height = -1;
 
     public int size = 16;
     public int height = -1;

-    
+

     public final void push (int state, ]b4_yystype[ value]dnl
     public final void push (int state, ]b4_yystype[ value]dnl

-                           b4_locations_if([, ]b4_location_type[ loc])[) {
+                           b4_locations_if([, ]b4_location_type[ loc])[) {

       height++;
       height++;

-      if (size == height) 
+      if (size == height)

         {
          int[] newStateStack = new int[size * 2];
          System.arraycopy (stateStack, 0, newStateStack, 0, height);
         {
          int[] newStateStack = new int[size * 2];
          System.arraycopy (stateStack, 0, newStateStack, 0, height);


@@ -236,7 +275,7 @@ b4_lexer_if([[
          ]b4_location_type[[] newLocStack = new ]b4_location_type[[size * 2];
          System.arraycopy (locStack, 0, newLocStack, 0, height);
          locStack = newLocStack;]])
          ]b4_location_type[[] newLocStack = new ]b4_location_type[[size * 2];
          System.arraycopy (locStack, 0, newLocStack, 0, height);
          locStack = newLocStack;]])

-         
+

          b4_yystype[[] newValueStack = new ]b4_yystype[[size * 2];
          System.arraycopy (valueStack, 0, newValueStack, 0, height);
          valueStack = newValueStack;
          b4_yystype[[] newValueStack = new ]b4_yystype[[size * 2];
          System.arraycopy (valueStack, 0, newValueStack, 0, height);
          valueStack = newValueStack;


@@ -278,7 +317,7 @@ b4_lexer_if([[
     public void print (java.io.PrintStream out)
     {
       out.print ("Stack now");
     public void print (java.io.PrintStream out)
     {
       out.print ("Stack now");

-      
+

       for (int i = 0; i < height; i++)
         {
          out.print (' ');
       for (int i = 0; i < height; i++)
         {
          out.print (' ');


@@ -325,14 +364,14 @@ b4_lexer_if([[
     return yyerrstatus_ == 0;
   }
 
     return yyerrstatus_ == 0;
   }
 

-  private int yyaction (int yyn, YYStack yystack, int yylen)
+  private int yyaction (int yyn, YYStack yystack, int yylen) ]b4_maybe_throws([b4_throws])[

   {
     ]b4_yystype[ yyval;
     ]b4_locations_if([b4_location_type[ yyloc = yylloc (yystack, yylen);]])[
 
     /* If YYLEN is nonzero, implement the default value of the action:
        `$$ = $1'.  Otherwise, use the top of the stack.
   {
     ]b4_yystype[ yyval;
     ]b4_locations_if([b4_location_type[ yyloc = yylloc (yystack, yylen);]])[
 
     /* If YYLEN is nonzero, implement the default value of the action:
        `$$ = $1'.  Otherwise, use the top of the stack.

-    
+

        Otherwise, the following line sets YYVAL to garbage.
        This behavior is undocumented and Bison
        users should not rely upon it.  */
        Otherwise, the following line sets YYVAL to garbage.
        This behavior is undocumented and Bison
        users should not rely upon it.  */


@@ -340,7 +379,7 @@ b4_lexer_if([[
       yyval = yystack.valueAt (yylen - 1);
     else
       yyval = yystack.valueAt (0);
       yyval = yystack.valueAt (yylen - 1);
     else
       yyval = yystack.valueAt (0);

-    
+

     yy_reduce_print (yyn, yystack);
 
     switch (yyn)
     yy_reduce_print (yyn, yystack);
 
     switch (yyn)


@@ -367,6 +406,7 @@ b4_lexer_if([[
     return YYNEWSTATE;
   }
 
     return YYNEWSTATE;
   }
 

+]b4_error_verbose_if([[

   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
      that double-quoting is unnecessary unless the string contains an
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
      that double-quoting is unnecessary unless the string contains an


@@ -401,6 +441,7 @@ b4_lexer_if([[
 
     return yystr;
   }
 
     return yystr;
   }

+]])[

 
   /*--------------------------------.
   | Print this symbol on YYOUTPUT.  |
 
   /*--------------------------------.
   | Print this symbol on YYOUTPUT.  |


@@ -414,7 +455,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 ()) + ")");

   }
 
   /**
   }
 
   /**


@@ -424,7 +465,7 @@ b4_lexer_if([[
    * @@return <tt>true</tt> if the parsing succeeds.  Note that this does not
    *          imply that there were no syntax errors.
    */
    * @@return <tt>true</tt> if the parsing succeeds.  Note that this does not
    *          imply that there were no syntax errors.
    */

-  public boolean parse () ]b4_maybe_throws([b4_throws])[
+  public boolean parse () ]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[

   {
     /// Lookahead and lookahead in internal form.
     int yychar = yyempty_;
   {
     /// Lookahead and lookahead in internal form.
     int yychar = yyempty_;


@@ -477,11 +518,11 @@ m4_popdef([b4_at_dollar])])dnl
         yycdebug ("Entering state " + yystate + "\n");
         if (yydebug > 0)
           yystack.print (yyDebugStream);
         yycdebug ("Entering state " + yystate + "\n");
         if (yydebug > 0)
           yystack.print (yyDebugStream);

-    
+

         /* Accept?  */
         if (yystate == yyfinal_)
           return true;
         /* Accept?  */
         if (yystate == yyfinal_)
           return true;

-    
+

         /* Take a decision.  First try without lookahead.  */
         yyn = yypact_[yystate];
         if (yyn == yypact_ninf_)
         /* Take a decision.  First try without lookahead.  */
         yyn = yypact_[yystate];
         if (yyn == yypact_ninf_)


@@ -489,37 +530,37 @@ m4_popdef([b4_at_dollar])])dnl
             label = YYDEFAULT;
            break;
           }
             label = YYDEFAULT;
            break;
           }

-    
+

         /* Read a lookahead token.  */
         if (yychar == yyempty_)
           {
         /* Read a lookahead token.  */
         if (yychar == yyempty_)
           {

-           yycdebug ("Reading a token: ");
-           yychar = yylex ();]
+        yycdebug ("Reading a token: ");
+        yychar = yylexer.yylex ();]

             b4_locations_if([[
             b4_locations_if([[

-           yylloc = new ]b4_location_type[(yylexer.getStartPos (),
-                                           yylexer.getEndPos ());]])
+        yylloc = new ]b4_location_type[(yylexer.getStartPos (),
+                            yylexer.getEndPos ());]])

             yylval = yylexer.getLVal ();[
           }
             yylval = yylexer.getLVal ();[
           }

-    
+

         /* Convert token to internal form.  */
         /* Convert token to internal form.  */

-        if (yychar <= EOF)
+        if (yychar <= Lexer.EOF)

           {
           {

-           yychar = yytoken = EOF;
-           yycdebug ("Now at end of input.\n");
+        yychar = yytoken = Lexer.EOF;
+        yycdebug ("Now at end of input.\n");

           }
         else
           {
            yytoken = yytranslate_ (yychar);
            yy_symbol_print ("Next token is", yytoken,
           }
         else
           {
            yytoken = yytranslate_ (yychar);
            yy_symbol_print ("Next token is", yytoken,

-                            yylval]b4_locations_if([, yylloc])[);
+                            yylval]b4_locations_if([, yylloc])[);

           }
           }

-    
+

         /* If the proper action on seeing token YYTOKEN is to reduce or to
            detect an error, take that action.  */
         yyn += yytoken;
         if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken)
           label = YYDEFAULT;
         /* If the proper action on seeing token YYTOKEN is to reduce or to
            detect an error, take that action.  */
         yyn += yytoken;
         if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken)
           label = YYDEFAULT;

-    
+

         /* <= 0 means reduce or error.  */
         else if ((yyn = yytable_[yyn]) <= 0)
           {
         /* <= 0 means reduce or error.  */
         else if ((yyn = yytable_[yyn]) <= 0)
           {


@@ -531,27 +572,27 @@ m4_popdef([b4_at_dollar])])dnl
                label = YYREDUCE;
              }
           }
                label = YYREDUCE;
              }
           }

-    
+

         else
           {
             /* Shift the lookahead token.  */
            yy_symbol_print ("Shifting", yytoken,
         else
           {
             /* Shift the lookahead token.  */
            yy_symbol_print ("Shifting", yytoken,

-                            yylval]b4_locations_if([, yylloc])[);
-    
+                            yylval]b4_locations_if([, yylloc])[);
+

             /* Discard the token being shifted.  */
             yychar = yyempty_;
             /* Discard the token being shifted.  */
             yychar = yyempty_;

-    
+

             /* Count tokens shifted since error; after three, turn off error
                status.  */
             if (yyerrstatus_ > 0)
               --yyerrstatus_;
             /* Count tokens shifted since error; after three, turn off error
                status.  */
             if (yyerrstatus_ > 0)
               --yyerrstatus_;

-    
+

             yystate = yyn;
             yystack.push (yystate, yylval]b4_locations_if([, yylloc])[);
             label = YYNEWSTATE;
           }
         break;
             yystate = yyn;
             yystack.push (yystate, yylval]b4_locations_if([, yylloc])[);
             label = YYNEWSTATE;
           }
         break;

-    
+

       /*-----------------------------------------------------------.
       | yydefault -- do the default action for the current state.  |
       `-----------------------------------------------------------*/
       /*-----------------------------------------------------------.
       | yydefault -- do the default action for the current state.  |
       `-----------------------------------------------------------*/


@@ -562,7 +603,7 @@ m4_popdef([b4_at_dollar])])dnl
         else
           label = YYREDUCE;
         break;
         else
           label = YYREDUCE;
         break;

-    
+

       /*-----------------------------.
       | yyreduce -- Do a reduction.  |
       `-----------------------------*/
       /*-----------------------------.
       | yyreduce -- Do a reduction.  |
       `-----------------------------*/


@@ -571,7 +612,7 @@ m4_popdef([b4_at_dollar])])dnl
         label = yyaction (yyn, yystack, yylen);
        yystate = yystack.stateAt (0);
         break;
         label = yyaction (yyn, yystack, yylen);
        yystate = yystack.stateAt (0);
         break;

-    
+

       /*------------------------------------.
       | yyerrlab -- here on detecting error |
       `------------------------------------*/
       /*------------------------------------.
       | yyerrlab -- here on detecting error |
       `------------------------------------*/


@@ -582,33 +623,33 @@ m4_popdef([b4_at_dollar])])dnl
            ++yynerrs_;
            yyerror (]b4_locations_if([yylloc, ])[yysyntax_error (yystate, yytoken));
           }
            ++yynerrs_;
            yyerror (]b4_locations_if([yylloc, ])[yysyntax_error (yystate, yytoken));
           }

-    
+

         ]b4_locations_if([yyerrloc = yylloc;])[
         if (yyerrstatus_ == 3)
           {
         ]b4_locations_if([yyerrloc = yylloc;])[
         if (yyerrstatus_ == 3)
           {

-           /* If just tried and failed to reuse lookahead token after an
-            error, discard it.  */
-    
-           if (yychar <= EOF)
-             {
-             /* Return failure if at end of input.  */
-             if (yychar == EOF)
-               return false;
-             }
-           else
+        /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+        if (yychar <= Lexer.EOF)
+          {
+          /* Return failure if at end of input.  */
+          if (yychar == Lexer.EOF)
+            return false;
+          }
+        else

              yychar = yyempty_;
           }
              yychar = yyempty_;
           }

-    
+

         /* Else will try to reuse lookahead token after shifting the error
            token.  */
         label = YYERRLAB1;
         break;
         /* Else will try to reuse lookahead token after shifting the error
            token.  */
         label = YYERRLAB1;
         break;

-    
+

       /*---------------------------------------------------.
       | errorlab -- error raised explicitly by YYERROR.  |
       `---------------------------------------------------*/
       case YYERROR:
       /*---------------------------------------------------.
       | errorlab -- error raised explicitly by YYERROR.  |
       `---------------------------------------------------*/
       case YYERROR:

-    
+

         ]b4_locations_if([yyerrloc = yystack.locationAt (yylen - 1);])[
         /* Do not reclaim the symbols of the rule which action triggered
            this YYERROR.  */
         ]b4_locations_if([yyerrloc = yystack.locationAt (yylen - 1);])[
         /* Do not reclaim the symbols of the rule which action triggered
            this YYERROR.  */


@@ -617,13 +658,13 @@ m4_popdef([b4_at_dollar])])dnl
         yystate = yystack.stateAt (0);
         label = YYERRLAB1;
         break;
         yystate = yystack.stateAt (0);
         label = YYERRLAB1;
         break;

-    
+

       /*-------------------------------------------------------------.
       | yyerrlab1 -- common code for both syntax error and YYERROR.  |
       `-------------------------------------------------------------*/
       case YYERRLAB1:
         yyerrstatus_ = 3;      /* Each real token shifted decrements this.  */
       /*-------------------------------------------------------------.
       | yyerrlab1 -- common code for both syntax error and YYERROR.  |
       `-------------------------------------------------------------*/
       case YYERRLAB1:
         yyerrstatus_ = 3;      /* Each real token shifted decrements this.  */

-    
+

         for (;;)
           {
            yyn = yypact_[yystate];
         for (;;)
           {
            yyn = yypact_[yystate];


@@ -637,18 +678,18 @@ m4_popdef([b4_at_dollar])])dnl
                      break;
                  }
              }
                      break;
                  }
              }

-    
+

            /* Pop the current state because it cannot handle the error token.  */
            if (yystack.height == 1)
              return false;
            /* Pop the current state because it cannot handle the error token.  */
            if (yystack.height == 1)
              return false;

-    
+

            ]b4_locations_if([yyerrloc = yystack.locationAt (0);])[
            yystack.pop ();
            yystate = yystack.stateAt (0);
            if (yydebug > 0)
              yystack.print (yyDebugStream);
           }
            ]b4_locations_if([yyerrloc = yystack.locationAt (0);])[
            yystack.pop ();
            yystate = yystack.stateAt (0);
            if (yydebug > 0)
              yystack.print (yyDebugStream);
           }

-    
+

        ]b4_locations_if([
        /* Muck with the stack to setup for yylloc.  */
        yystack.push (0, null, yylloc);
        ]b4_locations_if([
        /* Muck with the stack to setup for yylloc.  */
        yystack.push (0, null, yylloc);


@@ -659,16 +700,16 @@ m4_popdef([b4_at_dollar])])dnl
         /* Shift the error token.  */
         yy_symbol_print ("Shifting", yystos_[yyn],
                         yylval]b4_locations_if([, yyloc])[);
         /* Shift the error token.  */
         yy_symbol_print ("Shifting", yystos_[yyn],
                         yylval]b4_locations_if([, yyloc])[);

-    
+

         yystate = yyn;
        yystack.push (yyn, yylval]b4_locations_if([, yyloc])[);
         label = YYNEWSTATE;
         break;
         yystate = yyn;
        yystack.push (yyn, yylval]b4_locations_if([, yyloc])[);
         label = YYNEWSTATE;
         break;

-    
+

         /* Accept.  */
       case YYACCEPT:
         return true;
         /* Accept.  */
       case YYACCEPT:
         return true;

-    
+

         /* Abort.  */
       case YYABORT:
         return false;
         /* Abort.  */
       case YYABORT:
         return false;


@@ -677,8 +718,8 @@ m4_popdef([b4_at_dollar])])dnl
 
   // Generate an error message.
   private String yysyntax_error (int yystate, int tok)
 
   // Generate an error message.
   private String yysyntax_error (int yystate, int tok)

-  {
-    if (errorVerbose)
+  {]b4_error_verbose_if([[
+    if (yyErrorVerbose)

       {
         int yyn = yypact_[yystate];
         if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
         int yyn = yypact_[yystate];
         if (yypact_ninf_ < yyn && yyn <= yylast_)


@@ -711,115 +752,65 @@ m4_popdef([b4_at_dollar])])dnl
                      res.append (yytnamerr_ (yytname_[x]));
                    }
              }
                      res.append (yytnamerr_ (yytname_[x]));
                    }
              }

-           return res.toString ();
+        return res.toString ();

           }
       }
           }
       }

-
+]])[

     return "syntax error";
   }
 
     return "syntax error";
   }
 

-

   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
   private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[;
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
   private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[;

-  private static final ]b4_int_type_for([b4_pact])[ yypact_[] =
-  {
-    ]b4_pact[
-  };
+  ]b4_integral_parser_table([yypact_], [b4_pact])[

 
   /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
      doesn't specify something else to do.  Zero means the default is an
      error.  */
 
   /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
      doesn't specify something else to do.  Zero means the default is an
      error.  */

-  private static final ]b4_int_type_for([b4_defact])[ yydefact_[] =
-  {
-    ]b4_defact[
-  };
+  ]b4_integral_parser_table([yydefact_], [b4_defact])[

 
   /* YYPGOTO[NTERM-NUM].  */
 
   /* YYPGOTO[NTERM-NUM].  */

-  private static final ]b4_int_type_for([b4_pgoto])[ yypgoto_[] =
-  {
-    ]b4_pgoto[
-  };
+  ]b4_integral_parser_table([yypgoto_], [b4_pgoto])[

 
   /* YYDEFGOTO[NTERM-NUM].  */
 
   /* YYDEFGOTO[NTERM-NUM].  */

-  private static final ]b4_int_type_for([b4_defgoto])[
-  yydefgoto_[] =
-  {
-    ]b4_defgoto[
-  };
+  ]b4_integral_parser_table([yydefgoto_], [b4_defgoto])[

 
   /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
      positive, shift that token.  If negative, reduce the rule which
      number is the opposite.  If zero, do what YYDEFACT says.  */
   private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[;
 
   /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
      positive, shift that token.  If negative, reduce the rule which
      number is the opposite.  If zero, do what YYDEFACT says.  */
   private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[;

-  private static final ]b4_int_type_for([b4_table])[
-  yytable_[] =
-  {
-    ]b4_table[
-  };
+  ]b4_integral_parser_table([yytable_], [b4_table])[

 
   /* YYCHECK.  */
 
   /* YYCHECK.  */

-  private static final ]b4_int_type_for([b4_check])[
-  yycheck_[] =
-  {
-    ]b4_check[
-  };
+  ]b4_integral_parser_table([yycheck_], [b4_check])[

 
   /* STOS_[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 
   /* STOS_[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */

-  private static final ]b4_int_type_for([b4_stos])[
-  yystos_[] =
-  {
-    ]b4_stos[
-  };
+  ]b4_integral_parser_table([yystos_], [b4_stos])[

 
   /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
      to YYLEX-NUM.  */
 
   /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
      to YYLEX-NUM.  */

-  private static final ]b4_int_type_for([b4_toknum])[
-  yytoken_number_[] =
-  {
-    ]b4_toknum[
-  };
+  ]b4_integral_parser_table([yytoken_number_], [b4_toknum])[

 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

-  private static final ]b4_int_type_for([b4_r1])[
-  yyr1_[] =
-  {
-    ]b4_r1[
-  };
+  ]b4_integral_parser_table([yyr1_], [b4_r1])[

 
   /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 
   /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

-  private static final ]b4_int_type_for([b4_r2])[
-  yyr2_[] =
-  {
-    ]b4_r2[
-  };
+  ]b4_integral_parser_table([yyr2_], [b4_r2])[

 
   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
 
   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */

-  private static final String yytname_[] =
-  {
-    ]b4_tname[
-  };
+  ]b4_typed_parser_table([String], [yytname_], [b4_tname])[

 
   /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 
   /* YYRHS -- A `-1'-separated list of the rules' RHS.  */

-  private static final ]b4_int_type_for([b4_rhs])[ yyrhs_[] =
-  {
-    ]b4_rhs[
-  };
+  ]b4_integral_parser_table([yyrhs_], [b4_rhs])[

 
   /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
      YYRHS.  */
 
   /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
      YYRHS.  */

-  private static final ]b4_int_type_for([b4_prhs])[ yyprhs_[] =
-  {
-    ]b4_prhs[
-  };
+  ]b4_integral_parser_table([yyprhs_], [b4_prhs])[

 
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */

-  private static final ]b4_int_type_for([b4_rline])[ yyrline_[] =
-  {
-    ]b4_rline[
-  };
+  ]b4_integral_parser_table([yyrline_], [b4_rline])[

 
   // Report on the debug stream that the rule yyrule is going to be reduced.
   private void yy_reduce_print (int yyrule, YYStack yystack)
 
   // Report on the debug stream that the rule yyrule is going to be reduced.
   private void yy_reduce_print (int yyrule, YYStack yystack)


@@ -837,15 +828,12 @@ m4_popdef([b4_at_dollar])])dnl
     for (int yyi = 0; yyi < yynrhs; yyi++)
       yy_symbol_print ("   $" + (yyi + 1) + " =",
                       yyrhs_[yyprhs_[yyrule] + yyi],
     for (int yyi = 0; yyi < yynrhs; yyi++)
       yy_symbol_print ("   $" + (yyi + 1) + " =",
                       yyrhs_[yyprhs_[yyrule] + yyi],

-                      ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([, 
+                      ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([,

                       b4_rhs_location(yynrhs, yyi + 1)])[);
   }
 
   /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
                       b4_rhs_location(yynrhs, yyi + 1)])[);
   }
 
   /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

-  private static final ]b4_int_type_for([b4_translate])[ yytranslate_table_[] =
-  {
-    ]b4_translate[
-  };
+  ]b4_integral_parser_table([yytranslate_table_], [b4_translate])[

 
   private static final ]b4_int_type_for([b4_translate])[ yytranslate_ (int t)
   {
 
   private static final ]b4_int_type_for([b4_translate])[ yytranslate_ (int t)
   {