From 95d1cc62ea655a047333e5224d52c17a70c2d0cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Jan 2015 19:56:18 -0400 Subject: avoid unncessary padding on last column in table --- src/Utility/Table.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Utility/Table.hs') diff --git a/src/Utility/Table.hs b/src/Utility/Table.hs index 4e862ff6..3d1a3980 100644 --- a/src/Utility/Table.hs +++ b/src/Utility/Table.hs @@ -22,7 +22,8 @@ formatTable table = map (\r -> unwords (map pad (zip r rowsizes))) table where pad (cell, size) = cell ++ take (size - length cell) padding padding = repeat ' ' - rowsizes = sumrows (map (map length) table) + rowsizes = reverse $ (0:) $ drop 1 $ reverse $ + sumrows (map (map length) table) sumrows [] = repeat 0 sumrows [r] = r sumrows (r1:r2:rs) = sumrows $ map (uncurry max) (zip r1 r2) : rs -- cgit v1.2.3 From ee7135dbfd87c1be06ce7777e9e21fd6548c420e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Jan 2015 19:57:42 -0400 Subject: typo; columns vs rows No behavior change --- src/Utility/Table.hs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Utility/Table.hs') diff --git a/src/Utility/Table.hs b/src/Utility/Table.hs index 3d1a3980..20adf40d 100644 --- a/src/Utility/Table.hs +++ b/src/Utility/Table.hs @@ -16,14 +16,14 @@ tableWithHeader header rows = header : map linesep header : rows where linesep = map (const '-') --- | Formats a table to lines, automatically padding rows to the same size. +-- | Formats a table to lines, automatically padding columns to the same size. formatTable :: Table -> [String] -formatTable table = map (\r -> unwords (map pad (zip r rowsizes))) table +formatTable table = map (\r -> unwords (map pad (zip r colsizes))) table where pad (cell, size) = cell ++ take (size - length cell) padding padding = repeat ' ' - rowsizes = reverse $ (0:) $ drop 1 $ reverse $ - sumrows (map (map length) table) - sumrows [] = repeat 0 - sumrows [r] = r - sumrows (r1:r2:rs) = sumrows $ map (uncurry max) (zip r1 r2) : rs + colsizes = reverse $ (0:) $ drop 1 $ reverse $ + sumcols (map (map length) table) + sumcols [] = repeat 0 + sumcols [r] = r + sumcols (r1:r2:rs) = sumcols $ map (uncurry max) (zip r1 r2) : rs -- cgit v1.2.3