From 0e9f98c430410bd92ec94b6f0600ba8e0946d37d Mon Sep 17 00:00:00 2001 From: Tatsuhiko Kubo Date: Mon, 25 Aug 2014 17:17:37 +0900 Subject: Fix Numeric#pow behavior. * Before 2 ** -1 #=> 0 * After 2 ** -1 #=> 0.5 --- src/numeric.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/numeric.c b/src/numeric.c index 90ea6c965..3f211ca70 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -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); } -- cgit v1.2.3 From bd6dc0da77470c2dfca7fbccf543cb94b17624af Mon Sep 17 00:00:00 2001 From: Tatsuhiko Kubo Date: Mon, 25 Aug 2014 17:18:24 +0900 Subject: Add test for Numeric#pow. --- test/t/numeric.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/t/numeric.rb b/test/t/numeric.rb index 2b01611a7..120cc960d 100644 --- a/test/t/numeric.rb +++ b/test/t/numeric.rb @@ -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 -- cgit v1.2.3