diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | numeric.c | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Fri Oct 26 17:01:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084] + Wed Oct 25 07:18:09 2007 James Edward Gray II <jeg2@ruby-lang.org> Merged 13781 from trunk. @@ -2243,6 +2243,7 @@ static VALUE fix_pow(x, y) VALUE x, y; { + static const double zero = 0.0; long a = FIX2LONG(x); if (FIXNUM_P(y)) { @@ -2252,7 +2253,10 @@ fix_pow(x, y) if (b == 0) return INT2FIX(1); if (b == 1) return x; a = FIX2LONG(x); - if (a == 0) return INT2FIX(0); + if (a == 0) { + if (b > 0) return INT2FIX(0); + return rb_float_new(1.0 / zero); + } if (a == 1) return INT2FIX(1); if (a == -1) { if (b % 2 == 0) @@ -2276,7 +2280,9 @@ fix_pow(x, y) 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 == 0) { + return rb_float_new(RFLOAT(y)->value < 0 ? (1.0 / zero) : 0.0); + } if (a == 1) return rb_float_new(1.0); return rb_float_new(pow((double)a, RFLOAT(y)->value)); default: @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-10-25" +#define RUBY_RELEASE_DATE "2007-10-26" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071025 +#define RUBY_RELEASE_CODE 20071026 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |