on master help sign in
drop wcwidth module in preference to pure-haskell wcwidth implementation
be67a29AgentM
project-m36.cabal+2−1
@@ -57,7 +57,7 @@ Library
57 ,time
57 ,time
58 ,hashable-time
58 ,hashable-time
59 ,old-locale
59 ,old-locale
60− ,wcwidth
60+ ,rset
61 --used for CSV parsing
61 --used for CSV parsing
62 ,attoparsec
62 ,attoparsec
63 ,either
63 ,either
@@ -113,6 +113,7 @@ Library
113 ProjectM36.Relation.Show.HTML,
113 ProjectM36.Relation.Show.HTML,
114 ProjectM36.StaticOptimizer,
114 ProjectM36.StaticOptimizer,
115 ProjectM36.Relation.Show.Term,
115 ProjectM36.Relation.Show.Term,
116+ ProjectM36.WCWidth,
116 ProjectM36.Relation.Show.CSV,
117 ProjectM36.Relation.Show.CSV,
117 ProjectM36.Relation.Show.Gnuplot,
118 ProjectM36.Relation.Show.Gnuplot,
118 ProjectM36.Relation.Parse.CSV,
119 ProjectM36.Relation.Parse.CSV,
src/lib/ProjectM36/Relation/Show/Term.hs+1−1
@@ -10,7 +10,7 @@ import qualified Data.List as L
10import qualified Data.Text as T
10import qualified Data.Text as T
11import Control.Arrow hiding (left)
11import Control.Arrow hiding (left)
12import Data.Monoid
12import Data.Monoid
13−import Data.Char.WCWidth --guess the width that the character will appear as in the terminal
13+import ProjectM36.WCWidth --guess the width that the character will appear as in the terminal
14
14
15boxV :: StringType
15boxV :: StringType
16boxV = "│"
16boxV = "│"
src/lib/ProjectM36/TransactionGraph/Persist.hs+1−1
@@ -214,7 +214,7 @@ readGraphTransactionIdFile dbdir = do
214 Right . map grapher . T.lines <$> readUTF8FileOrError (transactionLogPath dbdir)
214 Right . map grapher . T.lines <$> readUTF8FileOrError (transactionLogPath dbdir)
215
215
216--rationale- reading essential database files must fail hard
216--rationale- reading essential database files must fail hard
217−readUTF8FileOrError :: FilePath -> IO (T.Text)
217+readUTF8FileOrError :: FilePath -> IO T.Text
218readUTF8FileOrError pathIn = do
218readUTF8FileOrError pathIn = do
219 eFileBytes <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
219 eFileBytes <- try (BS.readFile pathIn) :: IO (Either IOError BS.ByteString)
220 case eFileBytes of
220 case eFileBytes of