Garmelon/chards
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder functions

Browse source
This commit is contained in:
Joscha 2018-01-04 18:28:54 +00:00
parent 9eddf454e3
commit 4fd80876f5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Cards.hs
View file

@ -83,6 +83,12 @@ testElements = Elements . Map.fromList. zip [1..] $
updateElements :: Elements -> Elements -> Elements updateElements :: Elements -> Elements -> Elements
updateElements (Elements old) (Elements new) = Elements $ Map.union new old updateElements (Elements old) (Elements new) = Elements $ Map.union new old
-- | Convert a list of 'Card's back into an 'Elements'.
-- As long as the same numbers are assosiated to the same cards as they were
-- originally, this can safely be used to update the original 'Elements'.
fromCards :: [(Integer, Card)] -> Elements
fromCards = Elements . Map.fromList . mapSnd fromCard
-- | Extract all 'Card's from an 'Elements'. -- | Extract all 'Card's from an 'Elements'.
-- Entries may be deleted or modified, as long as the numbers are not changed -- Entries may be deleted or modified, as long as the numbers are not changed
-- and stay associated to their original 'Card'. -- and stay associated to their original 'Card'.
@ -96,12 +102,6 @@ toCards (Elements elms) =
toDueCards :: UTCTime -> Elements -> [(Integer, Card)] toDueCards :: UTCTime -> Elements -> [(Integer, Card)]
toDueCards time = filter (isDue time . snd) . toCards toDueCards time = filter (isDue time . snd) . toCards
-- | Convert a list of 'Card's back into an 'Elements'.
-- As long as the same numbers are assosiated to the same cards as they were
-- originally, this can safely be used to update the original 'Elements'.
fromCards :: [(Integer, Card)] -> Elements
fromCards = Elements . Map.fromList . mapSnd fromCard
mapSnd :: (b -> c) -> [(a, b)] -> [(a, c)] mapSnd :: (b -> c) -> [(a, b)] -> [(a, c)]
mapSnd f l = [(a, f b) | (a, b) <- l] mapSnd f l = [(a, f b) | (a, b) <- l]