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

revert r28788 (backport of r28751).

Browse source 
The patch seems to be revised by r28763.  The patch will be backported
after it is stabilized by an experience in trunk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-08-01 12:22:06 +00:00
parent ff60853e4c
commit b22c83311d
3 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -19,11 +19,6 @@ Sun Aug 1 09:35:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
* bignum.c (big_op): comparison of bignum and infinity has returned 1 * bignum.c (big_op): comparison of bignum and infinity has returned 1
or -1, but it must return boolean. or -1, but it must return boolean.
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]
Wed Jul 21 15:22:17 2010 Evan Phoenix <evan@fallingsnow.net> Wed Jul 21 15:22:17 2010 Evan Phoenix <evan@fallingsnow.net>
* lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from * lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from

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

@ -239,20 +239,6 @@ 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 }