From 17a84642fbb4684d5a8415371003f12ccb760d99 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 8 Mar 2012 00:54:19 -0600
Subject: Corrected calculation of market valuation expressions

---
 src/commodity.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/commodity.cc')

diff --git a/src/commodity.cc b/src/commodity.cc
index 0543c973..24d54695 100644
--- a/src/commodity.cc
+++ b/src/commodity.cc
@@ -97,14 +97,20 @@ commodity_t::find_price_from_expr(expr_t& expr,
     DEBUG("commodity.price.find", "");
   }
 #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()));
-  call_args.push_back(moment);
-  if (commodity)
-    call_args.push_back(string_value(commodity->symbol()));
+  if (is_expr(result)) {
+    value_t call_args;
+
+    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, expr.calc(call_args).to_amount());
+  return price_point_t(moment, result.to_amount());
 }
 
 optional<price_point_t>
-- 
cgit v1.2.3