From d1992916e05993b671e9ee9a92e0bb325aadf27a Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 22 Aug 2007 01:26:39 +0000 Subject: * numeric.c (fix_pow): integer power calculation: 0**n => 0, 1**n => 1, -1**n => 1 (n: even) / -1 (n: odd). * test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test suite. pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 88711f1d55..6384c1fabb 100644 --- a/numeric.c +++ b/numeric.c @@ -2177,6 +2177,15 @@ fix_divmod(x, y) return rb_num_coerce_bin(x, y); } +static VALUE +int_even_p(VALUE num) +{ + if (rb_funcall(num, '%', 1, INT2FIX(2)) == INT2FIX(0)) { + return Qtrue; + } + return Qfalse; +} + /* * call-seq: * fix ** other => Numeric @@ -2193,23 +2202,45 @@ static VALUE fix_pow(x, y) VALUE x, y; { + long a = FIX2LONG(x); + if (FIXNUM_P(y)) { - long a, b; + long b; b = FIX2LONG(y); if (b == 0) return INT2FIX(1); if (b == 1) return x; a = FIX2LONG(x); if (a == 0) return INT2FIX(0); + if (a == 1) return INT2FIX(1); + if (a == -1) { + if (b % 2 == 0) + return INT2FIX(1); + else + return INT2FIX(-1); + } if (b > 0) { return rb_big_pow(rb_int2big(a), y); } return rb_float_new(pow((double)a, (double)b)); - } else if (TYPE(y) == T_FLOAT) { - long a = FIX2LONG(x); - return rb_float_new(pow((double)a, RFLOAT(y)->value)); } - return rb_num_coerce_bin(x, y); + switch (TYPE(y)) { + case T_BIGNUM: + if (a == 0) return INT2FIX(0); + if (a == 1) return INT2FIX(1); + if (a == -1) { + if (int_even_p(y)) return INT2FIX(1); + else return INT2FIX(-1); + } + x = rb_int2big(FIX2LONG(x)); + return rb_big_pow(x, y); + case T_FLOAT: + if (a == 0) return rb_float_new(0.0); + if (a == 1) return rb_float_new(1.0); + return rb_float_new(pow((double)a, RFLOAT(y)->value)); + default: + return rb_num_coerce_bin(x, y); + } } /* -- cgit v1.2.3