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

Add handling of private and stateful functions

Browse Source
This commit is contained in:
Robert Virding 2019-02-01 17:00:12 +01:00
parent d330133b3f
commit 2f36380a81
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.lock
View File

@ -7,7 +7,7 @@
{<<"jsx">>, {<<"jsx">>,
{git,"https://github.com/talentdeficit/jsx.git", {git,"https://github.com/talentdeficit/jsx.git",
{ref,"3074d4865b3385a050badf7828ad31490d860df5"}}, {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},
0}]. 0}]}.
[ [
{pkg_hash,[ {pkg_hash,[
{<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]} {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}

40
src/aeso_aci.erl
View File

@ -45,9 +45,12 @@ encode(ContractString) ->
%% io:format("~p\n", [TypedAst]), %% io:format("~p\n", [TypedAst]),
%% aeso_ast:pp(Ast), %% aeso_ast:pp(Ast),
%% aeso_ast:pp_typed(TypedAst), %% aeso_ast:pp_typed(TypedAst),
Cname = contract_name(hd(TypedAst)), %% We look at the first contract.
Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(hd(TypedAst))) ], Contract = hd(TypedAst),
Fdefs = [ encode_func(F) || F <- sort_decls(contract_funcs(hd(TypedAst))) ], Cname = contract_name(Contract),
Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(Contract)) ],
Fdefs = [ encode_func(F) || F <- sort_decls(contract_funcs(Contract)),
not is_private_func(F) ],
Jmap = [{<<"contract">>, [{<<"name">>, list_to_binary(Cname)}, Jmap = [{<<"contract">>, [{<<"name">>, list_to_binary(Cname)},
{<<"type_defs">>, Tdefs}, {<<"type_defs">>, Tdefs},
{<<"functions">>, Fdefs}]}], {<<"functions">>, Fdefs}]}],
@ -60,7 +63,8 @@ encode_func(Fdef) ->
Type = function_type(Fdef), Type = function_type(Fdef),
[{<<"name">>, list_to_binary(Name)}, [{<<"name">>, list_to_binary(Name)},
{<<"arguments">>, encode_args(Args)}, {<<"arguments">>, encode_args(Args)},
{<<"type">>, list_to_binary(encode_type(Type))}]. {<<"type">>, list_to_binary(encode_type(Type))},
{<<"stateful">>, is_stateful_func(Fdef)}].
encode_args(Args) -> encode_args(Args) ->
[ encode_arg(A) || A <- Args ]. [ encode_arg(A) || A <- Args ].
@ -146,18 +150,19 @@ decode_args(As) ->
decode_arg(#{<<"type">> := T}) -> decode_type(T). decode_arg(#{<<"type">> := T}) -> decode_type(T).
decode_tdefs(Ts) -> [ decode_tdef(T) || T <- Ts ]. %% To keep dialyzer happy and quiet.
%% decode_tdefs(Ts) -> [ decode_tdef(T) || T <- Ts ].
decode_tdef(#{<<"name">> := Name,<<"vars">> := Vs,<<"typedef">> := T}) -> %% decode_tdef(#{<<"name">> := Name,<<"vars">> := Vs,<<"typedef">> := T}) ->
[" type"," ",io_lib:format("~s", [Name]),decode_tvars(Vs), %% [" type"," ",io_lib:format("~s", [Name]),decode_tvars(Vs),
" = ",decode_type(T),$\n]. %% " = ",decode_type(T),$\n].
decode_tvars([]) -> []; %No tvars, no parentheses %% decode_tvars([]) -> []; %No tvars, no parentheses
decode_tvars(Vs) -> %% decode_tvars(Vs) ->
Dvs = [ decode_tvar(V) || V <- Vs ], %% Dvs = [ decode_tvar(V) || V <- Vs ],
[$(,lists:join(", ", Dvs),$)]. %% [$(,lists:join(", ", Dvs),$)].
decode_tvar(#{<<"name">> := N}) -> io_lib:format("~s", [N]). %% decode_tvar(#{<<"name">> := N}) -> io_lib:format("~s", [N]).
%% #contract{Ann, Con, [Declarations]}. %% #contract{Ann, Con, [Declarations]}.
@ -170,10 +175,9 @@ contract_types(#contract{decls=Decls}) ->
[ D || D <- Decls, is_record(D, type_def) ]. [ D || D <- Decls, is_record(D, type_def) ].
sort_decls(Ds) -> sort_decls(Ds) ->
%% We can easily sort them in annotation, they all should have the
%% same column.
Sort = fun (D1, D2) -> Sort = fun (D1, D2) ->
aeso_syntax:get_ann(D1) =< aeso_syntax:get_ann(D2) aeso_syntax:get_ann(line, D1, 0) =<
aeso_syntax:get_ann(line, D2, 0)
end, end,
lists:sort(Sort, Ds). lists:sort(Sort, Ds).
@ -185,6 +189,10 @@ function_args(#letfun{args=Args}) -> Args.
function_type(#letfun{type=Type}) -> Type. function_type(#letfun{type=Type}) -> Type.
is_private_func(#letfun{ann=A}) -> aeso_syntax:get_ann(private, A, false).
is_stateful_func(#letfun{ann=A}) -> aeso_syntax:get_ann(stateful, A, false).
%% #type_def{Ann, Id, [Var], Typedef}. %% #type_def{Ann, Id, [Var], Typedef}.
typedef_name(#type_def{id=#id{name=N}}) -> N. typedef_name(#type_def{id=#id{name=N}}) -> N.