summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2012-07-26 16:44:45 +0200
committerAkim Demaille <akim@lrde.epita.fr>2012-07-26 17:03:52 +0200
commit0e164d43d115b13f300892a4c0ab643ed03020c9 (patch)
tree4b33b6108860c7caf01cb9c972879e09e25af588
parentd511fbd576e8249633776ba21a9209465fa1e59f (diff)
downloadbison-0e164d43d115b13f300892a4c0ab643ed03020c9.tar.gz
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.
-rw-r--r--NEWS4
-rw-r--r--data/glr.cc8
2 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index f4decfa8..b97956cc 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,9 @@ GNU Bison NEWS
** 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]
diff --git a/data/glr.cc b/data/glr.cc
index ba6ceac0..78a7ae51 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -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], [
:])[
#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], [,])[
#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 () const
{
- return yydebug_;
+ return yydebug;
}
void
]b4_parser_class_name[::set_debug_level (debug_level_type l)
{
- yydebug_ = l;
+ // Actually, it is yydebug which is really used.
+ yydebug = l;
}
#endif
@@ -320,7 +321,6 @@ b4_user_stype
const location_type* yylocationp);
private:
/* Debugging. */
- int yydebug_;
std::ostream* yycdebug_;
# endif