Merge remote-tracking branch 'origin/maint'

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 21b03f27eb126960b3c38d75dc86367ea6373812..9a9d7764b06ba71f130daeddc9351c6ead09f52a 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,22 +1,19 @@
-m4_divert(-1)                                                       -*- C -*-
-

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

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

 
 

-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 2002-2012 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
 # 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/>.

 
 
 # This skeleton produces a C++ class that encapsulates a C glr parser.
 
 
 # This skeleton produces a C++ class that encapsulates a C glr parser.


@@ -30,7 +27,7 @@ m4_divert(-1)                                                       -*- C -*-
 #
 #   The additional arguments are stored as members of the parser
 #   object, yyparser.  The C routines need to carry yyparser
 #
 #   The additional arguments are stored as members of the parser
 #   object, yyparser.  The C routines need to carry yyparser

-#   throughout the C parser; that easy: just let yyparser become an
+#   throughout the C parser; that's easy: make yyparser an

 #   additional parse-param.  But because the C++ skeleton needs to
 #   know the "real" original parse-param, we save them
 #   (b4_parse_param_orig).  Note that b4_parse_param is overquoted
 #   additional parse-param.  But because the C++ skeleton needs to
 #   know the "real" original parse-param, we save them
 #   (b4_parse_param_orig).  Note that b4_parse_param is overquoted


@@ -40,23 +37,26 @@ m4_divert(-1)                                                       -*- C -*-
 # The locations
 #
 #   We use location.cc just like lalr1.cc, but because glr.c stores
 # The locations
 #
 #   We use location.cc just like lalr1.cc, but because glr.c stores

-#   the locations in a (C++) union, the position and location classes
+#   the locations in a union, the position and location classes

 #   must not have a constructor.  Therefore, contrary to lalr1.cc, we
 #   must not define "b4_location_constructors".  As a consequence the
 #   user must initialize the first positions (in particular the
 #   filename member).
 
 # We require a pure interface using locations.
 #   must not have a constructor.  Therefore, contrary to lalr1.cc, we
 #   must not define "b4_location_constructors".  As a consequence the
 #   user must initialize the first positions (in particular the
 #   filename member).
 
 # We require a pure interface using locations.

-m4_define([b4_locations_flag], [1])
+m4_define([b4_percent_define(locations)], [])

 m4_define([b4_pure_flag],      [1])
 
 # The header is mandatory.
 b4_defines_if([],
 m4_define([b4_pure_flag],      [1])
 
 # The header is mandatory.
 b4_defines_if([],

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

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

-m4_include(b4_pkgdatadir/[location.cc])
+b4_percent_define_ifdef([[location_type]], [],
+                        [m4_include(b4_pkgdatadir/[location.cc])])

 
 

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

 
 # Save the parse parameters.
 m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))
 
 # Save the parse parameters.
 m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))


@@ -76,10 +76,10 @@ m4_define([b4_yy_symbol_print_generate],
     [static void],
     [[FILE *],               []],
     [[int yytype],           [yytype]],
     [static void],
     [[FILE *],               []],
     [[int yytype],           [yytype]],

-    [[const b4_namespace::b4_parser_class_name::semantic_type *yyvaluep],
-                            [yyvaluep]],
-    [[const b4_namespace::b4_parser_class_name::location_type *yylocationp],
-                            [yylocationp]],
+    [[const b4_namespace_ref::b4_parser_class_name::semantic_type *yyvaluep],
+                             [yyvaluep]],
+    [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp],
+                             [yylocationp]],

     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl
     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl


@@ -94,7 +94,8 @@ m4_append([b4_post_prologue],
 
 b4_c_ansi_function_decl([yyerror],
     [static void],
 
 b4_c_ansi_function_decl([yyerror],
     [static void],

-    [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+    [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp],
+                        [yylocationp]],

     b4_parse_param,
     [[const char* msg], [msg]])])
 
     b4_parse_param,
     [[const char* msg], [msg]])])
 


