naruse	2011-11-22 11:27:53 +0900 (Tue, 22 Nov 2011)

  New Revision: 33812

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33812

  Log:
    * bignum.c (): refix of r33536. Don't change behavior of Bignum#/.
      [ruby-core:40429] [Bug #5490]

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/test/ruby/test_bignum.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33811)
+++ ChangeLog	(revision 33812)
@@ -1,3 +1,8 @@
+Tue Nov 22 11:26:08 2011  NARUSE, Yui  <naruse@r...>
+
+	* bignum.c (): refix of r33536. Don't change behavior of Bignum#/.
+	  [ruby-core:40429] [Bug #5490]
+
 Tue Nov 22 10:46:57 2011  NARUSE, Yui  <naruse@r...>
 
 	* numeric.c (ruby_float_step): improve floating point calculations.
Index: bignum.c
===================================================================
--- bignum.c	(revision 33811)
+++ bignum.c	(revision 33812)
@@ -2781,14 +2781,13 @@
 
       case T_FLOAT:
 	{
-	    double div, dy = RFLOAT_VALUE(y);
-	    if (dy == 0.0) rb_num_zerodiv();
-	    div = rb_big2dbl(x) / dy;
 	    if (op == '/') {
-		return DBL2NUM(div);
+		return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
 	    }
 	    else {
-		return rb_dbl2big(div);
+		double dy = RFLOAT_VALUE(y);
+		if (dy == 0.0) rb_num_zerodiv();
+		return rb_dbl2big(rb_big2dbl(x) / dy);
 	    }
 	}
 
Index: test/ruby/test_bignum.rb
===================================================================
--- test/ruby/test_bignum.rb	(revision 33811)
+++ test/ruby/test_bignum.rb	(revision 33812)
@@ -268,6 +268,12 @@
     assert_equal(0, T32 / T64)
   end
 
+  def test_divide
+    bug5490 = '[ruby-core:40429]'
+    assert_raise(ZeroDivisionError, bug5490) {T1024./(0)}
+    assert_equal(Float::INFINITY, T1024./(0.0), bug5490)
+  end
+
   def test_div
     assert_equal(T32.to_f, T32 / 1.0)
     assert_raise(TypeError) { T32 / "foo" }

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