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

lib: Hledger.Data.Dates: intervalStartBefore -> intervalBoundaryBefore

Browse Source
This commit is contained in:
Simon Michael 2023-01-11 07:32:59 -10:00
parent 8f9c35200f
commit 93f74f7a0e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ module Hledger.Data.Dates (
daysInSpan, daysInSpan,
tests_Dates tests_Dates
, intervalStartBefore) , intervalBoundaryBefore)
where where
import qualified Control.Monad.Fail as Fail (MonadFail, fail) import qualified Control.Monad.Fail as Fail (MonadFail, fail)
@ -548,8 +548,8 @@ nextyear = startofyear . addGregorianYearsClip 1
startofyear day = fromGregorian y 1 1 where (y,_,_) = toGregorian day startofyear day = fromGregorian y 1 1 where (y,_,_) = toGregorian day
-- Get the natural start for the given interval that falls on or before the given day. -- Get the natural start for the given interval that falls on or before the given day.
intervalStartBefore :: Interval -> Day -> Day intervalBoundaryBefore :: Interval -> Day -> Day
intervalStartBefore int d = intervalBoundaryBefore int d =
case splitSpan int (DateSpan (Just d) (Just $ addDays 1 d)) of case splitSpan int (DateSpan (Just d) (Just $ addDays 1 d)) of
(DateSpan (Just start) _:_) -> start (DateSpan (Just start) _:_) -> start
_ -> d _ -> d

2
hledger-lib/Hledger/Reports/BudgetReport.hs
View File

@ -139,7 +139,7 @@ journalAddBudgetGoalTransactions bopts ropts reportspan j =
pts -> (ptinterval pt, ptspan pt) pts -> (ptinterval pt, ptspan pt)
where pt = maximumBy (comparing ptinterval) pts -- PARTIAL: maximumBy won't fail where pt = maximumBy (comparing ptinterval) pts -- PARTIAL: maximumBy won't fail
-- the natural start of this interval on or before the journal/report start -- the natural start of this interval on or before the journal/report start
intervalstart = intervalStartBefore intervl d intervalstart = intervalBoundaryBefore intervl d
-- the natural interval start before the journal/report start, -- the natural interval start before the journal/report start,
-- or the rule-specified start if later, -- or the rule-specified start if later,
-- but no later than the journal/report start. -- but no later than the journal/report start.