Refactor 2015 Day 07

2015/day07/day07.hs

@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-simplifiable-class-constraints #-}
+
 import Aoc
 import Data.Char ( isDigit )
 import Data.Bits
@@ -22,27 +24,27 @@ eval AND = (.&.)
 eval SHIFTR = shiftR
 eval SHIFTL = shiftL
 eval CONST = const
-eval NOT = \a _-> complement a
+eval NOT = const' complement
 
-eval' :: Op -> Int -> Int -> Int
+evalM :: [(String, (Op, String, String))] -> MemoF String Int
-eval' op arg1 arg2 = (.&. 0xFFFF) $ eval op arg1 arg2
+evalM wires = memoise $ \values label ->
-
+    case lookup label wires of
-eval'' :: [(String, (Op, String, String))] -> [(String, Int)] -> String -> (Int, [(String, Int)])
-eval'' wires memos label = case lookup label memos of
-    Just value -> (value, memos)
-    Nothing -> case lookup label wires of
         Just (op, arg1, arg2) ->
-            let (val1, memos1) = eval'' wires memos arg1 in
+            let 
-            let (val2, memos2) = eval'' wires memos1 arg2 in
+                (arg1', values') = evalM wires values arg1 
-            let val = eval' op val1 val2 in
+                (arg2', values'') = evalM wires values' arg2
-            (val, (label, val):memos2)
+            in
-        Nothing -> (if all isDigit label then read label else undefined, memos) -- if null label then 0 else 
+                (eval op arg1' arg2' .&. 0xFFFF, values'')
+        Nothing ->
+            if all isDigit label 
+                then (read label, values)
+                else error label
 
 part1 :: [(String, (Op, String, String))] -> Int
-part1 wires = fst $ eval'' wires [] "a"
+part1 wires = unmemo (evalM wires) "a"
 
 part2 :: [(String, (Op, String, String))] -> Int -> Int
-part2 wires part1Answer = fst $ eval'' wires [("b", part1Answer)] "a"
+part2 wires part1Answer = fst $ evalM wires [("b", part1Answer)] "a"
 
 main :: IO ()
 main = aocMain' parseFile (dup . part1) part2