From 31667e5ffc1f99f745664ff7a80791ebb5875841 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 26 Oct 2007 08:01:41 +0000 Subject: * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ numeric.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd9b89069d..cde4796f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 26 17:01:34 2007 Nobuyoshi Nakada + + * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084] + Fri Oct 26 15:00:52 2007 Nobuyoshi Nakada * misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for diff --git a/numeric.c b/numeric.c index 1ecac751bf..3c0cfdaaa6 100644 --- a/numeric.c +++ b/numeric.c @@ -2326,6 +2326,7 @@ int_pow(long x, unsigned long y) static VALUE fix_pow(VALUE x, VALUE y) { + static const double zero = 0.0; long a = FIX2LONG(x); if (FIXNUM_P(y)) { @@ -2333,7 +2334,10 @@ fix_pow(VALUE x, VALUE y) if (b == 0) return INT2FIX(1); if (b == 1) return 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) @@ -2357,7 +2361,9 @@ fix_pow(VALUE x, VALUE 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: -- cgit v1.2.3