diff options
Diffstat (limited to 'lib/date/delta/parser.rb')
| -rw-r--r-- | lib/date/delta/parser.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/date/delta/parser.rb b/lib/date/delta/parser.rb index 7efe29f4c2..459d77a572 100644 --- a/lib/date/delta/parser.rb +++ b/lib/date/delta/parser.rb @@ -13,7 +13,7 @@ class Date class Parser < Racc::Parser -module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42 +module_eval <<'..end parser.ry modeval..idf2987de166', 'parser.ry', 42 def lookup(str) t = str.downcase @@ -28,7 +28,8 @@ module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42 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'] @@ -56,7 +57,7 @@ module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42 @q.shift end -..end parser.ry modeval..id43bff5dec9 +..end parser.ry modeval..idf2987de166 ##### racc 1.4.5 generates ### |