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

parse period expressions and date: more strictly

Browse Source 
Period expressions and date: query terms must now be parseable all the
way to their end; we won't ignore unparseable trailing bits.
This commit is contained in:
Simon Michael 2014-08-07 17:29:09 -07:00
parent a675b99870
commit 632dee668d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Data/Dates.hs
View File

@ -60,6 +60,7 @@ module Hledger.Data.Dates (
) )
where where
import Control.Applicative ((<*))
import Control.Monad import Control.Monad
import Data.List import Data.List
import Data.Maybe import Data.Maybe
@ -241,7 +242,7 @@ earliest (Just d1) (Just d2) = Just $ min d1 d2
-- | Parse a period expression to an Interval and overall DateSpan using -- | Parse a period expression to an Interval and overall DateSpan using
-- the provided reference date, or return a parse error. -- the provided reference date, or return a parse error.
parsePeriodExpr :: Day -> String -> Either ParseError (Interval, DateSpan) parsePeriodExpr :: Day -> String -> Either ParseError (Interval, DateSpan)
parsePeriodExpr refdate = parsewith (periodexpr refdate) parsePeriodExpr refdate = parsewith (periodexpr refdate <* eof)
maybePeriod :: Day -> String -> Maybe (Interval,DateSpan) maybePeriod :: Day -> String -> Maybe (Interval,DateSpan)
maybePeriod refdate = either (const Nothing) Just . parsePeriodExpr refdate maybePeriod refdate = either (const Nothing) Just . parsePeriodExpr refdate