summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-29 06:09:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-29 06:09:08 +0000
commita3ffe9698b8a8dff25d94b3e7e490f0a01684bfe (patch)
tree6521135a57fcc5508ec052f8725114af7de0b477 /numeric.c
parente15b3c83b880aa2c2f07378095d1eba0214ca468 (diff)
* numeric.c (flo_round): fix for negative value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/numeric.c b/numeric.c
index a02dfd3974..fd77ff980a 100644
--- a/numeric.c
+++ b/numeric.c
@@ -97,6 +97,7 @@ round(double x)
}
#endif
+static VALUE fix_uminus(VALUE num);
static VALUE fix_mul(VALUE x, VALUE y);
static VALUE int_pow(long x, unsigned long y);
@@ -1504,10 +1505,15 @@ flo_round(int argc, VALUE *argv, VALUE num)
}
else {
if (ndigits < 0) {
- if (fabs(number) < f) return INT2FIX(0);
+ double absnum = fabs(number);
+ if (absnum < f) return INT2FIX(0);
if (!FIXABLE(number)) {
VALUE f10 = int_pow(10, -ndigits);
- num = rb_big_idiv(rb_dbl2big(number), f10);
+ VALUE n10 = f10;
+ if (number < 0) {
+ f10 = FIXNUM_P(f10) ? fix_uminus(f10) : rb_big_uminus(f10);
+ }
+ num = rb_big_idiv(rb_dbl2big(absnum), n10);
return FIXNUM_P(num) ? fix_mul(num, f10) : rb_big_mul(num, f10);
}
number /= f;