diff options
Diffstat (limited to 'src/amount.cc')
| -rw-r--r-- | src/amount.cc | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/amount.cc b/src/amount.cc index 1dc160cc..99e346b7 100644 --- a/src/amount.cc +++ b/src/amount.cc @@ -115,6 +115,7 @@ namespace { mpq_t quant, amount_t::precision_t precision, int zeros_prec = -1, + mpfr_rnd_t rnd = MPFR_RNDN, const optional<commodity_t&>& comm = none) { char * buf = NULL; @@ -135,7 +136,7 @@ namespace { DEBUG("amount.convert", "num prec = " << num_prec); mpfr_set_prec(tempfnum, num_prec); - mpfr_set_z(tempfnum, mpq_numref(quant), GMP_RNDN); + mpfr_set_z(tempfnum, mpq_numref(quant), rnd); mp_prec_t den_prec = mpz_sizeinbase(mpq_denref(quant), 2); den_prec += amount_t::extend_by_digits*64; @@ -144,15 +145,15 @@ namespace { DEBUG("amount.convert", "den prec = " << den_prec); mpfr_set_prec(tempfden, den_prec); - mpfr_set_z(tempfden, mpq_denref(quant), GMP_RNDN); + mpfr_set_z(tempfden, mpq_denref(quant), rnd); mpfr_set_prec(tempfb, num_prec + den_prec); - mpfr_div(tempfb, tempfnum, tempfden, GMP_RNDN); + mpfr_div(tempfb, tempfnum, tempfden, rnd); if (mpfr_asprintf(&buf, "%.*RNf", precision, tempfb) < 0) throw_(amount_error, _("Cannot output amount to a floating-point representation")); - + DEBUG("amount.convert", "mpfr_print = " << buf << " (precision " << precision << ", zeros_prec " << zeros_prec << ")"); @@ -669,7 +670,7 @@ void amount_t::in_place_floor() _dup(); std::ostringstream out; - stream_out_mpq(out, MP(quantity), precision_t(0)); + stream_out_mpq(out, MP(quantity), precision_t(0), -1, MPFR_RNDZ); mpq_set_str(MP(quantity), out.str().c_str(), 10); } @@ -844,8 +845,8 @@ double amount_t::to_double() const if (! quantity) throw_(amount_error, _("Cannot convert an uninitialized amount to a double")); - mpfr_set_q(tempf, MP(quantity), GMP_RNDN); - return mpfr_get_d(tempf, GMP_RNDN); + mpfr_set_q(tempf, MP(quantity), MPFR_RNDN); + return mpfr_get_d(tempf, MPFR_RNDN); } long amount_t::to_long() const @@ -853,14 +854,14 @@ long amount_t::to_long() const if (! quantity) throw_(amount_error, _("Cannot convert an uninitialized amount to a long")); - mpfr_set_q(tempf, MP(quantity), GMP_RNDN); - return mpfr_get_si(tempf, GMP_RNDN); + mpfr_set_q(tempf, MP(quantity), MPFR_RNDN); + return mpfr_get_si(tempf, MPFR_RNDN); } bool amount_t::fits_in_long() const { - mpfr_set_q(tempf, MP(quantity), GMP_RNDN); - return mpfr_fits_slong_p(tempf, GMP_RNDN); + mpfr_set_q(tempf, MP(quantity), MPFR_RNDN); + return mpfr_fits_slong_p(tempf, MPFR_RNDN); } commodity_t& amount_t::commodity() const @@ -1049,16 +1050,12 @@ bool amount_t::parse(std::istream& in, const parse_flags_t& flags) // Create the commodity if has not already been seen, and update the // precision if something greater was used for the quantity. - bool newly_created = false; - if (symbol.empty()) { commodity_ = NULL; } else { commodity_ = commodity_pool_t::current_pool->find(symbol); - if (! commodity_) { + if (! commodity_) commodity_ = commodity_pool_t::current_pool->create(symbol); - newly_created = true; - } assert(commodity_); if (details) @@ -1243,7 +1240,7 @@ void amount_t::print(std::ostream& _out, const uint_least8_t flags) const } stream_out_mpq(out, MP(quantity), display_precision(), - comm ? commodity().precision() : 0, comm); + comm ? commodity().precision() : 0, MPFR_RNDN, comm); if (comm.has_flags(COMMODITY_STYLE_SUFFIXED)) { if (comm.has_flags(COMMODITY_STYLE_SEPARATED)) |