simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-12-24 02:44:25 +03:00
Code Issues Projects Releases Wiki Activity

Better types

Browse Source
This commit is contained in:
Luca Molteni 2018-06-08 21:45:20 +02:00
parent edd130781c
commit f922df71d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -187,7 +187,7 @@ parseCsv2 = undefined
parseCassava :: FilePath -> String -> Either String [Record] parseCassava :: FilePath -> String -> Either String [Record]
parseCassava path content = fmap fromCassavaToCSV $ DCSV.decode DCSV.NoHeader (C.pack content) parseCassava path content = fmap fromCassavaToCSV $ DCSV.decode DCSV.NoHeader (C.pack content)
fromCassavaToCSV :: (V.Vector (V.Vector C.ByteString)) -> [Record] fromCassavaToCSV :: (V.Vector (V.Vector C.ByteString)) -> CSV
fromCassavaToCSV records = V.toList (V.map toCSVRecord records) fromCassavaToCSV records = V.toList (V.map toCSVRecord records)
where toCSVRecord fields = V.toList (V.map (C.unpack) fields) where toCSVRecord fields = V.toList (V.map (C.unpack) fields)
>>>>>>> Conversion to Text CSV type >>>>>>> Conversion to Text CSV type
@ -861,15 +861,15 @@ tests_CsvReader = tests "CsvReader" [
,tests "rulesp" [ ,tests "rulesp" [
test "trailing comments" $ test "trailing comments" $
parseWithState' rules rulesp "skip\n# \n#\n" `is` Right rules{rdirectives = [("skip","")]} parseWithState' rules rulesp "skip\n# \n#\n" `is` Right rules{rdirectives = [("skip","")]}
,test "trailing blank lines" $ ,test "trailing blank lines" $
parseWithState' rules rulesp "skip\n\n \n" `is` (Right rules{rdirectives = [("skip","")]}) parseWithState' rules rulesp "skip\n\n \n" `is` (Right rules{rdirectives = [("skip","")]})
,test "no final newline" $ ,test "no final newline" $
parseWithState' rules rulesp "skip" `is` (Right rules{rdirectives=[("skip","")]}) parseWithState' rules rulesp "skip" `is` (Right rules{rdirectives=[("skip","")]})
,test "assignment with empty value" $ ,test "assignment with empty value" $
parseWithState' rules rulesp "account1 \nif foo\n account2 foo\n" `is` parseWithState' rules rulesp "account1 \nif foo\n account2 foo\n" `is`
(Right rules{rassignments = [("account1","")], rconditionalblocks = [([["foo"]],[("account2","foo")])]}) (Right rules{rassignments = [("account1","")], rconditionalblocks = [([["foo"]],[("account2","foo")])]})
] ]