From caed7c21343726cb8e4c01b576acb116ef137c12 Mon Sep 17 00:00:00 2001 From: tadf Date: Wed, 21 Jun 2006 12:30:58 +0000 Subject: fixed an issue about mathn. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/date.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aae579a94..efe3d9159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 21 21:28:32 2006 Tadayoshi Funaba + + * lib/date.rb (jd_to_commercial): now works fine even if in + mathn-ized context. + Wed Jun 21 17:32:31 2006 Hidetoshi NAGAI * signal.c (ruby_nativethread_signal, posix_nativethread_signal, diff --git a/lib/date.rb b/lib/date.rb index c2070760a..8639b3157 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1,7 +1,7 @@ # # date.rb - date and time library # -# Author: Tadayoshi Funaba 1998-2005 +# Author: Tadayoshi Funaba 1998-2006 # # Documentation: William Webber # @@ -370,7 +370,7 @@ class Date ns = ns?(jd, sg) a = jd_to_civil(jd - 3, ns)[0] y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end - w = 1 + (jd - commercial_to_jd(y, 1, 1, ns)) / 7 + w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor d = (jd + 1) % 7 if d.zero? then d = 7 end return y, w, d -- cgit