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 #2562 from cubicdaiya/issues/pow_flo

Browse Source 
Fix and add test for Numeric#pow behavior.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-08-26 02:24:18 +09:00
parent b01b3c4472 bd6dc0da77
commit ecc77829ce
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+4 -3
View File
@@ -54,11 +54,12 @@ static mrb_value
num_pow(mrb_state *mrb, mrb_value x)
{
mrb_value y;
mrb_float d;
mrb_float d, yv;
mrb_get_args(mrb, "o", &y);
d = pow(mrb_to_flo(mrb, x), mrb_to_flo(mrb, y));
if (mrb_fixnum_p(x) && mrb_fixnum_p(y) && FIXABLE(d))
yv = mrb_to_flo(mrb, y);
d = pow(mrb_to_flo(mrb, x), yv);
if (mrb_fixnum_p(x) && mrb_fixnum_p(y) && FIXABLE(d) && yv > 0)
return mrb_fixnum_value((mrb_int)d);
return mrb_float_value(mrb, d);
}
test/t/numeric.rb
+8
View File
@@ -18,6 +18,14 @@ assert('Numeric#abs', '15.2.7.4.3') do
assert_equal(1.0, -1.abs)
end
assert('Numeric#pow') do
assert_equal(8, 2 ** 3)
assert_equal(-8, -2 ** 3)
assert_equal(1, 2 ** 0)
assert_equal(1, 2.2 ** 0)
assert_equal(0.5, 2 ** -1)
end
assert('Numeric#/', '15.2.8.3.4') do
n = Class.new(Numeric){ def /(x); 15.1;end }.new