Loader: Rename shape_.ml into lookup_def.ml

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

Author: panglesd

src/loader/implementation.mli

@@ -2,7 +2,7 @@ val of_cmt :
   Odoc_model.Paths.Identifier.SourcePage.t option ->
   Odoc_model.Paths.Identifier.RootModule.t ->
   Cmt_format.cmt_infos ->
-  Shape_.t option * Odoc_model.Lang.Source_info.infos
+  Lookup_def.t option * Odoc_model.Lang.Source_info.infos
 (** Extract all implementation information from a [cmt]: the shape, and the
     {{!Odoc_model.Lang.Source_info.infos}source infos} (local and global
     definitions and occurrences).

src/loader/shape_.ml renamed to src/loader/lookup_def.ml

@@ -1,6 +1,7 @@
 open Result
 module Error = Odoc_model.Error
-module Shape = Shape_
+
+module Lookup_def = Lookup_def
 
 let read_string parent_definition filename text =
   let location =

src/loader/shape_.mli renamed to src/loader/lookup_def.mli

@@ -2,7 +2,7 @@ open Result
 open Odoc_model
 open Odoc_model.Paths
 
-module Shape = Shape_
+module Lookup_def = Lookup_def
 
 type make_root =
   module_name:string ->
@@ -19,7 +19,7 @@ val read_cmt_infos :
   Identifier.SourcePage.t option ->
   Identifier.RootModule.t ->
   filename:string ->
-  ((Shape.t * Lang.Source_info.infos) option, Error.t) result
+  ((Lookup_def.t * Lang.Source_info.infos) option, Error.t) result
   Error.with_warnings
 (** Read the shape from a .cmt file. *)
 
@@ -34,7 +34,7 @@ val read_cmt :
   parent:Identifier.ContainerPage.t option ->
   filename:string ->
   source_id_opt:Identifier.SourcePage.t option ->
-  ( Lang.Compilation_unit.t * (Shape.t * Lang.Source_info.infos) option,
+  ( Lang.Compilation_unit.t * (Lookup_def.t * Lang.Source_info.infos) option,
     Error.t )
   result
   Error.with_warnings

src/loader/odoc_loader.ml

@@ -17,7 +17,7 @@
 open Odoc_model
 open Or_error
 
-type unit_content = Lang.Compilation_unit.t * Odoc_loader.Shape.t option
+type unit_content = Lang.Compilation_unit.t * Odoc_loader.Lookup_def.t option
 
 type content =
   | Page_content of Lang.Page.t

src/loader/odoc_loader.mli

@@ -19,7 +19,7 @@
 open Odoc_model
 open Or_error
 
-type unit_content = Lang.Compilation_unit.t * Odoc_loader.Shape.t option
+type unit_content = Lang.Compilation_unit.t * Odoc_loader.Lookup_def.t option
 
 (** Either a page or a module. *)
 type content =

src/odoc/odoc_file.ml

@@ -235,7 +235,7 @@ let build_compile_env_for_unit
   in
   let lookup_unit = lookup_unit ~important_digests ~imports_map ap
   and lookup_page = lookup_page ap
-  and lookup_def = Odoc_loader.Shape.lookup_def lookup in
+  and lookup_def = Odoc_loader.Lookup_def.lookup_def lookup in
   let resolver = { Env.open_units; lookup_unit; lookup_page; lookup_def } in
   Env.env_of_unit m ~linking:false resolver
 
@@ -247,7 +247,7 @@ let build ?(imports_map = StringMap.empty)
     | Some (m, Some shape) -> Some (m, shape)
     | _ -> None
   in
-  let lookup_def = Odoc_loader.Shape.lookup_def lookup in
+  let lookup_def = Odoc_loader.Lookup_def.lookup_def lookup in
   let lookup_unit = lookup_unit ~important_digests ~imports_map ap
   and lookup_page = lookup_page ap in
   { Env.open_units; lookup_unit; lookup_page; lookup_def }

src/odoc/odoc_file.mli

@@ -38,15 +38,15 @@ val lookup_page : t -> string -> Odoc_model.Lang.Page.t option
 
 val build_compile_env_for_unit :
   t ->
-  Odoc_loader.Shape.t option ->
+  Odoc_loader.Lookup_def.t option ->
   Odoc_model.Lang.Compilation_unit.t ->
   Odoc_xref2.Env.t
 (** Initialize the environment for compiling the given module. *)
 
 val build_link_env_for_unit :
   t ->
   Odoc_model.Lang.Compilation_unit.t ->
-  Odoc_loader.Shape.t option ->
+  Odoc_loader.Lookup_def.t option ->
   Odoc_xref2.Env.t
 (** Initialize the environment for linking the given module. *)