formatting: fix strftime %U and %W

[factor.git] / basis / formatting / formatting.factor

diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index 4ed90e8006809550587dfdfff63d8ba8be0d3ce8..1f5663c959ef9fa920ce8b16b6fcf705875dff31 100644 (file)
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors arrays assocs calendar calendar.english
-combinators combinators.smart generalizations io
-io.streams.string kernel math math.functions
+calendar.private combinators combinators.smart generalizations
+io io.streams.string kernel math math.functions
 math.functions.integer-logs math.parser multiline namespaces
 peg.ebnf present prettyprint quotations sequences
 sequences.generalizations splitting strings unicode ;
@@ -106,7 +106,7 @@ pad       = pad-align pad-char pad-width => [[ <reversed> >quotation dup first 0
 sign_     = [+ ]                 => [[ '[ dup first CHAR: - = [ _ prefix ] unless ] ]]
 sign      = (sign_)?             => [[ [ ] or ]]
 
-width_    = "." ([0-9])*         => [[ second >digits '[ _ short head ] ]]
+width_    = "." ([0-9])*         => [[ second >digits '[ _ index-or-length head ] ]]
 width     = (width_)?            => [[ [ ] or ]]
 
 digits_   = "." ([0-9])*         => [[ second >digits ]]
@@ -142,7 +142,7 @@ assocs    = "[%" types ": %" types " %]" => [[ [ second ] [ fourth ] bi '[ [ _ _
 
 formats   = "%" (types|fmt-%|lists|assocs|unknown) => [[ second ]]
 
-plain-text = (!("%").)+          => [[ >string ]]
+plain-text = [^%]+               => [[ >string ]]
 
 text      = (formats|plain-text)*
 
@@ -204,8 +204,9 @@ MACRO: sprintf ( format-string -- quot )
     ] output>array join-words ; inline
 
 : week-of-year ( timestamp day -- n )
-    [ dup clone 1 >>month 1 >>day day-of-week dup ] dip > [ 7 swap - ] when
-    [ day-of-year ] dip 2dup < [ 0 2nip ] [ - 7 / 1 + >fixnum ] if ;
+    [ dup clone first-day-of-year dup clone ]
+    [ day-this-week ] bi* swap '[ _ time- duration>days ] bi@
+    dup 0 < [ 7 + - ] [ drop ] if 7 + 7 /i ;
 
 : week-of-year-sunday ( timestamp -- n ) 0 week-of-year ; inline
 
@@ -243,7 +244,7 @@ formats_  = fmt-%|fmt-a|fmt-A|fmt-b|fmt-B|fmt-c|fmt-d|fmt-H|fmt-I|
 
 formats   = "%" (formats_)       => [[ second ]]
 
-plain-text = (!("%").)+          => [[ >string ]]
+plain-text = [^%]+               => [[ >string ]]
 
 text      = (formats|plain-text)*