Refactor exported and stamps.

Author: cristianoc

analysis/src/ProcessCmt.ml

@@ -39,7 +39,7 @@ let addItem ~name ~extent ~stamp ~env ~item attributes exported stamps =
   Hashtbl.add stamps stamp declared;
   declared
 
-let rec forTypeSignatureItem ~env ~(exported : SharedTypes.exported)
+let rec forTypeSignatureItem ~env ~(exported : SharedTypes.Exported.t)
     (item : Types.signature_item) =
   match item with
   | Sig_value (ident, {val_type; val_attributes; val_loc = loc}) ->
@@ -135,7 +135,7 @@ let rec forTypeSignatureItem ~env ~(exported : SharedTypes.exported)
   | _ -> []
 
 and forTypeSignature env signature =
-  let exported = initExported () in
+  let exported = Exported.init () in
   let topLevel =
     List.fold_right
       (fun item items -> forTypeSignatureItem ~env ~exported item @ items)
@@ -156,7 +156,7 @@ let getModuleTypePath mod_desc =
   | Tmty_ident (path, _) | Tmty_alias (path, _) -> Some path
   | Tmty_signature _ | Tmty_functor _ | Tmty_with _ | Tmty_typeof _ -> None
 
-let forTypeDeclaration ~env ~(exported : exported)
+let forTypeDeclaration ~env ~(exported : Exported.t)
     {
       typ_id;
       typ_loc;
@@ -215,7 +215,7 @@ let forTypeDeclaration ~env ~(exported : exported)
   in
   {declared with item = ModuleKind.Type (declared.item, recStatus)}
 
-let rec forSignatureItem ~env ~(exported : exported)
+let rec forSignatureItem ~env ~(exported : Exported.t)
     (item : Typedtree.signature_item) =
   match item.sig_desc with
   | Tsig_value {val_id; val_loc; val_name = name; val_desc; val_attributes} ->
@@ -267,7 +267,7 @@ let rec forSignatureItem ~env ~(exported : exported)
   | _ -> []
 
 let forSignature ~env items =
-  let exported = initExported () in
+  let exported = Exported.init () in
   let topLevel =
     items |> List.map (forSignatureItem ~env ~exported) |> List.flatten
   in
@@ -301,7 +301,7 @@ let rec getModulePath mod_desc =
   | Tmod_constraint (expr, _typ, _constraint, _coercion) ->
     getModulePath expr.mod_desc
 
-let rec forStructureItem ~env ~(exported : exported) item =
+let rec forStructureItem ~env ~(exported : Exported.t) item =
   match item.str_desc with
   | Tstr_value (_isRec, bindings) ->
     let declareds = ref [] in
@@ -446,7 +446,7 @@ and forModule env mod_desc moduleName =
     Constraint (modKind, modTypeKind)
 
 and forStructure ~env items =
-  let exported = initExported () in
+  let exported = Exported.init () in
   let topLevel =
     List.fold_right
       (fun item results -> forStructureItem ~env ~exported item @ results)
@@ -491,7 +491,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     let env =
       {
         scope = extent;
-        stamps = initStamps ();
+        stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
     in
@@ -510,7 +510,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     let env =
       {
         scope = sigItemsExtent items;
-        stamps = initStamps ();
+        stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
     in
@@ -520,7 +520,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     let env =
       {
         scope = impItemsExtent structure.str_items;
-        stamps = initStamps ();
+        stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
     in
@@ -530,7 +530,7 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
     let env =
       {
         scope = sigItemsExtent signature.sig_items;
-        stamps = initStamps ();
+        stamps = Stamps.init ();
         modulePath = File (uri, moduleName);
       }
     in

analysis/src/References.ml

@@ -90,7 +90,7 @@ let getLocItem ~full ~line ~col =
   | li :: _ -> Some li
   | _ -> None
 
-let declaredForTip ~stamps stamp (tip : Tip.t) =
+let declaredForTip ~(stamps : Stamps.t) stamp (tip : Tip.t) =
   let open Infix in
   match tip with
   | Value ->
@@ -169,7 +169,7 @@ let definedForLoc ~file ~package locKind =
             maybeLog "Yes!! got it";
             Some res))))
 
-let declaredForExportedTip ~(stamps : stamps) ~(exported : exported) name
+let declaredForExportedTip ~(stamps : Stamps.t) ~(exported : Exported.t) name
     (tip : Tip.t) =
   let open Infix in
   match tip with

analysis/src/SharedTypes.ml

@@ -28,11 +28,20 @@ type 't stampMap = (int, 't) Hashtbl.t
 type 't namedMap = (string, 't) Hashtbl.t
 type namedStampMap = int namedMap
 
-type exported = {
-  types : namedStampMap;
-  values : namedStampMap;
-  modules : namedStampMap;
-}
+module Exported = struct
+  type t = {
+    types : namedStampMap;
+    values : namedStampMap;
+    modules : namedStampMap;
+  }
+
+  let init () =
+    {
+      types = Hashtbl.create 10;
+      values = Hashtbl.create 10;
+      modules = Hashtbl.create 10;
+    }
+end
 
 type 't declared = {
   name : string Location.loc;
@@ -54,7 +63,7 @@ module ModuleKind = struct
 
   and contents = {
     docstring : string list;
-    exported : exported;
+    exported : Exported.t;
     topLevel : moduleItem declared list;
   }
 
@@ -80,49 +89,44 @@ module Kind = struct
     | Value _ -> 12
 end
 
-let initExported () =
-  {
-    types = Hashtbl.create 10;
-    values = Hashtbl.create 10;
-    modules = Hashtbl.create 10;
+module Stamps = struct
+  type t = {
+    types : Type.t declared stampMap;
+    values : Types.type_expr declared stampMap;
+    modules : ModuleKind.t declared stampMap;
+    constructors : constructor declared stampMap;
   }
 
-type stamps = {
-  types : Type.t declared stampMap;
-  values : Types.type_expr declared stampMap;
-  modules : ModuleKind.t declared stampMap;
-  constructors : constructor declared stampMap;
-}
-
-let initStamps () =
-  {
-    types = Hashtbl.create 10;
-    values = Hashtbl.create 10;
-    modules = Hashtbl.create 10;
-    constructors = Hashtbl.create 10;
-  }
+  let init () =
+    {
+      types = Hashtbl.create 10;
+      values = Hashtbl.create 10;
+      modules = Hashtbl.create 10;
+      constructors = Hashtbl.create 10;
+    }
+end
 
-type env = {stamps : stamps; modulePath : visibilityPath; scope : Location.t}
+type env = {stamps : Stamps.t; modulePath : visibilityPath; scope : Location.t}
 
 module File = struct
   type t = {
     uri : Uri2.t;
-    stamps : stamps;
+    stamps : Stamps.t;
     moduleName : string;
     contents : ModuleKind.contents;
   }
 
   let create moduleName uri =
     {
       uri;
-      stamps = initStamps ();
+      stamps = Stamps.init ();
       moduleName;
-      contents = {docstring = []; exported = initExported (); topLevel = []};
+      contents = {docstring = []; exported = Exported.init (); topLevel = []};
     }
 end
 
 module QueryEnv = struct
-  type t = {file : File.t; exported : exported}
+  type t = {file : File.t; exported : Exported.t}
 
   let fromFile file = {file; exported = file.contents.exported}
 end