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

Corrected calculation of market valuation expressions

Browse source
This commit is contained in:
John Wiegley 2012-03-08 00:54:19 -06:00
parent c86bff2707
commit 17a84642fb
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/commodity.cc
View file

@ -97,14 +97,20 @@ commodity_t::find_price_from_expr(expr_t& expr,
DEBUG("commodity.price.find", ""); DEBUG("commodity.price.find", "");
} }
#endif #endif
call_scope_t call_args(*scope_t::default_scope); value_t result(expr.calc(*scope_t::default_scope));
call_args.push_back(string_value(base_symbol())); if (is_expr(result)) {
call_args.push_back(moment); value_t call_args;
if (commodity)
call_args.push_back(string_value(commodity->symbol()));
return price_point_t(moment, expr.calc(call_args).to_amount()); call_args.push_back(string_value(base_symbol()));
call_args.push_back(moment);
if (commodity)
call_args.push_back(string_value(commodity->symbol()));
result = as_expr(result)->call(call_args, *scope_t::default_scope);
}
return price_point_t(moment, result.to_amount());
} }
optional<price_point_t> optional<price_point_t>