(goto_number): Now unsigned int, not short int.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 45c05ce168f72a7268d82f88d4061901d9e97860..e77e784262a612c4e75bbd9a2c605022372a628b 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,6 +1,6 @@
 m4_divert(-1)
 # C++ skeleton for Bison
 m4_divert(-1)
 # C++ skeleton for Bison

-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 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


@@ -83,13 +83,22 @@ m4_define([b4_constructor],
 
 # b4_parse_param_decl
 # -------------------
 
 # b4_parse_param_decl
 # -------------------

-#  Constructor's extra arguments.
+# Extra formal arguments of the constructor.
+# Change the parameter names from "foo" into "foo_yyarg", so that
+# there is no collision bw the user chosen attribute name, and the
+# argument name in the constructor.

 m4_define([b4_parse_param_decl],
 m4_define([b4_parse_param_decl],

-          [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])])
+[m4_ifset([b4_parse_param],
+          [, m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])])
+
+m4_define([b4_parse_param_decl_1],
+[$1_yyarg])
+
+

 
 # b4_parse_param_cons
 # -------------------
 
 # b4_parse_param_cons
 # -------------------

-#  constructor's extra initialisations.
+# Extra initialisations of the constructor.

 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
                    [,
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
                    [,


@@ -98,11 +107,11 @@ m4_define([b4_cc_constructor_calls],
          [m4_map_sep([b4_cc_constructor_call], [,
       ], [$@])])
 m4_define([b4_cc_constructor_call],
          [m4_map_sep([b4_cc_constructor_call], [,
       ], [$@])])
 m4_define([b4_cc_constructor_call],

-         [$2($2)])
+         [$2 ($2_yyarg)])

 
 # b4_parse_param_vars
 # -------------------
 
 # b4_parse_param_vars
 # -------------------

-#  Extra instance variables.
+# Extra instance variables.

 m4_define([b4_parse_param_vars],
           [m4_ifset([b4_parse_param],
                    [
 m4_define([b4_parse_param_vars],
           [m4_ifset([b4_parse_param],
                    [


@@ -114,13 +123,15 @@ m4_define([b4_cc_var_decls],
 m4_define([b4_cc_var_decl],
          [    $1;])
 
 m4_define([b4_cc_var_decl],
          [    $1;])
 

+
+

 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

-             [2002, 2003])[
+             [2002, 2003, 2004])[

 /* FIXME: This is wrong, we want computed header guards.
    I don't know why the macros are missing now. :( */
 #ifndef PARSER_HEADER_H
 /* FIXME: This is wrong, we want computed header guards.
    I don't know why the macros are missing now. :( */
 #ifndef PARSER_HEADER_H


@@ -153,7 +164,9 @@ b4_syncline([@oline@], [@ofile@])[
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 

-#ifndef YYSTYPE
+#ifdef YYSTYPE
+typedef YYSTYPE yystype;
+#else

 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;
 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;


@@ -168,27 +181,41 @@ b4_syncline([@oline@], [@ofile@])],
 
 ]/* Line __line__ of lalr1.cc.  */
 b4_syncline([@oline@], [@ofile@])[
 
 ]/* Line __line__ of lalr1.cc.  */
 b4_syncline([@oline@], [@ofile@])[

+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N) \
-   ((Current).end = Rhs[N].end)
+# define YYLLOC_DEFAULT(Current, Rhs, N)               \
+do {                                                   \
+  if (N)                                               \
+    {                                                  \
+      (Current).begin = (Rhs)[1].begin;                        \
+      (Current).end   = (Rhs)[N].end;                  \
+    }                                                  \
+  else                                                 \
+    {                                                  \
+      (Current).begin = (Current).end = (Rhs)[0].end;  \
+    }                                                  \
+} while (0)

 #endif
 
 namespace yy
 {
   class ]b4_parser_class_name[;
 
 #endif
 
 namespace yy
 {
   class ]b4_parser_class_name[;
 

-  template < typename P >
+  template <typename P>

   struct Traits
   {
   };
 
   struct Traits
   {
   };
 

-  template < >
-  struct Traits< ]b4_parser_class_name[ >
+  template <>
+  struct Traits<]b4_parser_class_name[>

   {
     typedef ]b4_int_type_for([b4_translate])[ TokenNumberType;
     typedef ]b4_int_type_for([b4_rhs])[       RhsNumberType;
   {
     typedef ]b4_int_type_for([b4_translate])[ TokenNumberType;
     typedef ]b4_int_type_for([b4_rhs])[       RhsNumberType;

-    typedef int      StateType;
-    typedef yystype  SemanticType;
+    typedef int StateType;
+    typedef yystype SemanticType;

     typedef ]b4_location_type[ LocationType;
   };
 }
     typedef ]b4_location_type[ LocationType;
   };
 }


@@ -199,30 +226,33 @@ namespace yy
   {
   public:
 
   {
   public:
 

-    typedef Traits< ]b4_parser_class_name[ >::TokenNumberType TokenNumberType;
-    typedef Traits< ]b4_parser_class_name[ >::RhsNumberType   RhsNumberType;
-    typedef Traits< ]b4_parser_class_name[ >::StateType       StateType;
-    typedef Traits< ]b4_parser_class_name[ >::SemanticType    SemanticType;
-    typedef Traits< ]b4_parser_class_name[ >::LocationType    LocationType;
+    typedef Traits<]b4_parser_class_name[>::TokenNumberType TokenNumberType;
+    typedef Traits<]b4_parser_class_name[>::RhsNumberType   RhsNumberType;
+    typedef Traits<]b4_parser_class_name[>::StateType       StateType;
+    typedef Traits<]b4_parser_class_name[>::SemanticType    SemanticType;
+    typedef Traits<]b4_parser_class_name[>::LocationType    LocationType;

 
 

-    typedef Stack< StateType >    StateStack;
-    typedef Stack< SemanticType > SemanticStack;
-    typedef Stack< LocationType > LocationStack;
+    typedef Stack<StateType>    StateStack;
+    typedef Stack<SemanticType> SemanticStack;
+    typedef Stack<LocationType> LocationStack;

 
 

-#if YYLSP_NEEDED
-    ]b4_parser_class_name[ (bool debug,
-           LocationType initlocation][]b4_param[]b4_parse_param_decl[) :
-      ]b4_constructor[][debug_ (debug),
-      cdebug_ (std::cerr),
-      initlocation_ (initlocation)]b4_parse_param_cons[
-#else

     ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :
       ]b4_constructor[][debug_ (debug),
       cdebug_ (std::cerr)]b4_parse_param_cons[
     ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :
       ]b4_constructor[][debug_ (debug),
       cdebug_ (std::cerr)]b4_parse_param_cons[

-#endif

     {
     }
 
     {
     }
 

+    ]b4_parser_class_name[ (bool debug,
+           LocationType][]b4_param[]b4_parse_param_decl[) :
+      ]b4_constructor[][debug_ (debug),
+      cdebug_ (std::cerr)]b4_parse_param_cons[
+    {
+      cdebug_ << __FILE__ << ':' << __LINE__
+             << ": this constructor is provided by backward compatibility"
+             << ", but will be removed in the near future."
+             << std::endl;
+    }
+

     virtual ~]b4_parser_class_name[ ()
     {
     }
     virtual ~]b4_parser_class_name[ ()
     {
     }


@@ -234,6 +264,13 @@ namespace yy
     virtual void lex_ ();
     virtual void error_ ();
     virtual void print_ ();
     virtual void lex_ ();
     virtual void error_ ();
     virtual void print_ ();

+    virtual void report_syntax_error_ ();
+#if YYDEBUG
+    virtual void symprint_ (int yytype,
+                           const SemanticType* yyvaluep,
+                           const LocationType* yylocationp);
+#endif /* ! YYDEBUG */
+

 
     /* Stacks.  */
     StateStack    state_stack_;
 
     /* Stacks.  */
     StateStack    state_stack_;


@@ -249,6 +286,7 @@ namespace yy
     static const ]b4_int_type_for([b4_table])[ table_[];
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ table_ninf_;
     static const ]b4_int_type_for([b4_check])[ check_[];
     static const ]b4_int_type_for([b4_table])[ table_[];
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ table_ninf_;
     static const ]b4_int_type_for([b4_check])[ check_[];

+    static const ]b4_int_type_for([b4_stos])[ stos_[];

     static const ]b4_int_type_for([b4_r1])[ r1_[];
     static const ]b4_int_type_for([b4_r2])[ r2_[];
 
     static const ]b4_int_type_for([b4_r1])[ r1_[];
     static const ]b4_int_type_for([b4_r2])[ r2_[];
 


@@ -261,14 +299,19 @@ namespace yy
     static const RhsNumberType rhs_[];
     static const ]b4_int_type_for([b4_prhs])[ prhs_[];
     static const ]b4_int_type_for([b4_rline])[ rline_[];
     static const RhsNumberType rhs_[];
     static const ]b4_int_type_for([b4_prhs])[ prhs_[];
     static const ]b4_int_type_for([b4_rline])[ rline_[];

-    static const ]b4_int_type_for([b4_stos])[ stos_[];

     static const ]b4_int_type_for([b4_toknum])[ token_number_[];
     virtual void reduce_print_ (int yyrule);
     virtual void stack_print_ ();
 #endif
 
     /* Even more tables.  */
     static const ]b4_int_type_for([b4_toknum])[ token_number_[];
     virtual void reduce_print_ (int yyrule);
     virtual void stack_print_ ();
 #endif
 
     /* Even more tables.  */

-    static inline TokenNumberType translate_ (int token);
+    inline TokenNumberType translate_ (int token);
+    inline void destruct_ (const char* yymsg,
+                           int yytype,
+                           SemanticType* yyvaluep, LocationType* yylocationp);
+
+    /// Pop \a n symbols the three stacks.
+    inline void pop (unsigned int n = 1);

 
     /* Constants.  */
     static const int eof_;
 
     /* Constants.  */
     static const int eof_;


@@ -280,7 +323,7 @@ namespace yy
     static const int terror_;
     static const int errcode_;
     static const int ntokens_;
     static const int terror_;
     static const int errcode_;
     static const int ntokens_;

-    static const unsigned user_token_number_max_;
+    static const unsigned int user_token_number_max_;

     static const TokenNumberType undef_token_;
 
     /* State.  */
     static const TokenNumberType undef_token_;
 
     /* State.  */


@@ -288,27 +331,32 @@ namespace yy
     int len_;
     int state_;
 
     int len_;
     int state_;
 

+    /* Error handling. */
+    int nerrs_;
+    int errstatus_;
+

     /* Debugging.  */
     int debug_;
     /* Debugging.  */
     int debug_;

-    std::ostream &cdebug_;
+    std::ostream& cdebug_;

 
 

-    /* Lookahead and lookahead in internal form.  */
+    /* Look-ahead and look-ahead in internal form.  */

     int looka_;
     int ilooka_;
 
     /* Message.  */
     std::string message;
 
     int looka_;
     int ilooka_;
 
     /* Message.  */
     std::string message;
 

-    /* Semantic value and location of lookahead token.  */
+    /// Semantic value of the look-ahead.

     SemanticType value;
     SemanticType value;

+    /// Location of the look-ahead.

     LocationType location;
     LocationType location;

+    /// The locations where the error started and ended.
+    Location error_range_[2];

 
 

-    /* @@$ and $$.  */
+    /// $$.

     SemanticType yyval;
     SemanticType yyval;

+    /// @@$.

     LocationType yyloc;
     LocationType yyloc;

-
-    /* Initial location.  */
-    LocationType initlocation_;

 ]b4_parse_param_vars[
   };
 }
 ]b4_parse_param_vars[
   };
 }


@@ -317,71 +365,151 @@ namespace yy
 ])dnl
 @output @output_parser_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 ])dnl
 @output @output_parser_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

-             [2002, 2003])
+             [2002, 2003, 2004])

 
 m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
 m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
 
 /* Enable debugging if requested.  */
 #if YYDEBUG

-# define YYCDEBUG    if (debug_) cdebug_
+
+# define YYCDEBUG                              \
+  if (debug_)                                  \
+    cdebug_
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do {                                                   \
+  if (debug_)                                          \
+    {                                                  \
+      cdebug_ << (Title) << ' ';                       \
+      symprint_ ((Type), (Value), (Location));         \
+      cdebug_ << std::endl;                            \
+    }                                                  \
+} while (0)
+

 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (debug_)                          \
     reduce_print_ (Rule);              \
 } while (0)
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (debug_)                          \
     reduce_print_ (Rule);              \
 } while (0)

