From: Neil Smith <neil.git@njae.me.uk>
Date: Sat, 1 Dec 2018 13:28:20 +0000 (+0000)
Subject: Better variable names, simpler parser
X-Git-Url: https://git.njae.me.uk/?p=advent-of-code-18.git;a=commitdiff_plain;h=09aa30f8d65d40f675e942ee641905670fccd3e7

Better variable names, simpler parser
---

diff --git a/src/advent01/advent01.hs b/src/advent01/advent01.hs
index 3b7a71c..d833bbc 100644
--- a/src/advent01/advent01.hs
+++ b/src/advent01/advent01.hs
@@ -12,7 +12,7 @@ import qualified Text.Megaparsec.Char.Lexer as L
 import qualified Control.Applicative as CA
 
 import Data.IntSet (IntSet)
-import qualified Data.IntSet as IntSet
+import qualified Data.IntSet as S
 
 main :: IO ()
 main = do 
@@ -26,33 +26,27 @@ part1 :: [Int] -> Int
 part1 = sum 
 
 part2 :: [Int] -> Int
-part2 changes = snd $ head $ dropWhile unRepeated $ scanl merge (IntSet.empty, 0) $ cycle changes
-
+part2 changes = snd $ head $ dropWhile unRepeated $ scanl merge (S.empty, 0) $ cycle changes
 
 merge :: (IntSet, Int) -> Int -> (IntSet, Int)
-merge (s, f) c = (IntSet.insert f s, f+c)
+merge (frequencies, frequency) change = (S.insert frequency frequencies, frequency + change)
 
 unRepeated :: (IntSet, Int) -> Bool
-unRepeated (s, f) = f `IntSet.notMember` s
+unRepeated (frequencies, frequency) = frequency `S.notMember` frequencies
 
 -- Parse the input file
 type Parser = Parsec Void Text
 
 sc :: Parser ()
--- sc = L.space (skipSome spaceChar) CA.empty CA.empty
-sc = L.space (skipSome (char ' ')) CA.empty CA.empty
+sc = L.space (skipSome spaceChar) CA.empty CA.empty
+-- sc = L.space (skipSome (char ' ')) CA.empty CA.empty
 
 
 lexeme  = L.lexeme sc
 integer = lexeme L.decimal
 signedInteger = L.signed sc integer
 
--- symb = L.symbol sc
--- comma = symb ","
-
-
-changesP = signedInteger `sepEndBy` newline
-
+changesP = many signedInteger
 
 successfulParse :: Text -> [Int]
 successfulParse input =