summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 11:48:21 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 11:48:21 +0000
commit092c647cb70af77b431f00c83126f93b0364857b (patch)
treed0587f0fd11b2a042fb699d28cbf366a6441141c
parentfebf2cefb3b69dd859b3c81e0512d0bae9b315ea (diff)
* time.c (rb_time_unmagnify_to_float): Avoid double rounding.
Reported by Tsuyoshi Sawada. https://bugs.ruby-lang.org/issues/10135#note-1 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_time.rb6
-rw-r--r--time.c5
3 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 364515c66a..a2ece3d250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 26 20:46:55 2014 Tanaka Akira <akr@fsij.org>
+
+ * time.c (rb_time_unmagnify_to_float): Avoid double rounding.
+ Reported by Tsuyoshi Sawada.
+ https://bugs.ruby-lang.org/issues/10135#note-1
+
Tue Aug 26 17:12:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_close): ignore only "closed stream" IOError and
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index bf78bbf8cb..399242e4b7 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -423,6 +423,12 @@ class TestTime < Test::Unit::TestCase
assert_equal(946684800.0, t2000.to_f)
end
+ def test_to_f_accuracy
+ # https://bugs.ruby-lang.org/issues/10135#note-1
+ f = 1381089302.195
+ assert_equal(f, Time.at(f).to_f, "[ruby-core:64373] [Bug #10135] note-1")
+ end
+
def test_cmp
t2000 = get_t2000
assert_equal(-1, t2000 <=> Time.gm(2001))
diff --git a/time.c b/time.c
index 7ba83bbea7..6248a74442 100644
--- a/time.c
+++ b/time.c
@@ -697,7 +697,10 @@ rb_time_unmagnify_to_float(wideval_t w)
}
#endif
v = w2v(w);
- return quo(v, DBL2NUM(TIME_SCALE));
+ if (RB_TYPE_P(v, T_RATIONAL))
+ return rb_Float(quo(v, INT2FIX(TIME_SCALE)));
+ else
+ return quo(v, DBL2NUM(TIME_SCALE));
}
static void