Fix glr.cc's debug level handling.

	* data/glr.cc (yydebug_): Remove, as it is actually yydebug from
	glr.c which is used.
	(debug_level, set_debug_level): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 4cb120ed9ee1d77ca0f18f16eee37cae41e16258..e4801fbbb3527ae3ff26737edb4c84d9b3903b97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-25  Akim Demaille  <demaille@gostai.com>
+
+       Fix glr.cc's debug level handling.
+       * data/glr.cc (yydebug_): Remove, as it is actually yydebug from
+       glr.c which is used.
+       (debug_level, set_debug_level): Adjust.
+

 2009-02-25  Akim Demaille  <demaille@gostai.com>
 
        Copyright years.
 2009-02-25  Akim Demaille  <demaille@gostai.com>
 
        Copyright years.

diff --git a/data/glr.cc b/data/glr.cc
index 8463bb7ad7859208955e14205d0e09bf6a6a320f..254bda1e75b1dfa98c495b34c50a9e2fc6c9ec3f 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -123,8 +123,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 +186,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


@@ -334,7 +333,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