diff options
Diffstat (limited to 'src/xact.cc')
| -rw-r--r-- | src/xact.cc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/xact.cc b/src/xact.cc index 1188fd0f..d8ed3f8b 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -509,7 +509,7 @@ namespace { foreach (post_t * p, post.xact->posts) { bind_scope_t bound_scope(args, *p); - if (expr->calc(bound_scope).to_boolean()) + if (expr->calc(bound_scope, args.locus, args.depth).to_boolean()) return true; } return false; @@ -522,7 +522,7 @@ namespace { foreach (post_t * p, post.xact->posts) { bind_scope_t bound_scope(args, *p); - if (! expr->calc(bound_scope).to_boolean()) + if (! expr->calc(bound_scope, args.locus, args.depth).to_boolean()) return false; } return true; @@ -629,8 +629,7 @@ namespace { } // unnamed namespace -void auto_xact_t::extend_xact(xact_base_t& xact, - optional<date_t::year_type> current_year) +void auto_xact_t::extend_xact(xact_base_t& xact) { posts_list initial_posts(xact.posts.begin(), xact.posts.end()); @@ -680,10 +679,8 @@ void auto_xact_t::extend_xact(xact_base_t& xact, if (deferred_notes) { foreach (deferred_tag_data_t& data, *deferred_notes) { if (data.apply_to_post == NULL) - initial_post->parse_tags(data.tag_data.c_str(), - bound_scope, - data.overwrite_existing, - current_year); + initial_post->parse_tags(data.tag_data.c_str(), bound_scope, + data.overwrite_existing); } } if (check_exprs) { @@ -694,9 +691,9 @@ void auto_xact_t::extend_xact(xact_base_t& xact, else if (! pair.first.calc(bound_scope).to_boolean()) { if (pair.second == auto_xact_t::EXPR_ASSERTION) { throw_(parse_error, - _("Transaction assertion failed: %1" << pair.first)); + _("Transaction assertion failed: %1") << pair.first); } else { - warning_(_("Transaction check failed: %1" << pair.first)); + warning_(_("Transaction check failed: %1") << pair.first); } } } @@ -778,10 +775,8 @@ void auto_xact_t::extend_xact(xact_base_t& xact, if (deferred_notes) { foreach (deferred_tag_data_t& data, *deferred_notes) { if (data.apply_to_post == post) - new_post->parse_tags(data.tag_data.c_str(), - bound_scope, - data.overwrite_existing, - current_year); + new_post->parse_tags(data.tag_data.c_str(), bound_scope, + data.overwrite_existing); } } } |