bench: report the size too.

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 2f164c74101e3caf5d3682cc515f09aede110c25..ea04b28dff343713be1ec986dd78a49259d3cdc4 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,22 +1,21 @@
                                                                     -*- C -*-
 
 # C++ GLR skeleton for Bison
                                                                     -*- C -*-
 
 # 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.


@@ -57,12 +56,8 @@ b4_defines_if([],
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])
 
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])
 

-b4_check_percent_define_variables([[global_tokens_and_yystype]],
-                                  [[parser_class_name]],
-                                  [[location_type]],
-                                  [[filename_type]],
-                                  [[b4_namespace]],
-                                  [[b4_define_location_comparison]])
+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]))


@@ -82,9 +77,9 @@ 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],
+    [[const b4_namespace_ref::b4_parser_class_name::semantic_type *yyvaluep],

                             [yyvaluep]],
                             [yyvaluep]],

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

                             [yylocationp]],
     b4_parse_param)[
 {
                             [yylocationp]],
     b4_parse_param)[
 {


@@ -100,7 +95,7 @@ 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]],
+    [[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]])])
 


@@ -114,7 +109,7 @@ 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]],
+    [[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]])[
 {


@@ -123,8 +118,7 @@ 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.


@@ -206,7 +200,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
 #endif
 ]m4_popdef([b4_parse_param])dnl
 
 #endif
 ]m4_popdef([b4_parse_param])dnl

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

 
 ]])
 
 
 ]])
 


@@ -214,10 +208,10 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 # 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])


@@ -232,9 +226,7 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 

-]m4_ifdef([b4_percent_code_requires],
-[[/* Copy the %code "requires" blocks.  */
-]b4_user_code([b4_percent_code_requires])])[
+]b4_percent_code_get([[requires]])[

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


@@ -242,11 +234,10 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_flag[
 
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_flag[
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

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

-}
+]b4_namespace_close[

 
 #include "location.hh"
 
 
 #include "location.hh"
 


@@ -274,8 +265,7 @@ namespace ]b4_namespace[
     while (/*CONSTCOND*/ 0)
 #endif
 
     while (/*CONSTCOND*/ 0)
 #endif
 

-namespace ]b4_namespace[
-{
+]b4_namespace_open[

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


@@ -284,8 +274,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;]])])[


@@ -293,7 +284,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
     {


@@ -368,21 +359,19 @@ b4_user_stype
   };
 
 ]dnl Redirections for glr.c.
   };
 
 ]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
 

-}
+]b4_namespace_close[

 
 

-]m4_ifdef([b4_percent_code_provides],
-[[/* Copy the %code "provides" blocks.  */
-]b4_user_code([b4_percent_code_provides])])[]dnl
+]b4_percent_code_get([[provides]])[]dnl

 
 [#endif /* ! defined PARSER_HEADER_H */]
 m4_divert_pop(0)
 
 [#endif /* ! defined PARSER_HEADER_H */]
 m4_divert_pop(0)