From 4ec54b86f856c6e85446d065d2940b4244d71b8f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 8 May 2010 02:06:06 -0400 Subject: Added any() and all() value expression macros any() matches an expression against every post in a transaction or account, and returns true if any of them are true. all() tests if all are true. For example: ledger -l 'account =~ /Expense/ & any(account =~ /MasterCard/)' reg This reports every posting affecting an Expense account (regex match), but only if some other posting in the same transaction affects the MasterCard account. Both functions also take a second boolean argument. If it is false, the "source" posting is not considered. For example: ledger -l 'any(/x/, false)' This matches any posting where a *different* posting in the same transaction contains the letter 'x'. --- src/account.cc | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src/account.cc') diff --git a/src/account.cc b/src/account.cc index 245d61fc..e02d21d7 100644 --- a/src/account.cc +++ b/src/account.cc @@ -239,6 +239,36 @@ namespace { value_t get_parent(account_t& account) { return value_t(static_cast(account.parent)); } + + value_t fn_any(call_scope_t& scope) + { + interactive_t args(scope, "X&X"); + + account_t& account(find_scope(scope)); + expr_t& expr(args.get(0)); + + foreach (post_t * p, account.posts) { + bind_scope_t bound_scope(scope, *p); + if (expr.calc(bound_scope).to_boolean()) + return true; + } + return false; + } + + value_t fn_all(call_scope_t& scope) + { + interactive_t args(scope, "X&X"); + + account_t& account(find_scope(scope)); + expr_t& expr(args.get(0)); + + foreach (post_t * p, account.posts) { + bind_scope_t bound_scope(scope, *p); + if (! expr.calc(bound_scope).to_boolean()) + return false; + } + return true; + } } expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind, @@ -255,6 +285,10 @@ expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind, return WRAP_FUNCTOR(get_wrapper<&get_account>); else if (name == "account_base") return WRAP_FUNCTOR(get_wrapper<&get_account_base>); + else if (name == "any") + return WRAP_FUNCTOR(&fn_any); + else if (name == "all") + return WRAP_FUNCTOR(&fn_all); break; case 'c': -- cgit v1.2.3