diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-03-21 15:13:23 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-03-21 15:13:23 +0000 |
| commit | d05305eb3b357a62359e45cfacfbc963e8414c9b (patch) | |
| tree | 0ed5f63dd297a8bcc2dc5fa5e35b3e84a19a6ca2 /lib/time.rb | |
| parent | 82ced3bcc6c15fb1bd29fd69cc05266f301a7073 (diff) | |
| download | ruby-d05305eb3b357a62359e45cfacfbc963e8414c9b.tar.gz ruby-d05305eb3b357a62359e45cfacfbc963e8414c9b.tar.xz ruby-d05305eb3b357a62359e45cfacfbc963e8414c9b.zip | |
* regex.c (re_compile_pattern): fix previous change.
* instruby.rb, ext/extmk.rb, ext/tk/lib/tk.rb, lib/benchmark.rb,
lib/cgi.rb, lib/debug.rb, lib/getoptlong.rb, lib/jcode.rb,
lib/optparse.rb, lib/time.rb, lib/date/format.rb,
lib/irb/ruby-lex.rb: escape `[', `]', `-' in chracter class in
regexp to avoid warning.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
| -rw-r--r-- | lib/time.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/time.rb b/lib/time.rb index f3e18d7c2..4c9d8a526 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -69,9 +69,9 @@ class Time def zone_offset(zone, year=Time.now.year) off = nil zone = zone.upcase - if /\A([-+])(\d\d):?(\d\d)\z/ =~ zone + if /\A([\-+])(\d\d):?(\d\d)\z/ =~ zone off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60 - elsif /\A[-+]\d\d\z/ =~ zone + elsif /\A[\-+]\d\d\z/ =~ zone off = zone.to_i * 3600 elsif ZoneOffset.include?(zone) off = ZoneOffset[zone] * 3600 |