summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-17 01:55:49 (GMT)
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-17 01:55:49 (GMT)
commit41114caa4fb3ebed8d7acc47caf922b3d4ad75fa (patch)
tree13b7db3fe51cdd297af9ffac6b16d9f22d7999c9
parent1fdd248a82f5c2773ffd7781b02794d3310196d9 (diff)
revertd.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--rational.c13
2 files changed, 5 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 65a793d..12fd67d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/rational.c b/rational.c
index a572dce..53bc11c 100644
--- a/rational.c
+++ b/rational.c
@@ -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();