maint: update for changes to gnulib's announce-gen.

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 8463bb7ad7859208955e14205d0e09bf6a6a320f..4ebb3d1b77411f47daf870279a6fc7f728cf03dd 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,6 +1,5 @@
 # C++ GLR skeleton for Bison
 # C++ GLR skeleton for Bison

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


@@ -44,7 +43,7 @@
 #   filename member).
 
 # We require a pure interface using locations.
 #   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.
 m4_define([b4_pure_flag],      [1])
 
 # The header is mandatory.


@@ -123,8 +122,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 YYDEBUG
   ]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], [,])[
+    ]m4_ifset([b4_parse_param], [  ], [ :])[yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[

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


@@ -187,13 +185,13 @@ 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
   }
 
 #endif


@@ -216,7 +214,7 @@ m4_popdef([b4_parse_param])
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],

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

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


@@ -225,11 +223,12 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 
 ]b4_percent_code_get([[requires]])[
 
 
 ]b4_percent_code_get([[requires]])[
 

+#include <stdexcept>

 #include <string>
 #include <iostream>
 
 /* Using locations.  */
 #include <string>
 #include <iostream>
 
 /* Using locations.  */

-#define YYLSP_NEEDED ]b4_locations_flag[
+#define YYLSP_NEEDED ]b4_locations_if([1], [0])[

 
 ]b4_namespace_open[
   class position;
 
 ]b4_namespace_open[
   class position;


@@ -240,7 +239,7 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 
 /* 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].


@@ -267,28 +266,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 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_percent_define_get([[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[);


@@ -334,7 +312,6 @@ b4_user_stype
                                   const location_type* yylocationp);
   private:
     /* Debugging.  */
                                   const location_type* yylocationp);
   private:
     /* Debugging.  */

-    int yydebug_;

     std::ostream* yycdebug_;
 #endif
 
     std::ostream* yycdebug_;
 #endif