1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/date/format.rb: reverted.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2009-08-16 13:20:50 +00:00
parent 5e4f23d600
commit aa3c6d4dd2
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Aug 16 22:20:16 2009 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: reverted.
Sun Aug 16 21:31:21 2009 NARUSE, Yui <naruse@ruby-lang.org> Sun Aug 16 21:31:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
* lib/date/format.rb: suppressed a warning. * lib/date/format.rb: suppressed a warning.

14
lib/date/format.rb
View File

@ -544,8 +544,8 @@ class Date
e._cent ||= if val >= 69 then 19 else 20 end e._cent ||= if val >= 69 then 19 else 20 end
when 'Z', /\A:{0,3}z/ when 'Z', /\A:{0,3}z/
return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
|[a-z.\s]+(?:standard|daylight)\s+time\b |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
|[a-z]+(?:\s+dst)?\b |[[:alpha:]]+(?:\s+dst)?\b
)/ix, '') )/ix, '')
val = $1 val = $1
e.zone = val e.zone = val
@ -560,8 +560,8 @@ class Date
end end
else else
case c case c
when /\A\s/ when /\A[\s\v]/
str.sub!(/\A\s+/, '') str.sub!(/\A[\s\v]+/, '')
else else
return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '') return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
end end
@ -703,9 +703,9 @@ class Date
( (
(?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
| |
[a-z.\s]+(?:standard|daylight)\stime\b [[:alpha:].\s]+(?:standard|daylight)\stime\b
| |
[a-z]+(?:\sdst)?\b [[:alpha:]]+(?:\sdst)?\b
) )
)? )?
/ix, /ix,
@ -1034,7 +1034,7 @@ class Date
e._comp = comp e._comp = comp
str.gsub!(/[^-+',.\/:@0-9a-zA-Z\[\]]+/, ' ') str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
_parse_time(str, e) # || _parse_beat(str, e) _parse_time(str, e) # || _parse_beat(str, e)
_parse_day(str, e) _parse_day(str, e)