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

Allow bytes(N) as indices if N =< 32 and payload if N > 32

Browse Source
This commit is contained in:
Ulf Norell 2019-06-25 16:26:50 +02:00
parent 961f557215
commit 523d6b03a9
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aeso_ast_infer_types.erl
View File

@ -772,13 +772,13 @@ is_word_type({id, _, Name}) ->
lists:member(Name, ["int", "address", "hash", "bits", "bool"]); lists:member(Name, ["int", "address", "hash", "bits", "bool"]);
is_word_type({app_t, _, {id, _, Name}, [_, _]}) -> is_word_type({app_t, _, {id, _, Name}, [_, _]}) ->
lists:member(Name, ["oracle", "oracle_query"]); lists:member(Name, ["oracle", "oracle_query"]);
is_word_type({bytes_t, _, [N]}) -> N =< 32; is_word_type({bytes_t, _, N}) -> N =< 32;
is_word_type({con, _, _}) -> true; is_word_type({con, _, _}) -> true;
is_word_type({qcon, _, _}) -> true; is_word_type({qcon, _, _}) -> true;
is_word_type(_) -> false. is_word_type(_) -> false.
is_string_type({id, _, "string"}) -> true; is_string_type({id, _, "string"}) -> true;
is_string_type({bytes_t, _, _}) -> true; is_string_type({bytes_t, _, N}) -> N > 32;
is_string_type(_) -> false. is_string_type(_) -> false.
-spec check_constructor_overlap(env(), aeso_syntax:con(), type()) -> ok | no_return(). -spec check_constructor_overlap(env(), aeso_syntax:con(), type()) -> ok | no_return().

27
src/aeso_builtins.erl
View File

@ -119,11 +119,12 @@ check_event_type(EvtName, Ix, Type, Icode) ->
catch _:_ -> catch _:_ ->
error({EvtName, could_not_resolve_type, Type}) error({EvtName, could_not_resolve_type, Type})
end, end,
case {Ix, VMType} of case {Ix, VMType, Type} of
{indexed, word} -> ok; {indexed, word, _} -> ok;
{notindexed, string} -> ok; {notindexed, string, _} -> ok;
{indexed, _} -> error({EvtName, indexed_field_should_be_word, is, VMType}); {notindexed, _, {bytes_t, _, N}} when N > 32 -> ok;
{notindexed, _} -> error({EvtName, payload_should_be_string, is, VMType}) {indexed, _, _} -> error({EvtName, indexed_field_should_be_word, is, VMType});
{notindexed, _, _} -> error({EvtName, payload_should_be_string, is, VMType})
end. end.
bfun(B, {IArgs, IExpr, IRet}) -> bfun(B, {IArgs, IExpr, IRet}) ->
@ -177,16 +178,22 @@ builtin_event(EventT) ->
VIx = fun(Ix) -> v(lists:concat(["v", Ix])) end, VIx = fun(Ix) -> v(lists:concat(["v", Ix])) end,
ArgPats = fun(Ts) -> [ VIx(Ix) || Ix <- lists:seq(0, length(Ts) - 1) ] end, ArgPats = fun(Ts) -> [ VIx(Ix) || Ix <- lists:seq(0, length(Ts) - 1) ] end,
Payload = %% Should put data ptr, length on stack. Payload = %% Should put data ptr, length on stack.
fun([]) -> {inline_asm, [A(?PUSH1), 0, A(?PUSH1), 0]}; fun([]) -> {inline_asm, [A(?PUSH1), 0, A(?PUSH1), 0]};
([V]) -> {seq, [V, {inline_asm, [A(?DUP1), A(?MLOAD), %% length, ptr ([{{id, _, "string"}, V}]) ->
A(?SWAP1), A(?PUSH1), 32, A(?ADD)]}]} %% ptr+32, length {seq, [V, {inline_asm, [A(?DUP1), A(?MLOAD), %% length, ptr
A(?SWAP1), A(?PUSH1), 32, A(?ADD)]}]}; %% ptr+32, length
([{{bytes_t, _, N}, V}]) -> {seq, [V, {integer, N}, {inline_asm, A(?SWAP1)}]}
end, end,
Ix =
fun({bytes_t, _, N}, V) when N < 32 -> ?BSR(V, 32 - N);
(_, V) -> V end,
Clause = Clause =
fun(_Tag, {con, _, Con}, IxTypes) -> fun(_Tag, {con, _, Con}, IxTypes) ->
Types = [ T || {_Ix, T} <- IxTypes ], Types = [ T || {_Ix, T} <- IxTypes ],
Indexed = [ Var || {Var, {indexed, _Type}} <- lists:zip(ArgPats(Types), IxTypes) ], Indexed = [ Ix(Type, Var) || {Var, {indexed, Type}} <- lists:zip(ArgPats(Types), IxTypes) ],
Data = [ {Type, Var} || {Var, {notindexed, Type}} <- lists:zip(ArgPats(Types), IxTypes) ],
EvtIndex = {unop, 'sha3', str_to_icode(Con)}, EvtIndex = {unop, 'sha3', str_to_icode(Con)},
{event, lists:reverse(Indexed) ++ [EvtIndex], Payload(ArgPats(Types) -- Indexed)} {event, lists:reverse(Indexed) ++ [EvtIndex], Payload(Data)}
end, end,
Pat = fun(Tag, Types) -> {tuple, [{integer, Tag} | ArgPats(Types)]} end, Pat = fun(Tag, Types) -> {tuple, [{integer, Tag} | ArgPats(Types)]} end,