kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (flo_cmp): honor the result of infinite? method of the

Browse source 
other.  [ruby-core:31470]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-07-24 20:37:31 +00:00
parent 8d3bb806b0
commit 7bfa1146e2
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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. * test/ruby/envutil.rb (EnvUtil#.suppress_warning): added.

10
numeric.c
View file

@ -1016,7 +1016,7 @@ rb_dbl_cmp(double a, double b)
static VALUE static VALUE
flo_cmp(VALUE x, VALUE y) flo_cmp(VALUE x, VALUE y)
{ {
double a, b; double a, b, i;
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (isnan(a)) return Qnil; if (isnan(a)) return Qnil;
@ -1038,8 +1038,12 @@ flo_cmp(VALUE x, VALUE y)
break; break;
default: default:
if (isinf(a) && (!rb_respond_to(y, rb_intern("infinite?")) || if (isinf(a) && (i = rb_check_funcall(y, rb_intern("infinite?"), 0, 0)) != Qundef) {
!RTEST(rb_funcall(y, rb_intern("infinite?"), 0, 0)))) { 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); if (a > 0.0) return INT2FIX(1);
return INT2FIX(-1); return INT2FIX(-1);
} }

14
test/ruby/test_float.rb
View file

@ -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)
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 } assert_raise(ArgumentError) { 1.0 >= nil }
assert_raise(ArgumentError) { 1.0 < nil } assert_raise(ArgumentError) { 1.0 < nil }