summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTatsuhiko Kubo <[email protected]>2014-08-25 17:17:37 +0900
committerTatsuhiko Kubo <[email protected]>2014-08-25 17:17:37 +0900
commit0e9f98c430410bd92ec94b6f0600ba8e0946d37d (patch)
tree1768f78838b3d1b107d1d6d3b423661251f9f967
parentb01b3c44728f66e0db1a9ab66fca7f6e8213f5e5 (diff)
downloadmruby-0e9f98c430410bd92ec94b6f0600ba8e0946d37d.tar.gz
mruby-0e9f98c430410bd92ec94b6f0600ba8e0946d37d.zip
Fix Numeric#pow behavior.
* Before 2 ** -1 #=> 0 * After 2 ** -1 #=> 0.5
-rw-r--r--src/numeric.c7
1 files 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);
}