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

handle hash literals when permissive_address_literals

Browse Source
This commit is contained in:
Ulf Norell 2019-03-01 11:36:28 +01:00
parent edc37bcf1b
commit 3efde2a2a1
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/aeso_ast_infer_types.erl
View File

@ -1655,6 +1655,7 @@ unify1(_Env, A, B, When) ->
Kind = fun({qcon, _, _}) -> con; Kind = fun({qcon, _, _}) -> con;
({con, _, _}) -> con; ({con, _, _}) -> con;
({id, _, "address"}) -> addr; ({id, _, "address"}) -> addr;
({id, _, "hash"}) -> hash;
({app_t, _, {id, _, "oracle"}, _}) -> oracle; ({app_t, _, {id, _, "oracle"}, _}) -> oracle;
({app_t, _, {id, _, "oracle_query"}, _}) -> query; ({app_t, _, {id, _, "oracle_query"}, _}) -> query;
(_) -> other end, (_) -> other end,

1
test/aeso_abi_tests.erl
View File

@ -97,6 +97,7 @@ calldata_test() ->
Map = #{ <<"a">> => 4 }, Map = #{ <<"a">> => 4 },
[{variant, 1, [Map]}, {{<<"b">>, 5}, {variant, 0, []}}] = [{variant, 1, [Map]}, {{<<"b">>, 5}, {variant, 0, []}}] =
encode_decode_calldata("foo", ["variant", "r"], ["Blue({[\"a\"] = 4})", "{x = (\"b\", 5), y = Red}"]), encode_decode_calldata("foo", ["variant", "r"], ["Blue({[\"a\"] = 4})", "{x = (\"b\", 5), y = Red}"]),
[16#123, 16#456] = encode_decode_calldata("foo", ["hash", "address"], ["#123", "#456"]),
ok. ok.
calldata_init_test() -> calldata_init_test() ->