diff options
author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-08-05 04:55:00 +0000 |
---|---|---|
committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-08-05 04:55:00 +0000 |
commit | 7e10b0c4de56dd727ca6adb3264b0867b275437d (patch) | |
tree | faf2a1b5c88dc1f37945b89dd3af99aec9071743 | |
parent | 08c031f3214915e4ca8a6d78537e2bfeface0284 (diff) | |
download | ruby-7e10b0c4de56dd727ca6adb3264b0867b275437d.tar.gz |
"%\n" means "\n".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/date/format.rb | 13 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Sat Aug 5 13:49:43 2006 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date/format.rb (str[fp]time): "%\n" means "\n". + Fri Aug 4 12:13:22 2006 Eric Hodel <drbrain@segment7.net> * lib: Clean up files for RDoc. diff --git a/lib/date/format.rb b/lib/date/format.rb index 52eecaf2a2..04fadd84a2 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -1,4 +1,4 @@ -# format.rb: Written by Tadayoshi Funaba 1999-2005 +# format.rb: Written by Tadayoshi Funaba 1999-2006 # $Id: format.rb,v 2.15 2005-02-06 13:28:48+09 tadf Exp $ require 'rational' @@ -52,7 +52,7 @@ class Date def self.__strptime(str, fmt, elem) fmt.scan(/%[EO]?.|./mo) do |c| - cc = c.sub(/\A%[EO]?(.)\Z/o, '%\\1') + cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1') case cc when /\A\s/o str.sub!(/\A[\s\v]+/o, '') @@ -213,6 +213,8 @@ class Date warn("warning: %3 is deprecated; use '%F'") end return unless __strptime(str, '%F', elem) + when /\A%(.)/m + return unless str.sub!(Regexp.new('\\A' + Regexp.quote($1)), '') else return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '') end @@ -491,7 +493,7 @@ class Date def strftime(fmt='%F') o = '' fmt.scan(/%[EO]?.|./mo) do |c| - cc = c.sub(/^%[EO]?(.)$/o, '%\\1') + cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1') case cc when '%A'; o << DAYNAMES[wday] when '%a'; o << ABBR_DAYNAMES[wday] @@ -571,7 +573,10 @@ class Date warn("warning: %3 is deprecated; use '%F'") end o << strftime('%F') - else; o << c + when /\A%(.)/m + o << $1 + else + o << c end end o |