Merge branch 'maint'

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index ba6ceac0da68a4e3259f988d98ad3604c00664c3..e1826da999178069841a54922213a5be29a6f862 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,5 +1,3 @@
-                                                                    -*- C -*-
-

 # C++ GLR skeleton for Bison
 
 # Copyright (C) 2002-2012 Free Software Foundation, Inc.
 # C++ GLR skeleton for Bison
 
 # Copyright (C) 2002-2012 Free Software Foundation, Inc.


@@ -29,7 +27,7 @@
 #
 #   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


@@ -39,14 +37,13 @@
 # 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).
 
 #   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])
+# We require a pure interface.

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


@@ -76,12 +73,13 @@ m4_define([b4_yy_symbol_print_generate],
 
 ]b4_c_ansi_function_def([yy_symbol_print],
     [static void],
 
 ]b4_c_ansi_function_def([yy_symbol_print],
     [static void],

-    [[FILE *],               []],
-    [[int yytype],           [yytype]],
+    [[FILE *],      []],
+    [[int yytype],  [yytype]],

     [[const ]b4_namespace_ref::b4_parser_class_name[::semantic_type *yyvaluep],
     [[const ]b4_namespace_ref::b4_parser_class_name[::semantic_type *yyvaluep],

-                             [yyvaluep]],
+                    [yyvaluep]][]dnl
+b4_locations_if([,

     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],
     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],

-                             [yylocationp]],
+                    [yylocationp]]]),

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


@@ -97,9 +95,9 @@ m4_append([b4_post_prologue],
 ]b4_yylloc_default_define[
 #define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc)
 ]b4_c_ansi_function_decl([yyerror],
 ]b4_yylloc_default_define[
 #define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc)
 ]b4_c_ansi_function_decl([yyerror],

-    [static void],
+    [static void],b4_locations_if([

     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],
     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],

-                        [yylocationp]],
+                        [yylocationp]],])

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


@@ -113,14 +111,14 @@ m4_append([b4_epilogue],
 `------------------*/
 
 ]b4_c_ansi_function_def([yyerror],
 `------------------*/
 
 ]b4_c_ansi_function_def([yyerror],

-    [static void],
+    [static void],b4_locations_if([

     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],
     [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp],

-                        [yylocationp]],
+                        [yylocationp]],])

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

-[  yyparser.error (*yylocationp, msg);
+[  yyparser.error (]b4_locations_if([[*yylocationp, ]])[msg);

 }
 
 
 }
 
 


@@ -131,8 +129,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
   ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
     :])[
 #if ]b4_api_PREFIX[DEBUG
   ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
     :])[
 #if ]b4_api_PREFIX[DEBUG

-    ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),
-      yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+    ]m4_ifset([b4_parse_param], [  ], [ :])[yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[

 #endif]b4_parse_param_cons[
   {
   }
 #endif]b4_parse_param_cons[
   {
   }


@@ -154,17 +151,17 @@ 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)
-  {
-    YYUSE (yylocationp);
+                           const semantic_type* yyvaluep]b4_locations_if([[,
+                           const location_type* yylocationp]])[)
+  {]b4_locations_if([[
+    YYUSE (yylocationp);]])[

     YYUSE (yyvaluep);
     std::ostream& yyoutput = debug_stream ();
     std::ostream& yyo = yyoutput;
     YYUSE (yyo);
     switch (yytype)
       {
     YYUSE (yyvaluep);
     std::ostream& yyoutput = debug_stream ();
     std::ostream& yyo = yyoutput;
     YYUSE (yyo);
     switch (yytype)
       {

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

 [        default:
           break;
       }
 [        default:
           break;
       }


@@ -173,13 +170,13 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
   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]b4_locations_if([[,
+                           const location_type* yylocationp]])[)

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

-               << ' ' << yytname[yytype] << " ("
-               << *yylocationp << ": ";
-    yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
+               << ' ' << yytname[yytype] << " ("]b4_locations_if([[
+               << *yylocationp << ": "]])[;
+    yy_symbol_value_print_ (yytype, yyvaluep]b4_locations_if([[, yylocationp]])[);

     *yycdebug_ << ')';
   }
 
     *yycdebug_ << ')';
   }
 


@@ -199,19 +196,19 @@ 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;
+    // Actually, it is yydebug which is really used.
+    yydebug = l;

   }
 
 #endif
 ]m4_popdef([b4_parse_param])dnl
 b4_namespace_close[
   }
 
 #endif
 ]m4_popdef([b4_parse_param])dnl
 b4_namespace_close[

-

 ]])
 
 
 ]])
 
 


@@ -226,21 +223,19 @@ m4_defn([b4_parse_param]))],
 m4_include(b4_pkgdatadir/[glr.c])
 m4_popdef([b4_parse_param])
 
 m4_include(b4_pkgdatadir/[glr.c])
 m4_popdef([b4_parse_param])
 

