diff --git a/aoc.cabal b/aoc.cabal index 24b74f2..f58726a 100644 --- a/aoc.cabal +++ b/aoc.cabal @@ -20,7 +20,6 @@ library exposed-modules: AoC AoC.Day - AoC.Parser AoC.Riddle AoC.Util AoC.Y2023 @@ -61,7 +60,7 @@ library OverloadedStrings ImportQualifiedPost DerivingStrategies - 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 + 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 build-depends: base , containers @@ -86,7 +85,7 @@ executable aoc OverloadedStrings ImportQualifiedPost DerivingStrategies - 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 + 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 build-depends: aoc , base @@ -113,7 +112,7 @@ test-suite doctest OverloadedStrings ImportQualifiedPost DerivingStrategies - 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 + 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 build-tool-depends: doctest:doctest build-depends: @@ -145,7 +144,7 @@ test-suite spec OverloadedStrings ImportQualifiedPost DerivingStrategies - 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 + 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 cpp-options: -DTEST build-tool-depends: hspec-discover:hspec-discover diff --git a/package.yaml b/package.yaml index dfbee0d..7d8239b 100644 --- a/package.yaml +++ b/package.yaml @@ -25,7 +25,6 @@ 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 deleted file mode 100644 index ba305db..0000000 --- a/src/AoC/Parser.hs +++ /dev/null @@ -1,19 +0,0 @@ -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 50f1502..f9ad279 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 f2d0731..021465f 100644 --- a/src/AoC/Y2023/D02.hs +++ b/src/AoC/Y2023/D02.hs @@ -1,16 +1,30 @@ -module AoC.Y2023.D02 (solve) where +module AoC.Y2023.D02 where -import AoC.Parser import AoC.Riddle +import Data.Map (foldMapWithKey) import Data.Map qualified as M -import Text.Megaparsec (choice, sepBy) -import Text.Megaparsec.Char (char, space1, string) +import Text.Megaparsec (Parsec, choice, parse, sepBy, sepEndBy1) +import Text.Megaparsec.Char (char, eol, 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 @@ -48,7 +62,7 @@ isGameValid :: Game -> Bool isGameValid (_, rounds) = all isRoundValid rounds isRoundValid :: Round -> Bool -isRoundValid = getAll . M.foldMapWithKey (\c n -> All $ cubesPossible c n) +isRoundValid = getAll . foldMapWithKey (\c n -> All $ cubesPossible c n) cubesPossible :: Cube -> Integer -> Bool cubesPossible Red = (<= 12) diff --git a/test/doctest/Doctest.hs b/test/doctest/Doctest.hs index 0f22692..bdd02c3 100644 --- a/test/doctest/Doctest.hs +++ b/test/doctest/Doctest.hs @@ -1,10 +1,10 @@ --- | Run the doctest executable +-- | Rn the doctest executable module Main (main) where import System.Process (callProcess) -doctest :: IO () -doctest = callProcess "cabal" ["repl", "--with-ghc=doctest"] +doctest :: [String] -> IO () +doctest = callProcess "doctest" main :: IO () -main = doctest +main = doctest ["--fast", "src"]