diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-22 10:34:29 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-22 10:34:29 +0000 |
commit | 258ed42c12ab2d0d2d23cbd0b5bcbd60f3ed55d6 (patch) | |
tree | 5e7a16fa36cc387f8849141027948c2df26237c9 /lib | |
parent | f50bcf93171c4a73a513e04b91d6c9c8824c42ba (diff) | |
download | ruby-258ed42c12ab2d0d2d23cbd0b5bcbd60f3ed55d6.tar.gz |
* lib/time.rb (Time.parse): use year completion in Date._parse.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/time.rb | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/time.rb b/lib/time.rb index 37da4e381d..5b70deca5f 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -253,26 +253,13 @@ class Time # A failure for Time.parse should be checked, though. # def parse(date, now=self.now) - d = Date._parse(date, false) + comp = !block_given? + d = Date._parse(date, comp) if !d[:year] && !d[:mon] && !d[:mday] && !d[:hour] && !d[:min] && !d[:sec] && !d[:sec_fraction] raise ArgumentError, "no time information in #{date.inspect}" end year = d[:year] - if year - if block_given? - year = yield(year) - else - year = if year < 0 - year - elsif year < 50 - 2000 + year - elsif year < 100 - 1900 + year - else - year - end - end - end + year = yield(year) if year && !comp make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) end |