From 3dc28710c98502db74dc103bcdc58b65564e83ab Mon Sep 17 00:00:00 2001 From: marcandre Date: Mon, 5 Sep 2011 21:44:42 +0000 Subject: * numeric.c (flo_round): Fix criteria for 32 bits platform part 2 of [bug #5276] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ numeric.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a84421ec64..5072a04196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 6 06:44:25 2011 Marc-Andre Lafortune + + * numeric.c (flo_round): Fix criteria for 32 bits platform + part 2 of [bug #5276] + Tue Sep 6 05:37:11 2011 Masatoshi SEKI * test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures diff --git a/numeric.c b/numeric.c index d3977e44ee..87afe14662 100644 --- a/numeric.c +++ b/numeric.c @@ -1560,16 +1560,16 @@ flo_round(int argc, VALUE *argv, VALUE num) 10 ** ((binexp-1)/log_2(10)) <= |number| < 10 ** (binexp/log_2(10)) If binexp >= 0, and since log_2(10) = 3.322259: 10 ** (binexp/4 - 1) < |number| < 10 ** (binexp/3) - binexp/4 <= exp <= binexp/3 + floor(binexp/4) <= exp <= ceil(binexp/3) If binexp <= 0, swap the /4 and the /3 - So if ndigits + binexp/(4 or 3) >= float_dig, the result is number - If ndigits + binexp/(3 or 4) < 0 the result is 0 + So if ndigits + floor(binexp/(4 or 3)) >= float_dig, the result is number + If ndigits + ceil(binexp/(3 or 4)) < 0 the result is 0 */ if (isinf(number) || isnan(number) || - (((long)ndigits - float_dig) * (3 + (binexp > 0)) + binexp >= 0)) { + (ndigits >= float_dig - (binexp > 0 ? binexp / 4 : binexp / 3 - 1))) { return num; } - if ((long)ndigits * (4 - (binexp > 0)) + binexp < 0) { + if (ndigits < - (binexp > 0 ? binexp / 3 + 1 : binexp / 4)) { return DBL2NUM(0); } f = pow(10, ndigits); -- cgit v1.2.3