From e75bb1f71fca2f67446d0caa4a98bb0168e66119 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 25 Feb 2006 13:40:14 +0000 Subject: *** empty log message *** --- main.cc | 2 -- valexpr.cc | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main.cc b/main.cc index 31836975..b727b23b 100644 --- a/main.cc +++ b/main.cc @@ -69,10 +69,8 @@ int parse_and_report(int argc, char * argv[], char * envp[]) config.process_option("file", p); if (const char * p = std::getenv("LEDGER_INIT")) config.process_option("init-file", p); -#if 0 if (const char * p = std::getenv("PRICE_HIST")) config.process_option("price-db", p); -#endif if (const char * p = std::getenv("PRICE_EXP")) config.process_option("price-exp", p); #endif diff --git a/valexpr.cc b/valexpr.cc index 013cfad7..00fce46f 100644 --- a/valexpr.cc +++ b/valexpr.cc @@ -348,6 +348,8 @@ void value_expr_t::compute(value_t& result, const details_t& details) const if (right) { assert(right->kind == O_ARG); switch (right->left->kind) { + case F_NOW: + break; // already set to now case DATE: if (details.xact && transaction_has_xdata(*details.xact) && transaction_xdata_(*details.xact).date) @@ -377,6 +379,8 @@ void value_expr_t::compute(value_t& result, const details_t& details) const std::time_t moment = terminus; if (right) { switch (right->kind) { + case F_NOW: + break; // already set to now case DATE: if (details.xact && transaction_has_xdata(*details.xact) && transaction_xdata_(*details.xact).date) -- cgit v1.2.3