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

*** empty log message ***

Browse source
This commit is contained in:
John Wiegley 2006-03-13 23:44:32 +00:00
parent 82d0ee869b
commit 4a96c8d7d8
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
balance.cc
View file

@ -21,7 +21,7 @@ amount_t balance_t::amount(const commodity_t& commodity) const
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Requested amount of a balance with multiple commodities: " errmsg << "Requested amount of a balance with multiple commodities: "
<< *this; << temp;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }
@ -213,7 +213,7 @@ balance_t& balance_t::operator*=(const balance_t& bal)
return *this = bal * temp; return *this = bal * temp;
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Cannot multiply two balances: " << *this << " * " << bal; errmsg << "Cannot multiply two balances: " << temp << " * " << bal;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }
@ -254,7 +254,7 @@ balance_t& balance_t::operator*=(const amount_t& amt)
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Attempt to multiply balance by a commodity" errmsg << "Attempt to multiply balance by a commodity"
<< " not found in that balance: " << " not found in that balance: "
<< *this << " * " << amt; << temp << " * " << amt;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }
@ -284,7 +284,7 @@ balance_t& balance_t::operator/=(const balance_t& bal)
return *this /= temp; return *this /= temp;
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Cannot divide between two balances: " << *this << " / " << bal; errmsg << "Cannot divide between two balances: " << temp << " / " << bal;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }
@ -325,7 +325,7 @@ balance_t& balance_t::operator/=(const amount_t& amt)
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Attempt to divide balance by a commodity" errmsg << "Attempt to divide balance by a commodity"
<< " not found in that balance: " << " not found in that balance: "
<< *this << " * " << amt; << temp << " * " << amt;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }
@ -348,7 +348,7 @@ balance_t::operator amount_t() const
std::ostringstream errmsg; std::ostringstream errmsg;
errmsg << "Cannot convert a balance with " errmsg << "Cannot convert a balance with "
<< "multiple commodities to an amount: " << *this; << "multiple commodities to an amount: " << temp;
throw new amount_error(errmsg.str()); throw new amount_error(errmsg.str());
} }
} }

10
value.cc
View file

@ -694,14 +694,12 @@ bool value_t::operator OP(const value_t& value) \
return *((amount_t *) data) OP *((amount_t *) value.data); \ return *((amount_t *) data) OP *((amount_t *) value.data); \
\ \
case BALANCE: \ case BALANCE: \
return (*((amount_t *) data) OP \ return (balance_t(*((amount_t *) data)) OP \
((balance_t *) value.data)-> \ *((balance_t *) value.data)); \
amount(((amount_t *) data)->commodity())); \
\ \
case BALANCE_PAIR: \ case BALANCE_PAIR: \
return (*((amount_t *) data) OP \ return (balance_t(*((amount_t *) data)) OP \
((balance_pair_t *) value.data)-> \ *((balance_pair_t *) value.data)); \
quantity.amount(((amount_t *) data)->commodity())); \
\ \
default: \ default: \
assert(0); \ assert(0); \