From b5a972d1a0b12bb55f16af9f57166a779823bc7f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 16 Feb 2009 02:51:09 -0400 Subject: The -n option for bal command is working again The fix was that when appending new predicates, enclosed both sides of the AND with parentheses. --- src/report.cc | 2 +- src/report.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/report.cc b/src/report.cc index 837a1fb4..b0281c3e 100644 --- a/src/report.cc +++ b/src/report.cc @@ -271,7 +271,7 @@ namespace { value_t operator()(call_scope_t& args) { - if (args.value().size() > 0) { + if (args.size() > 0) { report.HANDLER(limit_).append (args_to_predicate_expr(args.value().as_sequence().begin(), args.value().as_sequence().end())); diff --git a/src/report.h b/src/report.h index 809d0f5b..2007d29c 100644 --- a/src/report.h +++ b/src/report.h @@ -278,7 +278,7 @@ public: if (! handled) on(text); else - on(string("(") + str() + ")&" + text); + on(string("(") + str() + ")&(" + text + ")"); } DO_(args) { append(args[0].to_string()); @@ -345,7 +345,7 @@ public: if (! handled) on(text); else - on(string("(") + str() + ")&" + text); + on(string("(") + str() + ")&(" + text + ")"); } DO_(args) { append(args[0].to_string()); @@ -373,7 +373,7 @@ public: if (! handled) on(text); else - on(string("(") + str() + ")&" + text); + on(string("(") + str() + ")&(" + text + ")"); } DO_(args) { append(args[0].to_string()); -- cgit v1.2.3