QPQ-AG/gmbytecode
10
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 9 Wiki Activity

Fix testcase.

Browse Source
This commit is contained in:
Erik Stenman 2019-03-14 16:52:57 +01:00
parent c614da15e0
commit 83fb49254d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aeb_fate_data.erl
View File

@ -205,7 +205,7 @@ format(?FATE_VARIANT(Size, Tag, T)) ->
" |)"]; " |)"];
format(M) when ?IS_FATE_MAP(M) -> format(M) when ?IS_FATE_MAP(M) ->
["{ ", format_kvs(maps:to_list(?FATE_MAP_VALUE(M))), " }"]; ["{ ", format_kvs(maps:to_list(?FATE_MAP_VALUE(M))), " }"];
format(?FATE_ADDRESS(Address)) -> [address_to_base58(Address)]; format(?FATE_ADDRESS(Address)) -> ["@", address_to_base58(Address)];
format(?FATE_HASH(X)) -> ["#", base64:encode(X)]; format(?FATE_HASH(X)) -> ["#", base64:encode(X)];
format(?FATE_SIGNATURE(X)) -> ["$", base64:encode(X)]; format(?FATE_SIGNATURE(X)) -> ["$", base64:encode(X)];
format(?FATE_CONTRACT(X)) -> ["ct_", address_to_base58(X)]; format(?FATE_CONTRACT(X)) -> ["ct_", address_to_base58(X)];

2
src/aeb_fate_encoding.erl
View File

@ -218,7 +218,7 @@ deserialize_type(<<?TYPE_LIST, Rest/binary>>) ->
deserialize_type(<<?TYPE_TUPLE, N, Rest/binary>>) -> deserialize_type(<<?TYPE_TUPLE, N, Rest/binary>>) ->
{Ts, Rest2} = deserialize_types(N, Rest, []), {Ts, Rest2} = deserialize_types(N, Rest, []),
{{tuple, Ts}, Rest2}; {{tuple, Ts}, Rest2};
deserialize_type(<<TYPE_OBJECT, ObjectType, Rest/binary>>) -> deserialize_type(<<?TYPE_OBJECT, ObjectType, Rest/binary>>) ->
case ObjectType of case ObjectType of
?OTYPE_ADDRESS -> {address, Rest}; ?OTYPE_ADDRESS -> {address, Rest};
?OTYPE_HASH -> {hash, Rest}; ?OTYPE_HASH -> {hash, Rest};

8
test/asm_code/all_instructions.fate
View File

@ -24,7 +24,7 @@ FUNCTION foo () : {tuple, []}
SWITCH_V3 var4 0x1d61723dd 79 7 SWITCH_V3 var4 0x1d61723dd 79 7
SWITCH_VN #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv [1, 2, 3] SWITCH_VN arg0 [1, 2, 3]
PUSH var80 PUSH var80
@ -112,7 +112,7 @@ FUNCTION foo () : {tuple, []}
ADDR_TO_STR a arg216 ADDR_TO_STR a arg216
STR_REVERSE a174 #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv STR_REVERSE a174 @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv
INT_TO_ADDR arg127 var207 INT_TO_ADDR arg127 var207
@ -180,11 +180,11 @@ FUNCTION foo () : {tuple, []}
LOG3 arg255 arg15 arg211 var139 arg44 LOG3 arg255 arg15 arg211 var139 arg44
LOG4 #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv a247 a 9 a38 a LOG4 @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv a247 a 9 a38 a
DEACTIVATE DEACTIVATE
SPEND #nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv var136 SPEND @nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv var136
ORACLE_REGISTER arg29 48 ((| 5 | 2 | (1, "foo", ()) |)) arg65 { <> => false} <> ORACLE_REGISTER arg29 48 ((| 5 | 2 | (1, "foo", ()) |)) arg65 { <> => false} <>