From e82e05131c25c657ed04d5686b47664296c904e2 Mon Sep 17 00:00:00 2001
From: Michael Zhang <failed.down@gmail.com>
Date: Tue, 20 Feb 2018 05:19:49 -0600
Subject: [PATCH] assignment

---
 lambda.ml  | 11 ++++++-----
 lexer.mll  |  1 +
 parser.mly |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lambda.ml b/lambda.ml
index 39c5cc7..bf6712c 100644
--- a/lambda.ml
+++ b/lambda.ml
@@ -3,6 +3,7 @@ open Lexing
 open Parser
 open Types
 
+exception UnboundVariable of string
 exception EvaluationComplete
 
 (*
@@ -31,7 +32,7 @@ let remove ctx name =
 
 let rec lookup ctx name : Types.term =
   match ctx with
-  | [] -> print_endline ("unbound variable " ^ name); raise (Failure ("unbound variable " ^ name))
+  | [] -> raise (UnboundVariable name)
   | (n, t)::tail ->
       if n = name then t else lookup tail name
 
@@ -71,12 +72,13 @@ let rec eval (ctx, t) =
         let (s, t') = try_subst n t r in
         (*print_endline ("try_subst('" ^ n ^ "', " ^ (string_of_term t) ^ ", " ^ (string_of_term r) ^ ") = " ^ (if s then "true" else "false"));*)
         if s then helper (ctx, t') (d + 1) else (ctx, t')
-    | _ -> (*print_endline "called EvaluationComplete"; *)raise EvaluationComplete
   in try
     let (ctx', t') = helper (ctx, t) 0 in
     if t = t' then raise EvaluationComplete else
     eval (ctx', t')
-  with EvaluationComplete -> (ctx, t)
+  with
+  | UnboundVariable v -> print_endline ("unbound variable " ^ v); raise (Failure "")
+  | EvaluationComplete -> (ctx, t)
 
 let _ =
   try
@@ -91,8 +93,7 @@ let _ =
             loop ctx'
       | Types.Assign (n, t) ->
           let (ctx', r) = eval (ctx, t) in
-            (* bind the name *)
-            loop ctx'
+            loop (assign ctx' (n, r))
     in loop []
   with Lexer.Eof ->
     print_endline "^D";
diff --git a/lexer.mll b/lexer.mll
index 04412b6..23b3e74 100644
--- a/lexer.mll
+++ b/lexer.mll
@@ -11,5 +11,6 @@ rule token = parse
   | '(' { LParen }
   | ')' { RParen }
   | '.' { Dot }
+  | "let" { Let }
   | ['a'-'z' 'A'-'Z'] ['a'-'z' 'A'-'Z' '0'-'9' '_']* as s { Ident(s) }
   | eof { raise Eof }
diff --git a/parser.mly b/parser.mly
index e816dcf..d4bf2ed 100644
--- a/parser.mly
+++ b/parser.mly
@@ -7,6 +7,7 @@
 %token Equal
 %token LParen
 %token RParen
+%token Let
 %token <string> Ident
 %token Lambda
 
@@ -23,7 +24,7 @@ main:
   | expr EOL { Types.Term($1) }
 ;
 assign:
-  | Ident Equal expr { Types.Assign($1, $3) }
+  | Let Ident Equal expr { Types.Assign($2, $4) }
 ;
 expr:
   | Ident { Types.TmVar($1) }