kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

"%\n" means "\n".

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2006-08-05 04:55:00 +00:00
parent f567761a7b
commit a15fe4d1f2
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Aug 5 13:54:03 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (str[fp]time): "%\n" means "\n".
Fri Aug 4 15:21:00 2006 Eric Hodel <drbrain@segment7.net> Fri Aug 4 15:21:00 2006 Eric Hodel <drbrain@segment7.net>
* lib: Merge RDoc and .document from HEAD. * lib: Merge RDoc and .document from HEAD.

13
lib/date/format.rb
View file

@ -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 $ # $Id: format.rb,v 2.15 2005-02-06 13:28:48+09 tadf Exp $
require 'rational' require 'rational'
@ -52,7 +52,7 @@ class Date
def self.__strptime(str, fmt, elem) def self.__strptime(str, fmt, elem)
fmt.scan(/%[EO]?.|./mo) do |c| fmt.scan(/%[EO]?.|./mo) do |c|
cc = c.sub(/\A%[EO]?(.)\Z/o, '%\\1') cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1')
case cc case cc
when /\A\s/o when /\A\s/o
str.sub!(/\A[\s\v]+/o, '') str.sub!(/\A[\s\v]+/o, '')
@ -213,6 +213,8 @@ class Date
warn("warning: %3 is deprecated; use '%F'") warn("warning: %3 is deprecated; use '%F'")
end end
return unless __strptime(str, '%F', elem) return unless __strptime(str, '%F', elem)
when /\A%(.)/m
return unless str.sub!(Regexp.new('\\A' + Regexp.quote($1)), '')
else else
return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '') return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
end end
@ -491,7 +493,7 @@ class Date
def strftime(fmt='%F') def strftime(fmt='%F')
o = '' o = ''
fmt.scan(/%[EO]?.|./mo) do |c| fmt.scan(/%[EO]?.|./mo) do |c|
cc = c.sub(/^%[EO]?(.)$/o, '%\\1') cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1')
case cc case cc
when '%A'; o << DAYNAMES[wday] when '%A'; o << DAYNAMES[wday]
when '%a'; o << ABBR_DAYNAMES[wday] when '%a'; o << ABBR_DAYNAMES[wday]
@ -571,7 +573,10 @@ class Date
warn("warning: %3 is deprecated; use '%F'") warn("warning: %3 is deprecated; use '%F'")
end end
o << strftime('%F') o << strftime('%F')
else; o << c when /\A%(.)/m
o << $1
else
o << c
end end
end end
o o