[前][次][番号順一覧][スレッド一覧]

ruby-changes:15136

From: tadf <ko1@a...>
Date: Mon, 22 Mar 2010 19:32:52 +0900 (JST)
Subject: [ruby-changes:15136] Ruby:r27013 (trunk): * lib/date.rb (Date#>>): fixed.

tadf	2010-03-22 19:32:10 +0900 (Mon, 22 Mar 2010)

  New Revision: 27013

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27013

  Log:
    * lib/date.rb (Date#>>): fixed.  [ruby-core:28011]

  Modified files:
    trunk/ChangeLog
    trunk/lib/date.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27012)
+++ ChangeLog	(revision 27013)
@@ -1,3 +1,7 @@
+Mon Mar 22 19:31:06 2010  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date.rb (Date#>>): fixed.  [ruby-core:28011]
+
 Mon Mar 22 18:01:13 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RMDIRS): use rmdir -p if possible.
Index: lib/date.rb
===================================================================
--- lib/date.rb	(revision 27012)
+++ lib/date.rb	(revision 27013)
@@ -1,7 +1,7 @@
 #
 # date.rb - date and time library
 #
-# Author: Tadayoshi Funaba 1998-2009
+# Author: Tadayoshi Funaba 1998-2010
 #
 # Documentation: William Webber <william@w...>
 #
@@ -1416,7 +1416,10 @@
     y, m = (year * 12 + (mon - 1) + n).divmod(12)
     m,   = (m + 1)                    .divmod(1)
     d = mday
-    d -= 1 until jd2 = _valid_civil?(y, m, d, @sg)
+    until jd2 = _valid_civil?(y, m, d, @sg)
+      d -= 1
+      raise ArgumentError, 'invalid date' unless d > 0
+    end
     self + (jd2 - jd)
   end
 

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

[前][次][番号順一覧][スレッド一覧]