From 24a9bf988c896f073d0d483a117c4197f93006c2 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 18:05:03 +0000 Subject: merge revision(s) 13785: * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ numeric.c | 10 ++++++++-- version.h | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index aae02e0673..a28c5a8722 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 03:04:38 2008 Nobuyoshi Nakada + + * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084] + Sun Jun 8 02:58:19 2008 James Edward Gray II Merged 13781 from trunk. diff --git a/numeric.c b/numeric.c index 51a1fb2337..6d69df943e 100644 --- a/numeric.c +++ b/numeric.c @@ -2202,6 +2202,7 @@ static VALUE fix_pow(x, y) VALUE x, y; { + static const double zero = 0.0; long a = FIX2LONG(x); if (FIXNUM_P(y)) { @@ -2211,7 +2212,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) @@ -2235,7 +2239,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: diff --git a/version.h b/version.h index c7326ae22e..97bb723d95 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3