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

Fix issues with pretty-printing of fexprs

Browse Source
This commit is contained in:
Gaith Hallak 2023-05-19 18:46:04 +03:00
parent 066ff0bc96
commit 7c67561585
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/aeso_ast_to_fcode.erl
View File

@ -2301,6 +2301,8 @@ pp_par(Xs) -> prettypr:par(Xs).
-spec pp_fexpr(fexpr()) -> prettypr:document(). -spec pp_fexpr(fexpr()) -> prettypr:document().
pp_fexpr({lit, _, {typerep, T}}) -> pp_fexpr({lit, _, {typerep, T}}) ->
pp_ftype(T); pp_ftype(T);
pp_fexpr({lit, _, {contract_code, Contract}}) ->
pp_beside(pp_text("contract "), pp_text(Contract));
pp_fexpr({lit, _, {Tag, Lit}}) -> pp_fexpr({lit, _, {Tag, Lit}}) ->
aeso_pretty:expr({Tag, [], Lit}); aeso_pretty:expr({Tag, [], Lit});
pp_fexpr({nil, _}) -> pp_fexpr({nil, _}) ->
@ -2371,9 +2373,7 @@ pp_fexpr({set_state, FAnn, R, A}) ->
pp_call(pp_text("set_state"), [{lit, FAnn, {int, R}}, A]); pp_call(pp_text("set_state"), [{lit, FAnn, {int, R}}, A]);
pp_fexpr({get_state, FAnn, R}) -> pp_fexpr({get_state, FAnn, R}) ->
pp_call(pp_text("get_state"), [{lit, FAnn, {int, R}}]); pp_call(pp_text("get_state"), [{lit, FAnn, {int, R}}]);
pp_fexpr({switch, _, Split}) -> pp_split(Split); pp_fexpr({switch, _, Split}) -> pp_split(Split).
pp_fexpr({contract_code, Contract}) ->
pp_beside(pp_text("contract "), pp_text(Contract)).
-spec pp_call(prettypr:document(), [fexpr()]) -> prettypr:document(). -spec pp_call(prettypr:document(), [fexpr()]) -> prettypr:document().
pp_call(Fun, Args) -> pp_call(Fun, Args) ->
@ -2403,7 +2403,11 @@ pp_ftype({variant, Cons}) ->
[ case Args of [ case Args of
[] -> pp_fexpr({con, [], [], I - 1, []}); [] -> pp_fexpr({con, [], [], I - 1, []});
_ -> pp_beside(pp_fexpr({con, [], [], I - 1, []}), pp_ftype({tuple, Args})) _ -> pp_beside(pp_fexpr({con, [], [], I - 1, []}), pp_ftype({tuple, Args}))
end || {I, Args} <- indexed(Cons)])). end || {I, Args} <- indexed(Cons)]));
pp_ftype([]) ->
%% NOTE: This could happen with `{typerep, []}` since `[]` is not a ftype().
%% TODO: It would be better to make sure that `{typerep, []}` does not arrive here.
pp_text("[]").
-spec pp_split(fsplit()) -> prettypr:document(). -spec pp_split(fsplit()) -> prettypr:document().
pp_split({nosplit, _, E}) -> pp_fexpr(E); pp_split({nosplit, _, E}) -> pp_fexpr(E);