add variable assignments to annotations

src/solidity-common/solidity_common.ml

@@ -87,10 +87,10 @@ module Ident = struct
   let to_string id = id
   let of_string id = id
   let printf fmt id = Format.fprintf fmt "%s" id
-  let constructor = "#"
-  let onBounce = "!"
-  let receive = "@"
-  let fallback = "*"
+  let constructor = ":constructor"
+  let onBounce = ":onBounce"
+  let receive = ":receive"
+  let fallback = ":fallback"
 end
 
 module LongIdent = struct

src/solidity-typechecker/solidity_checker_TYPES.ml

@@ -102,6 +102,7 @@ and variable_desc = {
   mutable variable_getter : function_desc option; (* when the variable has a getter*)
   variable_is_primitive : bool;
   variable_def : Solidity_ast.state_variable_definition option; (* module/contract*)
+  mutable variable_assigns : function_desc list ;
 }
 
 and function_desc = {
@@ -116,6 +117,7 @@ and function_desc = {
   function_is_method : bool;
   function_is_primitive : bool;
   function_def : Solidity_ast.function_definition option; (* Primitives have no definition *)
+  mutable function_assigns : variable_desc list ;
 }
 
 and modifier_desc = {
@@ -241,7 +243,7 @@ type options = {
   call_args: args option;   (* could just have an in_lvalue flag *)
   fun_returns : type_ list;
   in_loop: bool;
-  in_function: bool;
+  in_function: function_desc option;
   in_modifier: bool;
   current_hierarchy: absolute LongIdent.t list;
   current_contract: contract_desc option;

src/solidity-typechecker/solidity_tenv.ml

@@ -194,7 +194,9 @@ let find_constructor pos { contract_abs_name; contract_env; _ } =
         function_selector = None;
         function_is_method = true;
         function_is_primitive = false;
-        function_def = None; }
+        function_def = None;
+        function_assigns = [];
+      }
 
 let has_abstract_function cd =
   let exception Found of Ident.t in

src/solidity-typechecker/solidity_type_builder.ml

@@ -257,7 +257,9 @@ and function_type_to_desc pos env ft =
     function_selector = None;
     function_is_method = false;
     function_is_primitive = false;
-    function_def = None; }
+    function_def = None;
+    function_assigns = [];
+  }
 
 and process_fun_params pos env ~ext params =
   List.map (fun (t, loc_opt, name_opt) ->
@@ -321,7 +323,9 @@ let variable_desc_to_function_desc pos vid variable_abs_name vt :
     function_selector;
     function_is_method = true;
     function_is_primitive = false;
-    function_def = None; }
+    function_def = None;
+    function_assigns = [];
+  }
 
 (* Build the function corresponding to an event *)
 let event_desc_to_function_desc (ed : event_desc) : function_desc =
@@ -335,7 +339,9 @@ let event_desc_to_function_desc (ed : event_desc) : function_desc =
     function_selector = None;
     function_is_method = false;
     function_is_primitive = false;
-    function_def = None; }
+    function_def = None;
+    function_assigns = [];
+  }
 
 (* Make a ident description for a local variable *)
 let local_variable_desc variable_type : variable_desc =
@@ -347,7 +353,9 @@ let local_variable_desc variable_type : variable_desc =
     variable_override = None;
     variable_getter = None;
     variable_is_primitive = false;
-    variable_def = None; }
+    variable_def = None;
+    variable_assigns = [] ;
+  }
 
 
 
@@ -395,7 +403,9 @@ let make_variable_desc vlid vd =
     variable_override = None;
     variable_getter = None;
     variable_is_primitive = false;
-    variable_def = Some (vd); }
+    variable_def = Some (vd);
+    variable_assigns = [] ;
+  }
 
 let update_variable_desc pos env vd kind_opt =
   let vd' =
@@ -428,7 +438,9 @@ let make_function_desc flid fd method_ =
     function_selector = None;
     function_is_method = method_;
     function_is_primitive = false;
-    function_def = Some (fd); }
+    function_def = Some (fd);
+    function_assigns = [];
+  }
 
 let update_function_desc pos env fd kind_opt =
   let fd' =
@@ -479,7 +491,9 @@ let primitive_fun_desc ?(returns_lvalue=false)
     function_selector = None;
     function_is_method = false; (* can be true *)
     function_is_primitive = true;
-    function_def = None; }
+    function_def = None;
+    function_assigns = [];
+  }
 
 let primitive_fun_type ?(kind=KOther) ?(returns_lvalue=false)
     arg_types ret_types function_mutability =
@@ -502,7 +516,9 @@ let primitive_var_desc (*?(is_lvalue=false)*) variable_type =
     variable_override = None;
     variable_getter = None;
     variable_is_primitive = true;
-    variable_def = None; }
+    variable_def = None;
+    variable_assigns = [] ;
+  }
 
 let primitive_var (*?(is_lvalue=false)*) variable_type =
   let vd = primitive_var_desc variable_type in