@@ -108,7 +109,8 @@ m4_append([b4_epilogue],
 
 ]b4_c_ansi_function_def([yyerror],
     [static void],
 
 ]b4_c_ansi_function_def([yyerror],
     [static void],

-    [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+    [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp],
+                        [yylocationp]],

     b4_parse_param,
     [[const char* msg], [msg]])[
 {
     b4_parse_param,
     [[const char* msg], [msg]])[
 {


@@ -117,13 +119,15 @@ m4_append([b4_epilogue],
 }
 
 
 }
 
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

 ]dnl In this section, the parse param are the original parse_params.
 m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 [  /// Build a parser object.
 ]dnl In this section, the parse param are the original parse_params.
 m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 [  /// Build a parser object.

-  ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)
-    : 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], [  ], [ :])[yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+#endif]b4_parse_param_cons[

   {
   }
 
   {
   }
 


@@ -144,27 +148,31 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
   inline void
   ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,
 
   inline void
   ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,

-                          const semantic_type* yyvaluep, const location_type* yylocationp)
+                           const semantic_type* yyvaluep,
+                           const location_type* yylocationp)

   {
   {

-    /* Pacify ``unused variable'' warnings.  */
-    YYUSE (yyvaluep);

     YYUSE (yylocationp);
     YYUSE (yylocationp);

+    YYUSE (yyvaluep);
+    std::ostream& yyoutput = debug_stream ();
+    std::ostream& yyo = yyoutput;
+    YYUSE (yyo);

     switch (yytype)
       {
     switch (yytype)
       {

-  ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+]b4_symbol_foreach([b4_symbol_printer])dnl

 [        default:
 [        default:

-         break;
+          break;

       }
   }
 
 
   void
   ]b4_parser_class_name[::yy_symbol_print_ (int yytype,
       }
   }
 
 
   void
   ]b4_parser_class_name[::yy_symbol_print_ (int yytype,

-                          const semantic_type* yyvaluep, const location_type* yylocationp)
+                           const semantic_type* yyvaluep,
+                           const location_type* yylocationp)

   {
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")
   {
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")

-              << ' ' << yytname[yytype] << " ("
-              << *yylocationp << ": ";
+               << ' ' << yytname[yytype] << " ("
+               << *yylocationp << ": ";

     yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
     *yycdebug_ << ')';
   }
     yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
     *yycdebug_ << ')';
   }


@@ -185,63 +193,55 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
   ]b4_parser_class_name[::debug_level_type
   ]b4_parser_class_name[::debug_level () const
   {
   ]b4_parser_class_name[::debug_level_type
   ]b4_parser_class_name[::debug_level () const
   {

-    return ::yydebug;
+    return yydebug;

   }
 
   void
   ]b4_parser_class_name[::set_debug_level (debug_level_type l)
   {
   }
 
   void
   ]b4_parser_class_name[::set_debug_level (debug_level_type l)
   {

-    ::yydebug = l;
+    yydebug = l;

   }
 
   }
 

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

 ]m4_popdef([b4_parse_param])dnl
 ]m4_popdef([b4_parse_param])dnl

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

 ]])
 
 
 # Let glr.c believe that the user arguments include the parser itself.
 m4_ifset([b4_parse_param],
 [m4_pushdef([b4_parse_param],
 ]])
 
 
 # Let glr.c believe that the user arguments include the parser itself.
 m4_ifset([b4_parse_param],
 [m4_pushdef([b4_parse_param],

-           m4_dquote([[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]],]
+            m4_dquote([[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]],]

 m4_defn([b4_parse_param])))],
 [m4_pushdef([b4_parse_param],
 m4_defn([b4_parse_param])))],
 [m4_pushdef([b4_parse_param],

-           [[[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]]]])
+            [[[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]]]])

 ])
 m4_include(b4_pkgdatadir/[glr.c])
 m4_popdef([b4_parse_param])
 
 ])
 m4_include(b4_pkgdatadir/[glr.c])
 m4_popdef([b4_parse_param])
 

