Merge master to fortuna #530

Merged
zxq9 merged 52 commits from merge_master_to_fortuna into fortuna 2019-03-05 22:51:14 +09:00
Showing only changes of commit a263b09e57 - Show all commits

View File

@ -304,7 +304,6 @@ get_decode_type(FunName, [{contract, _, _, Defs}]) ->
GetType = fun({letfun, _, {id, _, Name}, _, Ret, _}) when Name == FunName -> [Ret]; GetType = fun({letfun, _, {id, _, Name}, _, Ret, _}) when Name == FunName -> [Ret];
({fun_decl, _, {id, _, Name}, {fun_t, _, _, _, Ret}}) when Name == FunName -> [Ret]; ({fun_decl, _, {id, _, Name}, {fun_t, _, _, _, Ret}}) when Name == FunName -> [Ret];
(_) -> [] end, (_) -> [] end,
io:format("~p\n", [Defs]),
case lists:flatmap(GetType, Defs) of case lists:flatmap(GetType, Defs) of
[Type] -> {ok, Type}; [Type] -> {ok, Type};
[] -> {error, missing_function} [] -> {error, missing_function}