akr	2008-06-28 01:10:46 +0900 (Sat, 28 Jun 2008)

  New Revision: 17617

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/test/ruby/test_time.rb
    branches/ruby_1_8/time.c
    trunk/ChangeLog
    trunk/test/ruby/test_time.rb
    trunk/time.c

  Log:
    * time.c: fix rounding negative float.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/time.c?r1=17617&r2=17616&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/test/ruby/test_time.rb?r1=17617&r2=17616&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17617&r2=17616&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17617&r2=17616&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_time.rb?r1=17617&r2=17616&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/time.c?r1=17617&r2=17616&diff_format=u

Index: time.c
===================================================================
--- time.c	(revision 17616)
+++ time.c	(revision 17617)
@@ -201,6 +201,10 @@
 	    double f, d;
 
 	    d = modf(RFLOAT_VALUE(num), &f);
+            if (d < 0) {
+                d += 1;
+                f -= 1;
+            }
 	    t.tv_sec = (time_t)f;
 	    if (f != t.tv_sec) {
 		rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT_VALUE(num));
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17616)
+++ ChangeLog	(revision 17617)
@@ -1,3 +1,7 @@
+Sat Jun 28 01:08:42 2008  Tanaka Akira  <akr@f...>
+
+	* time.c (time_timespec): fix rounding negative float.
+
 Fri Jun 27 21:38:57 2008  Tanaka Akira  <akr@f...>
 
 	* struct.c: __size__ removed.  use the length of __members__ instead.
Index: test/ruby/test_time.rb
===================================================================
--- test/ruby/test_time.rb	(revision 17616)
+++ test/ruby/test_time.rb	(revision 17617)
@@ -105,6 +105,18 @@
     assert_equal(100, Time.at(0.0000001).nsec)
     assert_equal(10, Time.at(0.00000001).nsec)
     assert_equal(1, Time.at(0.000000001).nsec)
+    assert_equal(0, Time.at(1e-10).nsec)
+    assert_equal(0, Time.at(4e-10).nsec)
+    assert_equal(1, Time.at(6e-10).nsec)
+    assert_equal(1, Time.at(14e-10).nsec)
+    assert_equal(2, Time.at(16e-10).nsec)
+    if negative_time_t?
+      assert_equal(0, Time.at(-1e-10).nsec)
+      assert_equal(0, Time.at(-4e-10).nsec)
+      assert_equal(999999999, Time.at(-6e-10).nsec)
+      assert_equal(999999999, Time.at(-14e-10).nsec)
+      assert_equal(999999998, Time.at(-16e-10).nsec)
+    end
   end
 
   def test_at2
Index: ruby_1_8/time.c
===================================================================
--- ruby_1_8/time.c	(revision 17616)
+++ ruby_1_8/time.c	(revision 17617)
@@ -192,6 +192,10 @@
 	    double f, d;
 
 	    d = modf(RFLOAT(time)->value, &f);
+            if (d < 0) {
+                d += 1;
+                f -= 1;
+            }
 	    t.tv_sec = (time_t)f;
 	    if (f != t.tv_sec) {
 		rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT(time)->value);
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17616)
+++ ruby_1_8/ChangeLog	(revision 17617)
@@ -1,3 +1,7 @@
+Sat Jun 28 01:08:42 2008  Tanaka Akira  <akr@f...>
+
+	* time.c (time_timeval): fix rounding negative float.
+
 Fri Jun 27 21:38:57 2008  Tanaka Akira  <akr@f...>
 
 	* struct.c: __size__ removed.  use the length of __members__ instead.
Index: ruby_1_8/test/ruby/test_time.rb
===================================================================
--- ruby_1_8/test/ruby/test_time.rb	(revision 17616)
+++ ruby_1_8/test/ruby/test_time.rb	(revision 17617)
@@ -71,4 +71,25 @@
       assert_equal(Time.at(0x7fffffff), Time.at(-0x80000000) - (-0xffffffff))
     end
   end
+
+  def test_at
+    assert_equal(100000, Time.at(0.1).usec)
+    assert_equal(10000, Time.at(0.01).usec)
+    assert_equal(1000, Time.at(0.001).usec)
+    assert_equal(100, Time.at(0.0001).usec)
+    assert_equal(10, Time.at(0.00001).usec)
+    assert_equal(1, Time.at(0.000001).usec)
+    assert_equal(0, Time.at(1e-7).usec)
+    assert_equal(0, Time.at(4e-7).usec)
+    assert_equal(1, Time.at(6e-7).usec)
+    assert_equal(1, Time.at(14e-7).usec)
+    assert_equal(2, Time.at(16e-7).usec)
+    if negative_time_t?
+      assert_equal(0, Time.at(-1e-7).usec)
+      assert_equal(0, Time.at(-4e-7).usec)
+      assert_equal(999999, Time.at(-6e-7).usec)
+      assert_equal(999999, Time.at(-14e-7).usec)
+      assert_equal(999998, Time.at(-16e-7).usec)
+    end
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/