balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor merge

Browse Source
This commit is contained in:
galfour 2019-09-26 16:53:25 +02:00 committed by Tom Jack
parent 09496ce4ca
commit c4a4942b09
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/passes/6-transpiler/transpiler.ml
View File

@ -56,7 +56,7 @@ them. please report this to the developers." in
let bad_big_map location = let bad_big_map location =
let title () = "bad arguments for main" in let title () = "bad arguments for main" in
let content () = "only one big_map per program which must appear let content () = "only one big_map per program which must appear
on the left hand side of a pair in the contract's storage" in on the left hand side of a pair in the contract's storage" in
let data = [ let data = [
("location" , fun () -> Format.asprintf "%a" Location.pp location) ; ("location" , fun () -> Format.asprintf "%a" Location.pp location) ;
@ -659,8 +659,8 @@ let check_storage f ty loc : (anon_function * _) result =
let rec aux (t:type_value) on_big_map = let rec aux (t:type_value) on_big_map =
match t with match t with
| T_big_map _ -> on_big_map | T_big_map _ -> on_big_map
| T_pair (a , b) -> (aux a true) && (aux b false) | T_pair (a , b) -> (aux (snd a) true) && (aux (snd b) false)
| T_or (a,b) -> (aux a false) && (aux b false) | T_or (a,b) -> (aux (snd a) false) && (aux (snd b) false)
| T_function (a,b) -> (aux a false) && (aux b false) | T_function (a,b) -> (aux a false) && (aux b false)
| T_deep_closure (_,a,b) -> (aux a false) && (aux b false) | T_deep_closure (_,a,b) -> (aux a false) && (aux b false)
| T_map (a,b) -> (aux a false) && (aux b false) | T_map (a,b) -> (aux a false) && (aux b false)
@ -672,7 +672,7 @@ let check_storage f ty loc : (anon_function * _) result =
in in
match f.body.type_value with match f.body.type_value with
| T_pair (_, storage) -> | T_pair (_, storage) ->
if aux storage false then ok (f, ty) else fail @@ bad_big_map loc if aux (snd storage) false then ok (f, ty) else fail @@ bad_big_map loc
| _ -> ok (f, ty) | _ -> ok (f, ty)
let extract_constructor (v : value) (tree : _ Append_tree.t') : (string * value * AST.type_value) result = let extract_constructor (v : value) (tree : _ Append_tree.t') : (string * value * AST.type_value) result =