glr.cc: fix the handling of yydebug

* data/glr.cc (yydebug_): Remove, unused.
(set_debug_level, debug_level): Work on yydebug instead.
* doc/bison.texi, NEWS: Document this.
This commit is contained in:
Akim Demaille
2012-07-26 16:44:45 +02:00
parent d511fbd576
commit 0e164d43d1
2 changed files with 7 additions and 5 deletions

4
NEWS
View File

@@ -6,7 +6,9 @@ GNU Bison NEWS
** Bug fixes ** Bug fixes
Type names are now properly escaped. *** Type names are now properly escaped.
*** glr.cc: set_debug_level and debug_level work as expected.
* Noteworthy changes in release 2.6 (2012-07-19) [stable] * Noteworthy changes in release 2.6 (2012-07-19) [stable]

View File

@@ -131,7 +131,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], [ ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
:])[ :])[
#if ]b4_api_PREFIX[DEBUG #if ]b4_api_PREFIX[DEBUG
]m4_ifset([b4_parse_param], [ ], [ :])[yydebug_ (false), ]m4_ifset([b4_parse_param], [ ], [ :])[
yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[ yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
#endif]b4_parse_param_cons[ #endif]b4_parse_param_cons[
{ {
@@ -199,13 +199,14 @@ 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_type
]b4_parser_class_name[::debug_level () const ]b4_parser_class_name[::debug_level () const
{ {
return yydebug_; return yydebug;
} }
void void
]b4_parser_class_name[::set_debug_level (debug_level_type l) ]b4_parser_class_name[::set_debug_level (debug_level_type l)
{ {
yydebug_ = l; // Actually, it is yydebug which is really used.
yydebug = l;
} }
#endif #endif
@@ -320,7 +321,6 @@ b4_user_stype
const location_type* yylocationp); const location_type* yylocationp);
private: private:
/* Debugging. */ /* Debugging. */
int yydebug_;
std::ostream* yycdebug_; std::ostream* yycdebug_;
# endif # endif