Task 3 done

3or4/Interpreter/Haskell.hs

@@ -10,14 +10,14 @@ import Control.Monad.Identity ( Identity( runIdentity ) )
 subst :: Variable -> Exp -> Exp -> Exp
 subst var e = \case
   Apply e1 e2 -> Apply (subst var e e1) (subst var e e2)
-  Lambda x e' -> Lambda x $ if var /= x then subst var e e' else e'
+  Lambda x e' -> Lambda x $ if var == x then e' else subst var e e'
   Var x -> if var == x then e else Var x
   Const c es -> Const c $ map (subst var e) es
-  Rec x e' -> Rec x $ if var /= x then subst var e e' else e'
+  Rec x e' -> Rec x $ if var == x then e' else subst var e e'
   Case e' bs -> Case (subst var e e') $ map substBr bs
     where
       substBr :: Br -> Br
-      substBr (Branch c vs e') = Branch c vs $ if var `notElem` vs then subst var e e' else e'
+      substBr (Branch c vs e') = Branch c vs $ if var `elem` vs then e' else subst var e e'
 
 -- Task 5
 eval :: Exp -> Exp
@@ -39,7 +39,7 @@ eval = runIdentity . eval'
       x -> pure x
     
     lookupBranch :: Constructor -> [Br] -> Identity ([Variable], Exp)
-    lookupBranch c [] = error "No matching branch"
+    lookupBranch c [] = error $ "No matching branch, c was: " <> show c
     lookupBranch c ((Branch c' bs e):brs) =
       if c == c'
       then pure (bs,e)

3or4/Interpreter/Self.hs

@@ -12,10 +12,6 @@ mapExp = parse
   \ ; Cons(x,xs) -> Cons(f x, map xs)\
   \ }"
 
-substBrExp :: Exp
-substBrExp = parse
-  "rec substBr = \\x. "
-
 ifExp :: Exp
 ifExp = parse
   "\\b. \\t. \\f. case b of \
@@ -24,7 +20,27 @@ ifExp = parse
   \ }"
 
 equalExp :: Exp
-equalExp = parse ""
+equalExp = parse
+  "rec equal = \\m. \\n. case m of \
+  \ { Zero() -> case n of { Zero() -> True(); Suc(n) -> False() } \
+  \ ; Suc(m) -> case n of { Zero() -> False(); Suc(n) -> equal m n }\
+  \ }"
+
+elemExp :: Exp
+elemExp =
+  subst (Variable "equal") equalExp .
+  subst (Variable "if") ifExp $ parse
+  "\\x. rec elem = \\l. case l of \
+  \ { Nil() -> False() \
+  \ ; Cons(v,vs) -> if (equal x v) True() (elem vs)\ 
+  \ }"
+
+substBrExp :: Exp
+substBrExp =
+  subst (Variable "elem") elemExp $ parse
+  "\\subst. \\var. \\b. case b of \
+  \ { Branch(c,vs,e') -> if (elem var vs) Branch(c,vs,e') Branch(c,vs, subst e') \
+  \ }"
 
 substExp :: Exp
 substExp =
@@ -38,5 +54,5 @@ substExp =
         \ ; Var(x) -> if (equal x var) e Var(x) \
         \ ; Const(c,es) -> Const(c, map subst es) \
         \ ; Rec(x, e') -> if (equal x var) Rec(x,e') Rec(x,subst e')\
-        \ ; Case(e',bs) -> _ \
+        \ ; Case(e',bs) -> Case(subst e', map (substBr subst var) bs) \
         \ }"