sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added 'count' and 'subcount' props for accounts

Browse source
This commit is contained in:
John Wiegley 2009-02-15 19:24:17 -04:00
parent c1fd59666e
commit dfee8bc691
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/account.cc
View file

@ -161,6 +161,16 @@ namespace {
return account.xdata_->total; return account.xdata_->total;
} }
value_t get_count(account_t& account) {
assert(account.xdata_);
return account.xdata_->total_count;
}
value_t get_subcount(account_t& account) {
assert(account.xdata_);
return account.xdata_->count;
}
value_t get_amount(account_t& account) { value_t get_amount(account_t& account) {
assert(account.xdata_); assert(account.xdata_);
return account.xdata_->value; return account.xdata_->value;
@ -196,6 +206,11 @@ expr_t::ptr_op_t account_t::lookup(const string& name)
return WRAP_FUNCTOR(get_wrapper<&get_amount>); return WRAP_FUNCTOR(get_wrapper<&get_amount>);
break; break;
case 'c':
if (name == "count")
return WRAP_FUNCTOR(get_wrapper<&get_count>);
break;
case 'd': case 'd':
if (name == "depth") if (name == "depth")
return WRAP_FUNCTOR(get_wrapper<&get_depth>); return WRAP_FUNCTOR(get_wrapper<&get_depth>);
@ -208,6 +223,11 @@ expr_t::ptr_op_t account_t::lookup(const string& name)
return WRAP_FUNCTOR(get_wrapper<&get_partial_name>); return WRAP_FUNCTOR(get_wrapper<&get_partial_name>);
break; break;
case 's':
if (name == "subcount")
return WRAP_FUNCTOR(get_wrapper<&get_subcount>);
break;
case 't': case 't':
if (name == "total") if (name == "total")
return WRAP_FUNCTOR(get_wrapper<&get_total>); return WRAP_FUNCTOR(get_wrapper<&get_total>);
@ -249,7 +269,7 @@ void account_t::calculate_sums(expr_t& amount_expr)
xdata_t& child_xd((*pair.second).xdata()); xdata_t& child_xd((*pair.second).xdata());
if (! child_xd.total.is_null()) { if (! child_xd.total.is_null()) {
add_or_set_value(xd.total, child_xd.total); add_or_set_value(xd.total, child_xd.total);
xd.total_count += child_xd.total_count + child_xd.count; xd.total_count += child_xd.total_count;
} else { } else {
assert(child_xd.total_count == 0); assert(child_xd.total_count == 0);
assert(child_xd.count == 0); assert(child_xd.count == 0);