steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strings.tables: fix a logic error

db4
Slava Pestov 2010-02-02 23:48:30 +13:00
parent 0b278adb5a
commit f8828aef8d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/strings/tables/tables-tests.factor
View File

@ -5,4 +5,8 @@ IN: strings.tables.tests
[ { "A BB" "CC D" } ] [ { { "A" "BB" } { "CC" "D" } } format-table ] unit-test
[ { "A C" "B " "D E" } ] [ { { "A\nB" "C" } { "D" "E" } } format-table ] unit-test
[ { "A C" "B " "D E" } ] [ { { "A\nB" "C" } { "D" "E" } } format-table ] unit-test
[ { "A B" " C" "D E" } ] [ { { "A" "B\nC" } { "D" "E" } } format-table ] unit-test
[ { "A B" "C D" " E" } ] [ { { "A" "B" } { "C" "D\nE" } } format-table ] unit-test

10
basis/strings/tables/tables.factor
View File

@ -11,11 +11,9 @@ IN: strings.tables
: max-length ( seq -- n )
[ length ] [ max ] map-reduce ;
: format-row ( seq ? -- seq )
[
dup max-length
'[ _ "" pad-tail ] map
] unless ;
: format-row ( seq -- seq )
dup max-length
'[ _ "" pad-tail ] map ;
: format-column ( seq ? -- seq )
[
@ -26,5 +24,5 @@ IN: strings.tables
PRIVATE>
: format-table ( table -- seq )
[ [ [ string-lines ] map ] dip format-row flip ] map-last concat
[ [ string-lines ] map format-row flip ] map concat
flip [ format-column ] map-last flip [ " " join ] map ;