admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1907 from ksss/float-round

Browse Source 
Float#round fix bug for infinity and nan cases
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-03-22 16:58:56 +09:00
parent 064030732a 8891cea41c
commit 5488da6c44
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+15 -1
View File
@@ -594,6 +594,16 @@ flo_round(mrb_state *mrb, mrb_value num)
mrb_get_args(mrb, "|i", &ndigits);
number = mrb_float(num);
if (isinf(number)) {
if (0 < ndigits) return num;
else mrb_raise(mrb, E_FLOATDOMAIN_ERROR, number < 0 ? "-Infinity" : "Infinity");
}
if (isnan(number)) {
if (0 < ndigits) return num;
else mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN");
}
f = 1.0;
i = abs(ndigits);
while (--i >= 0)
@@ -621,7 +631,11 @@ flo_round(mrb_state *mrb, mrb_value num)
if (ndigits < 0) number *= f;
else number /= f;
}
if (ndigits > 0) return mrb_float_value(mrb, number);
if (ndigits > 0) {
if (isinf(number) || isnan(number)) return num;
return mrb_float_value(mrb, number);
}
return mrb_fixnum_value((mrb_int)number);
}