From 7b6a59123d1013faeaaea09195cc7ed256788050 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 29 Mar 2013 18:42:00 +0000 Subject: [PATCH] eolof parser matches end of line or end of file --- hledger-lib/Hledger/Read/JournalReader.hs | 2 -- hledger-lib/Hledger/Utils.hs | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs index 46b0da9cb..edd68f028 100644 --- a/hledger-lib/Hledger/Read/JournalReader.hs +++ b/hledger-lib/Hledger/Read/JournalReader.hs @@ -833,8 +833,6 @@ followingcommentline = do optional newline return l -eolof = (newline >> return ()) <|> eof - tagsInComment :: String -> [Tag] tagsInComment c = concatMap tagsInCommentLine $ lines c' where diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 1e5caede9..dc777116e 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -414,6 +414,9 @@ spacenonewline = satisfy (`elem` " \v\f\t") restofline :: GenParser Char st String restofline = anyChar `manyTill` newline +eolof :: GenParser Char st () +eolof = (newline >> return ()) <|> eof + -- time getCurrentLocalTime :: IO LocalTime