diff --git a/haskell/Puzzles/Day1.hs b/haskell/Puzzles/Day1.hs index 3e71ecc..c2b109e 100644 --- a/haskell/Puzzles/Day1.hs +++ b/haskell/Puzzles/Day1.hs @@ -8,7 +8,7 @@ puzzle :: Puzzle puzzle = Puzzle { number = 1 - , parser = const $ flip sepEndBy newline $ (,) <$> ((char 'L' $> L) <|> (char 'R' $> R)) <*> (Inc <$> decimal) + , parser = const $ ((,) <$> ((char 'L' $> L) <|> (char 'R' $> R)) <*> (Inc <$> decimal)) `sepEndBy` newline , parts = [ TL.show . sum diff --git a/haskell/Puzzles/Day2.hs b/haskell/Puzzles/Day2.hs index d3b7283..da2bac7 100644 --- a/haskell/Puzzles/Day2.hs +++ b/haskell/Puzzles/Day2.hs @@ -9,7 +9,7 @@ puzzle :: Puzzle puzzle = Puzzle { number = 2 - , parser = const $ (<* newline) $ flip sepBy (char ',') $ (,) <$> (decimal <* char '-') <*> decimal + , parser = const $ (<* newline) $ ((,) <$> (decimal <* char '-') <*> decimal) `sepBy` (char ',') , parts = [ TL.show . sum diff --git a/haskell/Puzzles/Day3.hs b/haskell/Puzzles/Day3.hs index 085d229..9b62285 100644 --- a/haskell/Puzzles/Day3.hs +++ b/haskell/Puzzles/Day3.hs @@ -9,7 +9,7 @@ puzzle :: Puzzle puzzle = Puzzle { number = 3 - , parser = const $ flip sepEndBy newline $ Bank <$> some1 digit + , parser = const $ (Bank <$> some1 digit) `sepEndBy` newline , parts = [ TL.show . sum diff --git a/haskell/Puzzles/Day4.hs b/haskell/Puzzles/Day4.hs index a87d3d0..74411dc 100644 --- a/haskell/Puzzles/Day4.hs +++ b/haskell/Puzzles/Day4.hs @@ -12,7 +12,7 @@ puzzle :: Puzzle puzzle = Puzzle { number = 4 - , parser = const $ flip sepEndBy newline $ some $ asum $ enumerate <&> \t -> char (inToChar t) $> t + , parser = const $ (some $ asum $ enumerate <&> \t -> char (inToChar t) $> t) `sepEndBy` newline , parts = [ TL.show . (\g -> countRolls g - countRolls (removeAccessibleRolls $ findAccessible g)) diff --git a/haskell/Puzzles/Day5.hs b/haskell/Puzzles/Day5.hs index 9c9299e..f2bdffb 100644 --- a/haskell/Puzzles/Day5.hs +++ b/haskell/Puzzles/Day5.hs @@ -9,9 +9,9 @@ puzzle = Puzzle { number = 5 , parser = const do - ranges <- flip sepEndBy newline $ Range <$> decimal <* single '-' <*> decimal + ranges <- (Range <$> decimal <* single '-' <*> decimal) `sepEndBy` newline void newline - vals <- sepEndBy decimal newline + vals <- decimal `sepEndBy` newline pure (ranges, vals) , parts = [ \(ranges, vals) ->