-m4_divert_push(0)
-@output(b4_spec_defines_file@)@
-b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002-2006, 2009-2012])[
-
-/* C++ GLR parser skeleton written by Akim Demaille.  */

 
 

-]b4_cpp_guard_open([b4_spec_defines_file])[
-
-]b4_percent_code_get([[requires]])[
+# b4_shared_declarations
+# ----------------------
+# Declaration that might either go into the header (if --defines)
+# or open coded in the parser body.
+m4_define([b4_shared_declarations],
+[b4_percent_code_get([[requires]])[

 
 

-# include <string>
-# include <iostream>
+#include <stdexcept>
+#include <string>
+#include <iostream>

 ]b4_percent_define_ifdef([[location_type]], [],
 ]b4_percent_define_ifdef([[location_type]], [],

-                         [[# include "location.hh"]])[
+                         [[#include "location.hh"]])[

 
 ]b4_YYDEBUG_define[
 
 
 ]b4_YYDEBUG_define[
 


@@ -249,29 +244,7 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
   class ]b4_parser_class_name[
   {
   public:
   class ]b4_parser_class_name[
   {
   public:

-    /// Symbol semantic values.
-# ifndef ]b4_api_PREFIX[STYPE
-]m4_ifdef([b4_stype],
-[    union semantic_type
-    {
-b4_user_stype
-    };],
-[m4_if(b4_tag_seen_flag, 0,
-[[    typedef int semantic_type;]],
-[[    typedef ]b4_api_PREFIX[STYPE semantic_type;]])])[
-# else
-    typedef ]b4_api_PREFIX[STYPE semantic_type;
-# endif
-    /// Symbol locations.
-    typedef ]b4_percent_define_get([[location_type]],
-                                   [[location]])[ 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[);


@@ -293,43 +266,39 @@ 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:
   public:

-    /// Report a syntax error.
-    /// \param loc    where the syntax error is found.
+    /// Report a syntax error.]b4_locations_if([[
+    /// \param loc    where the syntax error is found.]])[

     /// \param msg    a description of the syntax error.
     /// \param msg    a description of the syntax error.

-    virtual void error (const location_type& loc, const std::string& msg);
-  private:
+    virtual void error (]b4_locations_if([[const location_type& loc, ]])[const std::string& msg);

 
 # if ]b4_api_PREFIX[DEBUG
   public:
     /// \brief Report a symbol value on the debug stream.
     /// \param yytype       The token type.
 
 # if ]b4_api_PREFIX[DEBUG
   public:
     /// \brief Report a symbol value on the debug stream.
     /// \param yytype       The token type.

-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
+    /// \param yyvaluep     Its semantic value.]b4_locations_if([[
+    /// \param yylocationp  Its location.]])[

     virtual void yy_symbol_value_print_ (int yytype,
     virtual void yy_symbol_value_print_ (int yytype,

-                                         const semantic_type* yyvaluep,
-                                         const location_type* yylocationp);
+                                         const semantic_type* yyvaluep]b4_locations_if([[,
+                                         const location_type* yylocationp]])[);

     /// \brief Report a symbol on the debug stream.
     /// \param yytype       The token type.
     /// \brief Report a symbol on the debug stream.
     /// \param yytype       The token type.

-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
+    /// \param yyvaluep     Its semantic value.]b4_locations_if([[
+    /// \param yylocationp  Its location.]])[

     virtual void yy_symbol_print_ (int yytype,
     virtual void yy_symbol_print_ (int yytype,

-                                   const semantic_type* yyvaluep,
-                                   const location_type* yylocationp);
+                                   const semantic_type* yyvaluep]b4_locations_if([[,
+                                   const location_type* yylocationp]])[);

   private:
     /* Debugging.  */
   private:
     /* Debugging.  */

-    int yydebug_;

     std::ostream* yycdebug_;
     std::ostream* yycdebug_;

-# endif
+#endif

 
 ]b4_parse_param_vars[
   };
 
 ]dnl Redirections for glr.c.
 b4_percent_define_flag_if([[global_tokens_and_yystype]],
 
 ]b4_parse_param_vars[
   };
 
 ]dnl Redirections for glr.c.
 b4_percent_define_flag_if([[global_tokens_and_yystype]],

-[b4_token_defines(b4_tokens)])
+[b4_token_defines])

 [
 #ifndef ]b4_api_PREFIX[STYPE
 # define ]b4_api_PREFIX[STYPE ]b4_namespace_ref[::]b4_parser_class_name[::semantic_type
 [
 #ifndef ]b4_api_PREFIX[STYPE
 # define ]b4_api_PREFIX[STYPE ]b4_namespace_ref[::]b4_parser_class_name[::semantic_type


@@ -340,5 +309,16 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]],
 
 ]b4_namespace_close[
 ]b4_percent_code_get([[provides]])[
 
 ]b4_namespace_close[
 ]b4_percent_code_get([[provides]])[

+]])
+
+m4_divert_push(0)
+@output(b4_spec_defines_file@)@
+b4_copyright([Skeleton interface for Bison GLR parsers in C++],
+             [2002-2012])[
+
+/* C++ GLR parser skeleton written by Akim Demaille.  */
+
+]b4_cpp_guard_open([b4_spec_defines_file])[
+]b4_shared_declarations[

 ]b4_cpp_guard_close([b4_spec_defines_file])[
 ]m4_divert_pop(0)
 ]b4_cpp_guard_close([b4_spec_defines_file])[
 ]m4_divert_pop(0)