8000 Float#round fix bug for infinity and nan cases by ksss · Pull Request #1907 · mruby/mruby · GitHub
[go: up one dir, main page]
Skip to content

Float#round fix bug for infinity and nan cases #1907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matz merged 1 commit into from
Mar 22, 2014
Merged

Float#round fix bug for infinity and nan cases #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/numeric.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}

Expand Down
12 changes: 12 additions & 0 deletions test/t/float.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@
assert_equal( 3, g)
assert_float( 3.4, h)
assert_float(3.423, i)

assert_equal(42.0, 42.0.round(307))
assert_equal(1.0e307, 1.0e307.round(2))

inf = 1.0/0.0
assert_raise(FloatDomainError){ inf.round }
assert_raise(FloatDomainError){ inf.round(-1) }
assert_equal(inf, inf.round(1))
nan = 0.0/0.0
assert_raise(FloatDomainError){ nan.round }
assert_raise(FloatDomainError){ nan.round(-1) }
assert_true(nan.round(1).nan?)
end

assert('Float#to_f', '15.2.9.3.13') do
Expand Down
0