Some code and documentation improvements.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 25b9160cb87b728ecc2360e17a2721fae6c3a4ea..3a15012a004b401a57fc2f3902fe2351e123c17c 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,29 +1,29 @@
-m4_divert(-1)
-

 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 # (at your option) any later version.

-
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 m4_include(b4_pkgdatadir/[c++.m4])
 
 
 m4_include(b4_pkgdatadir/[c++.m4])
 

+m4_define([b4_parser_class_name],
+          [b4_percent_define_get([[parser_class_name]])])
+

 # The header is mandatory.
 b4_defines_if([],
 # The header is mandatory.
 b4_defines_if([],

-              [m4_fatal(b4_skeleton[: using %defines is mandatory])])
+              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])

 
 # Backward compatibility.
 m4_define([b4_location_constructors])
 
 # Backward compatibility.
 m4_define([b4_location_constructors])


@@ -31,11 +31,11 @@ m4_include(b4_pkgdatadir/[location.cc])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()

-m4_divert(0)dnl
+m4_divert_push(0)dnl

 b4_defines_if(
 b4_defines_if(

-[@output @output_header_name@
+[@output(b4_spec_defines_file@)@

 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])
+             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])

 dnl FIXME: This is wrong, we want computed header guards.
 [
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 dnl FIXME: This is wrong, we want computed header guards.
 [
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */


@@ -43,22 +43,18 @@ dnl FIXME: This is wrong, we want computed header guards.
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 

+]b4_percent_code_get([[requires]])[
+

 #include <string>
 #include <iostream>
 #include "stack.hh"
 
 #include <string>
 #include <iostream>
 #include "stack.hh"
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

   class position;
   class location;
   class position;
   class location;

-}
-
-]m4_ifdef([b4_start_header],
-[[/* Copy the %start-header blocks.  */
-]b4_user_start_header])[
+]b4_namespace_close[

 
 

-]dnl Include location.hh here: it might depend on headers included above.
-[#include "location.hh"
+#include "location.hh"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -97,8 +93,7 @@ do {                                                  \
 } while (false)
 #endif
 
 } while (false)
 #endif
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

 
   /// A Bison parser.
   class ]b4_parser_class_name[
 
   /// A Bison parser.
   class ]b4_parser_class_name[


@@ -108,8 +103,9 @@ namespace ]b4_namespace[
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type

+    {

 b4_user_stype
 b4_user_stype

-       ;],
+    };],

 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[


@@ -117,7 +113,7 @@ b4_user_stype
     typedef YYSTYPE semantic_type;
 #endif
     /// Symbol locations.
     typedef YYSTYPE semantic_type;
 #endif
     /// Symbol locations.

-    typedef ]b4_location_type[ location_type;
+    typedef ]b4_percent_define_get([[location_type]])[ location_type;

     /// Tokens.
     struct token
     {
     /// Tokens.
     struct token
     {


@@ -134,6 +130,7 @@ b4_user_stype
     /// \returns  0 iff parsing succeeded.
     virtual int parse ();
 
     /// \returns  0 iff parsing succeeded.
     virtual int parse ();
 

+#if YYDEBUG

     /// The current debugging stream.
     std::ostream& debug_stream () const;
     /// Set the current debugging stream.
     /// The current debugging stream.
     std::ostream& debug_stream () const;
     /// Set the current debugging stream.


@@ -145,6 +142,7 @@ b4_user_stype
     debug_level_type debug_level () const;
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
     debug_level_type debug_level () const;
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);

+#endif

 
   private:
     /// Report a syntax error.
 
   private:
     /// Report a syntax error.


@@ -173,7 +171,7 @@ b4_error_verbose_if([, int tok])[);
     virtual void yy_symbol_print_ (int yytype,
                                   const semantic_type* yyvaluep,
                                   const location_type* yylocationp);
     virtual void yy_symbol_print_ (int yytype,
                                   const semantic_type* yyvaluep,
                                   const location_type* yylocationp);

-#endif /* ! YYDEBUG */
+#endif

 
 
     /// State numbers.
 
 
     /// State numbers.


@@ -199,7 +197,7 @@ b4_error_verbose_if([, int tok])[);
     static const ]b4_int_type_for([b4_pact])[ yypact_[];
     static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
 
     static const ]b4_int_type_for([b4_pact])[ yypact_[];
     static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
 

-    /// For a state, default rule to reduce.
+    /// For a state, default reduction number.

     /// Unless\a  yytable_ specifies something else to do.
     /// Zero means the default is an error.
     static const ]b4_int_type_for([b4_defact])[ yydefact_[];
     /// Unless\a  yytable_ specifies something else to do.
     /// Zero means the default is an error.
     static const ]b4_int_type_for([b4_defact])[ yydefact_[];


@@ -250,6 +248,10 @@ b4_error_verbose_if([, int tok])[);
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.
     virtual void yystack_print_ ();
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.
     virtual void yystack_print_ ();

+
+    /* Debugging.  */
+    int yydebug_;
+    std::ostream* yycdebug_;

 #endif
 
     /// Convert a scanner token number \a t to a symbol number.
 #endif
 
     /// Convert a scanner token number \a t to a symbol number.


@@ -280,47 +282,42 @@ b4_error_verbose_if([, int tok])[);
     static const int yyntokens_;
     static const unsigned int yyuser_token_number_max_;
     static const token_number_type yyundef_token_;
     static const int yyntokens_;
     static const unsigned int yyuser_token_number_max_;
     static const token_number_type yyundef_token_;

-
-    /* Debugging.  */
-    int yydebug_;
-    std::ostream* yycdebug_;
-

 ]b4_parse_param_vars[
   };
 ]b4_parse_param_vars[
   };

