X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=advent05%2FMainDirect.hs;h=9a56bba965800fde924c7ef09418590a4478900c;hb=14a708ee545a9bd6d81205177ab9baabd29d1894;hp=ca59a51b682b5e9ae499ff1dc35e752d235ff2af;hpb=f8648c0ce55739dcadf19bbcdd56d5e48cd4f2e6;p=advent-of-code-23.git diff --git a/advent05/MainDirect.hs b/advent05/MainDirect.hs index ca59a51..9a56bba 100644 --- a/advent05/MainDirect.hs +++ b/advent05/MainDirect.hs @@ -82,10 +82,10 @@ seedsP = "seeds: " *> numbersP almanacP = M.fromList <$> (aMapP `sepBy` blankLineP) aMapP = aMapify <$> aMapHeaderP <*> rulesP -aMapHeaderP = (,) <$> (nameP <* "-to-") <*> (nameP <* " map:" <* endOfLine) +aMapHeaderP = (,) <$> nameP <* "-to-" <*> nameP <* " map:" <* endOfLine rulesP = ruleP `sepBy` endOfLine -ruleP = Rule <$> (decimal <* space) <*> (decimal <* space) <*> decimal +ruleP = Rule <$> decimal <* space <*> decimal <* space <*> decimal numbersP = decimal `sepBy` skipSpace nameP = many1 letter