1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (flo_pow,fix_pow): may return complex number.

Browse Source 
* bignum.c (rb_big_pow): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2009-08-16 23:03:45 +00:00
parent b21088b431
commit 02a7cbec82
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 17 07:59:00 2009 Tadayoshi Funaba <tadf@dotrb.org>
* numeric.c (flo_pow,fix_pow): may return complex number.
* bignum.c (rb_big_pow): ditto.
Mon Aug 17 07:16:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Aug 17 07:16:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (num_imaginary): num#i to return imaginary counterpart * numeric.c (num_imaginary): num#i to return imaginary counterpart

2
bignum.c
View File

@ -2544,6 +2544,8 @@ rb_big_pow(VALUE x, VALUE y)
switch (TYPE(y)) { switch (TYPE(y)) {
case T_FLOAT: case T_FLOAT:
d = RFLOAT_VALUE(y); d = RFLOAT_VALUE(y);
if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
break; break;
case T_BIGNUM: case T_BIGNUM:

17
numeric.c
View File

@ -814,7 +814,6 @@ flo_divmod(VALUE x, VALUE y)
* Raises <code>float</code> the <code>other</code> power. * Raises <code>float</code> the <code>other</code> power.
* *
* 2.0**3 #=> 8.0 * 2.0**3 #=> 8.0
* (-8.0)**0.5 #=> NaN # try (-8.0)**Complex(0.5)
*/ */
static VALUE static VALUE
@ -826,7 +825,13 @@ flo_pow(VALUE x, VALUE y)
case T_BIGNUM: case T_BIGNUM:
return DBL2NUM(pow(RFLOAT_VALUE(x), rb_big2dbl(y))); return DBL2NUM(pow(RFLOAT_VALUE(x), rb_big2dbl(y)));
case T_FLOAT: case T_FLOAT:
return DBL2NUM(pow(RFLOAT_VALUE(x), RFLOAT_VALUE(y))); {
double dx = RFLOAT_VALUE(x);
double dy = RFLOAT_VALUE(y);
if (dx < 0 && dy != round(dy))
return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
return DBL2NUM(pow(dx, dy));
}
default: default:
return rb_num_coerce_bin(x, y, rb_intern("**")); return rb_num_coerce_bin(x, y, rb_intern("**"));
} }
@ -2468,7 +2473,6 @@ int_pow(long x, unsigned long y)
* 2 ** 3 #=> 8 * 2 ** 3 #=> 8
* 2 ** -1 #=> 0.5 * 2 ** -1 #=> 0.5
* 2 ** 0.5 #=> 1.4142135623731 * 2 ** 0.5 #=> 1.4142135623731
* (-8)**0.5 #=> NaN # try (-8)**Complex(0.5)
*/ */
static VALUE static VALUE
@ -2517,7 +2521,12 @@ fix_pow(VALUE x, VALUE y)
return DBL2NUM(RFLOAT_VALUE(y) < 0 ? infinite_value() : 0.0); return DBL2NUM(RFLOAT_VALUE(y) < 0 ? infinite_value() : 0.0);
} }
if (a == 1) return DBL2NUM(1.0); if (a == 1) return DBL2NUM(1.0);
return DBL2NUM(pow((double)a, RFLOAT_VALUE(y))); {
double dy = RFLOAT_VALUE(y);
if (a < 0 && dy != round(dy))
return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
return DBL2NUM(pow((double)a, dy));
}
default: default:
return rb_num_coerce_bin(x, y, rb_intern("**")); return rb_num_coerce_bin(x, y, rb_intern("**"));
} }