-}
+]b4_namespace_close[

 
 

-]m4_ifset([b4_global_tokens_and_yystype],
+]b4_percent_define_flag_if([[global_tokens_and_yystype]],

 [b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
  /* Redirection for backward compatibility.  */
 [b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
  /* Redirection for backward compatibility.  */

-# define YYSTYPE b4_namespace::b4_parser_class_name::semantic_type
+# define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type

 #endif
 ])
 #endif
 ])

-m4_ifdef([b4_end_header],
-[[/* Copy the %end-header blocks.  */
-]b4_end_header])[]dnl
+b4_percent_code_get([[provides]])[]dnl

 
 [#endif /* ! defined PARSER_HEADER_H */]
 ])dnl
 
 [#endif /* ! defined PARSER_HEADER_H */]
 ])dnl

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

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

-  [2002, 2003, 2004, 2005, 2006])
+             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])
+b4_percent_code_get([[top]])[]dnl

 m4_if(b4_prefix, [yy], [],
 [
 // Take the name prefix into account.
 #define yylex   b4_prefix[]lex])[
 
 /* First part of user declarations.  */
 m4_if(b4_prefix, [yy], [],
 [
 // Take the name prefix into account.
 #define yylex   b4_prefix[]lex])[
 
 /* First part of user declarations.  */

-]b4_pre_prologue
+]b4_user_pre_prologue

 
 

-b4_defines_if([
-#include @output_header_name@])[
+b4_defines_if([[
+#include "@basename(]b4_spec_defines_file[@)"]])[

 
 /* User implementation prologue.  */
 
 /* User implementation prologue.  */

-]b4_user_post_prologue[
+]b4_user_post_prologue
+b4_percent_code_get[]dnl

 
 

-#ifndef YY_
+[#ifndef YY_

 # if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
 # if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */


@@ -335,12 +332,12 @@ b4_defines_if([
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 

-/* A pseudo ostream that takes yydebug_ into account.  */
-# define YYCDEBUG if (yydebug_) (*yycdebug_)
-

 /* Enable debugging if requested.  */
 #if YYDEBUG
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
 

+/* A pseudo ostream that takes yydebug_ into account.  */
+# define YYCDEBUG if (yydebug_) (*yycdebug_)
+

 # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
 do {                                                   \
   if (yydebug_)                                                \
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
 do {                                                   \
   if (yydebug_)                                                \


@@ -365,18 +362,22 @@ do {                                      \
 
 #else /* !YYDEBUG */
 
 
 #else /* !YYDEBUG */
 

+# define YYCDEBUG if (false) std::cerr

 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()
 
 #endif /* !YYDEBUG */
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()
 
 #endif /* !YYDEBUG */
 

+#define yyerrok                (yyerrstatus_ = 0)
+#define yyclearin      (yychar = yyempty_)
+

 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab

+#define YYRECOVERING()  (!!yyerrstatus_)

 
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

 #if YYERROR_VERBOSE
 
   /* Return YYSTR after stripping away unnecessary quotes and
 #if YYERROR_VERBOSE
 
   /* Return YYSTR after stripping away unnecessary quotes and


@@ -419,9 +420,12 @@ namespace ]b4_namespace[
 #endif
 
   /// Build a parser object.
 #endif
 
   /// Build a parser object.

-  ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)
-    : yydebug_ (false),
-      yycdebug_ (&std::cerr)]b4_parse_param_cons[
+  ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
+    :])[
+#if YYDEBUG
+    ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),
+      yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+#endif]b4_parse_param_cons[

   {
   }
 
   {
   }
 


@@ -459,7 +463,7 @@ namespace ]b4_namespace[
     yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
     *yycdebug_ << ')';
   }
     yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
     *yycdebug_ << ')';
   }

-#endif /* ! YYDEBUG */
+#endif

 
   void
   ]b4_parser_class_name[::yydestruct_ (const char* yymsg,
 
   void
   ]b4_parser_class_name[::yydestruct_ (const char* yymsg,


@@ -487,6 +491,7 @@ namespace ]b4_namespace[
     yylocation_stack_.pop (n);
   }
 
     yylocation_stack_.pop (n);
   }
 

+#if YYDEBUG

   std::ostream&
   ]b4_parser_class_name[::debug_stream () const
   {
   std::ostream&
   ]b4_parser_class_name[::debug_stream () const
   {


@@ -511,7 +516,7 @@ namespace ]b4_namespace[
   {
     yydebug_ = l;
   }
   {
     yydebug_ = l;
   }

-
+#endif

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


@@ -534,7 +539,7 @@ namespace ]b4_namespace[
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.

-    location yyerror_range[2];
+    location_type yyerror_range[2];

 
     /// $$.
     semantic_type yyval;
 
     /// $$.
     semantic_type yyval;


@@ -567,6 +572,11 @@ m4_popdef([b4_at_dollar])])dnl
   yynewstate:
     yystate_stack_.push (yystate);
     YYCDEBUG << "Entering state " << yystate << std::endl;
   yynewstate:
     yystate_stack_.push (yystate);
     YYCDEBUG << "Entering state " << yystate << std::endl;

+
+    /* Accept?  */
+    if (yystate == yyfinal_)
+      goto yyacceptlab;
+

     goto yybackup;
 
     /* Backup.  */
     goto yybackup;
 
     /* Backup.  */


@@ -616,16 +626,11 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
        goto yyreduce;
       }
 
        goto yyreduce;
       }
 

-    /* Accept?  */
-    if (yyn == yyfinal_)
-      goto yyacceptlab;
-

     /* Shift the lookahead token.  */
     YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
     /* Shift the lookahead token.  */
     YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 

-    /* Discard the token being shifted unless it is eof.  */
-    if (yychar != yyeof_)
-      yychar = yyempty_;
+    /* Discard the token being shifted.  */
+    yychar = yyempty_;

 
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yylloc);
 
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yylloc);


@@ -671,7 +676,8 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
     switch (yyn)
       {
        ]b4_user_actions[
     switch (yyn)
       {
        ]b4_user_actions[

-       default: break;
+       default:
+          break;

       }
     YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
 
       }
     YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
 


@@ -780,9 +786,6 @@ b4_error_verbose_if([, yytoken])[));
        YY_STACK_PRINT ();
       }
 
        YY_STACK_PRINT ();
       }
 

-    if (yyn == yyfinal_)
-      goto yyacceptlab;
-

     yyerror_range[1] = yylloc;
     // Using YYLLOC is tempting, but would change the location of
     // the lookahead.  YYLOC is available though.
     yyerror_range[1] = yylloc;
     // Using YYLLOC is tempting, but would change the location of
     // the lookahead.  YYLOC is available though.


@@ -792,7 +795,7 @@ b4_error_verbose_if([, yytoken])[));
 
     /* Shift the error token.  */
     YY_SYMBOL_PRINT ("Shifting", yystos_[yyn],
 
     /* Shift the error token.  */
     YY_SYMBOL_PRINT ("Shifting", yystos_[yyn],

-                  &yysemantic_stack_[0], &yylocation_stack_[0]);
+                    &yysemantic_stack_[0], &yylocation_stack_[0]);

 
     yystate = yyn;
     goto yynewstate;
 
     yystate = yyn;
     goto yynewstate;


@@ -808,7 +811,7 @@ b4_error_verbose_if([, yytoken])[));
     goto yyreturn;
 
   yyreturn:
     goto yyreturn;
 
   yyreturn:

-    if (yychar != yyeof_ && yychar != yyempty_)
+    if (yychar != yyempty_)

       yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);
 
     /* Do not reclaim the symbols of the rule which action triggered
       yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);
 
     /* Do not reclaim the symbols of the rule which action triggered


@@ -838,7 +841,8 @@ b4_error_verbose_if([, int tok])[)
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
        /* Start YYX at -YYN if negative to avoid negative indexes in
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
        /* Start YYX at -YYN if negative to avoid negative indexes in

-          YYCHECK.  */
+          YYCHECK.  In other words, skip the first -YYN actions for this
+          state because they are default actions.  */

        int yyxbegin = yyn < 0 ? -yyn : 0;
 
        /* Stay within bounds of both yycheck and yytname.  */
        int yyxbegin = yyn < 0 ? -yyn : 0;
 
        /* Stay within bounds of both yycheck and yytname.  */


@@ -886,9 +890,9 @@ b4_error_verbose_if([, int tok])[)
     ]b4_pact[
   };
 
     ]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 reduction number in state S.  Performed when
