(yyuserMerge): Return void, not YYSTYPE.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7a08a73dc81856f683d919649e28be457a389313..1ec45264ae21215f40b1947033a784d3c5f41ba9 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -81,6 +81,39 @@ m4_define([b4_constructor],
                    [])])
 
 
                    [])])
 
 

+# b4_parse_param_decl
+# -------------------
+#  Constructor's extra arguments.
+m4_define([b4_parse_param_decl],
+          [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])])
+
+# b4_parse_param_cons
+# -------------------
+#  constructor's extra initialisations.
+m4_define([b4_parse_param_cons],
+          [m4_ifset([b4_parse_param],
+                   [,
+      b4_cc_constructor_calls(b4_parse_param)])])
+m4_define([b4_cc_constructor_calls],
+         [m4_map_sep([b4_cc_constructor_call], [,
+      ], [$@])])
+m4_define([b4_cc_constructor_call],
+         [$2($2)])
+
+# b4_parse_param_vars
+# -------------------
+#  Extra instance variables.
+m4_define([b4_parse_param_vars],
+          [m4_ifset([b4_parse_param],
+                   [
+    /* User arguments.  */
+b4_cc_var_decls(b4_parse_param)])])
+m4_define([b4_cc_var_decls],
+         [m4_map_sep([b4_cc_var_decl], [
+], [$@])])
+m4_define([b4_cc_var_decl],
+         [    $1;])
+

 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl


@@ -137,7 +170,7 @@ b4_syncline([@oline@], [@ofile@])],
 b4_syncline([@oline@], [@ofile@])[
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \
 b4_syncline([@oline@], [@ofile@])[
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \

-   Current.end = Rhs[N].end;
+   ((Current).end = Rhs[N].end)

 #endif
 
 namespace yy
 #endif
 
 namespace yy


@@ -178,14 +211,14 @@ namespace yy
 
 #if YYLSP_NEEDED
     ]b4_parser_class_name[ (bool debug,
 
 #if YYLSP_NEEDED
     ]b4_parser_class_name[ (bool debug,

-           LocationType initlocation][]b4_param[) :
+           LocationType initlocation][]b4_param[]b4_parse_param_decl[) :

       ]b4_constructor[][debug_ (debug),
       cdebug_ (std::cerr),
       ]b4_constructor[][debug_ (debug),
       cdebug_ (std::cerr),

-      initlocation_ (initlocation)
+      initlocation_ (initlocation)]b4_parse_param_cons[

 #else
 #else

-    ]b4_parser_class_name[ (bool debug][]b4_param[) :
+    ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :

       ]b4_constructor[][debug_ (debug),
       ]b4_constructor[][debug_ (debug),

-      cdebug_ (std::cerr)
+      cdebug_ (std::cerr)]b4_parse_param_cons[

 #endif
     {
     }
 #endif
     {
     }


@@ -209,12 +242,12 @@ namespace yy
 
     /* Tables.  */
     static const ]b4_int_type_for([b4_pact])[ pact_[];
 
     /* Tables.  */
     static const ]b4_int_type_for([b4_pact])[ pact_[];

-    static const ]b4_int_type_for([b4_pact])[ pact_ninf_;
+    static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ pact_ninf_;

     static const ]b4_int_type_for([b4_defact])[ defact_[];
     static const ]b4_int_type_for([b4_pgoto])[ pgoto_[];
     static const ]b4_int_type_for([b4_defgoto])[ defgoto_[];
     static const ]b4_int_type_for([b4_table])[ table_[];
     static const ]b4_int_type_for([b4_defact])[ defact_[];
     static const ]b4_int_type_for([b4_pgoto])[ pgoto_[];
     static const ]b4_int_type_for([b4_defgoto])[ defgoto_[];
     static const ]b4_int_type_for([b4_table])[ table_[];

-    static const ]b4_int_type_for([b4_table])[ table_ninf_;
+    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_r1])[ r1_[];
     static const ]b4_int_type_for([b4_r2])[ r2_[];
     static const ]b4_int_type_for([b4_check])[ check_[];
     static const ]b4_int_type_for([b4_r1])[ r1_[];
     static const ]b4_int_type_for([b4_r2])[ r2_[];


@@ -274,6 +307,7 @@ namespace yy
 
     /* Initial location.  */
     LocationType initlocation_;
 
     /* Initial location.  */
     LocationType initlocation_;

+]b4_parse_param_vars[

   };
 }
 
   };
 }
 


