summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/lib/date/format.rb3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 05906accd8..2e6991e6f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 25 02:47:46 2011 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/lib/date/format.rb: fixed a bug of regex.
+
Mon Apr 25 02:12:26 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/lib/date/format.rb: an adjustment of regex.
diff --git a/ext/date/lib/date/format.rb b/ext/date/lib/date/format.rb
index d2dec22f02..a541131fb5 100644
--- a/ext/date/lib/date/format.rb
+++ b/ext/date/lib/date/format.rb
@@ -206,7 +206,8 @@ class Date
end
e
elsif /\A\s*(?:([-+]?(?:\d{4}|\d{2})|--)(\d{2})(\d{2})|
- ([-+]?(?:\d{4}|\d{2}))?(\d{3)}|-(\d{3})|
+ ([-+]?(?:\d{4}|\d{2}))?(\d{3})|
+ -(\d{3})|
(\d{4}|\d{2})?w(\d{2})(\d))
(?:t?
(\d{2})(\d{2})(?:(\d{2})(?:[,.](\d+))?)?