* doc/bison.texinfo (Push Decl): Document the push parser.

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index adb5b34e2ff7d6a5728a0546986f97fd593c94a4..12f629a4ca40623baeb8835ab884943e452942d8 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,22 +1,21 @@
-m4_divert(-1)                                                       -*- C -*-
+                                                                    -*- C -*-

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

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

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


@@ -46,14 +45,21 @@ m4_divert(-1)                                                       -*- C -*-
 #   user must initialize the first positions (in particular the
 #   filename member).
 
 #   user must initialize the first positions (in particular the
 #   filename member).
 

-

 # We require a pure interface using locations.
 # We require a pure interface using locations.

-m4_define([b4_location_flag], [1])
-m4_define([b4_pure],          [1])
+m4_define([b4_locations_flag], [1])
+m4_define([b4_pure_flag],      [1])
+
+# The header is mandatory.
+b4_defines_if([],
+              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])

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

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

 
 # 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]))


@@ -80,15 +86,14 @@ m4_define([b4_yy_symbol_print_generate],
     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl
     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl

-[  yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_location_if([, yylocationp])[);
+[  yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_locations_if([, yylocationp])[);

 }
 ]])
 
 
 # Declare yyerror.
 m4_append([b4_post_prologue],
 }
 ]])
 
 
 # Declare yyerror.
 m4_append([b4_post_prologue],

-[/* Line __line__ of glr.cc.  */
-b4_syncline([@oline@], [@ofile@])
+[b4_syncline([@oline@], [@ofile@])

 
 b4_c_ansi_function_decl([yyerror],
     [static void],
 
 b4_c_ansi_function_decl([yyerror],
     [static void],


@@ -99,8 +104,7 @@ b4_c_ansi_function_decl([yyerror],
 
 # Define yyerror.
 m4_append([b4_epilogue],
 
 # Define yyerror.
 m4_append([b4_epilogue],

-[/* Line __line__ of glr.cc.  */
-b4_syncline([@oline@], [@ofile@])[
+[b4_syncline([@oline@], [@ofile@])[

 /*------------------.
 | Report an error.  |
 `------------------*/
 /*------------------.
 | Report an error.  |
 `------------------*/


@@ -121,8 +125,12 @@ namespace ]b4_namespace[
 ]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], [  ], [ :])[yydebug_ (false),
+      yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+#endif]b4_parse_param_cons[

   {
   }
 
   {
   }
 


@@ -184,16 +192,16 @@ 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
 [} // namespace ]b4_namespace[
 
 ]m4_popdef([b4_parse_param])dnl
 [} // namespace ]b4_namespace[
 


@@ -211,16 +219,18 @@ 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])
 

-
-@output @output_header_name@
-b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
-            [2002, 2003, 2004, 2005, 2006])[
+m4_divert_push(0)
+@output(b4_spec_defines_file@)
+b4_copyright([Skeleton interface for Bison GLR parsers in C++],
+  [2002, 2003, 2004, 2005, 2006])[

 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 

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

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


@@ -233,39 +243,11 @@ namespace ]b4_namespace[
   class location;
 }
 
   class location;
 }
 

-/* Copy the first part of user declarations.  */
-]b4_pre_prologue[
-
-]/* Line __line__ of glr.cc.  */
-b4_syncline([@oline@], [@ofile@])[
-

 #include "location.hh"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 #include "location.hh"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug[
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE ]b4_error_verbose[
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE ]b4_token_table[
-#endif
-
-#if 0
-/* Copy the second part of user declarations.  */
-]b4_post_prologue[
-
-]/* Line __line__ of glr.cc.  */
-
-b4_syncline([@oline@], [@ofile@])[
+# define YYDEBUG ]b4_debug_flag[

 #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].


@@ -297,16 +279,17 @@ namespace ]b4_namespace[
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type

-b4_stype
-/* Line __line__ of lalr1.cc.  */
-b4_syncline([@oline@], [@ofile@])
-       ;],
-[    typedef int 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.
 #else
     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
     {


@@ -361,7 +344,10 @@ b4_syncline([@oline@], [@ofile@])
                                   const semantic_type* yyvaluep,
                                   const location_type* yylocationp);
   private:
                                   const semantic_type* yyvaluep,
                                   const location_type* yylocationp);
   private:

-#endif /* ! YYDEBUG */
+    /* Debugging.  */
+    int yydebug_;
+    std::ostream* yycdebug_;
+#endif

 
 
     /// \brief Reclaim the memory associated to a symbol.
 
 
     /// \brief Reclaim the memory associated to a symbol.


@@ -374,13 +360,11 @@ b4_syncline([@oline@], [@ofile@])
                             semantic_type* yyvaluep,
                             location_type* yylocationp);
 
                             semantic_type* yyvaluep,
                             location_type* yylocationp);
 

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

 ]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


@@ -392,4 +376,7 @@ m4_ifset([b4_global_tokens_and_yystype],
 
 }
 
 
 }
 

-#endif /* ! defined PARSER_HEADER_H */]
+]b4_percent_code_get([[provides]])[]dnl
+
+[#endif /* ! defined PARSER_HEADER_H */]
+m4_divert_pop(0)