Move version-dependent code from odoc_loader to implementation

Author: jonludlam

src/loader/implementation.ml

@@ -503,8 +503,30 @@ let of_cmt (source_id : Odoc_model.Paths.Identifier.SourcePage.t)
 
   (uid_to_id, postprocess_poses source_id vs uid_to_id uid_to_loc)
 
+let read_cmt_infos source_id_opt id cmt_info =
+  match Odoc_model.Compat.shape_of_cmt_infos cmt_info with
+  | Some shape -> (
+      let uid_to_loc = cmt_info.cmt_uid_to_loc in
+      match (source_id_opt, cmt_info.cmt_annots) with
+      | Some source_id, Implementation impl ->
+          let map, source_infos =
+            of_cmt source_id id impl uid_to_loc
+          in
+          ( Some shape,
+            map,
+            Some
+              {
+                Odoc_model.Lang.Source_info.id = source_id;
+                infos = source_infos;
+              } )
+      | _, _ -> (Some shape, Odoc_model.Compat.empty_map, None))
+  | None -> (None, Odoc_model.Compat.empty_map, None)
+
+
+
 #else
 
-let of_cmt _ _ _ _ = (), []
+let read_cmt_infos _source_id_opt _id ~filename:_ () =
+  (None, Odoc_model.Compat.empty_map, None)
 
 #endif

src/loader/implementation.mli

@@ -1,10 +1,11 @@
-val of_cmt :
-  Odoc_model.Paths.Identifier.SourcePage.t ->
-  Odoc_model.Paths.Identifier.RootModule.t ->
-  Typedtree.structure ->
-  Odoc_model.Compat.uid_to_loc ->
-  Odoc_model.Paths.Identifier.Id.source_location Odoc_model.Compat.shape_uid_map
-  * Odoc_model.Lang.Source_info.infos
+val read_cmt_infos :
+  Odoc_model.Paths.Identifier.Id.source_page option ->
+  Odoc_model.Paths.Identifier.Id.root_module ->
+  Cmt_format.cmt_infos ->
+  Odoc_model.Compat.shape option
+  * Odoc_model.Paths.Identifier.Id.source_location
+    Odoc_model.Compat.shape_uid_map
+  * Odoc_model.Lang.Source_info.t option
 (** 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/odoc_loader.ml

@@ -42,41 +42,14 @@ exception Not_an_interface
 
 exception Make_root_error of string
 
-#if OCAML_VERSION >= (4, 14, 0)
-(** [cmt_info.cmt_annots = Implementation _] *)
-let read_cmt_infos' source_id_opt id cmt_info =
-  match Odoc_model.Compat.shape_of_cmt_infos cmt_info with
-  | Some shape -> (
-      let uid_to_loc = cmt_info.cmt_uid_to_loc in
-      match (source_id_opt, cmt_info.cmt_annots) with
-      | Some source_id, Implementation impl ->
-          let map, source_infos =
-            Implementation.of_cmt source_id id impl uid_to_loc
-          in
-          ( Some shape,
-            map,
-            Some
-              {
-                Odoc_model.Lang.Source_info.id = source_id;
-                infos = source_infos;
-              } )
-      | _, _ -> (Some shape, Odoc_model.Compat.empty_map, None))
-  | None -> (None, Odoc_model.Compat.empty_map, None)
-
 let read_cmt_infos source_id_opt id ~filename () =
   match Cmt_format.read_cmt filename with
   | exception Cmi_format.Error _ -> raise Corrupted
   | cmt_info -> (
       match cmt_info.cmt_annots with
-      | Implementation _ -> read_cmt_infos' source_id_opt id cmt_info
+      | Implementation _ -> Implementation.read_cmt_infos source_id_opt id cmt_info
       | _ -> raise Not_an_implementation)
 
-#else
-
-let read_cmt_infos _source_id_opt _id ~filename:_ () =
-  (None, Odoc_model.Compat.empty_map, None)
-
-#endif
 
 let make_compilation_unit ~make_root ~imports ~interface ?sourcefile ~name ~id
     ?canonical ?shape ~uid_to_id ~source_info content =