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

Fix build.

Browse Source
This commit is contained in:
Sander Spies 2020-04-14 13:13:07 +02:00
parent 3e447c40b7
commit 422623ce1e
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/passes/10-transpiler/transpiler.ml
View File

@ -278,7 +278,7 @@ let rec transpile_type (t:AST.type_expression) : type_value result =
)
(* TODO hmm *)
| T_sum m ->
let is_michelson_or = Stage_common.Helpers.is_michelson_or m in
let is_michelson_or = Ast_typed.Helpers.is_michelson_or m in
let node = Append_tree.of_list @@ kv_list_of_cmap m in
let aux a b : type_value annotated result =
let%bind a = a in
@ -297,12 +297,12 @@ let rec transpile_type (t:AST.type_expression) : type_value result =
aux node in
ok @@ snd m'
| T_record m ->
let is_tuple_lmap = Stage_common.Helpers.is_tuple_lmap m in
let is_tuple_lmap = Ast_typed.Helpers.is_tuple_lmap m in
let node = Append_tree.of_list @@ (
if is_tuple_lmap then
Stage_common.Helpers.tuple_of_record m
Ast_typed.Helpers.tuple_of_record m
else
List.rev @@ LMap.to_kv_list m
List.rev @@ Ast_typed.Types.LMap.to_kv_list m
)
in
let aux a b : type_value annotated result =
@ -311,7 +311,7 @@ let rec transpile_type (t:AST.type_expression) : type_value result =
ok (None, T_pair (a, b))
in
let%bind m' = Append_tree.fold_ne
(fun (Stage_common.Types.Label ann, a) ->
(fun (Ast_typed.Types.Label ann, a) ->
let%bind a = transpile_type a in
ok ((if is_tuple_lmap then
None

6
src/stages/4-ast_typed/helpers.ml
View File

@ -163,3 +163,9 @@ let kv_list_of_record_or_tuple (m: _ LMap.t) =
tuple_of_record m
else
List.rev @@ LMap.to_kv_list m
let is_michelson_or (t: _ constructor_map) =
CMap.cardinal t = 2 &&
(CMap.mem (Constructor "M_left") t) &&
(CMap.mem (Constructor "M_right") t)

4
src/stages/common/helpers.ml
View File

@ -67,7 +67,3 @@ let kv_list_of_record_or_tuple (m: _ LMap.t) =
else
List.rev @@ LMap.to_kv_list m
let is_michelson_or (t: _ constructor_map) =
CMap.cardinal t = 2 &&
(CMap.mem (Constructor "M_left") t) &&
(CMap.mem (Constructor "M_right") t)

1
src/stages/common/helpers.mli
View File

@ -24,7 +24,6 @@ val get_pair :
val tuple_of_record : 'a LMap.t -> (label * 'a) list
val list_of_record_or_tuple : 'a LMap.t -> 'a list
val kv_list_of_record_or_tuple : 'a LMap.t -> (label * 'a) list
val is_michelson_or : 'a Types.constructor_map -> bool
val bind_map_lmapi :