-@output @output_header_name@
+m4_divert_push(0)
+@output(b4_spec_defines_file@)@

 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])[
+             [2002-2012])[

 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 

-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
+]b4_cpp_guard_open([b4_spec_defines_file])[

 
 

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

 
 

+#include <stdexcept>

 #include <string>
 #include <iostream>
 #include <string>
 #include <iostream>

+]b4_percent_define_ifdef([[location_type]], [],
+                         [[#include "location.hh"]])[

 
 /* Using locations.  */
 
 /* Using locations.  */

-#define YYLSP_NEEDED ]b4_locations_flag[
-
-namespace ]b4_namespace[
-{
-  class position;
-  class location;
-}
-
-#include "location.hh"
+#define YYLSP_NEEDED ]b4_locations_if([1], [0])[

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

-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_parse_trace_if([1], [0])[

 #endif
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
 #endif
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].


@@ -249,47 +249,26 @@ namespace ]b4_namespace[
    the previous symbol: RHS[0] (always defined).  */
 
 #ifndef YYLLOC_DEFAULT
    the previous symbol: RHS[0] (always defined).  */
 
 #ifndef YYLLOC_DEFAULT

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

     while (/*CONSTCOND*/ 0)
 #endif
 
     while (/*CONSTCOND*/ 0)
 #endif
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

   /// A Bison parser.
   class ]b4_parser_class_name[
   {
   public:
   /// A Bison parser.
   class ]b4_parser_class_name[
   {
   public:

-    /// Symbol semantic values.
-#ifndef YYSTYPE
-]m4_ifdef([b4_stype],
-[    union semantic_type
-b4_user_stype
-       ;],
-[m4_if(b4_tag_seen_flag, 0,
-[[    typedef int semantic_type;]],
-[[    typedef YYSTYPE semantic_type;]])])[
-#else
-    typedef YYSTYPE semantic_type;
-#endif
-    /// Symbol locations.
-    typedef ]b4_location_type[ location_type;
-    /// Tokens.
-    struct token
-    {
-      ]b4_token_enums(b4_tokens)[
-    };
-    /// Token type.
-    typedef token::yytokentype token_type;
+]b4_public_types_declare[

 
     /// Build a parser object.
     ]b4_parser_class_name[ (]b4_parse_param_decl[);
 
     /// Build a parser object.
     ]b4_parser_class_name[ (]b4_parse_param_decl[);


@@ -311,14 +290,11 @@ b4_user_stype
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
 
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
 

-  private:
-

   public:
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
     /// \param msg    a description of the syntax error.
     virtual void error (const location_type& loc, const std::string& msg);
   public:
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
     /// \param msg    a description of the syntax error.
     virtual void error (const location_type& loc, const std::string& msg);

-  private:

 
 #if YYDEBUG
   public:
 
 #if YYDEBUG
   public:


@@ -327,49 +303,35 @@ b4_user_stype
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_value_print_ (int yytype,
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_value_print_ (int yytype,

-                                        const semantic_type* yyvaluep,
-                                        const location_type* yylocationp);
+                                         const semantic_type* yyvaluep,
+                                         const location_type* yylocationp);

     /// \brief Report a symbol on the debug stream.
     /// \param yytype       The token type.
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_print_ (int yytype,
     /// \brief Report a symbol on the debug stream.
     /// \param yytype       The token type.
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_print_ (int yytype,

-                                  const semantic_type* yyvaluep,
-                                  const location_type* yylocationp);
+                                   const semantic_type* yyvaluep,
+                                   const location_type* yylocationp);

   private:
   private:

-#endif /* ! YYDEBUG */
-
-
-    /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg        Why this token is reclaimed.
-    /// \param yytype       The symbol type.
-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
-    inline void yydestruct_ (const char* yymsg,
-                            int yytype,
-                            semantic_type* yyvaluep,
-                            location_type* yylocationp);
-

     /* Debugging.  */
     std::ostream* yycdebug_;
     /* Debugging.  */
     std::ostream* yycdebug_;

+#endif
+

 ]b4_parse_param_vars[
   };
 
 ]dnl Redirections for glr.c.
 ]b4_parse_param_vars[
   };
 
 ]dnl Redirections for glr.c.

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

 [b4_token_defines(b4_tokens)])
 [
 #ifndef YYSTYPE
 [b4_token_defines(b4_tokens)])
 [
 #ifndef YYSTYPE

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

 #endif
 #ifndef YYLTYPE
 #endif
 #ifndef YYLTYPE

-# define YYLTYPE ]b4_namespace[::]b4_parser_class_name[::location_type
+# define YYLTYPE ]b4_namespace_ref[::]b4_parser_class_name[::location_type

 #endif
 
 #endif
 

-}
-
-]m4_ifdef([b4_end_header],
-[[/* Copy the %end-header blocks.  */
-]b4_end_header])[]dnl
-
-[#endif /* ! defined PARSER_HEADER_H */]
+]b4_namespace_close[
+]b4_percent_code_get([[provides]])[
+]b4_cpp_guard_close([b4_spec_defines_file])[
+]m4_divert_pop(0)