diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-13 07:33:09 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-13 07:33:09 +0000 |
commit | 4e0ac23588e805fa4457878c5523fd7ed3367d40 (patch) | |
tree | 9a209bb3afa3dfb6edad8a99f8c7f57cfa1d83d5 /numeric.c | |
parent | 6bc16a119834f4d496c527c19b4dcdb2430e26ab (diff) |
* numeric.c (flodivmod): work around for inifinity.
* numeric.c (flo_divmod): work around for platforms have no round().
[ruby-dev:32247]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r-- | numeric.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -663,7 +663,10 @@ flodivmod(x, y, divp, modp) mod = x - z * y; } #endif - div = (x - mod) / y; + if (isinf(x) && !isinf(y) && !isnan(y)) + div = x; + else + div = (x - mod) / y; if (y*mod < 0) { mod += y; div -= 1.0; @@ -736,11 +739,18 @@ flo_divmod(x, y) } flodivmod(RFLOAT(x)->value, fy, &div, &mod); if (FIXABLE(div)) { +#ifdef HVAE_ROUND val = round(div); - a = LONG2FIX(val); +#else + val = (div < 0) ? ceil(x - 0.5) : floor(x + 0.5); +#endif + a = LONG2FIX(val); + } + else if (isnan(div) || isinf(div)) { + a = rb_float_new(div); } else { - a = rb_dbl2big(div); + a = rb_dbl2big(div); } b = rb_float_new(mod); return rb_assoc_new(a, b); |