summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-26 08:14:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-26 08:14:14 +0000
commit93f00244c51d48b6c18048d7ab4224eb01c8cb36 (patch)
treef275ea4a7becae787053a6ab696a608a720980a8
parent92d83c93546547a5d43cdf3afdc4ec09ef086475 (diff)
* numeric.c (fix_pow): returns 1.0 for 0**0.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--numeric.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 73109910cd..2853138979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Oct 26 17:01:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 26 17:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (fix_pow): returns 1.0 for 0**0.0.
* numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
diff --git a/numeric.c b/numeric.c
index fca31531bd..643a2cae80 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2247,12 +2247,10 @@ fix_pow(x, y)
long a = FIX2LONG(x);
if (FIXNUM_P(y)) {
- long b;
+ long b = FIX2LONG(y);
- b = FIX2LONG(y);
if (b == 0) return INT2FIX(1);
if (b == 1) return x;
- a = FIX2LONG(x);
if (a == 0) {
if (b > 0) return INT2FIX(0);
return rb_float_new(1.0 / zero);
@@ -2280,6 +2278,7 @@ fix_pow(x, y)
x = rb_int2big(FIX2LONG(x));
return rb_big_pow(x, y);
case T_FLOAT:
+ if (RFLOAT(y)->value == 0.0) return rb_float_new(1.0);
if (a == 0) {
return rb_float_new(RFLOAT(y)->value < 0 ? (1.0 / zero) : 0.0);
}