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

Fate compiler #553

Merged
zxq9 merged 87 commits from fate-compiler into master 2019-05-07 22:48:47 +09:00
Conversation 5 Commits 87 Files Changed 9 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c06e032199 - Show all commits

8
src/aeso_ast_to_fcode.erl
View File

@ -812,10 +812,10 @@ resolve_var(#{ vars := Vars } = Env, [X]) ->
resolve_var(Env, Q) -> resolve_fun(Env, Q). resolve_var(Env, Q) -> resolve_fun(Env, Q).
resolve_fun(#{ fun_env := Funs, builtins := Builtin }, Q) -> resolve_fun(#{ fun_env := Funs, builtins := Builtin }, Q) ->
case maps:get(Q, maps:merge(Funs, Builtin), not_found) of case {maps:get(Q, Funs, not_found), maps:get(Q, Builtin, not_found)} of
not_found -> fcode_error({unbound_variable, Q}); {not_found, not_found} -> fcode_error({unbound_variable, Q});
{B, Ar} -> {builtin, B, Ar}; {_, {B, Ar}} -> {builtin, B, Ar};
Fun -> {def, Fun} {Fun, _} -> {def, Fun}
end. end.
init_fresh_names() -> init_fresh_names() ->