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

Fix to_sophia_value for FATE backend

Browse Source
This commit is contained in:
Hans Svensson 2019-06-27 10:42:31 +02:00
parent c647a2cd34
commit 502a4e6464
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/aeso_compiler.erl
View File

@ -288,25 +288,40 @@ to_sophia_value(_, _, revert, Data, _Options) ->
end; end;
to_sophia_value(ContractString, FunName, ok, Data, Options) -> to_sophia_value(ContractString, FunName, ok, Data, Options) ->
try try
#{ typed_ast := TypedAst, Code = string_to_code(ContractString, Options),
type_env := TypeEnv, #{ typed_ast := TypedAst, type_env := TypeEnv} = Code,
icode := Icode } = string_to_code(ContractString, Options),
{ok, _, Type0} = get_decode_type(FunName, TypedAst), {ok, _, Type0} = get_decode_type(FunName, TypedAst),
Type = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]), Type = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
VmType = aeso_ast_to_icode:ast_typerep(Type, Icode),
case aeb_heap:from_binary(VmType, Data) of case proplists:get_value(backend, Options, aevm) of
{ok, VmValue} -> aevm ->
try Icode = maps:get(icode, Code),
{ok, aeso_vm_decode:from_aevm(VmType, Type, VmValue)} VmType = aeso_ast_to_icode:ast_typerep(Type, Icode),
catch throw:cannot_translate_to_sophia -> case aeb_heap:from_binary(VmType, Data) of
Type0Str = prettypr:format(aeso_pretty:type(Type0)), {ok, VmValue} ->
{error, join_errors("Translation error", [lists:flatten(io_lib:format("Cannot translate VM value ~p\n of type ~p\n to Sophia type ~s\n", try
[Data, VmType, Type0Str]))], {ok, aeso_vm_decode:from_aevm(VmType, Type, VmValue)}
fun (E) -> E end)} catch throw:cannot_translate_to_sophia ->
Type0Str = prettypr:format(aeso_pretty:type(Type0)),
{error, join_errors("Translation error", [lists:flatten(io_lib:format("Cannot translate VM value ~p\n of type ~p\n to Sophia type ~s\n",
[Data, VmType, Type0Str]))],
fun (E) -> E end)}
end;
{error, _Err} ->
{error, join_errors("Decode errors", [lists:flatten(io_lib:format("Failed to decode binary at type ~p", [VmType]))],
fun(E) -> E end)}
end; end;
{error, _Err} -> fate ->
{error, join_errors("Decode errors", [lists:flatten(io_lib:format("Failed to decode binary at type ~p", [VmType]))], try
fun(E) -> E end)} {ok, aeso_vm_decode:from_fate(Type, aeb_fate_encoding:deserialize(Data))}
catch throw:cannot_translate_to_sophia ->
{error, join_errors("Translation error",
[lists:flatten(io_lib:format("Cannot translate fate value ~p\n of Sophia type ~s\n",
[aeb_fate_encoding:deserialize(Data), Type]))],
fun (E) -> E end)};
_:R ->
{error, iolist_to_binary(io_lib:format("Decode error ~p: ~p\n", [R, erlang:get_stacktrace()]))}
end
end end
catch catch
error:{parse_errors, Errors} -> error:{parse_errors, Errors} ->