fmt

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/document/generator.ml

@@ -252,7 +252,7 @@ module Make (Syntax : SYNTAX) = struct
     let path id = Url.Path.from_identifier id
     let url id = Url.from_path (path id)
 
-    let to_link {Lang.Source_info.documentation; implementation} =
+    let to_link { Lang.Source_info.documentation; implementation } =
       let documentation =
         let open Paths.Path.Resolved in
         match documentation with

src/odoc/bin/main.ml

@@ -1174,9 +1174,7 @@ module Occurrences = struct
         $ (const index $ dst $ inputs $ inputs_in_file $ warnings_options))
 
     let info ~docs =
-      let doc =
-        "Aggregate hashtables created with odoc count-occurrences."
-      in
+      let doc = "Aggregate hashtables created with odoc count-occurrences." in
       Term.info "aggregate-occurrences" ~docs ~doc
   end
 end

src/odoc/occurrences.ml

@@ -142,10 +142,7 @@ let count ~dst ~warnings_options:_ directories =
           | Type { documentation = Some (`Resolved p as p'); _ }, _ ->
               incr htbl p Odoc_model.Paths.Path.((p' : Type.t :> t))
           | _ -> ())
-        (match unit.source_info with
-        | None -> []
-        | Some i ->
-            i.infos)
+        (match unit.source_info with None -> [] | Some i -> i.infos)
     in
     ()
   in

src/odoc/odoc_link.ml

@@ -8,13 +8,7 @@ let link_unit ~resolver ~filename m =
   let open Odoc_model in
   let open Lang.Compilation_unit in
   let m =
-    if Root.Odoc_file.hidden m.root.file then
-      {
-        m with
-        content = Module { items = []; compiled = false; doc = [] };
-        expansion = None;
-      }
-    else m
+    if Root.Odoc_file.hidden m.root.file then { m with expansion = None } else m
   in
   let env = Resolver.build_link_env_for_unit resolver m in
   Odoc_xref2.Link.link ~filename env m

src/xref2/link.ml

@@ -415,6 +415,106 @@ and open_ env parent = function
   | { Odoc_model__Lang.Open.doc; _ } as open_ ->
       { open_ with doc = comment_docs env parent doc }
 
+module Build_env = struct
+  let rec unit env t =
+    let open Compilation_unit in
+    match t.content with
+    | Module sg ->
+        let env = signature env sg in
+        env
+    | Pack _ -> env
+
+  and signature env s =
+    let env = Env.open_signature s env in
+    signature_items env s.items
+
+  and simple_expansion : Env.t -> ModuleType.simple_expansion -> Env.t =
+   fun env m ->
+    match m with
+    | Signature sg -> signature env sg
+    | Functor (arg, sg) ->
+        let env = Env.add_functor_parameter arg env in
+        let env = functor_argument env arg in
+        simple_expansion env sg
+
+  and functor_argument env a =
+    match a with
+    | FunctorParameter.Unit -> env
+    | Named arg -> functor_parameter_parameter env arg
+
+  and functor_parameter_parameter : Env.t -> FunctorParameter.parameter -> Env.t
+      =
+   fun env a -> module_type_expr env a.expr
+
+  and module_type_expr : Env.t -> ModuleType.expr -> Env.t =
+   fun env expr ->
+    let open ModuleType in
+    match expr with
+    | Signature s -> signature env s
+    | Path { p_path = _; p_expansion = Some p_expansion } ->
+        simple_expansion env p_expansion
+    | Path { p_path = _; p_expansion = None } -> env
+    | With _ -> env
+    | Functor (arg, res) ->
+        let env = functor_argument env arg in
+        let env = Env.add_functor_parameter arg env in
+        let env = module_type_expr env res in
+        env
+    | TypeOf { t_expansion = None; _ } -> env
+    | TypeOf { t_expansion = Some exp; _ } -> simple_expansion env exp
+
+  and signature_items : Env.t -> Signature.item list -> Env.t =
+   fun env s ->
+    let open Signature in
+    List.fold_left
+      (fun env item ->
+        match item with
+        | Module (_, m) -> module_ env m
+        | ModuleSubstitution m -> Env.open_module_substitution m env
+        | Type _ -> env
+        | TypeSubstitution t -> Env.open_type_substitution t env
+        | ModuleType mt -> module_type env mt
+        | ModuleTypeSubstitution mts ->
+            let env = Env.open_module_type_substitution mts env in
+            module_type_substitution env mts
+        | Value _ -> env
+        | Comment _ -> env
+        | TypExt _ -> env
+        | Exception _ -> env
+        | Class _ -> env (* TODO *)
+        | ClassType _ -> env
+        | Include i -> include_ env i
+        | Open _ -> env)
+      env s
+
+  and module_type_substitution : Env.t -> ModuleTypeSubstitution.t -> Env.t =
+   fun env m -> module_type_expr env m.manifest
+
+  and include_ : Env.t -> Include.t -> Env.t =
+   fun env i ->
+    let open Include in
+    signature_items env i.expansion.content.items
+
+  and module_type : Env.t -> ModuleType.t -> Env.t =
+   fun env m ->
+    match m.expr with None -> env | Some expr -> module_type_expr env expr
+
+  and module_ : Env.t -> Module.t -> Env.t =
+   fun env m ->
+    let open Module in
+    let env = module_decl env m.type_ in
+    match m.type_ with
+    | Alias (`Resolved _, Some exp) -> simple_expansion env exp
+    | Alias _ | ModuleType _ -> env
+
+  and module_decl : Env.t -> Module.decl -> Env.t =
+   fun env decl ->
+    let open Module in
+    match decl with
+    | ModuleType expr -> module_type_expr env expr
+    | Alias (_, None) -> env
+    | Alias (_, Some e) -> simple_expansion env e
+end
 let rec unit env t =
   let open Compilation_unit in
   let content =
@@ -427,11 +527,7 @@ let rec unit env t =
       | Pack _ as p -> p
   in
   let source_info =
-    let env =
-      match t.content with
-      | Module sg -> Env.open_signature sg env
-      | Pack _ -> env
-    in
+    let env = Build_env.unit env t in
     let open Source_info in
     match t.source_info with
     | Some inf ->

test/occurrences/double_wrapped.t/run.t

@@ -66,13 +66,16 @@ Uses of C are not counted, since the canonical destination (Main.C, generated by
 Uses of values Y.x and Z.y (in b.ml) are not counted since they come from a "local" module.
 
   $ occurrences_print occurrences.txt | sort
-  Main was used directly 0 times and indirectly 11 times
-  Main.A was used directly 4 times and indirectly 6 times
+  Main was used directly 0 times and indirectly 13 times
+  Main.A was used directly 4 times and indirectly 8 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
-  Main.A.x was used directly 2 times and indirectly 0 times
+  Main.A.x was used directly 4 times and indirectly 0 times
   Main.B was used directly 1 times and indirectly 0 times
+  Main__B was used directly 0 times and indirectly 1 times
+  Main__B.Z was used directly 0 times and indirectly 1 times
+  Main__B.Z.y was used directly 1 times and indirectly 0 times
   string was used directly 1 times and indirectly 0 times
 
   $ occurrences_print occurrences1.txt | sort
@@ -86,17 +89,20 @@ Uses of values Y.x and Z.y (in b.ml) are not counted since they come from a "loc
   string was used directly 1 times and indirectly 0 times
 
   $ occurrences_print occurrences4.txt | sort
-  Main was used directly 0 times and indirectly 7 times
-  Main.A was used directly 2 times and indirectly 5 times
+  Main was used directly 0 times and indirectly 8 times
+  Main.A was used directly 2 times and indirectly 6 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
-  Main.A.x was used directly 1 times and indirectly 0 times
+  Main.A.x was used directly 2 times and indirectly 0 times
+  Main__B was used directly 0 times and indirectly 1 times
+  Main__B.Z was used directly 0 times and indirectly 1 times
+  Main__B.Z.y was used directly 1 times and indirectly 0 times
 
   $ occurrences_print occurrences5.txt | sort
-  Main was used directly 0 times and indirectly 2 times
-  Main.A was used directly 1 times and indirectly 1 times
-  Main.A.x was used directly 1 times and indirectly 0 times
+  Main was used directly 0 times and indirectly 3 times
+  Main.A was used directly 1 times and indirectly 2 times
+  Main.A.x was used directly 2 times and indirectly 0 times
 
 Now we can merge both files
 
@@ -108,11 +114,14 @@ Now we can merge both files
   $ odoc aggregate-occurrences occurrences1.txt occurrences2.txt --file-list files.map -o aggregated.txt
 
   $ occurrences_print aggregated.txt | sort
-  Main was used directly 0 times and indirectly 11 times
-  Main.A was used directly 4 times and indirectly 6 times
+  Main was used directly 0 times and indirectly 13 times
+  Main.A was used directly 4 times and indirectly 8 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
-  Main.A.x was used directly 2 times and indirectly 0 times
+  Main.A.x was used directly 4 times and indirectly 0 times
   Main.B was used directly 1 times and indirectly 0 times
+  Main__B was used directly 0 times and indirectly 1 times
+  Main__B.Z was used directly 0 times and indirectly 1 times
+  Main__B.Z.y was used directly 1 times and indirectly 0 times
   string was used directly 1 times and indirectly 0 times

test/odoc_print/occurrences_print.ml

@@ -2,9 +2,7 @@ module H = Hashtbl.Make (Odoc_model.Paths.Identifier)
 
 let run inp =
   let ic = open_in_bin inp in
-  let htbl : Odoc_odoc.Occurrences.Occtbl.t =
-    Marshal.from_channel ic
-  in
+  let htbl : Odoc_odoc.Occurrences.Occtbl.t = Marshal.from_channel ic in
   Odoc_odoc.Occurrences.Occtbl.iter
     (fun id { Odoc_odoc.Occurrences.Occtbl.direct; indirect; _ } ->
       let id = String.concat "." (Odoc_model.Paths.Identifier.fullname id) in