@@ -432,8 +466,9 @@ yy::]b4_parser_class_name[::parse ()
       // Short files will use "unsigned char" for line numbers,
       // in which case they will be output as character litterals
       // by "<<".
       // Short files will use "unsigned char" for line numbers,
       // in which case they will be output as character litterals
       // by "<<".

+      unsigned yylno = rline_[n_];

       YYCDEBUG << "Reducing via rule " << n_ - 1
       YYCDEBUG << "Reducing via rule " << n_ - 1

-               << " (line " << static_cast <unsigned> (rline_[n_]) << "), ";
+               << " (line " << yylno << "), ";

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


@@ -497,17 +532,23 @@ b4_syncline([@oline@], [@ofile@])[
          message += name_[ilooka_];
          {
            int count = 0;
          message += name_[ilooka_];
          {
            int count = 0;

-           for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+            /* 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;
              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_)
+               for (int x1 = xbegin; x1 < xend; ++x1)
+                 if (check_[x1 + n_] == x1 && x1 != terror_)

                    {
                      message += (!count++) ? ", expecting " : " or ";
                    {
                      message += (!count++) ? ", expecting " : " or ";

-                     message += name_[x];
+                     message += name_[x1];

                    }
              }
          }
                    }
              }
          }


@@ -632,7 +673,7 @@ yy::]b4_parser_class_name[::lex_ ()
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-const ]b4_int_type_for([b4_pact]) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;
+const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;

 const ]b4_int_type_for([b4_pact])[
 yy::]b4_parser_class_name[::pact_[] =
 {
 const ]b4_int_type_for([b4_pact])[
 yy::]b4_parser_class_name[::pact_[] =
 {


@@ -665,7 +706,7 @@ yy::]b4_parser_class_name[::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.  */
 /* 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.  */

-const ]b4_int_type_for([b4_table]) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[;
+const ]b4_int_type(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[;

 const ]b4_int_type_for([b4_table])[
 yy::]b4_parser_class_name[::table_[] =
 {
 const ]b4_int_type_for([b4_table])[
 yy::]b4_parser_class_name[::table_[] =
 {


@@ -751,12 +792,12 @@ yy::]b4_parser_class_name[::translate_ (int token)
 {
   static
   const TokenNumberType
 {
   static
   const TokenNumberType

-  translate_[] =
+  translate_table[] =

   {
     ]b4_translate[
   };
   if ((unsigned) token <= user_token_number_max_)
   {
     ]b4_translate[
   };
   if ((unsigned) token <= user_token_number_max_)

-    return translate_[token];
+    return translate_table[token];

   else
     return undef_token_;
 }
   else
     return undef_token_;
 }


@@ -803,16 +844,16 @@ namespace yy
 
     inline
     T&
 
     inline
     T&

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

     {
     {

-      return seq_[index];
+      return seq_[i];

     }
 
     inline
     const T&
     }
 
     inline
     const T&

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

     {
     {

-      return seq_[index];
+      return seq_[i];

     }
 
     inline
     }
 
     inline


@@ -858,9 +899,9 @@ namespace yy
 
     inline
     const T&
 
     inline
     const T&

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

     {
     {

-      return stack_[range_ - index];
+      return stack_[range_ - i];

     }
 
   private:
     }
 
   private:


@@ -913,17 +954,22 @@ namespace yy
     /** \name Line and Column related manipulators
      ** \{ */
   public:
     /** \name Line and Column related manipulators
      ** \{ */
   public:

-    /** \brief (line related) Advance to the LINES next lines. */
-    inline void lines (int lines = 1)
+    /** \brief (line related) Advance to the COUNT next lines. */
+    inline void lines (int count = 1)

     {
       column = initial_column;
     {
       column = initial_column;

-      line += lines;
+      line += count;

     }
 
     }
 

-    /** \brief (column related) Advance to the COLUMNS next columns. */
-    inline void columns (int columns = 1)
+    /** \brief (column related) Advance to the COUNT next columns. */
+    inline void columns (int count = 1)

     {
     {

-      column += columns;
+      int leftmost = initial_column;
+      int current  = column;
+      if (leftmost <= current + count)
+       column += count;
+      else
+       column = initial_column;

     }
     /** \} */
 
     }
     /** \} */
 


@@ -973,7 +1019,7 @@ namespace yy
   inline std::ostream&
   operator<< (std::ostream& ostr, const Position& pos)
   {
   inline std::ostream&
   operator<< (std::ostream& ostr, const Position& pos)
   {

-    if (pos.filename != "")
+    if (!pos.filename.empty ())

       ostr << pos.filename << ':';
     return ostr << pos.line << '.' << pos.column;
   }
       ostr << pos.filename << ':';
     return ostr << pos.line << '.' << pos.column;
   }


@@ -1022,16 +1068,16 @@ namespace yy
       begin = end;
     }
 
       begin = end;
     }
 

-    /** \brief Extend the current location to the COLUMNS next columns. */
-    inline void columns (unsigned columns = 1)
+    /** \brief Extend the current location to the COUNT next columns. */
+    inline void columns (unsigned int count = 1)

     {
     {

-      end += columns;
+      end += count;

     }
 
     }
 

-    /** \brief Extend the current location to the LINES next lines. */
-    inline void lines (unsigned lines = 1)
+    /** \brief Extend the current location to the COUNT next lines. */
+    inline void lines (unsigned int count = 1)

     {
     {

-      end.lines (lines);
+      end.lines (count);

     }
     /** \} */
 
     }
     /** \} */
 


@@ -1068,19 +1114,20 @@ namespace yy
 
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream
 
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream

-   ** \param pos a reference to the Position to redirect
+   ** \param loc a reference to the Location to redirect

    **
    **

-   ** Don't issue twice the line number when the location is on a single line.
+   ** Avoid duplicate information.

    */
    */

-  inline std::ostream& operator<< (std::ostream& ostr, const Location& pos)
+  inline std::ostream& operator<< (std::ostream& ostr, const Location& loc)

   {
   {

-    ostr << pos.begin;
-    if (pos.begin.filename != pos.end.filename)
-      ostr << '-' << pos.end - 1;
-    else if (pos.begin.line != pos.end.line)
-      ostr << '-' << pos.end.line  << '.' << pos.end.column - 1;
-    else if (pos.begin.column != pos.end.column - 1)
-      ostr << '-' << pos.end.column - 1;
+    Position last = loc.end - 1;
+    ostr << loc.begin;
+    if (loc.begin.filename != last.filename)
+      ostr << '-' << last;
+    else if (loc.begin.line != last.line)
+      ostr << '-' << last.line  << '.' << last.column;
+    else if (loc.begin.column != last.column)
+      ostr << '-' << last.column;

     return ostr;
   }
 
     return ostr;
   }