QPQ-AG/sophia
11
0
Fork 0
Code Issues 43 Pull Requests 7 Actions Packages Projects Releases 16 Wiki Activity

Revert bytes(N) from icode/vm-types

Browse Source
This commit is contained in:
Hans Svensson
2019-04-23 17:47:50 +02:00
parent 51b63f9559
commit 3255c62e0e
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aeso_ast_to_icode.erl
+6 -4
View File
@@ -696,8 +696,11 @@ ast_typerep({qid, _, Name}, Icode) ->
lookup_type_id(Name, [], Icode);
ast_typerep({con, _, _}, _) ->
word; %% Contract type
ast_typerep({bytes_t, _, Len}, _) when Len =< 32 ->
word;
ast_typerep({bytes_t, _, Len}, _) ->
{bytes, Len};
Words = (31 + Len) div 32,
{tuple, lists:duplicate(Words, word)};
ast_typerep({app_t, _, {id, _, Name}, Args}, Icode) ->
ArgReps = [ ast_typerep(Arg, Icode) || Arg <- Args ],
lookup_type_id(Name, ArgReps, Icode);
@@ -726,7 +729,8 @@ ttl_t(Icode) ->
ast_typerep({qid, [], ["Chain", "ttl"]}, Icode).
sign_t() -> bytes_t(64).
bytes_t(Len) -> {bytes, Len}.
bytes_t(Len) when Len =< 32 -> word;
bytes_t(Len) -> {tuple, lists:duplicate((31 + Len) div 32, word)}.
get_signature_arg(Args0) ->
NamedArgs = [Arg || Arg = {named_arg, _, _, _} <- Args0],
@@ -760,8 +764,6 @@ type_value({list, A}) ->
type_value({tuple, As}) ->
#tuple{ cpts = [#integer{ value = ?TYPEREP_TUPLE_TAG },
#list{ elems = [ type_value(A) || A <- As ] }] };
type_value({bytes, Len}) ->
#tuple{ cpts = [#integer{ value = ?TYPEREP_BYTES_TAG }, #integer{ value = Len }] };
type_value({variant, Cs}) ->
#tuple{ cpts = [#integer{ value = ?TYPEREP_VARIANT_TAG },
#list{ elems = [ #list{ elems = [ type_value(A) || A <- As ] } || As <- Cs ] }] };