slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for ledger3 style multi-line comments

Browse Source
This commit is contained in:
Gergely Risko 2014-10-26 19:19:42 +01:00
parent e892fdc6d5
commit 6e4a7dff8c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-lib/Hledger/Read.hs
View File

@ -204,6 +204,11 @@ samplejournal = readJournal' $ unlines
," assets:bank:checking $1" ," assets:bank:checking $1"
," income:salary" ," income:salary"
,"" ,""
,"comment"
,"multi line comment here"
,"for testing purposes"
,"end comment"
,""
,"2008/06/01 gift" ,"2008/06/01 gift"
," assets:bank:checking $1" ," assets:bank:checking $1"
," income:gifts" ," income:gifts"

10
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -164,6 +164,7 @@ journal = do
, liftM (return . addPeriodicTransaction) periodictransaction , liftM (return . addPeriodicTransaction) periodictransaction
, liftM (return . addHistoricalPrice) historicalpricedirective , liftM (return . addHistoricalPrice) historicalpricedirective
, emptyorcommentlinep >> return (return id) , emptyorcommentlinep >> return (return id)
, multilinecommentp >> return (return id)
] <?> "journal transaction or directive" ] <?> "journal transaction or directive"
-- cf http://ledger-cli.org/3.0/doc/ledger3.html#Command-Directives -- cf http://ledger-cli.org/3.0/doc/ledger3.html#Command-Directives
@ -847,6 +848,15 @@ test_numberp = do
-- comment parsers -- comment parsers
multilinecommentp :: GenParser Char JournalContext ()
multilinecommentp = do
string "comment" >> newline
go
where
go = try (string "end comment" >> newline >> return ())
<|> (anyLine >> go)
anyLine = anyChar `manyTill` newline
emptyorcommentlinep :: GenParser Char JournalContext () emptyorcommentlinep :: GenParser Char JournalContext ()
emptyorcommentlinep = do emptyorcommentlinep = do
many spacenonewline >> (comment <|> (many spacenonewline >> newline >> return "")) many spacenonewline >> (comment <|> (many spacenonewline >> newline >> return ""))