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

Recompile the amount_expr before summing account totals.

Browse source
This commit is contained in:
John Wiegley 2009-02-09 14:51:45 -04:00
parent e0fab726c6
commit 3ee3b8f327
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/expr.cc
View file

@ -107,15 +107,21 @@ void expr_t::parse(std::istream& in, const uint32_t flags,
compiled = false; compiled = false;
} }
void expr_t::compile(scope_t& scope) void expr_t::recompile(scope_t& scope)
{ {
if (ptr.get() && ! compiled) { if (ptr.get()) {
ptr = ptr->compile(scope); ptr = ptr->compile(scope);
context = &scope; context = &scope;
compiled = true; compiled = true;
} }
} }
void expr_t::compile(scope_t& scope)
{
if (! compiled)
recompile(scope);
}
value_t expr_t::calc(scope_t& scope) value_t expr_t::calc(scope_t& scope)
{ {
if (ptr.get()) { if (ptr.get()) {

4
src/expr.h
View file

@ -128,6 +128,10 @@ public:
void parse(std::istream& in, const uint32_t flags = 0, void parse(std::istream& in, const uint32_t flags = 0,
const string * original_string = NULL); const string * original_string = NULL);
void mark_uncompiled() {
compiled = false;
}
void recompile(scope_t& scope);
void compile(scope_t& scope); void compile(scope_t& scope);
value_t calc(scope_t& scope); value_t calc(scope_t& scope);
value_t calc(scope_t& scope) const; value_t calc(scope_t& scope) const;

6
src/report.cc
View file

@ -107,12 +107,16 @@ void report_t::entry_report(xact_handler_ptr handler, entry_t& entry)
void report_t::sum_all_accounts() void report_t::sum_all_accounts()
{ {
expr_t& expr(HANDLER(amount_).expr);
expr.set_context(this);
session_xacts_iterator walker(session); session_xacts_iterator walker(session);
pass_down_xacts pass_down_xacts
(chain_xact_handlers(*this, xact_handler_ptr(new set_account_value), false), (chain_xact_handlers(*this, xact_handler_ptr(new set_account_value), false),
walker); walker);
session.master->calculate_sums(HANDLER(amount_).expr, *this); expr.mark_uncompiled(); // recompile, throw away xact_t bindings
session.master->calculate_sums(expr);
} }
void report_t::accounts_report(acct_handler_ptr handler) void report_t::accounts_report(acct_handler_ptr handler)