From ce2b7d3a58fb2cce8650d5d8809ce40e6a1e9250 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 22 Aug 2008 05:28:08 +0000 Subject: * strftime.c (rb_strftime): supported flags and precision for most conversions. [ruby-dev:35906] * lib/date/format.rb (Date#strftime): left-justifies %L and %N. [ruby-dev:35909] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/date/format.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/date') diff --git a/lib/date/format.rb b/lib/date/format.rb index 46d2147b89..7c500a52d2 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -153,8 +153,8 @@ class Date s[0,0] = sign end - if f[:p] != '-' - s = s.rjust(f[:w], f[:p]) + if f[:w] + s = f[:n] ? s.ljust(f[:w], f[:p]) : s.rjust(f[:w], f[:p]) end if f[:s] && f[:p] != "\s" @@ -257,12 +257,18 @@ class Date when 'j'; emit_n(yday, 3, f) when 'k'; emit_a(hour, 2, f) when 'L' - emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f) + f[:n] = true + w = f[:w] + s = emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f) + w ? s[0, w] : s when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f) when 'M', 'OM'; emit_n(min, 2, f) when 'm', 'Om'; emit_n(mon, 2, f) when 'N' - emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f) + f[:n] = true + w = f[:w] + s = emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f) + w ? s[0, w] : s when 'n'; "\n" when 'P'; emit_ad(strftime('%p').downcase, 0, f) when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f) -- cgit v1.2.3