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

ruby-changes:16825

From: mame <ko1@a...>
Date: Sun, 1 Aug 2010 18:52:39 +0900 (JST)
Subject: [ruby-changes:16825] Ruby:r28819 (ruby_1_9_2): merges r28815 from trunk into ruby_1_9_2.

mame	2010-08-01 18:46:34 +0900 (Sun, 01 Aug 2010)

  New Revision: 28819

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

  Log:
    merges r28815 from trunk into ruby_1_9_2.
    --
    * bignum.c (big_op): comparison of bignum and infinity has returned 1
      or -1, but it must return boolean.

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28818)
+++ ruby_1_9_2/ChangeLog	(revision 28819)
@@ -1,3 +1,8 @@
+Sun Aug  1 09:35:35 2010  Yusuke Endoh  <mame@t...>
+
+	* bignum.c (big_op): comparison of bignum and infinity has returned 1
+	  or -1, but it must return boolean.
+
 Sun Jul 25 05:37:20 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (flo_cmp): honor the result of infinite? method of the
Index: ruby_1_9_2/bignum.c
===================================================================
--- ruby_1_9_2/bignum.c	(revision 28818)
+++ ruby_1_9_2/bignum.c	(revision 28819)
@@ -1453,8 +1453,9 @@
 	    double a = RFLOAT_VALUE(y);
 
 	    if (isinf(a)) {
-		if (a > 0.0) return INT2FIX(-1);
-		else return INT2FIX(1);
+		if (a > 0.0) rel = INT2FIX(-1);
+		else rel = INT2FIX(1);
+		break;
 	    }
 	    rel = rb_dbl_cmp(rb_big2dbl(x), a);
 	    break;
Index: ruby_1_9_2/test/ruby/test_bignum.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_bignum.rb	(revision 28818)
+++ ruby_1_9_2/test/ruby/test_bignum.rb	(revision 28819)
@@ -185,6 +185,8 @@
     assert(T31P < T64P)
     assert(T64P > T31P)
     assert_raise(ArgumentError) { T31P < "foo" }
+    assert(T64 < (1.0/0.0))
+    assert(!(T64 > (1.0/0.0)))
   end
 
   def test_eq

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

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