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

parsing: parse time of day more carefully

Browse Source
This commit is contained in:
Simon Michael 2011-05-31 22:45:54 +00:00
parent 1f24e025da
commit 946e5ffcbc
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,12 +388,19 @@ ledgerdatetime = do
day <- ledgerdate day <- ledgerdate
many1 spacenonewline many1 spacenonewline
h <- many1 digit h <- many1 digit
let h' = read h
guard $ h' >= 0 && h' <= 23
char ':' char ':'
m <- many1 digit m <- many1 digit
let m' = read m
guard $ m' >= 0 && m' <= 59
s <- optionMaybe $ do s <- optionMaybe $ do
char ':' char ':'
many1 digit many1 digit
let tod = TimeOfDay (read h) (read m) (maybe 0 (fromIntegral.read) s) let s' = case s of Just sstr -> read sstr
Nothing -> 0
guard $ s' >= 0 && s' <= 59
let tod = TimeOfDay h' m' (fromIntegral s')
return $ LocalTime day tod return $ LocalTime day tod
ledgereffectivedate :: Day -> GenParser Char JournalContext Day ledgereffectivedate :: Day -> GenParser Char JournalContext Day
@ -721,6 +728,15 @@ tests_Hledger_Read_JournalReader = TestList [
assertParseFailure (parseWithCtx nullctx ledgerdate "1/1") assertParseFailure (parseWithCtx nullctx ledgerdate "1/1")
assertParse (parseWithCtx nullctx{ctxYear=Just 2011} ledgerdate "1/1") assertParse (parseWithCtx nullctx{ctxYear=Just 2011} ledgerdate "1/1")
,"ledgerdatetime" ~: do
assertParseFailure (parseWithCtx nullctx ledgerdatetime "2011/1/1")
assertParseFailure (parseWithCtx nullctx ledgerdatetime "2011/1/1 24:00:00")
assertParseFailure (parseWithCtx nullctx ledgerdatetime "2011/1/1 00:60:00")
assertParseFailure (parseWithCtx nullctx ledgerdatetime "2011/1/1 00:00:60")
assertParse (parseWithCtx nullctx ledgerdatetime "2011/1/1 00:00")
assertParse (parseWithCtx nullctx ledgerdatetime "2011/1/1 23:59:59")
assertParse (parseWithCtx nullctx ledgerdatetime "2011/1/1 3:5:7")
,"ledgerDefaultYear" ~: do ,"ledgerDefaultYear" ~: do
assertParse (parseWithCtx nullctx ledgerDefaultYear "Y 2010\n") assertParse (parseWithCtx nullctx ledgerDefaultYear "Y 2010\n")
assertParse (parseWithCtx nullctx ledgerDefaultYear "Y 10001\n") assertParse (parseWithCtx nullctx ledgerDefaultYear "Y 10001\n")