1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed an issue about mathn.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2006-06-21 12:23:58 +00:00
parent bc6a1d8dcf
commit 274ae70db2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jun 21 21:20:31 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (jd_to_commercial): now works fine even if in
mathn-ized context.
Wed Jun 21 17:29:57 2006 NAKAMURA Usaku <usa@ruby-lang.org> Wed Jun 21 17:29:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo. * ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.

4
lib/date.rb
View File

@ -1,7 +1,7 @@
# #
# date.rb - date and time library # date.rb - date and time library
# #
# Author: Tadayoshi Funaba 1998-2005 # Author: Tadayoshi Funaba 1998-2006
# #
# Documentation: William Webber <william@williamwebber.com> # Documentation: William Webber <william@williamwebber.com>
# #
@ -370,7 +370,7 @@ class Date
ns = ns?(jd, sg) ns = ns?(jd, sg)
a = jd_to_civil(jd - 3, ns)[0] 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 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 d = (jd + 1) % 7
if d.zero? then d = 7 end if d.zero? then d = 7 end
return y, w, d return y, w, d