From a8919963527bb87baf9722fa632fbb020465b5d4 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Sun, 3 Dec 2023 00:52:48 +0100 Subject: [PATCH] Move Parser definition to its own module --- aoc.cabal | 9 +++++---- package.yaml | 1 + src/AoC/Parser.hs | 19 +++++++++++++++++++ src/AoC/Riddle.hs | 6 +++--- src/AoC/Y2023/D02.hs | 24 +++++------------------- 5 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 src/AoC/Parser.hs diff --git a/aoc.cabal b/aoc.cabal index f58726a..24b74f2 100644 --- a/aoc.cabal +++ b/aoc.cabal @@ -20,6 +20,7 @@ library exposed-modules: AoC AoC.Day + AoC.Parser AoC.Riddle AoC.Util AoC.Y2023 @@ -60,7 +61,7 @@ library OverloadedStrings ImportQualifiedPost DerivingStrategies - ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages + ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages build-depends: base , containers @@ -85,7 +86,7 @@ executable aoc OverloadedStrings ImportQualifiedPost DerivingStrategies - ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages + ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages build-depends: aoc , base @@ -112,7 +113,7 @@ test-suite doctest OverloadedStrings ImportQualifiedPost DerivingStrategies - ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages + ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages build-tool-depends: doctest:doctest build-depends: @@ -144,7 +145,7 @@ test-suite spec OverloadedStrings ImportQualifiedPost DerivingStrategies - ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages + ghc-options: -Weverything -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -fdefer-typed-holes -Wno-unused-packages cpp-options: -DTEST build-tool-depends: hspec-discover:hspec-discover diff --git a/package.yaml b/package.yaml index 7d8239b..dfbee0d 100644 --- a/package.yaml +++ b/package.yaml @@ -25,6 +25,7 @@ dependencies: ghc-options: - -Weverything - -Wno-implicit-prelude + - -Wno-missing-export-lists - -Wno-missing-import-lists # Requires explicit imports of _every_ function (e.g. ‘$’); too strict - -Wno-missing-kind-signatures - -Wno-missed-specialisations # When GHC can’t specialize a polymorphic function. No big deal and requires fixing underlying libraries to solve. diff --git a/src/AoC/Parser.hs b/src/AoC/Parser.hs new file mode 100644 index 0000000..ba305db --- /dev/null +++ b/src/AoC/Parser.hs @@ -0,0 +1,19 @@ +module AoC.Parser (Parser, parseText, ws, linewise) where + +import Text.Megaparsec (Parsec, parse, sepEndBy1) +import Text.Megaparsec.Char (eol, space1) +import Text.Megaparsec.Char.Lexer qualified as L + +type Parser = Parsec Void Text + +parseText :: Parser a -> Text -> Either Text a +parseText p t = case parse p "" t of + Right a -> pure a + Left e -> Left $ show e + +-- skip whitespace +ws :: Parser () +ws = L.space space1 empty empty + +linewise :: Parser a -> Parser [a] +linewise p = p `sepEndBy1` eol diff --git a/src/AoC/Riddle.hs b/src/AoC/Riddle.hs index f9ad279..50f1502 100644 --- a/src/AoC/Riddle.hs +++ b/src/AoC/Riddle.hs @@ -1,7 +1,7 @@ module AoC.Riddle ( - Riddle (..), - Error (..), - Solution (..), + Riddle, + Error, + Solution, loadRiddle, ) where diff --git a/src/AoC/Y2023/D02.hs b/src/AoC/Y2023/D02.hs index 021465f..f2d0731 100644 --- a/src/AoC/Y2023/D02.hs +++ b/src/AoC/Y2023/D02.hs @@ -1,30 +1,16 @@ -module AoC.Y2023.D02 where +module AoC.Y2023.D02 (solve) where +import AoC.Parser import AoC.Riddle -import Data.Map (foldMapWithKey) import Data.Map qualified as M -import Text.Megaparsec (Parsec, choice, parse, sepBy, sepEndBy1) -import Text.Megaparsec.Char (char, eol, space1, string) +import Text.Megaparsec (choice, sepBy) +import Text.Megaparsec.Char (char, space1, string) import Text.Megaparsec.Char.Lexer qualified as L -type Parser = Parsec Void Text - data Cube = Red | Green | Blue deriving stock (Eq, Ord, Enum, Show) -parseText :: Parser a -> Text -> Either Text a -parseText p t = case parse p "" t of - Right a -> pure a - Left e -> Left $ show e - --- skip whitespace -ws :: Parser () -ws = L.space space1 empty empty - -linewise :: Parser a -> Parser [a] -linewise p = p `sepEndBy1` eol - type Round = Map Cube Integer pRound :: Parser Round @@ -62,7 +48,7 @@ isGameValid :: Game -> Bool isGameValid (_, rounds) = all isRoundValid rounds isRoundValid :: Round -> Bool -isRoundValid = getAll . foldMapWithKey (\c n -> All $ cubesPossible c n) +isRoundValid = getAll . M.foldMapWithKey (\c n -> All $ cubesPossible c n) cubesPossible :: Cube -> Integer -> Bool cubesPossible Red = (<= 12)