diff --git a/hledger-lib/Hledger/Data/FormatStrings.hs b/hledger-lib/Hledger/Data/FormatStrings.hs index d19965daf..8bb04abe1 100644 --- a/hledger-lib/Hledger/Data/FormatStrings.hs +++ b/hledger-lib/Hledger/Data/FormatStrings.hs @@ -67,13 +67,13 @@ formatLiteral = do c = (satisfy isPrintableButNotPercentage "printable character") <|> try (string "%%" >> return '%') -formatString :: GenParser Char st FormatString -formatString = +formatStr :: GenParser Char st FormatString +formatStr = formatField <|> formatLiteral formatStrings :: GenParser Char st [FormatString] -formatStrings = many formatString +formatStrings = many formatStr testFormat :: FormatString -> String -> String -> Assertion testFormat fs value expected = assertEqual name expected actual