QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

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
Conversation 4 Commits 52 Files Changed 20 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d6fff2612 - Show all commits

7
src/aeso_compiler.erl
View File

@ -117,9 +117,12 @@ join_errors(Prefix, Errors, Pfun) ->
check_call(Source, "init" = FunName, Args, Options) ->
PatchFun = fun(T) -> {tuple, [typerep, T]} end,
case check_call(Source, FunName, Args, Options, PatchFun) of
{error, _} when Args == [] ->
Err = {error, _} when Args == [] ->
%% Try with default init-function
check_call(insert_init_function(Source, Options), FunName, Args, Options, PatchFun);
case check_call(insert_init_function(Source, Options), FunName, Args, Options, PatchFun) of
{error, _} -> Err; %% The first error is most likely better...
Res -> Res
end;
Res ->
Res
end;