tadf	2011-04-25 03:07:24 +0900 (Mon, 25 Apr 2011)

  New Revision: 31337

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

  Log:
    * ext/date/lib/date/format.rb (_iso8601): added a pattern.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31336)
+++ ChangeLog	(revision 31337)
@@ -1,3 +1,7 @@
+Mon Apr 25 03:04:16 2011  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/lib/date/format.rb (_iso8601): added a pattern.
+
 Mon Apr 25 02:51:22 2011  NARUSE, Yui  <naruse@r...>
 
 	* ext/date/lib/date/format.rb: require 'date_core.so'.
@@ -6,7 +10,7 @@
 
 Mon Apr 25 02:47:46 2011  Tadayoshi Funaba  <tadf@d...>
 
-	* ext/date/lib/date/format.rb: fixed a bug of regex.
+	* ext/date/lib/date/format.rb (_iso8601): fixed a bug of regex.
 
 Mon Apr 25 02:12:26 2011  Tadayoshi Funaba  <tadf@d...>
 
Index: ext/date/lib/date/format.rb
===================================================================
--- ext/date/lib/date/format.rb	(revision 31336)
+++ ext/date/lib/date/format.rb	(revision 31337)
@@ -209,7 +209,8 @@
     elsif /\A\s*(?:([-+]?(?:\d{4}|\d{2})|--)(\d{2})(\d{2})|
 		   ([-+]?(?:\d{4}|\d{2}))?(\d{3})|
 		   -(\d{3})|
-		   (\d{4}|\d{2})?w(\d{2})(\d))
+		   (\d{4}|\d{2})?w(\d{2})(\d)|
+		-w-(\d))
 	(?:t?
 	(\d{2})(\d{2})(?:(\d{2})(?:[,.](\d+))?)?
 	(z|[-+]\d{2}(?:\d{2})?)?)?\s*\z/ix =~ str
@@ -252,19 +253,23 @@
 	  end
 	  e[:cwyear] = y
 	end
+      elsif $10
+	e = {
+	  :cwday => $10.to_i
+	}
       end
-      if $10
-	e[:hour] = $10.to_i
-	e[:min] = $11.to_i
-	e[:sec] = $12.to_i if $12
+      if $11
+	e[:hour] = $11.to_i
+	e[:min] = $12.to_i
+	e[:sec] = $13.to_i if $13
       end
-      if $13
-	e[:sec_fraction] = Rational($13.to_i, 10**$13.size)
-      end
       if $14
-	e[:zone] = $14
-	e[:offset] = zone_to_diff($14)
+	e[:sec_fraction] = Rational($14.to_i, 10**$14.size)
       end
+      if $15
+	e[:zone] = $15
+	e[:offset] = zone_to_diff($15)
+      end
       e
     elsif /\A\s*(?:(\d{2}):(\d{2})(?::(\d{2})(?:[,.](\d+))?)?
 	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str

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