Fixed several misplaced parentheses

This commit is contained in:
John Wiegley 2010-06-13 19:56:10 -04:00
parent 2ea075dc4f
commit e3f228bd5b
2 changed files with 6 additions and 6 deletions

View file

@ -885,14 +885,14 @@ void instance_t::assert_directive(char * line)
{ {
expr_t expr(line); expr_t expr(line);
if (! expr.calc(context.scope).to_boolean()) if (! expr.calc(context.scope).to_boolean())
throw_(parse_error, _("Assertion failed: %1" << line)); throw_(parse_error, _("Assertion failed: %1") << line);
} }
void instance_t::check_directive(char * line) void instance_t::check_directive(char * line)
{ {
expr_t expr(line); expr_t expr(line);
if (! expr.calc(context.scope).to_boolean()) if (! expr.calc(context.scope).to_boolean())
warning_(_("Check failed: %1" << line)); warning_(_("Check failed: %1") << line);
} }
void instance_t::expr_directive(char * line) void instance_t::expr_directive(char * line)
@ -1502,9 +1502,9 @@ xact_t * instance_t::parse_xact(char * line,
} }
else if (! expr.calc(bound_scope).to_boolean()) { else if (! expr.calc(bound_scope).to_boolean()) {
if (c == 'a') { if (c == 'a') {
throw_(parse_error, _("Transaction assertion failed: %1" << p)); throw_(parse_error, _("Transaction assertion failed: %1") << p);
} else { } else {
warning_(_("Transaction check failed: %1" << p)); warning_(_("Transaction check failed: %1") << p);
} }
} }
} }

View file

@ -694,9 +694,9 @@ void auto_xact_t::extend_xact(xact_base_t& xact,
else if (! pair.first.calc(bound_scope).to_boolean()) { else if (! pair.first.calc(bound_scope).to_boolean()) {
if (pair.second == auto_xact_t::EXPR_ASSERTION) { if (pair.second == auto_xact_t::EXPR_ASSERTION) {
throw_(parse_error, throw_(parse_error,
_("Transaction assertion failed: %1" << pair.first)); _("Transaction assertion failed: %1") << pair.first);
} else { } else {
warning_(_("Transaction check failed: %1" << pair.first)); warning_(_("Transaction check failed: %1") << pair.first);
} }
} }
} }