Refactor getCmtPath, avoid going out of sync w.r.t. whether the uri is an interface.

Fixes #300

Author: cristianoc

analysis/.depend

@@ -5,7 +5,6 @@ src/BuildSystem.cmx : \
 src/Cli.cmx : \
     src/Commands.cmx
 src/Cmt.cmx : \
-    src/Utils.cmx \
     src/Uri2.cmx \
     src/SharedTypes.cmx \
     src/ProcessCmt.cmx \

analysis/src/Cmt.ml

@@ -10,9 +10,7 @@ let fromUri ~uri =
     in
     match Hashtbl.find_opt package.pathsForModule moduleName with
     | Some paths ->
-      let cmt =
-        SharedTypes.getCmtPath ~interface:(Utils.endsWith path "i") paths
-      in
+      let cmt = SharedTypes.getCmtPath ~uri paths in
       ProcessCmt.fullForCmt ~moduleName ~package ~uri cmt
     | None ->
       prerr_endline ("can't find module " ^ moduleName);

analysis/src/ProcessCmt.ml

@@ -1260,8 +1260,8 @@ let fileForModule modname ~package =
   if Hashtbl.mem package.pathsForModule modname then (
     let paths = Hashtbl.find package.pathsForModule modname in
     (* TODO: do better *)
-    let cmt = SharedTypes.getCmtPath ~interface:true paths in
     let uri = SharedTypes.getUri paths in
+    let cmt = SharedTypes.getCmtPath ~uri paths in
     Log.log ("fileForModule " ^ SharedTypes.showPaths paths);
     match fileForCmt ~moduleName:modname ~cmt ~uri state with
     | None -> None

analysis/src/SharedTypes.ml

@@ -146,11 +146,13 @@ let getUri p =
   | Namespace {cmt} -> Uri2.fromPath cmt
   | IntfAndImpl {resi} -> Uri2.fromPath resi
 
-let getCmtPath ~interface p =
+let getCmtPath ~uri p =
   match p with
   | Impl {cmt} -> cmt
   | Namespace {cmt} -> cmt
-  | IntfAndImpl {cmti; cmt} -> if interface then cmti else cmt
+  | IntfAndImpl {cmti; cmt} ->
+    let interface = Utils.endsWith (Uri2.toPath uri) "i" in
+    if interface then cmti else cmt
 
 let emptyDeclared name =
   {