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

Don't try to eta expand builtins with named arguments in AEVM

Browse Source
This commit is contained in:
Ulf Norell 2019-09-04 10:21:23 +02:00
parent 157ffbf9e2
commit c37cc93abe
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/aeso_ast_to_icode.erl
View File

@ -220,8 +220,8 @@ ast_body({qid, _, ["Bits", "all"]}, _Icode) ->
%% Other terms %% Other terms
ast_body({id, _, Name}, _Icode) -> ast_body({id, _, Name}, _Icode) ->
#var_ref{name = Name}; #var_ref{name = Name};
ast_body({typed, _, Id = {qid, _, Name}, Type}, Icode) -> ast_body({typed, _, Id = {qid, _, _}, Type}, Icode) ->
case is_builtin_fun(Name, Icode) of case is_builtin_fun(Id, Icode) of
true -> eta_expand(Id, Type, Icode); true -> eta_expand(Id, Type, Icode);
false -> ast_body(Id, Icode) false -> ast_body(Id, Icode)
end; end;
@ -342,9 +342,12 @@ ast_body({switch,_,A,Cases}, Icode) ->
#switch{expr=ast_body(A, Icode), #switch{expr=ast_body(A, Icode),
cases=[{ast_body(Pat, Icode),ast_body(Body, Icode)} cases=[{ast_body(Pat, Icode),ast_body(Body, Icode)}
|| {'case',_,Pat,Body} <- Cases]}; || {'case',_,Pat,Body} <- Cases]};
ast_body({block,As,[{letval,_,Pat,_,E}|Rest]}, Icode) -> ast_body({block, As, [{letval, _, Pat, _, E} | Rest]}, Icode) ->
#switch{expr=ast_body(E, Icode), E1 = ast_body(E, Icode),
cases=[{ast_body(Pat, Icode),ast_body({block,As,Rest}, Icode)}]}; Pat1 = ast_body(Pat, Icode),
Rest1 = ast_body({block, As, Rest}, Icode),
#switch{expr = E1,
cases = [{Pat1, Rest1}]};
ast_body({block, As, [{letfun, Ann, F, Args, _Type, Expr} | Rest]}, Icode) -> ast_body({block, As, [{letfun, Ann, F, Args, _Type, Expr} | Rest]}, Icode) ->
ast_body({block, As, [{letval, Ann, F, unused, {lam, Ann, Args, Expr}} | Rest]}, Icode); ast_body({block, As, [{letval, Ann, F, unused, {lam, Ann, Args, Expr}} | Rest]}, Icode);
ast_body({block,_,[]}, _Icode) -> ast_body({block,_,[]}, _Icode) ->
@ -726,12 +729,14 @@ builtin_code(_, {qid, _, ["Bytes", "to_str"]}, [Bytes], _, _, Icode) ->
builtin_code(_As, Fun, _Args, _ArgsT, _RetT, _Icode) -> builtin_code(_As, Fun, _Args, _ArgsT, _RetT, _Icode) ->
gen_error({missing_code_for, Fun}). gen_error({missing_code_for, Fun}).
eta_expand(Id = {_, Ann0, _}, {fun_t, _, _, ArgsT, _}, Icode) -> eta_expand(Id = {_, Ann0, _}, {fun_t, _, [], ArgsT, _}, Icode) ->
Ann = [{origin, system} | Ann0], Ann = [{origin, system} | Ann0],
Xs = [ {arg, Ann, {id, Ann, "%" ++ integer_to_list(I)}, T} || Xs = [ {arg, Ann, {id, Ann, "%" ++ integer_to_list(I)}, T} ||
{I, T} <- lists:zip(lists:seq(1, length(ArgsT)), ArgsT) ], {I, T} <- lists:zip(lists:seq(1, length(ArgsT)), ArgsT) ],
Args = [ X || {arg, _, X, _} <- Xs ], Args = [ X || {arg, _, X, _} <- Xs ],
ast_body({lam, Ann, Xs, {app, Ann, Id, Args}}, Icode). ast_body({lam, Ann, Xs, {app, Ann, Id, Args}}, Icode);
eta_expand(Id, _Type, _Icode) ->
gen_error({unapplied_named_arg_builtin, Id}).
check_monomorphic_map({typed, Ann, _, MapType}, Icode) -> check_monomorphic_map({typed, Ann, _, MapType}, Icode) ->
check_monomorphic_map(Ann, MapType, Icode). check_monomorphic_map(Ann, MapType, Icode).