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

Merge pull request #82 from aeternity/fix-map-update-and-delete-for-fate

Browse Source 
Fix arg order for map_delete and renaming of vars for map_update
This commit is contained in:
Tobias Lindahl 2019-06-03 13:26:27 +02:00 committed by GitHub
commit e3950f6c1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aeso_ast_to_fcode.erl
View File

@ -498,13 +498,15 @@ expr_to_fcode(Env, _Type, {map, _, Map, KVs}) ->
[map_get, _, K | Default] = tuple_to_list(MapGet), [map_get, _, K | Default] = tuple_to_list(MapGet),
?make_let(Key, expr_to_fcode(Env, K), ?make_let(Key, expr_to_fcode(Env, K),
begin begin
%% Z might shadow Map1 or Key
Z1 = fresh_name(),
GetExpr = GetExpr =
case Default of case Default of
[] -> {op, map_get, [Map1, Key]}; [] -> {op, map_get, [Map1, Key]};
[D] -> {op, map_get_d, [Map1, Key, expr_to_fcode(Env, D)]} [D] -> {op, map_get_d, [Map1, Key, expr_to_fcode(Env, D)]}
end, end,
{'let', Z, GetExpr, {'let', Z1, GetExpr,
{op, map_set, [M, Key, expr_to_fcode(bind_var(Env, Z), V)]}} {op, map_set, [M, Key, rename([{Z, Z1}], expr_to_fcode(bind_var(Env, Z), V))]}}
end) end)
end end, Map1, KVs)); end end, Map1, KVs));
expr_to_fcode(Env, _Type, {map_get, _, Map, Key}) -> expr_to_fcode(Env, _Type, {map_get, _, Map, Key}) ->
@ -756,6 +758,8 @@ op_builtins() ->
bits_set, bits_clear, bits_test, bits_sum, bits_intersection, bits_union, bits_set, bits_clear, bits_test, bits_sum, bits_intersection, bits_union,
bits_difference, int_to_str, address_to_str]. bits_difference, int_to_str, address_to_str].
builtin_to_fcode(map_delete, [Key, Map]) ->
{op, map_delete, [Map, Key]};
builtin_to_fcode(map_member, [Key, Map]) -> builtin_to_fcode(map_member, [Key, Map]) ->
{op, map_member, [Map, Key]}; {op, map_member, [Map, Key]};
builtin_to_fcode(map_lookup, [Key0, Map0]) -> builtin_to_fcode(map_lookup, [Key0, Map0]) ->