Skip to content

Commit

Permalink
revertd.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
tadf committed Sep 17, 2013
1 parent 1fdd248 commit 41114ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Mon Sep 16 00:44:23 2013 Masaki Matsushita <glass.saga@gmail.com>
* ext/socket/mkconstants.rb: define MSG_FASTOPEN.
[ruby-core:57138] [Feature #8897]

Sun Sep 15 13:31:23 2013 Tadayoshi Funaba <tadf@dotrb.org>

* rational.c (nurat_div): reverted r28844, r28886 and r28887.

Sat Sep 14 06:08:10 2013 Eric Hodel <drbrain@segment7.net>

* dir.c (dir_s_glob): [DOC] Improve wording and layout.
Expand Down
13 changes: 1 addition & 12 deletions rational.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,19 +950,8 @@ nurat_div(VALUE self, VALUE other)
other, ONE, '/');
}
}
else if (RB_TYPE_P(other, T_FLOAT)) {
{
double x = RFLOAT_VALUE(other), den;
get_dat1(self);

if (isnan(x)) return DBL2NUM(NAN);
if (isinf(x)) return INT2FIX(0);
if (x != 0.0 && modf(x, &den) == 0.0) {
return rb_rational_raw2(dat->num, f_mul(rb_dbl2big(den), dat->den));
}
}
else if (RB_TYPE_P(other, T_FLOAT))
return rb_funcall(f_to_f(self), '/', 1, other);
}
else if (RB_TYPE_P(other, T_RATIONAL)) {
if (f_zero_p(other))
rb_raise_zerodiv();
Expand Down

0 comments on commit 41114ca

Please sign in to comment.