diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
| commit | f3bedb88b24ae8b2047ad86e57b161265c2812f5 (patch) | |
| tree | e6e5954f40a09e7fd002f242523c1eb0f318b397 /src/post.cc | |
| parent | 0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (diff) | |
| parent | 63b4bdaecff5a865bff22e8e7914bef6ab46fa6b (diff) | |
| download | fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.gz fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.bz2 fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.zip | |
Merge branch 'next'
Diffstat (limited to 'src/post.cc')
| -rw-r--r-- | src/post.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/post.cc b/src/post.cc index bbf43227..675749fc 100644 --- a/src/post.cc +++ b/src/post.cc @@ -353,12 +353,14 @@ namespace { foreach (post_t * p, post.xact->posts) { bind_scope_t bound_scope(args, *p); if (p == &post && args.has<expr_t::ptr_op_t>(1) && - ! args.get<expr_t::ptr_op_t>(1)->calc(bound_scope).to_boolean()) { + ! args.get<expr_t::ptr_op_t>(1) + ->calc(bound_scope, args.locus, args.depth).to_boolean()) { // If the user specifies any(EXPR, false), and the context is a // posting, then that posting isn't considered by the test. ; // skip it } - else if (expr->calc(bound_scope).to_boolean()) { + else if (expr->calc(bound_scope, args.locus, + args.depth).to_boolean()) { return true; } } @@ -373,12 +375,14 @@ namespace { foreach (post_t * p, post.xact->posts) { bind_scope_t bound_scope(args, *p); if (p == &post && args.has<expr_t::ptr_op_t>(1) && - ! args.get<expr_t::ptr_op_t>(1)->calc(bound_scope).to_boolean()) { + ! args.get<expr_t::ptr_op_t>(1) + ->calc(bound_scope, args.locus, args.depth).to_boolean()) { // If the user specifies any(EXPR, false), and the context is a // posting, then that posting isn't considered by the test. ; // skip it } - else if (! expr->calc(bound_scope).to_boolean()) { + else if (! expr->calc(bound_scope, args.locus, + args.depth).to_boolean()) { return false; } } |