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 eb926b1352 - Show all commits

View File

@ -508,7 +508,7 @@ init_env(Options) ->
end, global_env(), [{"oracle", 2}, {"oracle_query", 2}])
end.
-spec infer(aeso_syntax:ast(), list(option())) -> aeso_syntax:ast().
-spec infer(aeso_syntax:ast(), list(option())) -> aeso_syntax:ast() | {env(), aeso_syntax:ast()}.
infer(Contracts, Options) ->
ets_init(), %% Init the ETS table state
try