kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/date.rb: Re-revert the part of r28950.

Browse source 
It reverted the part of r28619.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-08-17 06:18:53 +00:00
parent 05745ccfb3
commit e44f5bcbd9
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Aug 17 15:13:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/date.rb: Re-revert the part of r28950.
It reverted the part of r28619.
Tue Aug 17 13:00:07 2010 Tanaka Akira <akr@fsij.org> Tue Aug 17 13:00:07 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_dirname): Pathname#dirname translated * ext/pathname/pathname.c (path_dirname): Pathname#dirname translated
@ -243,7 +248,7 @@ Tue Aug 10 15:24:30 2010 Kenta Murata <mrkn@mrkn.jp>
ext/bigdecimal/extconf.rb: BASE and BASE_FIG are defined ext/bigdecimal/extconf.rb: BASE and BASE_FIG are defined
based on the size of BDIGIT. based on the size of BDIGIT.
* ext/bigdecimal/bigdecimal.c, ext/bigdecimal/bigdecimal.h: * ext/bigdecimal/bigdecimal.c, ext/bigdecimal/bigdecimal.h:
use BDIGIT for Real#frac. use BDIGIT for Real#frac.
Tue Aug 10 15:19:45 2010 Kenta Murata <mrkn@mrkn.jp> Tue Aug 10 15:19:45 2010 Kenta Murata <mrkn@mrkn.jp>

10
lib/date.rb
View file

@ -470,7 +470,7 @@ class Date
end end
def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc: def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
y, m, d = jd_to_civil(jd, sg) y, _, d = jd_to_civil(jd, sg)
a = find_fdoy(y, sg) + 6 a = find_fdoy(y, sg) + 6
w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7) w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
return y, w, d return y, w, d
@ -486,7 +486,7 @@ class Date
end end
def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc: def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc:
y, m, d = jd_to_civil(jd, sg) y, m, = jd_to_civil(jd, sg)
j = find_fdom(y, m, sg) j = find_fdom(y, m, sg)
return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd) return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd)
end end
@ -645,7 +645,7 @@ class Date
d += 8 d += 8
end end
if w < 0 if w < 0
ny, nw, nd = ny, nw, =
jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg) jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg)
return unless ny == y return unless ny == y
w = nw w = nw
@ -660,7 +660,7 @@ class Date
d += 7 d += 7
end end
if w < 0 if w < 0
ny, nw, nd, nf = ny, nw, =
jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg) jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg)
return unless ny == y return unless ny == y
w = nw w = nw
@ -677,7 +677,7 @@ class Date
if n < 0 if n < 0
ny, nm = (y * 12 + m).divmod(12) ny, nm = (y * 12 + m).divmod(12)
nm, = (nm + 1) .divmod(1) nm, = (nm + 1) .divmod(1)
ny, nm, nn, nk = ny, nm, nn, =
jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg) jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg)
return unless [ny, nm] == [y, m] return unless [ny, nm] == [y, m]
n = nn n = nn