merge revision(s) 33198,33199:

	* numeric.c (flo_round): Fix criteria for 32 bits platform
	  part 2 of [bug #5276]

	* numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit
	  platform. part 1 of [bug #5276]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/numeric.c b/numeric.c
index a2b91191ef..baa6a178e4 100644
--- a/numeric.c
+++ b/numeric.c
@@ -873,8 +873,8 @@ flo_mod(VALUE x, VALUE y)
 static VALUE
 dbl2ival(double d)
 {
+    d = round(d);
     if (FIXABLE(d)) {
-	d = round(d);
 	return LONG2FIX((long)d);
     }
     return rb_dbl2big(d);
@@ -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);