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

(amount_t::valid): Don't verify the commodity as being non-null, since

Browse source 
NULL is a perfectly valid value for a commodity (it just means
null_commodity).  Also, never use commodity_->member, but always
commodity().member.
This commit is contained in:
John Wiegley 2006-02-24 09:33:15 +00:00
parent a2b7e86508
commit 2209249974
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
amount.cc
View file

@ -509,7 +509,7 @@ amount_t::operator bool() const
} else { } else {
mpz_set(temp, MPZ(quantity)); mpz_set(temp, MPZ(quantity));
if (commodity_) if (commodity_)
mpz_ui_pow_ui(divisor, 10, quantity->prec - commodity_->precision); mpz_ui_pow_ui(divisor, 10, quantity->prec - commodity().precision);
else else
mpz_ui_pow_ui(divisor, 10, quantity->prec); mpz_ui_pow_ui(divisor, 10, quantity->prec);
mpz_tdiv_q(temp, temp, divisor); mpz_tdiv_q(temp, temp, divisor);
@ -685,8 +685,8 @@ std::ostream& operator<<(std::ostream& _out, const amount_t& amt)
if (amt.commodity().larger) { if (amt.commodity().larger) {
amount_t last(amt); amount_t last(amt);
while (last.commodity().larger) { while (last.commodity().larger) {
last /= *last.commodity_->larger; last /= *last.commodity().larger;
last.commodity_ = last.commodity_->larger->commodity_; last.commodity_ = last.commodity().larger->commodity_;
if (ledger::abs(last) < 1) if (ledger::abs(last) < 1)
break; break;
base = last; base = last;
@ -945,7 +945,7 @@ void amount_t::parse(std::istream& in, unsigned short flags)
quantity->prec = quant.length() - last_comma - 1; quantity->prec = quant.length() - last_comma - 1;
} }
else if (last_period != std::string::npos && else if (last_period != std::string::npos &&
! (commodity_->flags & COMMODITY_STYLE_EUROPEAN)) { ! (commodity().flags & COMMODITY_STYLE_EUROPEAN)) {
quantity->prec = quant.length() - last_period - 1; quantity->prec = quant.length() - last_period - 1;
} }
else { else {
@ -955,9 +955,9 @@ void amount_t::parse(std::istream& in, unsigned short flags)
// Set the commodity's flags and precision accordingly // Set the commodity's flags and precision accordingly
if (newly_created || ! (flags & AMOUNT_PARSE_NO_MIGRATE)) { if (newly_created || ! (flags & AMOUNT_PARSE_NO_MIGRATE)) {
commodity_->flags |= comm_flags; commodity().flags |= comm_flags;
if (quantity->prec > commodity_->precision) if (quantity->prec > commodity().precision)
commodity_->precision = quantity->prec; commodity().precision = quantity->prec;
} }
// Now we have the final number. Remove commas and periods, if // Now we have the final number. Remove commas and periods, if
@ -991,9 +991,9 @@ void amount_t::parse(std::istream& in, unsigned short flags)
void amount_t::reduce() void amount_t::reduce()
{ {
while (commodity_ && commodity_->smaller) { while (commodity_ && commodity().smaller) {
*this *= *commodity_->smaller; *this *= *commodity().smaller;
commodity_ = commodity_->smaller->commodity_; commodity_ = commodity().smaller->commodity_;
} }
} }
@ -1137,8 +1137,12 @@ void amount_t::write_quantity(std::ostream& out) const
bool amount_t::valid() const bool amount_t::valid() const
{ {
if (quantity) { if (quantity) {
#if 0
// jww (2006-02-24): It's OK for commodity_ to be null here, it
// just means to use the null_commodity
if (! commodity_) if (! commodity_)
return false; return false;
#endif
if (quantity->ref == 0) if (quantity->ref == 0)
return false; return false;