diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | numeric.c | 10 | ||||
| -rw-r--r-- | test/ruby/test_float.rb | 14 |
3 files changed, 25 insertions, 4 deletions
@@ -1,4 +1,7 @@ -Sun Jul 25 05:26:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jul 25 05:37:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * numeric.c (flo_cmp): honor the result of infinite? method of the + other. [ruby-core:31470] * test/ruby/envutil.rb (EnvUtil#.suppress_warning): added. @@ -1016,7 +1016,7 @@ rb_dbl_cmp(double a, double b) static VALUE flo_cmp(VALUE x, VALUE y) { - double a, b; + double a, b, i; a = RFLOAT_VALUE(x); if (isnan(a)) return Qnil; @@ -1038,8 +1038,12 @@ flo_cmp(VALUE x, VALUE y) break; default: - if (isinf(a) && (!rb_respond_to(y, rb_intern("infinite?")) || - !RTEST(rb_funcall(y, rb_intern("infinite?"), 0, 0)))) { + if (isinf(a) && (i = rb_check_funcall(y, rb_intern("infinite?"), 0, 0)) != Qundef) { + if (RTEST(i)) { + int j = rb_cmpint(i, x, y); + j = (a > 0.0) ? (j > 0 ? 0 : +1) : (j < 0 ? 0 : -1); + return INT2FIX(j); + } if (a > 0.0) return INT2FIX(1); return INT2FIX(-1); } diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 5f3e98a6fd..a8ce76edbc 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -242,6 +242,20 @@ class TestFloat < Test::Unit::TestCase assert_equal(-1, (Float::MAX.to_i*2) <=> inf) assert_equal(1, (-Float::MAX.to_i*2) <=> -inf) + bug3609 = '[ruby-core:31470]' + def (pinf = Object.new).infinite?; +1 end + def (ninf = Object.new).infinite?; -1 end + def (fin = Object.new).infinite?; nil end + nonum = Object.new + assert_equal(0, inf <=> pinf, bug3609) + assert_equal(1, inf <=> fin, bug3609) + assert_equal(1, inf <=> ninf, bug3609) + assert_nil(inf <=> nonum, bug3609) + assert_equal(-1, -inf <=> pinf, bug3609) + assert_equal(-1, -inf <=> fin, bug3609) + assert_equal(0, -inf <=> ninf, bug3609) + assert_nil(-inf <=> nonum, bug3609) + assert_raise(ArgumentError) { 1.0 > nil } assert_raise(ArgumentError) { 1.0 >= nil } assert_raise(ArgumentError) { 1.0 < nil } |