+

 # define YY_STACK_PRINT()              \
 do {                                   \
   if (debug_)                          \
     stack_print_ ();                   \
 } while (0)
 # define YY_STACK_PRINT()              \
 do {                                   \
   if (debug_)                          \
     stack_print_ ();                   \
 } while (0)

+

 #else /* !YYDEBUG */
 #else /* !YYDEBUG */

+

 # define YYCDEBUG    if (0) cdebug_
 # define YYCDEBUG    if (0) cdebug_

+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()
 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()

+

 #endif /* !YYDEBUG */
 
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab
 
 #endif /* !YYDEBUG */
 
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab
 

+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+void
+yy::]b4_parser_class_name[::symprint_ (int yytype,
+                         const SemanticType* yyvaluep, const LocationType* yylocationp)
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  cdebug_ << (yytype < ntokens_ ? "token" : "nterm")
+         << ' ' << name_[yytype] << " ("
+          << *yylocationp << ": ";
+  switch (yytype)
+    {
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+[      default:
+        break;
+    }
+  cdebug_ << ')';
+}
+#endif /* ! YYDEBUG */
+
+void
+yy::]b4_parser_class_name[::destruct_ (const char* yymsg,
+                         int yytype, SemanticType* yyvaluep, LocationType* yylocationp)
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
+      default:
+        break;
+    }
+}
+
+void
+yy::]b4_parser_class_name[::pop (unsigned int n)
+{
+  state_stack_.pop (n);
+  semantic_stack_.pop (n);
+  location_stack_.pop (n);
+}

 
 int
 yy::]b4_parser_class_name[::parse ()
 {
 
 int
 yy::]b4_parser_class_name[::parse ()
 {

-  int nerrs = 0;
-  int errstatus = 0;
+  YYCDEBUG << "Starting parse" << std::endl;

 
 

-  /* Initialize the stacks.  The initial state will be pushed in
-     yynewstate, since the latter expects the semantical and the
-     location values to have been already stored, initialize these
-     stacks with a primary value.  */
-  state_stack_ = StateStack (0);
-  semantic_stack_ = SemanticStack (1);
-  location_stack_ = LocationStack (1);
+  nerrs_ = 0;
+  errstatus_ = 0;

 
   /* Start.  */
   state_ = 0;
   looka_ = empty_;
 
   /* Start.  */
   state_ = 0;
   looka_ = empty_;

-#if YYLSP_NEEDED
-  location = initlocation_;
-#endif
-  YYCDEBUG << "Starting parse" << std::endl;
+
+]m4_ifdef([b4_initial_action], [
+m4_pushdef([b4_at_dollar],     [location])dnl
+m4_pushdef([b4_dollar_dollar], [value])dnl
+  /* User initialization code. */
+  b4_initial_action
+m4_popdef([b4_dollar_dollar])dnl
+m4_popdef([b4_at_dollar])dnl
+/* Line __line__ of yacc.c.  */
+b4_syncline([@oline@], [@ofile@])])dnl
+
+[  /* Initialize the stacks.  The initial state will be pushed in
+     yynewstate, since the latter expects the semantical and the
+     location values to have been already stored, initialize these
+     stacks with a primary value.  */
+  state_stack_ = StateStack (0);
+  semantic_stack_ = SemanticStack (0);
+  location_stack_ = LocationStack (0);
+  semantic_stack_.push (value);
+  location_stack_.push (location);

 
   /* New state.  */
 
   /* New state.  */

- yynewstate:
+yynewstate:

   state_stack_.push (state_);
   YYCDEBUG << "Entering state " << state_ << std::endl;
   goto yybackup;
 
   /* Backup.  */
   state_stack_.push (state_);
   YYCDEBUG << "Entering state " << state_ << std::endl;
   goto yybackup;
 
   /* Backup.  */

- yybackup:
+yybackup:

 
 

-  /* Try to take a decision without lookahead.  */
+  /* Try to take a decision without look-ahead.  */

   n_ = pact_[state_];
   if (n_ == pact_ninf_)
     goto yydefault;
 
   n_ = pact_[state_];
   if (n_ == pact_ninf_)
     goto yydefault;
 

-  /* Read a lookahead token.  */
+  /* Read a look-ahead token.  */

   if (looka_ == empty_)
     {
       YYCDEBUG << "Reading a token: ";
   if (looka_ == empty_)
     {
       YYCDEBUG << "Reading a token: ";


@@ -389,27 +517,18 @@ yy::]b4_parser_class_name[::parse ()
     }
 
   /* Convert token to internal form.  */
     }
 
   /* Convert token to internal form.  */

-  if (looka_ <= 0)
+  if (looka_ <= eof_)

     {
     {

-      looka_ = eof_;
-      ilooka_ = 0;
+      looka_ = ilooka_ = eof_;

       YYCDEBUG << "Now at end of input." << std::endl;
     }
   else
     {
       ilooka_ = translate_ (looka_);
       YYCDEBUG << "Now at end of input." << std::endl;
     }
   else
     {
       ilooka_ = translate_ (looka_);

-#if YYDEBUG
-      if (debug_)
-       {
-         YYCDEBUG << "Next token is " << looka_
-                << " (" << name_[ilooka_];
-         print_ ();
-         YYCDEBUG << ')' << std::endl;
-       }
-#endif
+      YY_SYMBOL_PRINT ("Next token is", ilooka_, &value, &location);

     }
 
     }
 

-  /* If the proper action on seeing token YYTOKEN is to reduce or to
+  /* If the proper action on seeing token ILOOKA_ is to reduce or to

      detect an error, take that action.  */
   n_ += ilooka_;
   if (n_ < 0 || last_ < n_ || check_[n_] != ilooka_)
      detect an error, take that action.  */
   n_ += ilooka_;
   if (n_ < 0 || last_ < n_ || check_[n_] != ilooka_)


@@ -434,11 +553,8 @@ yy::]b4_parser_class_name[::parse ()
   if (n_ == final_)
     goto yyacceptlab;
 
   if (n_ == final_)
     goto yyacceptlab;
 

-  /* Shift the lookahead token.  */
-#if YYDEBUG
-  YYCDEBUG << "Shifting token " << looka_
-           << " (" << name_[ilooka_] << "), ";
-#endif
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", ilooka_, &value, &location);

 
   /* Discard the token being shifted unless it is eof.  */
   if (looka_ != eof_)
 
   /* Discard the token being shifted unless it is eof.  */
   if (looka_ != eof_)


@@ -449,8 +565,8 @@ yy::]b4_parser_class_name[::parse ()
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */

-  if (errstatus)
-    --errstatus;
+  if (errstatus_)
+    --errstatus_;

 
   state_ = n_;
   goto yynewstate;
 
   state_ = n_;
   goto yynewstate;


@@ -458,7 +574,7 @@ yy::]b4_parser_class_name[::parse ()
 /*-----------------------------------------------------------.
 | yydefault -- do the default action for the current state.  |
 `-----------------------------------------------------------*/
 /*-----------------------------------------------------------.
 | yydefault -- do the default action for the current state.  |
 `-----------------------------------------------------------*/

- yydefault:
+yydefault:

   n_ = defact_[state_];
   if (n_ == 0)
     goto yyerrlab;
   n_ = defact_[state_];
   if (n_ == 0)
     goto yyerrlab;


@@ -467,7 +583,7 @@ yy::]b4_parser_class_name[::parse ()
 /*-----------------------------.
 | yyreduce -- Do a reduction.  |
 `-----------------------------*/
 /*-----------------------------.
 | yyreduce -- Do a reduction.  |
 `-----------------------------*/

- yyreduce:
+yyreduce:

   len_ = r2_[n_];
   /* If LEN_ is nonzero, implement the default value of the action:
      `$$ = $1'.  Otherwise, use the top of the stack.
   len_ = r2_[n_];
   /* If LEN_ is nonzero, implement the default value of the action:
      `$$ = $1'.  Otherwise, use the top of the stack.


@@ -476,21 +592,14 @@ yy::]b4_parser_class_name[::parse ()
      This behavior is undocumented and Bison
      users should not rely upon it.  */
   if (len_)
      This behavior is undocumented and Bison
      users should not rely upon it.  */
   if (len_)

-    {
-      yyval = semantic_stack_[len_ - 1];
-      yyloc = location_stack_[len_ - 1];
-    }
+    yyval = semantic_stack_[len_ - 1];

   else
   else

-    {
-      yyval = semantic_stack_[0];
-      yyloc = location_stack_[0];
-    }
+    yyval = semantic_stack_[0];

 
 

-  if (len_)
-    {
-      Slice< LocationType, LocationStack > slice (location_stack_, len_);
-      YYLLOC_DEFAULT (yyloc, slice, len_);
-    }
+  {
+    Slice<LocationType, LocationStack> slice (location_stack_, len_);
+    YYLLOC_DEFAULT (yyloc, slice, len_);
+  }

   YY_REDUCE_PRINT (n_);
   switch (n_)
     {
   YY_REDUCE_PRINT (n_);
   switch (n_)
     {


@@ -500,9 +609,7 @@ yy::]b4_parser_class_name[::parse ()
 ]/* Line __line__ of lalr1.cc.  */
 b4_syncline([@oline@], [@ofile@])[
 
 ]/* Line __line__ of lalr1.cc.  */
 b4_syncline([@oline@], [@ofile@])[
 

-  state_stack_.pop (len_);
-  semantic_stack_.pop (len_);
-  location_stack_.pop (len_);
+  pop (len_);

 
   YY_STACK_PRINT ();
 
 
   YY_STACK_PRINT ();
 


@@ -521,50 +628,14 @@ b4_syncline([@oline@], [@ofile@])[
 /*------------------------------------.
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 /*------------------------------------.
 | yyerrlab -- here on detecting error |
 `------------------------------------*/

- yyerrlab:
+yyerrlab:

   /* If not already recovering from an error, report this error.  */
   /* If not already recovering from an error, report this error.  */

-  if (!errstatus)
-    {
-      ++nerrs;
-
-#if YYERROR_VERBOSE
-      n_ = pact_[state_];
-      if (pact_ninf_ < n_ && n_ < last_)
-       {
-         message = "syntax error, unexpected ";
-         message += name_[ilooka_];
-         {
-           int count = 0;
-            /* Start YYX at -YYN if negative to avoid negative indexes in
-               YYCHECK.  */
-           int xbegin = n_ < 0 ? -n_ : 0;
-           /* Stay within bounds of both yycheck and yytname.  */
-           int checklim = last_ - n_;
-           int xend = checklim < ntokens_ ? checklim : ntokens_;
-           for (int x = xbegin; x < xend; ++x)
-             if (check_[x + n_] == x && x != terror_)
-               ++count;
-           if (count < 5)
-             {
-               count = 0;
-               for (int x1 = xbegin; x1 < xend; ++x1)
-                 if (check_[x1 + n_] == x1 && x1 != terror_)
-                   {
-                     message += (!count++) ? ", expecting " : " or ";
-                     message += name_[x1];
-                   }
-             }
-         }
-       }
-      else
-#endif
-       message = "syntax error";
-      error_ ();
-    }
+  report_syntax_error_ ();

 
 

-  if (errstatus == 3)
+  error_range_[0] = location;
+  if (errstatus_ == 3)

     {
     {

-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an

         error, discard it.  */
 
       /* Return failure if at end of input.  */
         error, discard it.  */
 
       /* Return failure if at end of input.  */


@@ -575,27 +646,24 @@ b4_syncline([@oline@], [@ofile@])[
          if (looka_ == eof_)
             for (;;)
               {
          if (looka_ == eof_)
             for (;;)
               {

-                 state_stack_.pop ();
-                 semantic_stack_.pop ();
-                 location_stack_.pop ();
+                 error_range_[0] = location_stack_[0];
+                 pop ();

                 if (state_stack_.height () == 1)
                   YYABORT;
                 if (state_stack_.height () == 1)
                   YYABORT;

-//              YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-// FIXME: yydestruct (yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[);
+                 destruct_ ("Error: popping",
+                            stos_[state_stack_[0]],
+                            &semantic_stack_[0],
+                            &location_stack_[0]);

               }
         }
       else
         {
               }
         }
       else
         {

-#if YYDEBUG
-           YYCDEBUG << "Discarding token " << looka_
-                   << " (" << name_[ilooka_] << ")." << std::endl;
-//       yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[);
-#endif
-           looka_ = empty_;
+          destruct_ ("Error: discarding", ilooka_, &value, &location);
+          looka_ = empty_;

         }
     }
 
         }
     }
 

-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error

      token.  */
   goto yyerrlab1;
 
      token.  */
   goto yyerrlab1;
 


@@ -605,9 +673,15 @@ b4_syncline([@oline@], [@ofile@])[
 `---------------------------------------------------*/
 yyerrorlab:
 
 `---------------------------------------------------*/
 yyerrorlab:
 

-  state_stack_.pop (len_);
-  semantic_stack_.pop (len_);
-  location_stack_.pop (len_);
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
+#endif
+
+  error_range_[0] = location_stack_[len_ - 1];
+  pop (len_);

   state_ = state_stack_[0];
   goto yyerrlab1;
 
   state_ = state_stack_[0];
   goto yyerrlab1;
 


@@ -615,7 +689,7 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:

-  errstatus = 3;       /* Each real token shifted decrements this.  */
+  errstatus_ = 3;      /* Each real token shifted decrements this.  */

 
   for (;;)
     {
 
   for (;;)
     {


@@ -635,31 +709,10 @@ yyerrlab1:
       if (state_stack_.height () == 1)
        YYABORT;
 
       if (state_stack_.height () == 1)
        YYABORT;
 

-#if YYDEBUG
-      if (debug_)
-       {
-         if (stos_[state_] < ntokens_)
-           {
-             YYCDEBUG << "Error: popping token "
-                    << token_number_[stos_[state_]]
-                    << " (" << name_[stos_[state_]];
-# ifdef YYPRINT
-             YYPRINT (stderr, token_number_[stos_[state_]],
-                      semantic_stack_.top ());
-# endif
-             YYCDEBUG << ')' << std::endl;
-           }
-         else
-           {
-             YYCDEBUG << "Error: popping nonterminal ("
-                    << name_[stos_[state_]] << ')' << std::endl;
-           }
-       }
-#endif
-
-      state_stack_.pop ();
-      semantic_stack_.pop ();
-      location_stack_.pop ();
+      error_range_[0] = location_stack_[0];
+      destruct_ ("Error: popping",
+                 stos_[state_], &semantic_stack_[0], &location_stack_[0]);
+      pop ();

       state_ = state_stack_[0];
       YY_STACK_PRINT ();
     }
       state_ = state_stack_[0];
       YY_STACK_PRINT ();
     }


@@ -667,20 +720,29 @@ yyerrlab1:
   if (n_ == final_)
     goto yyacceptlab;
 
   if (n_ == final_)
     goto yyacceptlab;
 

-  YYCDEBUG << "Shifting error token, ";
-
+  error_range_[1] = location;
+  // Using LOCATION is tempting, but would change the location of
+  // the look-ahead.  YYLOC is available though.
+  YYLLOC_DEFAULT (yyloc, error_range_ - 1, 2);

   semantic_stack_.push (value);
   semantic_stack_.push (value);

-  location_stack_.push (location);
+  location_stack_.push (yyloc);
+
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", stos_[n_],
+                  &semantic_stack_[0], &location_stack_[0]);

 
   state_ = n_;
   goto yynewstate;
 
   /* Accept.  */
 
   state_ = n_;
   goto yynewstate;
 
   /* Accept.  */

- yyacceptlab:
+yyacceptlab:

   return 0;
 
   /* Abort.  */
   return 0;
 
   /* Abort.  */

- yyabortlab:
+yyabortlab:
+  /* Free the lookahead. */
+  destruct_ ("Error: discarding lookahead", ilooka_, &value, &location);
+  looka_ = empty_;

   return 1;
 }
 
   return 1;
 }
 


@@ -694,6 +756,45 @@ yy::]b4_parser_class_name[::lex_ ()
 #endif
 }
 
 #endif
 }
 

+/** Generate an error message, and invoke yyerror. */
+void
+yy::]b4_parser_class_name[::report_syntax_error_ ()
+{
+  /* If not already recovering from an error, report this error.  */
+  if (!errstatus_)
+    {
+      ++nerrs_;
+
+#if YYERROR_VERBOSE
+      n_ = pact_[state_];
+      if (pact_ninf_ < n_ && n_ < last_)
+       {
+         message = "syntax error, unexpected ";
+         message += name_[ilooka_];
+         {
+           int count = 0;
+           for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+             if (check_[x + n_] == x && x != terror_)
+               ++count;
+           if (count < 5)
+             {
+               count = 0;
+               for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+                 if (check_[x + n_] == x && x != terror_)
+                   {
+                     message += (!count++) ? ", expecting " : " or ";
+                     message += name_[x];
+                   }
+             }
+         }
+       }
+      else
+#endif
+       message = "syntax error";
+      error_ ();
+    }
+}
+

 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */


@@ -744,7 +845,6 @@ yy::]b4_parser_class_name[::check_[] =
   ]b4_check[
 };
 
   ]b4_check[
 };
 