+     YYTABLE doesn't specify something else to do.  Zero means the
+     default is an error.  */

   const ]b4_int_type_for([b4_defact])[
   ]b4_parser_class_name[::yydefact_[] =
   {
   const ]b4_int_type_for([b4_defact])[
   ]b4_parser_class_name[::yydefact_[] =
   {


@@ -1010,7 +1014,7 @@ b4_error_verbose_if([, int tok])[)
     int yynrhs = yyr2_[yyrule];
     /* Print the symbols being reduced, and their result.  */
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
     int yynrhs = yyr2_[yyrule];
     /* Print the symbols being reduced, and their result.  */
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1

-              << " (line " << yylno << "), ";
+              << " (line " << yylno << "):" << std::endl;

     /* The symbols being reduced.  */
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
     /* The symbols being reduced.  */
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",


@@ -1048,21 +1052,20 @@ b4_error_verbose_if([, int tok])[)
   const unsigned int ]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;
   const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
 
   const unsigned int ]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;
   const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
 

-} // namespace ]b4_namespace[
+]b4_namespace_close[

 
 ]b4_epilogue
 dnl
 
 ]b4_epilogue
 dnl

-@output b4_dir_prefix[]stack.hh
+@output(b4_dir_prefix[]stack.hh@)@

 b4_copyright([Stack handling for Bison parsers in C++],
 b4_copyright([Stack handling for Bison parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])[
+             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])[

 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
 
 #include <deque>
 
 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
 
 #include <deque>
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

   template <class T, class S = std::deque<T> >
   class stack
   {
   template <class T, class S = std::deque<T> >
   class stack
   {


@@ -1148,7 +1151,8 @@ namespace ]b4_namespace[
     const S& stack_;
     unsigned int range_;
   };
     const S& stack_;
     unsigned int range_;
   };

-}
+]b4_namespace_close[

 
 

-#endif // not BISON_STACK_HH]
-m4_divert(-1)
+#endif // not BISON_STACK_HH[]dnl
+]
+m4_divert_pop(0)