1 files changed, 20 insertions, 27 deletions

diff --git a/value.cc b/value.cc
index 1680ebd7..6038ca9e 100644
--- a/value.cc
+++ b/value.cc
@@ -723,7 +723,7 @@ void value_t::abs()
   }
 }
 
-value_t value_t::cost() const
+value_t value_t::price() const
 {
   switch (type) {
   case BOOLEAN:
@@ -733,9 +733,9 @@ value_t value_t::cost() const
     return *this;
 
   case BALANCE_PAIR:
-    assert(((balance_pair_t *) data)->cost);
-    if (((balance_pair_t *) data)->cost)
-      return *(((balance_pair_t *) data)->cost);
+    assert(((balance_pair_t *) data)->price);
+    if (((balance_pair_t *) data)->price)
+      return *(((balance_pair_t *) data)->price);
     else
       return ((balance_pair_t *) data)->quantity;
 
@@ -747,29 +747,21 @@ value_t value_t::cost() const
   return value_t();
 }
 
-value_t value_t::factor_price() const
+value_t value_t::cost() const
 {
   switch (type) {
   case BOOLEAN:
   case INTEGER:
-    return *this;
-
-  case AMOUNT: {
-    commodity_t& comm = ((amount_t *) data)->commodity();
-    if (comm.price != NULL)
-      return value_t(*comm.price * *((amount_t *) data));
-    return *this;
-  }
-
+  case AMOUNT:
   case BALANCE:
-    return ((balance_t *) data)->factor_price();
+    return *this;
 
-  case BALANCE_PAIR: {
-    balance_pair_t temp(((balance_pair_t *) data)->quantity.factor_price());
+  case BALANCE_PAIR:
+    assert(((balance_pair_t *) data)->cost);
     if (((balance_pair_t *) data)->cost)
-      temp.cost = new balance_t(((balance_pair_t *) data)->cost);
-    return temp;
-  }
+      return *(((balance_pair_t *) data)->cost);
+    else
+      return ((balance_pair_t *) data)->quantity;
 
   default:
     assert(0);
@@ -779,21 +771,22 @@ value_t value_t::factor_price() const
   return value_t();
 }
 
-value_t& value_t::add(const amount_t& amount, const amount_t * cost)
+value_t& value_t::add(const amount_t& amount,
+		      const amount_t * price, const amount_t * cost)
 {
   switch (type) {
   case BOOLEAN:
   case INTEGER:
   case AMOUNT:
-    if (cost) {
+    if (price || cost) {
       cast(BALANCE_PAIR);
-      return add(amount, cost);
+      return add(amount, price, cost);
     }
     else if ((type == AMOUNT &&
 	      ((amount_t *) data)->commodity() != amount.commodity()) ||
 	     (type != AMOUNT && amount.commodity())) {
       cast(BALANCE);
-      return add(amount, cost);
+      return add(amount, price, cost);
     }
     else if (type != AMOUNT) {
       cast(AMOUNT);
@@ -802,15 +795,15 @@ value_t& value_t::add(const amount_t& amount, const amount_t * cost)
     break;
 
   case BALANCE:
-    if (cost) {
+    if (price || cost) {
       cast(BALANCE_PAIR);
-      return add(amount, cost);
+      return add(amount, price, cost);
     }
     *((balance_t *) data) += amount;
     break;
 
   case BALANCE_PAIR:
-    ((balance_pair_t *) data)->add(amount, cost);
+    ((balance_pair_t *) data)->add(amount, price, cost);
     break;
 
   default: