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.
This commit is contained in:
John Wiegley 2009-02-16 02:51:09 -04:00
parent e3b40f5bb6
commit b5a972d1a0
2 changed files with 4 additions and 4 deletions

View file

@ -271,7 +271,7 @@ namespace {
value_t operator()(call_scope_t& args) value_t operator()(call_scope_t& args)
{ {
if (args.value().size() > 0) { if (args.size() > 0) {
report.HANDLER(limit_).append report.HANDLER(limit_).append
(args_to_predicate_expr(args.value().as_sequence().begin(), (args_to_predicate_expr(args.value().as_sequence().begin(),
args.value().as_sequence().end())); args.value().as_sequence().end()));

View file

@ -278,7 +278,7 @@ public:
if (! handled) if (! handled)
on(text); on(text);
else else
on(string("(") + str() + ")&" + text); on(string("(") + str() + ")&(" + text + ")");
} }
DO_(args) { DO_(args) {
append(args[0].to_string()); append(args[0].to_string());
@ -345,7 +345,7 @@ public:
if (! handled) if (! handled)
on(text); on(text);
else else
on(string("(") + str() + ")&" + text); on(string("(") + str() + ")&(" + text + ")");
} }
DO_(args) { DO_(args) {
append(args[0].to_string()); append(args[0].to_string());
@ -373,7 +373,7 @@ public:
if (! handled) if (! handled)
on(text); on(text);
else else
on(string("(") + str() + ")&" + text); on(string("(") + str() + ")&(" + text + ")");
} }
DO_(args) { DO_(args) {
append(args[0].to_string()); append(args[0].to_string());