Refactor: log error earlier instead of propagating and logging.

Author: cristianoc

analysis/.depend

@@ -29,7 +29,7 @@ src/ProcessCmt.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
 src/Protocol.cmx : src/vendor/Json.cmx
 src/References.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
     src/ProcessCmt.cmx src/Log.cmx src/Infix.cmx
-src/Shared.cmx : src/PrintType.cmx src/Files.cmx
+src/Shared.cmx : src/PrintType.cmx src/Log.cmx src/Files.cmx
 src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
     src/Infix.cmx
 src/Uri2.cmx :

analysis/src/ProcessCmt.ml

@@ -535,8 +535,8 @@ let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
 
 let fileForCmt ~moduleName ~uri cmt =
   match Shared.tryReadCmt cmt with
-  | Error e -> Error e
-  | Ok infos -> Ok (forCmt ~moduleName ~uri infos)
+  | None -> None
+  | Some infos -> Some (forCmt ~moduleName ~uri infos)
 
 let addLocItem extra loc locType =
   if not loc.Warnings.loc_ghost then
@@ -1178,20 +1178,18 @@ let extraForCmt ~file ({cmt_annots} : Cmt_format.cmt_infos) =
 
 let fullForCmt ~moduleName ~package ~uri cmt =
   match Shared.tryReadCmt cmt with
-  | Error e -> Error e
-  | Ok infos ->
+  | None -> None
+  | Some infos ->
     let file = forCmt ~moduleName ~uri infos in
     let extra = extraForCmt ~file infos in
-    Ok {file; extra; package}
+    Some {file; extra; package}
 
 open SharedTypes
 
 let newFileForCmt ~moduleName cmtCache changed ~cmt ~uri =
   match fileForCmt ~moduleName ~uri cmt with
-  | Error e ->
-    Log.log e;
-    None
-  | Ok file ->
+  | None -> None
+  | Some file ->
     Hashtbl.replace cmtCache cmt (changed, file);
     Some file
 
@@ -1209,10 +1207,8 @@ let getFullFromCmt ~uri =
     | Some paths -> (
       let cmt = SharedTypes.getCmt ~interface:(Utils.endsWith path "i") paths in
       match fullForCmt ~moduleName ~package ~uri cmt with
-      | Error message ->
-        prerr_endline message;
-        None
-      | Ok full ->
+      | None -> None
+      | Some full ->
         Hashtbl.replace package.interModuleDependencies moduleName
           (SharedTypes.hashList full.extra.externalReferences |> List.map fst);
         Some full)

analysis/src/Shared.ml

@@ -1,20 +1,24 @@
 let tryReadCmt cmt =
-  if not (Files.exists cmt) then Error ("Cmt file does not exist " ^ cmt)
+  if not (Files.exists cmt) then (
+    Log.log ("Cmt file does not exist " ^ cmt);
+    None)
   else
     match Cmt_format.read_cmt cmt with
     | exception Cmi_format.Error err ->
-      Error
+      Log.log
         ("Failed to load " ^ cmt ^ " as a cmt w/ ocaml version " ^ "406"
        ^ ", error: "
         ^
         (Cmi_format.report_error Format.str_formatter err;
-         Format.flush_str_formatter ()))
+         Format.flush_str_formatter ()));
+      None
     | exception err ->
-      Error
+      Log.log
         ("Invalid cmt format " ^ cmt
        ^ " - probably wrong ocaml version, expected " ^ Config.version ^ " : "
-       ^ Printexc.to_string err)
-    | x -> Ok x
+       ^ Printexc.to_string err);
+      None
+    | x -> Some x
 
 (** TODO move to the Process_ stuff *)
 let rec dig typ =