1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bignum.c (rb_big_eq): never equal to infinity.

Browse Source 
[ruby-core:31603]

* rational.c (nurat_div): hack for integral float divisor.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-03 11:30:19 +00:00
parent b5dc2576cc
commit 292c39098d
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Aug 3 20:30:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_eq): never equal to infinity.
[ruby-core:31603]
* rational.c (nurat_div): hack for integral float divisor.
Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org> Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441. * ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.

2
bignum.c
View File

@ -1567,7 +1567,7 @@ rb_big_eq(VALUE x, VALUE y)
volatile double a, b; volatile double a, b;
a = RFLOAT_VALUE(y); a = RFLOAT_VALUE(y);
if (isnan(a)) return Qfalse; if (isnan(a) || isinf(a)) return Qfalse;
b = rb_big2dbl(x); b = rb_big2dbl(x);
return (a == b)?Qtrue:Qfalse; return (a == b)?Qtrue:Qfalse;
} }

17
rational.c
View File

@ -869,6 +869,23 @@ nurat_div(VALUE self, VALUE other)
other, ONE, '/'); other, ONE, '/');
} }
case T_FLOAT: case T_FLOAT:
{
double x = RFLOAT_VALUE(other), den;
get_dat1(self);
if (isnan(x)) return DBL2NUM(NAN);
if (isinf(x)) {
if (RTEST(f_negative_p(dat->num)) == (x < 0)) {
return DBL2NUM(INFINITY);
}
else {
return DBL2NUM(-INFINITY);
}
}
if (modf(x, &den) == 0.0) {
return rb_rational_raw2(dat->num, f_mul(rb_dbl2big(den), dat->den));
}
}
return rb_funcall(f_to_f(self), '/', 1, other); return rb_funcall(f_to_f(self), '/', 1, other);
case T_RATIONAL: case T_RATIONAL:
if (f_zero_p(other)) if (f_zero_p(other))

1
test/ruby/test_bignum.rb
View File

@ -193,6 +193,7 @@ class TestBignum < Test::Unit::TestCase
assert(T31P != 1) assert(T31P != 1)
assert(T31P == 2147483647.0) assert(T31P == 2147483647.0)
assert(T31P != "foo") assert(T31P != "foo")
assert(2**77889 != (1.0/0.0), '[ruby-core:31603]')
end end
def test_eql def test_eql