Refactor type paths.

Author: cristianoc

analysis/src/FindFiles.ml

@@ -109,14 +109,14 @@ let collectFiles directory =
   compileds
   |> List.map (fun path ->
          let modName = getName path in
-         let compiled = directory /+ path in
-         let source =
+         let cmt = directory /+ path in
+         let resOpt =
            Utils.find
              (fun name ->
                if getName name = modName then Some (directory /+ name) else None)
              sources
          in
-         (modName, SharedTypes.Impl (compiled, source)))
+         (modName, SharedTypes.Impl {cmt; resOpt}))
 
 (* returns a list of (absolute path to cmt(i), relative path from base to source file) *)
 let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
@@ -141,32 +141,30 @@ let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
     |> Utils.filterMap (fun file ->
            if isImplementation file then (
              let moduleName = getName file in
-             let intf = Hashtbl.find_opt interfaces moduleName in
+             let resi = Hashtbl.find_opt interfaces moduleName in
              Hashtbl.remove interfaces moduleName;
              let base = compiledBaseName ~namespace (Files.relpath path file) in
-             match intf with
-             | Some intf ->
+             match resi with
+             | Some resi ->
                let cmti = (libBs /+ base) ^ ".cmti" in
                let cmt = (libBs /+ base) ^ ".cmt" in
                if Files.exists cmti then
                  if Files.exists cmt then
                    (* Log.log("Intf and impl " ++ cmti ++ " " ++ cmt) *)
                    Some
                      ( moduleName,
-                       SharedTypes.IntfAndImpl (cmti, intf, cmt, file) )
+                       SharedTypes.IntfAndImpl {cmti; resi; cmt; res = file} )
                  else None
                else (
                  (* Log.log("Just intf " ++ cmti) *)
-                 Log.log
-                   ("Bad source file (no cmt/cmti/cmi) " ^ (libBs /+ base)
-                   );
+                 Log.log ("Bad source file (no cmt/cmti/cmi) " ^ (libBs /+ base));
                  None)
              | None ->
                let cmt = (libBs /+ base) ^ ".cmt" in
-               if Files.exists cmt then Some (moduleName, Impl (cmt, Some file))
+               if Files.exists cmt then
+                 Some (moduleName, Impl {cmt; resOpt = Some file})
                else (
-                 Log.log
-                   ("Bad source file (no cmt/cmi) " ^ (libBs /+ base));
+                 Log.log ("Bad source file (no cmt/cmi) " ^ (libBs /+ base));
                  None))
            else None)
   in
@@ -183,7 +181,7 @@ let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
     let moduleName = nameSpaceToName namespace in
     let cmt = (libBs /+ namespace) ^ ".cmt" in
     Log.log ("adding namespace " ^ namespace ^ " : " ^ moduleName ^ " : " ^ cmt);
-    (moduleName, Impl (cmt, None)) :: result
+    (moduleName, Impl {cmt; resOpt = None}) :: result
 
 let findDependencyFiles base config =
   let open Infix in

analysis/src/Packages.ml

@@ -48,7 +48,7 @@ let newBsPackage rootPath =
            |> List.iter (fun (name, paths) ->
                   Log.log name;
                   match paths with
-                  | SharedTypes.Impl (cmt, _) -> Log.log ("impl " ^ cmt)
+                  | SharedTypes.Impl {cmt} -> Log.log ("impl " ^ cmt)
                   | _ -> Log.log "Both");
            let pathsForModule =
              makePathsForModule ~projectFilesAndPaths ~dependenciesFilesAndPaths
@@ -59,7 +59,7 @@ let newBsPackage rootPath =
              | Some namespace ->
                let cmt = Filename.concat libBs namespace ^ ".cmt" in
                Log.log ("############ Namespaced as " ^ namespace ^ " at " ^ cmt);
-               Hashtbl.add pathsForModule namespace (Impl (cmt, None));
+               Hashtbl.add pathsForModule namespace (Impl {cmt; resOpt = None});
                [FindFiles.nameSpaceToName namespace]
            in
            Log.log ("Dependency dirs " ^ String.concat " " dependencyDirectories);

analysis/src/References.ml

@@ -188,12 +188,12 @@ let alternateDeclared ~(file : File.t) ~package declared tip =
   | Some paths -> (
     maybeLog ("paths for " ^ file.moduleName);
     match paths with
-    | IntfAndImpl (_, intf, _, impl) -> (
+    | IntfAndImpl {resi; res} -> (
       maybeLog "Have both!!";
-      let intfUri = Uri2.fromPath intf in
-      let implUri = Uri2.fromPath impl in
-      if intfUri = file.uri then
-        match ProcessCmt.getFullFromCmt ~uri:implUri with
+      let resiUri = Uri2.fromPath resi in
+      let resUri = Uri2.fromPath res in
+      if resiUri = file.uri then
+        match ProcessCmt.getFullFromCmt ~uri:resUri with
         | None -> None
         | Some {file; extra} -> (
           match
@@ -203,7 +203,7 @@ let alternateDeclared ~(file : File.t) ~package declared tip =
           | None -> None
           | Some declared -> Some (file, extra, declared))
       else
-        match ProcessCmt.getFullFromCmt ~uri:intfUri with
+        match ProcessCmt.getFullFromCmt ~uri:resiUri with
         | None -> None
         | Some {file; extra} -> (
           match

analysis/src/SharedTypes.ml

@@ -114,25 +114,29 @@ end
 type filePath = string
 
 type paths =
-  | Impl of filePath * filePath option
-  (* .cm(t)i, .mli, .cmt, .rei *)
-  | IntfAndImpl of filePath * filePath * filePath * filePath
+  | Impl of {cmt : filePath; resOpt : filePath option}
+  | IntfAndImpl of {
+      cmti : filePath;
+      resi : filePath;
+      cmt : filePath;
+      res : filePath;
+    }
 
 open Infix
 
 let showPaths paths =
   match paths with
-  | Impl (cmt, src) -> Printf.sprintf "Impl(%s, %s)" cmt (src |? "nil")
-  | IntfAndImpl (cmti, srci, cmt, src) ->
-    Printf.sprintf "IntfAndImpl(%s, %s, %s, %s)" cmti srci cmt src
+  | Impl {cmt; resOpt} -> Printf.sprintf "Impl(%s, %s)" cmt (resOpt |? "nil")
+  | IntfAndImpl {cmti; resi; cmt; res} ->
+    Printf.sprintf "IntfAndImpl(%s, %s, %s, %s)" cmti resi cmt res
 
 let getSrc p =
-  match p with Impl (_, s) -> s | IntfAndImpl (_, s, _, _) -> Some s
+  match p with Impl {resOpt} -> resOpt | IntfAndImpl {resi} -> Some resi
 
 let getCmt ?(interface = true) p =
   match p with
-  | Impl (c, _) -> c
-  | IntfAndImpl (cint, _, cimpl, _) -> if interface then cint else cimpl
+  | Impl {cmt} -> cmt
+  | IntfAndImpl {cmti; cmt} -> if interface then cmti else cmt
 
 let emptyDeclared name =
   {