strings.tables: fix a logic error

diff --git a/basis/strings/tables/tables-tests.factor b/basis/strings/tables/tables-tests.factor
index 9429772f4a63fcae526b0d354f442d2bba6dc491..56aacfeb17ce3d31b8e4a692715911a1c55da6b1 100644 (file)
--- a/basis/strings/tables/tables-tests.factor
+++ b/basis/strings/tables/tables-tests.factor
@@ -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
\ No newline at end of file
+[ { "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
\ No newline at end of file

diff --git a/basis/strings/tables/tables.factor b/basis/strings/tables/tables.factor
index 19d0051d176a6008fd92b0f955bee142a236adb2..32bdcbfad17cbd599413f8a91f33ec810d02a0d9 100644 (file)
--- a/basis/strings/tables/tables.factor
+++ b/basis/strings/tables/tables.factor
@@ -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 ;
\ No newline at end of file