tadf	2010-08-10 19:59:17 +0900 (Tue, 10 Aug 2010)

  New Revision: 28950

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

  Log:
    [ruby-core:31658]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28949)
+++ ChangeLog	(revision 28950)
@@ -1,3 +1,7 @@
+Tue Aug 10 19:56:13 2010  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date/format.rb: [ruby-core:31658]
+
 Tue Aug 10 17:24:56 2010  NAKAMURA Usaku  <usa@r...>
 
 	* README.EXT.ja: rb_tainted_str_new_cstr() is an alias of
Index: lib/date/format.rb
===================================================================
--- lib/date/format.rb	(revision 28949)
+++ lib/date/format.rb	(revision 28950)
@@ -356,7 +356,7 @@
 
   def jisx0301
     if jd < 2405160
-      iso8601
+      strftime('%F')
     else
       case jd
       when 2405160...2419614
Index: lib/date.rb
===================================================================
--- lib/date.rb	(revision 28949)
+++ lib/date.rb	(revision 28950)
@@ -470,7 +470,7 @@
     end
 
     def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
-      y, _, d = jd_to_civil(jd, sg)
+      y, m, d = jd_to_civil(jd, sg)
       a = find_fdoy(y, sg) + 6
       w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
       return y, w, d
@@ -486,7 +486,7 @@
     end
 
     def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc:
-      y, m, = jd_to_civil(jd, sg)
+      y, m, d = jd_to_civil(jd, sg)
       j = find_fdom(y, m, sg)
       return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd)
     end
@@ -645,7 +645,7 @@
 	d += 8
       end
       if w < 0
-	ny, nw, =
+	ny, nw, nd =
 	  jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg)
 	return unless ny == y
 	w = nw
@@ -660,7 +660,7 @@
 	d += 7
       end
       if w < 0
-	ny, nw, =
+	ny, nw, nd, nf =
 	  jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg)
 	return unless ny == y
 	w = nw
@@ -677,7 +677,7 @@
       if n < 0
 	ny, nm = (y * 12 + m).divmod(12)
 	nm,    = (nm + 1)    .divmod(1)
-	ny, nm, nn, =
+	ny, nm, nn, nk =
 	  jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg)
 	return unless [ny, nm] == [y, m]
 	n = nn

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