From 552531375721e94d559a54276259fdabf1ef92a3 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 24 Mar 2020 11:11:15 -0700 Subject: [PATCH] formatting: support other sequences in printf. --- basis/formatting/formatting-tests.factor | 1 + basis/formatting/formatting.factor | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/basis/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor index 80b5e41c06..96666a4594 100644 --- a/basis/formatting/formatting-tests.factor +++ b/basis/formatting/formatting-tests.factor @@ -143,6 +143,7 @@ IN: formatting.tests { "[####monkey]" } [ "monkey" "[%'#10s]" sprintf ] unit-test { "[many monke]" } [ "many monkeys" "[%10.10s]" sprintf ] unit-test +{ "{ 1, 2, 3 }" } [ BV{ 1 2 3 } "%[%d, %]" sprintf ] unit-test { "{ 1, 2, 3 }" } [ { 1 2 3 } "%[%s, %]" sprintf ] unit-test { "{ 1:2, 3:4 }" } [ H{ { 1 2 } { 3 4 } } "%[%s: %s %]" sprintf ] unit-test diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor index 5b9b722f89..34fdbef9d4 100644 --- a/basis/formatting/formatting.factor +++ b/basis/formatting/formatting.factor @@ -136,7 +136,7 @@ numbers = sign pad numbers_ => [[ unclip-last prefix compose-all [ fix-sign types = strings|numbers -lists = "[%" types ", %]" => [[ second '[ _ map ", " join "{ " prepend " }" append ] ]] +lists = "[%" types ", %]" => [[ second '[ _ { } map-as ", " join "{ " " }" surround ] ]] assocs = "[%" types ": %" types " %]" => [[ [ second ] [ fourth ] bi '[ unzip [ _ map ] dip _ map zip [ ":" join ] map ", " join "{ " prepend " }" append ] ]] -- 2.34.1