xiretza/aoc2020
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

haskell: don't force concatenation in splitOnEmptyLines

Browse source
This commit is contained in:
Xiretza 2020-12-06 07:36:45 +01:00
parent 4f13a47281
commit b1ac705f73
Signed by: xiretza
GPG key ID: 17B78226F7139993
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/AoC.hs
View file

@ -13,8 +13,8 @@ oneCompleteResult p s = case readP_to_S (p <* eof) s of
[(x, "")] -> Just x [(x, "")] -> Just x
_ -> Nothing _ -> Nothing
splitOnEmptyLines :: String -> [String] splitOnEmptyLines :: String -> [[String]]
splitOnEmptyLines = map (intercalate " ") . filter (not . any null) . groupBy ((==) `on` null) . lines splitOnEmptyLines = filter (not . any null) . groupBy ((==) `on` null) . lines
runAoC :: (Show r1, Show r2) => (String -> i) -> (i -> r1) -> (i -> r2) -> IO () runAoC :: (Show r1, Show r2) => (String -> i) -> (i -> r1) -> (i -> r2) -> IO ()
runAoC inputTransform part1 part2 = do runAoC inputTransform part1 part2 = do

2
day4/day4.hs
View file

@ -93,4 +93,4 @@ hasAllRequiredFields = maybe False containsAllFields . fieldNames
containsAllFields fields = all (`elem` fields) requiredFieldNames containsAllFields fields = all (`elem` fields) requiredFieldNames
fieldNames = oneCompleteResult parseFieldNames fieldNames = oneCompleteResult parseFieldNames
main = runAoC (filter hasAllRequiredFields . splitOnEmptyLines) (length) (length . mapMaybe (oneCompleteResult parsePassport)) main = runAoC (filter hasAllRequiredFields . map (intercalate " ") . splitOnEmptyLines) (length) (length . mapMaybe (oneCompleteResult parsePassport))