From ccdbd5bbd05b5edcc291af8202d1cf00cfa93c95 Mon Sep 17 00:00:00 2001
From: Galfour <gabriel.alfour@gmail.com>
Date: Fri, 17 May 2019 16:18:03 +0000
Subject: [PATCH] fix

---
 src/simplify/pascaligo.ml    |  2 +-
 src/transpiler/transpiler.ml |  5 ++---
 src/typer/typer.ml           | 17 +++++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/simplify/pascaligo.ml b/src/simplify/pascaligo.ml
index f9e281677..ad686959f 100644
--- a/src/simplify/pascaligo.ml
+++ b/src/simplify/pascaligo.ml
@@ -62,7 +62,7 @@ let rec simpl_type_expression (t:Raw.type_expr) : type_expression result =
           match v.value.args with
             None -> []
           | Some (_, product) ->
-              npsseq_to_list product.value in
+              npseq_to_list product.value in
         let%bind te = simpl_list_type_expression
           @@ args in
         ok (v.value.constr.value, te)
diff --git a/src/transpiler/transpiler.ml b/src/transpiler/transpiler.ml
index bac549897..83f3c2772 100644
--- a/src/transpiler/transpiler.ml
+++ b/src/transpiler/transpiler.ml
@@ -250,9 +250,8 @@ and translate_annotated_expression (ae:AST.annotated_expression) : expression re
   | E_application ({expression = E_lambda {binder; input_type; output_type=_; body=[]; result}; _},
                    rhs) ->
     let%bind ty' = translate_type input_type in
-    let%bind rhs' = translate_annotated_expression env rhs in
-    let result_env = Environment.(add (binder, ty') env) in
-    let%bind result' = translate_annotated_expression result_env result in
+    let%bind rhs' = translate_annotated_expression rhs in
+    let%bind result' = translate_annotated_expression result in
     return (E_let_in ((binder, ty'), rhs', result'))
   | E_failwith ae -> (
       let%bind ae' = translate_annotated_expression ae in
diff --git a/src/typer/typer.ml b/src/typer/typer.ml
index 0956ce58c..10a146afd 100644
--- a/src/typer/typer.ml
+++ b/src/typer/typer.ml
@@ -489,13 +489,22 @@ and type_annotated_expression : environment -> I.annotated_expression -> O.annot
       output_type ;
       result ;
       body ;
-    } ->
-      let%bind input_type = evaluate_type e input_type in
-      let%bind output_type = evaluate_type e output_type in
+    } -> (
+      let%bind input_type =
+        let%bind input_type =
+          trace_option (simple_error "missing annotation on input type")
+            input_type in
+        evaluate_type e input_type in
+      let%bind output_type =
+        let%bind output_type =
+          trace_option (simple_error "missing annotation of output type")
+            output_type in
+        evaluate_type e output_type in
       let e' = Environment.add_ez_binder binder input_type e in
       let%bind (body, e'') = type_block_full e' body in
       let%bind result = type_annotated_expression e'' result in
       return (E_lambda {binder;input_type;output_type;result;body}) (t_function input_type output_type ())
+    )
   | E_constant (name, lst) ->
       let%bind lst' = bind_list @@ List.map (type_annotated_expression e) lst in
       let tv_lst = List.map get_type_annotation lst' in
@@ -636,7 +645,7 @@ let rec untype_annotated_expression (e:O.annotated_expression) : (I.annotated_ex
       let%bind output_type = untype_type_value output_type in
       let%bind result = untype_annotated_expression result in
       let%bind body = untype_block body in
-      return (E_lambda {binder;input_type;output_type;body;result})
+      return (E_lambda {binder;input_type = Some input_type;output_type = Some output_type;body;result})
   | E_tuple lst ->
       let%bind lst' = bind_list
         @@ List.map untype_annotated_expression lst in