diff --git a/hledger-lib/Hledger/Read/TimelogReader.hs b/hledger-lib/Hledger/Read/TimelogReader.hs index 18a51b15b..480894ae2 100644 --- a/hledger-lib/Hledger/Read/TimelogReader.hs +++ b/hledger-lib/Hledger/Read/TimelogReader.hs @@ -56,7 +56,7 @@ import System.FilePath import Hledger.Data -- XXX too much reuse ? import Hledger.Read.JournalReader ( - directive, historicalpricedirective, defaultyeardirective, emptyline, datetime, + directive, historicalpricedirective, defaultyeardirective, emptyline, datetimep, parseJournalWith, getParentAccount ) import Hledger.Utils @@ -100,7 +100,7 @@ timelogentry :: GenParser Char JournalContext TimeLogEntry timelogentry = do code <- oneOf "bhioO" many1 spacenonewline - datetime <- datetime + datetime <- datetimep comment <- optionMaybe (many1 spacenonewline >> liftM2 (++) getParentAccount restofline) return $ TimeLogEntry (read [code]) datetime (maybe "" rstrip comment) diff --git a/hledger/Hledger/Cli/Add.hs b/hledger/Hledger/Cli/Add.hs index 545a52004..058766fe6 100644 --- a/hledger/Hledger/Cli/Add.hs +++ b/hledger/Hledger/Cli/Add.hs @@ -96,7 +96,7 @@ getTransaction j opts defdate moredefs = do -- A default date, and zero or more defaults for subsequent fields, are provided. getTransactionOrRestart :: Journal -> CliOpts -> String -> [String] -> IO (Maybe Transaction) getTransactionOrRestart j opts defdate moredefs = do - let dateandcodep = do {d <- smartdate; c <- optionMaybe code; many spacenonewline; eof; return (d, fromMaybe "" c)} + let dateandcodep = do {d <- smartdate; c <- optionMaybe codep; many spacenonewline; eof; return (d, fromMaybe "" c)} datecodestr <- runInteractionDefault $ askFor "date" (Just defdate) (Just $ \s -> null s