shyouhei	2008-06-29 20:09:30 +0900 (Sun, 29 Jun 2008)

  New Revision: 17709

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/test/ruby/test_time.rb
    branches/ruby_1_8_7/time.c
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17617:
    * time.c (time_timeval): fix rounding negative float.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17709&r2=17708&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/test/ruby/test_time.rb?r1=17709&r2=17708&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17709&r2=17708&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/time.c?r1=17709&r2=17708&diff_format=u

Index: ruby_1_8_7/time.c
===================================================================
--- ruby_1_8_7/time.c	(revision 17708)
+++ ruby_1_8_7/time.c	(revision 17709)
@@ -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_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17708)
+++ ruby_1_8_7/ChangeLog	(revision 17709)
@@ -1,3 +1,7 @@
+Sun Jun 29 20:08:11 2008  Tanaka Akira  <akr@f...>
+
+	* time.c (time_timeval): fix rounding negative float.
+
 Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17708)
+++ ruby_1_8_7/version.h	(revision 17709)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/ruby/test_time.rb
===================================================================
--- ruby_1_8_7/test/ruby/test_time.rb	(revision 17708)
+++ ruby_1_8_7/test/ruby/test_time.rb	(revision 17709)
@@ -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/