formatting: fix strftime %U and %W

diff --git a/basis/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor
index b8a95c7888ccca70c5152e0f1febe0a2d3859e72..8b4bf16b12ca4bd947f012aaa12c125b06b887e0 100644 (file)
--- a/basis/formatting/formatting-tests.factor
+++ b/basis/formatting/formatting-tests.factor
@@ -178,3 +178,19 @@ ${ os windows? "1.000000e+00" "1e+00" ? } [ 1.0 "%.0e" sprintf ] unit-test
 
 { "44" } [ 2020 11 6 <date> "%U" strftime ] unit-test
 { "44" } [ 2020 11 6 <date> "%W" strftime ] unit-test
+
+{ "00" } [ 2022 1 1 <date> "%U" strftime ] unit-test
+{ "01" } [ 2022 1 2 <date> "%U" strftime ] unit-test
+{ "01" } [ 2022 1 3 <date> "%U" strftime ] unit-test
+
+{ "00" } [ 2022 1 1 <date> "%W" strftime ] unit-test
+{ "00" } [ 2022 1 2 <date> "%W" strftime ] unit-test
+{ "01" } [ 2022 1 3 <date> "%W" strftime ] unit-test
+
+{ "34" } [ 2022 8 27 <date> "%U" strftime ] unit-test
+{ "35" } [ 2022 8 28 <date> "%U" strftime ] unit-test
+{ "35" } [ 2022 8 29 <date> "%U" strftime ] unit-test
+
+{ "34" } [ 2022 8 27 <date> "%W" strftime ] unit-test
+{ "34" } [ 2022 8 28 <date> "%W" strftime ] unit-test
+{ "35" } [ 2022 8 29 <date> "%W" strftime ] unit-test

diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index 535133e7b65b4d00f237388c64d107bde610c47e..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 ;
@@ -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