-#if YYDEBUG

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


@@ -753,6 +853,7 @@ yy::]b4_parser_class_name[::stos_[] =
   ]b4_stos[
 };
 
   ]b4_stos[
 };
 

+#if YYDEBUG

 /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding
    to YYLEX-NUM.  */
 const ]b4_int_type_for([b4_toknum])[
 /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding
    to YYLEX-NUM.  */
 const ]b4_int_type_for([b4_toknum])[


@@ -778,7 +879,7 @@ yy::]b4_parser_class_name[::r2_[] =
 
 #if YYDEBUG || YYERROR_VERBOSE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
 
 #if YYDEBUG || YYERROR_VERBOSE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+   First, the terminals, then, starting at NTOKENS_, nonterminals. */

 const char*
 const yy::]b4_parser_class_name[::name_[] =
 {
 const char*
 const yy::]b4_parser_class_name[::name_[] =
 {


@@ -814,8 +915,8 @@ yy::]b4_parser_class_name[::rline_[] =
 void
 yy::]b4_parser_class_name[::stack_print_ ()
 {
 void
 yy::]b4_parser_class_name[::stack_print_ ()
 {

-  cdebug_ << "state stack now";
-  for (StateStack::ConstIterator i = state_stack_.begin ();
+  cdebug_ << "Stack now";
+  for (StateStack::const_iterator i = state_stack_.begin ();

        i != state_stack_.end (); ++i)
     cdebug_ << ' ' << *i;
   cdebug_ << std::endl;
        i != state_stack_.end (); ++i)
     cdebug_ << ' ' << *i;
   cdebug_ << std::endl;


@@ -828,7 +929,8 @@ yy::]b4_parser_class_name[::reduce_print_ (int yyrule)
 {
   unsigned int yylno = rline_[yyrule];
   /* Print the symbols being reduced, and their result.  */
 {
   unsigned int yylno = rline_[yyrule];
   /* Print the symbols being reduced, and their result.  */

-  cdebug_ << "Reducing via rule " << n_ - 1 << " (line " << yylno << "), ";
+  cdebug_ << "Reducing stack by rule " << n_ - 1
+          << " (line " << yylno << "), ";

   for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
        0 <= rhs_[i]; ++i)
     cdebug_ << name_[rhs_[i]] << ' ';
   for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
        0 <= rhs_[i]; ++i)
     cdebug_ << name_[rhs_[i]] << ' ';


@@ -846,7 +948,7 @@ yy::]b4_parser_class_name[::translate_ (int token)
   {
     ]b4_translate[
   };
   {
     ]b4_translate[
   };

-  if ((unsigned) token <= user_token_number_max_)
+  if ((unsigned int) token <= user_token_number_max_)

     return translate_table[token];
   else
     return undef_token_;
     return translate_table[token];
   else
     return undef_token_;


@@ -861,13 +963,13 @@ const int yy::]b4_parser_class_name[::terror_ = 1;
 const int yy::]b4_parser_class_name[::errcode_ = 256;
 const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[;
 
 const int yy::]b4_parser_class_name[::errcode_ = 256;
 const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[;
 

-const unsigned yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[;
+const unsigned int yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[;

 const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[;
 
 ]b4_epilogue
 dnl
 @output stack.hh
 const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[;
 
 ]b4_epilogue
 dnl
 @output stack.hh

-b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[
+b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003, 2004])[

 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH


@@ -876,32 +978,33 @@ b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[
 
 namespace yy
 {
 
 namespace yy
 {

-  template < class T, class S = std::deque< T > >
+  template <class T, class S = std::deque<T> >

   class Stack
   {
   public:
 
   class Stack
   {
   public:
 

-    typedef typename S::iterator Iterator;
-    typedef typename S::const_iterator ConstIterator;
+    // Hide our reversed order.
+    typedef typename S::reverse_iterator iterator;
+    typedef typename S::const_reverse_iterator const_iterator;

 
     Stack () : seq_ ()
     {
     }
 
 
     Stack () : seq_ ()
     {
     }
 

-    Stack (unsigned n) : seq_ (n)
+    Stack (unsigned int n) : seq_ (n)

     {
     }
 
     inline
     T&
     {
     }
 
     inline
     T&

-    operator [] (unsigned i)
+    operator [] (unsigned int i)

     {
       return seq_[i];
     }
 
     inline
     const T&
     {
       return seq_[i];
     }
 
     inline
     const T&

-    operator [] (unsigned i) const
+    operator [] (unsigned int i) const

     {
       return seq_[i];
     }
     {
       return seq_[i];
     }


@@ -915,41 +1018,41 @@ namespace yy
 
     inline
     void
 
     inline
     void

-    pop (unsigned n = 1)
+    pop (unsigned int n = 1)

     {
       for (; n; --n)
        seq_.pop_front ();
     }
 
     inline
     {
       for (; n; --n)
        seq_.pop_front ();
     }
 
     inline

-    unsigned
+    unsigned int

     height () const
     {
       return seq_.size ();
     }
 
     height () const
     {
       return seq_.size ();
     }
 

-    inline ConstIterator begin () const { return seq_.begin (); }
-    inline ConstIterator end () const { return seq_.end (); }
+    inline const_iterator begin () const { return seq_.rbegin (); }
+    inline const_iterator end () const { return seq_.rend (); }

 
   private:
 
     S seq_;
   };
 
 
   private:
 
     S seq_;
   };
 

-  template < class T, class S = Stack< T > >
+  template <class T, class S = Stack<T> >

   class Slice
   {
   public:
 
     Slice (const S& stack,
   class Slice
   {
   public:
 
     Slice (const S& stack,

-          unsigned range) : stack_ (stack),
-                            range_ (range)
+          unsigned int range) : stack_ (stack),
+                                range_ (range)

     {
     }
 
     inline
     const T&
     {
     }
 
     inline
     const T&

-    operator [] (unsigned i) const
+    operator [] (unsigned int i) const

     {
       return stack_[range_ - i];
     }
     {
       return stack_[range_ - i];
     }


@@ -957,14 +1060,14 @@ namespace yy
   private:
 
     const S& stack_;
   private:
 
     const S& stack_;

-    unsigned range_;
+    unsigned int range_;

   };
 }
 
 #endif // not BISON_STACK_HH]
 dnl
 @output position.hh
   };
 }
 
 #endif // not BISON_STACK_HH]
 dnl
 @output position.hh

-b4_copyright([Position class for Bison C++ parsers], [2002, 2003])[
+b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004])[

 
 /**
  ** \file position.hh
 
 /**
  ** \file position.hh


@@ -1077,7 +1180,7 @@ namespace yy
 }
 #endif // not BISON_POSITION_HH]
 @output location.hh
 }
 #endif // not BISON_POSITION_HH]
 @output location.hh

-b4_copyright([Location class for Bison C++ parsers], [2002, 2003])[
+b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004])[

 
 /**
  ** \file location.hh
 
 /**
  ** \file location.hh


@@ -1148,7 +1251,7 @@ namespace yy
   }
 
   /** \brief Add two Location objects */
   }
 
   /** \brief Add two Location objects */

-  inline const Location operator+ (const Location& begin, unsigned width)
+  inline const Location operator+ (const Location& begin, unsigned int width)

   {
     Location res = begin;
     res.columns (width);
   {
     Location res = begin;
     res.columns (width);


@@ -1156,7 +1259,7 @@ namespace yy
   }
 
   /** \brief Add and assign a Location */
   }
 
   /** \brief Add and assign a Location */

-  inline Location &operator+= (Location& res, unsigned width)
+  inline Location& operator+= (Location& res, unsigned int width)

   {
     res.columns (width);
     return res;
   {
     res.columns (width);
     return res;