Remove merge comments

This commit is contained in:
Lesenechal Remi 2019-09-09 22:23:29 +02:00
parent e5b4d37af8
commit c7cfce2bf7

View File

@ -632,10 +632,6 @@ let check_storage f ty loc : (anon_function * _) result =
if aux storage false then ok (f, ty) else fail @@ bad_big_map loc if aux storage false then ok (f, ty) else fail @@ bad_big_map loc
| _ -> ok (f, ty) | _ -> ok (f, ty)
(* let translate_main (l:AST.lambda) loc : anon_function result =
let%bind expr = translate_lambda Environment.empty l in
match Combinators.Expression.get_content expr with
| E_literal (D_function f) -> check_storage f loc *)
let translate_main (l:AST.lambda) loc : (anon_function * _) result = let translate_main (l:AST.lambda) loc : (anon_function * _) result =
let%bind expr = translate_lambda Environment.empty l in let%bind expr = translate_lambda Environment.empty l in
match expr.content , expr.type_value with match expr.content , expr.type_value with