diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/date/format.rb | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Mon Aug 7 14:51:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/date/format.rb: specify maximum number of digits to parse + "200608007". %Y(4), %y(2), %m(2), %d(2). [ruby-core:8484] + [experimental] + Mon Aug 7 14:37:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * configure.in, common.mk: AIX link issue. a patch from Yutaka diff --git a/lib/date/format.rb b/lib/date/format.rb index 4425635d33..8533e8461d 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -75,7 +75,7 @@ class Date when '%D' return unless __strptime(str, '%m/%d/%y', elem) when '%d', '%e' - return unless str.sub!(/\A ?(\d+)/o, '') + return unless str.sub!(/\A ?(\d{1,2})/o, '') val = $1.to_i return unless (1..31) === val elem[:mday] = val @@ -112,7 +112,7 @@ class Date return unless (0..59) === val elem[:min] = val when '%m' - return unless str.sub!(/\A(\d+)/o, '') + return unless str.sub!(/\A(\d{1,2})/o, '') val = $1.to_i return unless (1..12) === val elem[:mon] = val @@ -171,11 +171,11 @@ class Date when '%x' return unless __strptime(str, '%m/%d/%y', elem) when '%Y' - return unless str.sub!(/\A([-+]?\d+)/o, '') + return unless str.sub!(/\A([-+]?\d{1,4})/o, '') val = $1.to_i elem[:year] = val when '%y' - return unless str.sub!(/\A(\d+)/o, '') + return unless str.sub!(/\A(\d{2})/o, '') val = $1.to_i return unless (0..99) === val elem[:year] = val |