[前][次][番号順一覧][スレッド一覧]

ruby-changes:5415

From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 03:04:20 +0900 (JST)
Subject: [ruby-changes:5415] Ruby:r16917 (ruby_1_8_5): merge revision(s) 13785:

shyouhei	2008-06-08 03:04:08 +0900 (Sun, 08 Jun 2008)

  New Revision: 16917

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/numeric.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13785:
    * numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/numeric.c?r1=16917&r2=16916&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16917&r2=16916&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16917&r2=16916&diff_format=u

Index: ruby_1_8_5/numeric.c
===================================================================
--- ruby_1_8_5/numeric.c	(revision 16916)
+++ ruby_1_8_5/numeric.c	(revision 16917)
@@ -2204,6 +2204,7 @@
 fix_pow(x, y)
     VALUE x, y;
 {
+    static const double zero = 0.0;
     long a = FIX2LONG(x);
 
     if (FIXNUM_P(y)) {
@@ -2213,7 +2214,10 @@
 	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)
@@ -2237,7 +2241,9 @@
 	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:
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16916)
+++ ruby_1_8_5/ChangeLog	(revision 16917)
@@ -1,3 +1,7 @@
+Sun Jun  8 03:03:27 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
+
 Sun Jun  8 02:57:32 2008  James Edward Gray II  <jeg2@r...>
 
 	Merged 13781 from trunk.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16916)
+++ ruby_1_8_5/version.h	(revision 16917)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 139
+#define RUBY_PATCHLEVEL 140
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]