Split out a specific type for the module used to implement namespaces.

Author: cristianoc

analysis/.depend

@@ -30,8 +30,7 @@ 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/Log.cmx src/Files.cmx
-src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
-    src/Infix.cmx
+src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx
 src/Uri2.cmx :
 src/Utils.cmx : src/Protocol.cmx
 src/vendor/Json.cmx :

analysis/src/FindFiles.ml

@@ -107,7 +107,7 @@ let collectFiles directory =
   let compileds = allFiles |> List.filter isCompiledFile |> filterDuplicates in
   let sources = allFiles |> List.filter isSourceFile |> filterDuplicates in
   compileds
-  |> List.map (fun path ->
+  |> Utils.filterMap (fun path ->
          let modName = getName path in
          let cmt = directory /+ path in
          let resOpt =
@@ -116,7 +116,9 @@ let collectFiles directory =
                if getName name = modName then Some (directory /+ name) else None)
              sources
          in
-         (modName, SharedTypes.Impl {cmt; resOpt}))
+         match resOpt with
+         | None -> None
+         | Some res -> Some (modName, SharedTypes.Impl {cmt; res}))
 
 (* returns a list of (absolute path to cmt(i), relative path from base to source file) *)
 let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
@@ -161,8 +163,7 @@ let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
                  None)
              | None ->
                let cmt = (libBs /+ base) ^ ".cmt" in
-               if Files.exists cmt then
-                 Some (moduleName, Impl {cmt; resOpt = Some file})
+               if Files.exists cmt then Some (moduleName, Impl {cmt; res = file})
                else (
                  Log.log ("Bad source file (no cmt/cmi) " ^ (libBs /+ base));
                  None))
@@ -181,7 +182,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; resOpt = None}) :: result
+    (moduleName, Namespace {cmt}) :: result
 
 let findDependencyFiles base config =
   let open Infix in

analysis/src/Packages.ml

@@ -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; resOpt = None});
+               Hashtbl.add pathsForModule namespace (Namespace {cmt});
                [FindFiles.nameSpaceToName namespace]
            in
            Log.log ("Dependency dirs " ^ String.concat " " dependencyDirectories);

analysis/src/SharedTypes.ml

@@ -114,28 +114,32 @@ end
 type filePath = string
 
 type paths =
-  | Impl of {cmt : filePath; resOpt : filePath option}
+  | Impl of {cmt : filePath; res : filePath}
+  | Namespace of {cmt : filePath}
   | IntfAndImpl of {
       cmti : filePath;
       resi : filePath;
       cmt : filePath;
       res : filePath;
     }
 
-open Infix
-
 let showPaths paths =
   match paths with
-  | Impl {cmt; resOpt} -> Printf.sprintf "Impl(%s, %s)" cmt (resOpt |? "nil")
+  | Impl {cmt; res} -> Printf.sprintf "Impl(%s, %s)" cmt res
+  | Namespace {cmt} -> Printf.sprintf "Namespace(%s)" cmt
   | IntfAndImpl {cmti; resi; cmt; res} ->
     Printf.sprintf "IntfAndImpl(%s, %s, %s, %s)" cmti resi cmt res
 
 let getSrc p =
-  match p with Impl {resOpt} -> resOpt | IntfAndImpl {resi} -> Some resi
+  match p with
+  | Impl {res} -> Some res
+  | Namespace _ -> None
+  | IntfAndImpl {resi} -> Some resi
 
 let getCmt ?(interface = true) p =
   match p with
   | Impl {cmt} -> cmt
+  | Namespace {cmt} -> cmt
   | IntfAndImpl {cmti; cmt} -> if interface then cmti else cmt
 
 let emptyDeclared name =