summaryrefslogtreecommitdiff
path: root/lib/date/format.rb
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-19 01:27:53 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-19 01:27:53 +0000
commit8bf9e0829f06fb8d57e2d91fd01326bd113dadca (patch)
treee935fd6651b9c44312d879d2c451123cf154a802 /lib/date/format.rb
parent3d18c14e2c95b1c182932f074f6a55604df07498 (diff)
* lib/date/format.rb (Date._parse): detects some OFX dates
(Of course not fully). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/date/format.rb')
-rw-r--r--lib/date/format.rb21
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/date/format.rb b/lib/date/format.rb
index 7fc2477bbf..e2339827c5 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,5 +1,5 @@
# format.rb: Written by Tadayoshi Funaba 1999-2007
-# $Id: format.rb,v 2.34 2007-05-08 21:17:02+09 tadf Exp $
+# $Id: format.rb,v 2.35 2007-05-19 09:23:48+09 tadf Exp $
require 'rational'
@@ -839,7 +839,7 @@ class Date
end
def self._parse_dot(str, e) # :nodoc:
- if str.sub!(%r|('?-?\d+)\.\s*('?\d+)[^-+\d]\s*('?-?\d+)|n, ' ') # '
+ if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|n, ' ') # '
s3e(e, $1, $2, $3)
true
end
@@ -878,11 +878,12 @@ class Date
(?:
\s*
(
- Z
+ Z\b
|
- [-+]\d{1,4}
+ [-+]\d{1,4}\b
+ |
+ \[[-+]?\d[^\]]*\]
)
- \b
)?
/inx,
' ')
@@ -985,6 +986,14 @@ class Date
end
if $5
e.zone = $5
+ if e.zone[0,1] == '['
+ o, n, = e.zone[1..-2].split(':')
+ e.zone = n || o
+ if /\A\d/ =~ o
+ o = format('+%s', o)
+ end
+ e.offset = zone_to_diff(o)
+ end
end
true
end
@@ -1002,7 +1011,7 @@ class Date
e._comp = comp
- str.gsub!(/[^-+',.\/:0-9@a-z\x80-\xff]+/in, ' ')
+ str.gsub!(/[^-+',.\/:0-9@a-z\[\]\x80-\xff]+/in, ' ')
_parse_time(str, e) # || _parse_beat(str, e)
_parse_day(str, e)