From fe93dacf9a9264b62c3024e01fd95b80450aa6d5 Mon Sep 17 00:00:00 2001 From: vird Date: Mon, 17 Aug 2020 21:34:31 +0000 Subject: [PATCH 1/2] shortest op_list fix --- src/ast_transform.coffee | 2 +- src/translate_ligo.coffee | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ast_transform.coffee b/src/ast_transform.coffee index b02379a..080d86a 100755 --- a/src/ast_transform.coffee +++ b/src/ast_transform.coffee @@ -59,7 +59,7 @@ module = @ router_func_list = router_collector root, opt root = add_router root, obj_merge {router_func_list}, opt - root = return_op_list_count root, opt + # root = return_op_list_count root, opt root ercs_translate = (root, opt) -> diff --git a/src/translate_ligo.coffee b/src/translate_ligo.coffee index 01f5c66..1cd7b90 100755 --- a/src/translate_ligo.coffee +++ b/src/translate_ligo.coffee @@ -736,6 +736,9 @@ walk = (root, ctx)-> type_str = type_list.join " * " return "var #{config.op_list} : list(operation) := cons(#{arg_list[0]}, list transaction((#{arg_list[1..].join ' * '}), 0mutez, (get_contract(match_action.#{config.callback_address}) : contract(#{type_str})) end)" + when "transaction" + return "var #{config.op_list} : list(operation) := cons(#{config.op_list}, list transaction(#{arg_list.join ', '}) end)" + else fn = root.fn.name else From 539527528898bf18cc149f0d695528b88c005237 Mon Sep 17 00:00:00 2001 From: vird Date: Mon, 17 Aug 2020 22:14:20 +0000 Subject: [PATCH 2/2] fix cons, fix := --- src/translate_ligo.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translate_ligo.coffee b/src/translate_ligo.coffee index 1cd7b90..816f6a5 100755 --- a/src/translate_ligo.coffee +++ b/src/translate_ligo.coffee @@ -737,7 +737,7 @@ walk = (root, ctx)-> return "var #{config.op_list} : list(operation) := cons(#{arg_list[0]}, list transaction((#{arg_list[1..].join ' * '}), 0mutez, (get_contract(match_action.#{config.callback_address}) : contract(#{type_str})) end)" when "transaction" - return "var #{config.op_list} : list(operation) := cons(#{config.op_list}, list transaction(#{arg_list.join ', '}) end)" + return "var #{config.op_list} : list(operation) = cons(transaction(#{arg_list.join ', '}), #{config.op_list})" else fn = root.fn.name