diff options
| author | John Wiegley <johnw@newartisans.com> | 2007-04-30 11:22:08 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-04-13 03:38:34 -0400 |
| commit | 21af83013f3b1bae511a61b9e27224ab3de235c1 (patch) | |
| tree | bf0eea45f33e7e269220adc6ce37815f7bc14a3f /src/balance.cc | |
| parent | 3ba6c2572dfc58bcd963cbc8cac1cce2f5b01dba (diff) | |
| download | fork-ledger-21af83013f3b1bae511a61b9e27224ab3de235c1.tar.gz fork-ledger-21af83013f3b1bae511a61b9e27224ab3de235c1.tar.bz2 fork-ledger-21af83013f3b1bae511a61b9e27224ab3de235c1.zip | |
Did more work on the utility code.
Diffstat (limited to 'src/balance.cc')
| -rw-r--r-- | src/balance.cc | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/src/balance.cc b/src/balance.cc index 487f749f..73fd668c 100644 --- a/src/balance.cc +++ b/src/balance.cc @@ -15,7 +15,7 @@ amount_t balance_t::amount(const commodity_t& commodity) const if (temp.amounts.size() == 1) return temp.amount(commodity); - throw_(amount_exception, + throw_(amount_error, "Requested amount of a balance with multiple commodities: " << temp); } } @@ -172,9 +172,7 @@ balance_t& balance_t::operator*=(const balance_t& bal) if (temp.amounts.size() == 1) return *this = bal * temp; - std::ostringstream errmsg; - errmsg << "Cannot multiply two balances: " << temp << " * " << bal; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, "Cannot multiply two balances: " << temp << " * " << bal); } } @@ -209,11 +207,8 @@ balance_t& balance_t::operator*=(const amount_t& amt) return *this = temp * amt; } - std::ostringstream errmsg; - errmsg << "Attempt to multiply balance by a commodity" - << " not found in that balance: " - << temp << " * " << amt; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, "Attempt to multiply balance by a commodity" << + " not found in that balance: " << temp << " * " << amt); } } return *this; @@ -222,9 +217,7 @@ balance_t& balance_t::operator*=(const amount_t& amt) balance_t& balance_t::operator/=(const balance_t& bal) { if (bal.realzero()) { - std::ostringstream errmsg; - errmsg << "Attempt to divide by zero: " << *this << " / " << bal; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, "Divide by zero: " << *this << " / " << bal); } else if (realzero()) { return *this = 0L; @@ -241,18 +234,15 @@ balance_t& balance_t::operator/=(const balance_t& bal) if (temp.amounts.size() == 1) return *this /= temp; - std::ostringstream errmsg; - errmsg << "Cannot divide between two balances: " << temp << " / " << bal; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, + "Cannot divide two balances: " << temp << " / " << bal); } } balance_t& balance_t::operator/=(const amount_t& amt) { if (amt.realzero()) { - std::ostringstream errmsg; - errmsg << "Attempt to divide by zero: " << *this << " / " << amt; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, "Divide by zero: " << *this << " / " << amt); } else if (realzero()) { return *this = 0L; @@ -280,11 +270,8 @@ balance_t& balance_t::operator/=(const amount_t& amt) (*temp.amounts.begin()).first == &amt.commodity()) return *this = temp / amt; - std::ostringstream errmsg; - errmsg << "Attempt to divide balance by a commodity" - << " not found in that balance: " - << temp << " * " << amt; - throw amount_exception(errmsg.str(), context()); + throw_(amount_error, "Attempt to divide balance by a commodity" << + " not found in that balance: " << temp << " * " << amt); } } return *this; @@ -304,7 +291,7 @@ balance_t::operator amount_t() const if (temp.amounts.size() == 1) return (*temp.amounts.begin()).second; - throw_(amount_exception, + throw_(amount_error, "Cannot convert a balance with " << "multiple commodities to an amount: " << temp); } |