From 0005e2887d5a4d42f85c441295a3f64f6e999ca9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 9 Aug 2008 07:17:59 -0400 Subject: Revert "Added the concept of "balance setting transactions"." This reverts commit c93175183e790cf7f1100dfd554197161a69e6fe. The feature needs more thought and is not ready for 2.6.1. --- valexpr.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'valexpr.cc') diff --git a/valexpr.cc b/valexpr.cc index 0a2f27ee..4fed821e 100644 --- a/valexpr.cc +++ b/valexpr.cc @@ -833,8 +833,7 @@ value_expr_t * parse_value_term(std::istream& in, scope_t * scope, bool definition = false; if (c == '=') { in.get(c); - if ((flags & PARSE_VALEXPR_NO_ASSIGN) || - peek_next_nonws(in) == '=') { + if (peek_next_nonws(in) == '=') { in.unget(); c = '\0'; } else { @@ -1161,16 +1160,10 @@ value_expr_t * parse_logic_expr(std::istream& in, scope_t * scope, case '!': case '=': { bool negate = c == '!'; - if (! negate && (flags & PARSE_VALEXPR_NO_ASSIGN)) { - in.unget(); - break; - } - else if ((c = peek_next_nonws(in)) == '=') { + if ((c = peek_next_nonws(in)) == '=') in.get(c); - } - else { + else unexpected(c, '='); - } value_expr prev(node.release()); node.reset(new value_expr_t(negate ? value_expr_t::O_NEQ : value_expr_t::O_EQ)); -- cgit v1.2.3