Added support for recursive and mult-file function definitions

Author: Adam Welc

infer/lib/go/src_to_ast_json.go

@@ -1,9 +1,8 @@
 type object_type =
 	[ FuncDecl of func_decl_type
 	| FuncDeclRef of int
-	| Field of field_type	
 	| FieldRef of int
-	| ValueSpec of value_spec_type
+	| ValueSpec of value_spec_type 
 	| ValueSpecRef of int 
 	| AssignStmt of assign_stmt_type
 	| AssignStmtRef of int
@@ -68,7 +67,7 @@ type value_spec_type = {
 }
 
 type spec_type =
-	[ValueSpec of value_spec_type]
+	[ ValueSpec of value_spec_type ]
 
 type gen_decl_type = {
 	ln <json name="Ln"> : int;
@@ -77,10 +76,13 @@ type gen_decl_type = {
 	specs <json name="Specs"> : spec_type list;
 }
 
+type func_desc_type =
+	[ FuncTypeRef of int ]
+
 type func_decl_type = {
 	uid <json name="Uid"> : int;
 	name <json name="Name"> : ident_type;
-	func_type <json name="FuncType"> : func_type_type;
+	func_desc <json name="FuncDesc"> : func_desc_type;
 	body <json name="Body"> : block_stmt_type;
 }
 
@@ -109,7 +111,7 @@ type assign_stmt_type = {
 
 type stmt_type =
 	[ DeclStmt of decl_stmt_type
-	| ReturnStmt of return_stmt_type 
+	| ReturnStmt of return_stmt_type
 	| AssignStmt of assign_stmt_type
 	| BlockStmt of block_stmt_type
 	| IfStmt of if_stmt_type 
@@ -127,9 +129,10 @@ type field_type = {
 }
 
 type field_list_el_type =
-	[ Field of field_type ]
+	[ FieldRef of int ]
 
 type func_type_type = {
+	uid <json name="Uid"> : int;
 	ln <json name="Ln"> : int;
 	col <json name="Col"> : int;
     params <json name="Params"> : field_list_el_type list;
@@ -191,6 +194,17 @@ type empty_stmt_type = {
 	col <json name="Col"> : int;
 }
 
+type func_sig_type = {
+	name <json name="Name"> : string;
+	func_desc <json name="FuncDesc"> : func_desc_type;
+}
+
+type def_type = 
+	[ FuncType of func_type_type
+	| Field of field_type ]
+
 type file_type = {
+	defs <json name="Defs"> : def_type list;
 	decls <json name="Decls"> : decl_type list;
+	funcs <json name="Funcs"> : func_sig_type list;
 }

infer/src/atd/go_ast_to_json.atd

@@ -17,16 +17,31 @@ end)
 
 module FuncDeclsMap = IntMap
 
+module FuncTypesMap = IntMap
+
+module FieldsMap = IntMap
+
 module LabeledStmtsMap = IntMap
 
 module LabelNodesMap = IntMap
 
 module NestMap = Procdesc.NodeMap
 
+module FuncSigsMap = Caml.Map.Make(struct
+  type t = string [@@deriving compare]
+end)
+
+type gomodule = 
+	{ mutable func_sigs : (Typ.t) FuncSigsMap.t 
+	; mutable files : string list }
+
 type gocfg = 
 	{ cfg: Cfg.t
 	; src_file: SourceFile.t
-	; mutable func_decls: (Procdesc.t) FuncDeclsMap.t }
+	; mutable func_decls: (Procdesc.t) FuncDeclsMap.t 
+	; mutable func_types: (Go_ast_to_json_t.func_type_type) FuncTypesMap.t
+	; mutable fields : (Go_ast_to_json_t.field_type) FieldsMap.t
+	; go_module : gomodule }
 
 type t =
 	{ proc_desc: Procdesc.t
@@ -59,7 +74,15 @@ let create_context proc_desc go_cfg exit_node =
 	; exit_node
 	; go_cfg }
 
-let create_cfg file = 
+let create_cfg m file = 
 	{ cfg = Cfg.create ()
 	; src_file = file
-	; func_decls = FuncDeclsMap.empty }
+	; func_decls = FuncDeclsMap.empty
+	; func_types = FuncTypesMap.empty 
+	; fields = FieldsMap.empty
+	; go_module = m }
+
+let create_module paths = 
+	{ func_sigs = FuncSigsMap.empty
+	; files = paths }
+

infer/src/go/context.ml

@@ -14,16 +14,29 @@ module IntMap : Caml.Map.S with type key = int
 
 module FuncDeclsMap : Caml.Map.S with type key = int
 
+module FuncTypesMap : Caml.Map.S with type key = int
+
+module FieldsMap : Caml.Map.S with type key = int
+
 module LabeledStmtsMap : Caml.Map.S with type key = int
 
 module LabelNodesMap : Caml.Map.S with type key = int
 
 module NestMap : Caml.Map.S with type key = Procdesc.Node.t
 
+module FuncSigsMap : Caml.Map.S with type key = string
+
+type gomodule = 
+	{ mutable func_sigs : (Typ.t) FuncSigsMap.t
+	; mutable files : string list }
+
 type gocfg = 
 	{ cfg: Cfg.t
 	; src_file: SourceFile.t
-	; mutable func_decls: (Procdesc.t) FuncDeclsMap.t }
+	; mutable func_decls: (Procdesc.t) FuncDeclsMap.t
+	; mutable func_types : (Go_ast_to_json_t.func_type_type) FuncTypesMap.t
+	; mutable fields : (Go_ast_to_json_t.field_type) FieldsMap.t 
+	; go_module : gomodule }
 
 type t =
 	{ proc_desc: Procdesc.t
@@ -52,4 +65,6 @@ type t =
 
 val create_context : Procdesc.t -> gocfg -> Procdesc.Node.t -> t
 
-val create_cfg : SourceFile.t -> gocfg
+val create_cfg : gomodule -> SourceFile.t -> gocfg
+
+val create_module : string list -> gomodule

infer/src/go/context.mli

@@ -1,26 +1,28 @@
 open! IStd
 open Go_ast_to_json_t
 
-let funcs_map = Int.Table.create () ~size:8
+let func_decls_map = Int.Table.create () ~size:8
+let func_types_map = Int.Table.create () ~size:8
+let fields_map = Int.Table.create () ~size:8
 let labeled_stmts_map = Int.Table.create () ~size:8
 
 let concatmap sep fn l =  String.concat ~sep:(sep) (List.map ~f:(fn) l)
 
 let rec pretty_file go_file =
+  List.iter ~f:(get_def) go_file.defs;
   concatmap "\n" pretty_decl go_file.decls
 
+and get_def = function 
+  | `FuncType (t) -> Hashtbl.replace func_types_map t.uid t
+  | `Field (field) -> Hashtbl.replace fields_map field.uid field
+
 and pretty_decl = function
   | `GenDecl (decl) -> pretty_gen_decl decl
-  | `FuncDecl (decl) -> pretty_func_decl decl
-  | `FuncDeclRef (ref) -> 
-      (match Hashtbl.find funcs_map ref with
-        | None -> raise (Failure "Should not happen")
-        | Some (s) -> s )
+  | `FuncDecl (decl) -> Hashtbl.replace func_decls_map decl.uid decl; pretty_func_decl decl
+  | `FuncDeclRef (ref) -> pretty_func_decl (Hashtbl.find_exn func_decls_map ref)
 
 and pretty_func_decl fdecl = 
-  match Hashtbl.find funcs_map fdecl.uid with
-    | None -> "func " ^ (pretty_ident fdecl.name) ^ (pretty_func_type fdecl.func_type) ^ " {\n" ^ (pretty_stmt_type fdecl.body) ^ "\n}\n"
-    | Some (s) -> s
+  "func " ^ (pretty_ident fdecl.name) ^ (pretty_func_type (get_func_type fdecl.func_desc)) ^ " {\n" ^ (pretty_stmt_type fdecl.body) ^ "\n}\n"
 
 and pretty_value_spec (vspec : value_spec_type) : string =
   if (List.length vspec.names > 1) then raise (Failure "Only single variable declaration supported for now") else (
@@ -41,7 +43,7 @@ and pretty_value_spec (vspec : value_spec_type) : string =
   )
 
 and pretty_spec = function
-  | `ValueSpec (vspec) -> pretty_value_spec vspec
+  | `ValueSpec (spec : value_spec_type) -> pretty_value_spec spec
 
 and pretty_gen_decl gdecl =
   if (List.length gdecl.specs > 1) then raise (Failure "Only one declaration specification supported for now") else (
@@ -54,13 +56,11 @@ and pretty_ident ident =
     | Some (o) ->
       match o with
         | `FuncDecl (decl) -> 
-          let s = pretty_func_decl decl in
-            Hashtbl.replace funcs_map ~key:decl.uid ~data:s;
-            ident.id
+          Hashtbl.replace func_decls_map decl.uid decl;
+          ident.id
         | `LabeledStmt (stmt) -> 
-          let s = pretty_labeled_stmt stmt in
-            Hashtbl.replace labeled_stmts_map ~key:stmt.uid ~data:s;
-            ident.id
+          Hashtbl.replace labeled_stmts_map stmt.uid stmt;
+          ident.id
         | _ -> ident.id
 
 and pretty_star_expr (expr : star_expr_type) : string =
@@ -77,11 +77,15 @@ and pretty_expr = function
   | `BasicLit (lit) -> lit.value  
   | `CallExpr (expr) -> pretty_call_expr expr
 
-and pretty_res_typ = function
-  | `Field (field) -> pretty_expr field.t
+and get_field = function
+    | `FieldRef (ref) -> Hashtbl.find_exn fields_map ref
+
+and pretty_res_typ f =
+  let field = get_field f in
+    pretty_expr field.t
 
-and pretty_param = function
-  | `Field (field) ->
+and pretty_param f =
+  let field = get_field f in  
     if (List.length field.names > 1) then raise (Failure "Function parameter can have only one name") else (
       pretty_ident (List.nth_exn field.names 0) ^ " " ^ pretty_expr field.t
     )
@@ -91,6 +95,11 @@ and pretty_func_type func_type =
     "(" ^ (concatmap ", " pretty_param func_type.params) ^ ") " ^  (pretty_res_typ (List.nth_exn func_type.results 0))  
   )
 
+and get_func_type = function
+  | `FuncTypeRef (ref) ->
+    Hashtbl.find_exn func_types_map ref
+
+
 and pretty_decl_stmt stmt =
   pretty_decl stmt.decl 
 
@@ -128,9 +137,7 @@ and pretty_labeled_stmt stmt =
   pretty_ident stmt.label ^ ":\n" ^ pretty_stmt stmt.stmt
 
 and pretty_labeled_stmt_ref ref =
-      (match Hashtbl.find labeled_stmts_map ref with
-        | None -> raise (Failure "Should not happen")
-        | Some (s) -> s )
+  pretty_labeled_stmt (Hashtbl.find_exn labeled_stmts_map ref)
 
 
 and pretty_stmt = function
@@ -142,7 +149,7 @@ and pretty_stmt = function
   | `ForStmt (stmt) -> pretty_for_stmt stmt
   | `IncDecStmt (stmt) -> pretty_inc_dec_stmt stmt
   | `BranchStmt (stmt) -> pretty_branch_stmt stmt
-  | `LabeledStmt (stmt) -> pretty_labeled_stmt stmt
+  | `LabeledStmt (stmt) -> Hashtbl.replace labeled_stmts_map stmt.uid stmt; pretty_labeled_stmt stmt
   | `LabeledStmtRef (ref) -> pretty_labeled_stmt_ref ref
   | `EmptyStmt (stmt) -> ""