diff options
Diffstat (limited to 'lib/date/delta/parser.ry')
| -rw-r--r-- | lib/date/delta/parser.ry | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/date/delta/parser.ry b/lib/date/delta/parser.ry index 84d4c22c3c..4de8aa1e46 100644 --- a/lib/date/delta/parser.ry +++ b/lib/date/delta/parser.ry @@ -1,4 +1,4 @@ -# parser.ry: Written by Tadayoshi Funaba 2006,2008,2009 -*- ruby -*- +# parser.ry: Written by Tadayoshi Funaba 2006,2008-2010 -*- ruby -*- class Date::Delta::Parser @@ -53,7 +53,8 @@ class Date::Delta::Parser until str.empty? case str when /\A\s+/ - when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i + when /\Ap\d+[ymdhsw]/i + /\Ap(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i =~ str y, m, d, h, min, s, w = [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i} y *= UNITS4KEY['years'] |