diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-03-11 03:55:25 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-03-11 03:55:25 -0500 |
| commit | 363670d35bf451ff8ce636c071da73a0d93c514a (patch) | |
| tree | 153899e85596849bcbe96c820d5d55bbc61f1d8b /src/report.cc | |
| parent | 2303aa993cf41ad5bde8f8f5722bd265c11e3aa7 (diff) | |
| download | fork-ledger-363670d35bf451ff8ce636c071da73a0d93c514a.tar.gz fork-ledger-363670d35bf451ff8ce636c071da73a0d93c514a.tar.bz2 fork-ledger-363670d35bf451ff8ce636c071da73a0d93c514a.zip | |
Tighten up argument passing related to fn_market()
Diffstat (limited to 'src/report.cc')
| -rw-r--r-- | src/report.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/report.cc b/src/report.cc index 8205c1dd..a3abcb98 100644 --- a/src/report.cc +++ b/src/report.cc @@ -532,12 +532,13 @@ value_t report_t::fn_should_bold(call_scope_t& scope) value_t report_t::fn_market(call_scope_t& args) { - optional<datetime_t> moment = (args.has<datetime_t>(1) ? - args.get<datetime_t>(1) : - optional<datetime_t>()); value_t result; value_t arg0 = args[0]; + datetime_t moment; + if (args.has<datetime_t>(1)) + moment = args.get<datetime_t>(1); + if (arg0.is_string()) { amount_t tmp(1L); commodity_t * commodity = @@ -962,7 +963,7 @@ value_t report_t::pricemap_command(call_scope_t& args) std::ostream& out(output_stream); commodity_pool_t::current_pool->commodity_price_history.print_map (out, args.has<string>(0) ? - optional<datetime_t>(datetime_t(parse_date(args.get<string>(0)))) : none); + datetime_t(parse_date(args.get<string>(0))) : datetime_t()); return true; } |