tidy up

1 files changed, 7 insertions, 14 deletions

diff --git a/execs/Day05.hs b/execs/Day05.hs
index 4251cd6..c018203 100644
--- a/execs/Day05.hs
+++ b/execs/Day05.hs
@@ -1,23 +1,16 @@
 module Main where
 
-import           Text.ParserCombinators.Parsec
-import Data.List (sort)
-import Control.Monad
-
 data Direction = Upper | Lower
 
-doHalving :: [Direction] -> (Int, Int) -> (Int, Int)
-doHalving [] p = p
-doHalving (Lower:rest) (l, u) = doHalving rest (l, (u+l) `div` 2)
-doHalving (Upper:rest) (l, u) = doHalving rest ((u+l) `div` 2 + 1, u)
-
-findId :: (Int, Int) -> Int
-findId (row, col) = row * 8 + col
+doHalf :: [Direction] -> (Int, Int) -> Int
+doHalf ls start = fst $ foldl fn start ls 
+    where fn (l, u) Lower = (l, (u+l) `div` 2)
+          fn (l, u) Upper = ((u+l) `div` 2 + 1, u)
 
 doValidate :: String -> Int
-doValidate s = findId (row, col)
-    where row = fst $ flip doHalving (0, 127) $ map readDir (take 7 s)
-          col = fst $ flip doHalving (0, 7) $ map readDir (drop 7 s)
+doValidate s = row * 8 + col
+    where row = flip doHalf (0, 127) $ map readDir (take 7 s)
+          col = flip doHalf (0, 7) $ map readDir (drop 7 s)
 
 readDir :: Char -> Direction
 readDir c