funclang series5: Source code cleanup.

funclang-taddeus/series5/ass13.ml

@@ -9,8 +9,9 @@ let rec eval exp =
         | _ -> raise (Failure "Unknown unary operator")
     in
     let eval_binop binop = match binop with
-          (op, Num a, Num b) -> (match op with
+          (op, Num a, Num b) ->
             (* Arithmethic or relational operation is possible on numbers *)
+            (match op with
               Add -> Num (a + b)
             | Sub -> Num (a - b)
             | Mul -> Num (a * b)
@@ -23,9 +24,11 @@ let rec eval exp =
             | Gt -> Bool (a > b)
             | Ge -> Bool (a >= b)
             | _ -> raise (Failure "Unknown arithmetic/relational operator"))
-        | (op, Bool a, Bool b) -> (match op with
+        | (op, Bool a, Bool b) ->
             (* Locical operation is possible on booleans *)
-              And | Or -> Bool (if op = And then a && b else a || b)
+            (match op with
+              And -> Bool (a && b)
+            | Or -> Bool (a || b)
             | _ -> raise (Failure "Unknown locical operator"))
         | (op, e1, e2) -> BinopAp (op, eval e1, eval e2)
     in

funclang-taddeus/series5/test.ml

@@ -29,7 +29,7 @@ test_expr2string "a * 3" (BinopAp (Mul, Var "a", Num 3));;
 let l arg body = Fun (arg, body);;
 let app func arg = FunAp (func, arg);;
 
-(* Define resursive factorial function for test usage *)
+(* Define resursive factorial function for a more extensive test *)
 let fac =
     let eq = BinopAp (Eq, Var "n", Num 0) in
     let sub = BinopAp (Sub, Var "n", Num 1) in
@@ -81,6 +81,7 @@ test_eval "c + b" (Let ("a", Var "c", (BinopAp (Add, Var "a", Var "b"))));;
 test_eval "a" (Cond (Bool true, Var "a", Var "b"));;
 test_eval "b" (Cond (Bool false, Var "a", Var "b"));;
 
+(* Test resolving of name clash *)
 let x = Var "x" in
 let y = Var "y" in
 let z = Var "z" in