From 2f36380a81439ffc388cbed14050e062e13a6a57 Mon Sep 17 00:00:00 2001
From: Robert Virding <rvirding@gmail.com>
Date: Fri, 1 Feb 2019 17:00:12 +0100
Subject: [PATCH] Add handling of private and stateful functions

---
 rebar.lock       |  2 +-
 src/aeso_aci.erl | 40 ++++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/rebar.lock b/rebar.lock
index 13ae7f2..3043376 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -7,7 +7,7 @@
  {<<"jsx">>,
   {git,"https://github.com/talentdeficit/jsx.git",
        {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},
-  0}].
+  0}]}.
 [
 {pkg_hash,[
  {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}
diff --git a/src/aeso_aci.erl b/src/aeso_aci.erl
index dff3cc5..666e8b6 100644
--- a/src/aeso_aci.erl
+++ b/src/aeso_aci.erl
@@ -45,9 +45,12 @@ encode(ContractString) ->
     %% io:format("~p\n", [TypedAst]),
     %% aeso_ast:pp(Ast),
     %% aeso_ast:pp_typed(TypedAst),
-    Cname = contract_name(hd(TypedAst)),
-    Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(hd(TypedAst))) ],
-    Fdefs = [ encode_func(F) || F <- sort_decls(contract_funcs(hd(TypedAst))) ],
+    %% We look at the first contract.
+    Contract = 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)},
 			      {<<"type_defs">>, Tdefs},
 			      {<<"functions">>, Fdefs}]}],
@@ -60,7 +63,8 @@ encode_func(Fdef) ->
     Type = function_type(Fdef),
     [{<<"name">>, list_to_binary(Name)},
      {<<"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_arg(A) || A <- Args ].
@@ -146,18 +150,19 @@ decode_args(As) ->
 
 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}) ->
-    ["  type"," ",io_lib:format("~s", [Name]),decode_tvars(Vs),
-     " = ",decode_type(T),$\n].
+%% decode_tdef(#{<<"name">> := Name,<<"vars">> := Vs,<<"typedef">> := T}) ->
+%%     ["  type"," ",io_lib:format("~s", [Name]),decode_tvars(Vs),
+%%      " = ",decode_type(T),$\n].
 
-decode_tvars([]) -> [];				%No tvars, no parentheses
-decode_tvars(Vs) ->
-    Dvs = [ decode_tvar(V) || V <- Vs ],
-    [$(,lists:join(", ", Dvs),$)].
+%% decode_tvars([]) -> [];				%No tvars, no parentheses
+%% decode_tvars(Vs) ->
+%%     Dvs = [ decode_tvar(V) || V <- Vs ],
+%%     [$(,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]}.
 
@@ -170,10 +175,9 @@ contract_types(#contract{decls=Decls}) ->
     [ D || D <- Decls, is_record(D, type_def) ].
 
 sort_decls(Ds) ->
-    %% We can easily sort them in annotation, they all should have the
-    %% same column.
     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,
     lists:sort(Sort, Ds).
 
@@ -185,6 +189,10 @@ function_args(#letfun{args=Args}) -> Args.
 
 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}.
 
 typedef_name(#type_def{id=#id{name=N}}) -> N.