Refactor away path.

Author: cristianoc

analysis/.depend

@@ -68,8 +68,7 @@ src/Packages.cmx : \
     src/FindFiles.cmx \
     src/Files.cmx \
     src/BuildSystem.cmx
-src/PartialParser.cmx : \
-    src/SharedTypes.cmx
+src/PartialParser.cmx :
 src/PrepareUtils.cmx :
 src/PrintType.cmx : \
     src/vendor/res_outcome_printer/res_outcome_printer.cmx \

analysis/src/NewCompletions.ml

@@ -465,8 +465,8 @@ let resolveOpens ~env ~previous opens ~package =
         match prev with
         | [] -> (
           match path with
-          | Tip _ -> previous
-          | Nested (name, path) -> (
+          | [] | [_] -> previous
+          | name :: path -> (
             match ProcessCmt.fileForModule ~package name with
             | None ->
               Log.log ("Could not get module " ^ name);
@@ -556,22 +556,20 @@ let isCapitalized name =
     match c with 'A' .. 'Z' -> true | _ -> false
 
 type completion =
-  | AbsAttribute of path
+  | AbsAttribute of string list
   | Attribute of string list * string
-  | Normal of path
+  | Normal of string list
 
 let determineCompletion dotpath =
   let rec loop dotpath =
     match dotpath with
     | [] -> assert false
-    | [one] -> Normal (Tip one)
+    | [one] -> Normal [one]
     | [one; two] when not (isCapitalized one) -> Attribute ([one], two)
-    | [one; two] -> Normal (Nested (one, Tip two))
+    | [one; two] -> Normal [one; two]
     | one :: rest -> (
       if isCapitalized one then
-        match loop rest with
-        | Normal path -> Normal (Nested (one, path))
-        | x -> x
+        match loop rest with Normal path -> Normal (one :: path) | x -> x
       else
         match loop rest with
         | Normal path -> AbsAttribute path
@@ -600,8 +598,8 @@ let getEnvWithOpens ~pos ~(env : QueryEnv.t) ~package ~(opens : QueryEnv.t list)
         | None -> loop rest)
       | [] -> (
         match path with
-        | Tip _ -> None
-        | Nested (top, path) -> (
+        | [] | [_] -> None
+        | top :: path -> (
           Log.log ("Getting module " ^ top);
           match ProcessCmt.fileForModule ~package top with
           | None -> None
@@ -1050,8 +1048,8 @@ let processCompletable ~processDotPath ~full ~package ~rawOpens
     in
     let rec removeRawOpen rawOpen modulePath =
       match (rawOpen, modulePath) with
-      | Tip _, _ -> Some modulePath
-      | Nested (s, inner), first :: restPath when s = first ->
+      | [_], _ -> Some modulePath
+      | s :: inner, first :: restPath when s = first ->
         removeRawOpen inner restPath
       | _ -> None
     in

analysis/src/PartialParser.ml

@@ -292,8 +292,8 @@ let findOpens text offset =
   let pathOfModuleOpen o =
     let rec loop items =
       match items with
-      | [] -> SharedTypes.Tip "place holder"
-      | one :: rest -> Nested (one, loop rest)
+      | [] -> ["place holder"]
+      | one :: rest -> one :: loop rest
     in
     loop (o |> Str.split (Str.regexp_string "."))
   in

analysis/src/ProcessCmt.ml

@@ -639,19 +639,20 @@ let rec joinPaths modulePath path =
   match modulePath with
   | Path.Pident ident -> (ident.stamp, ident.name, path)
   | Papply (fnPath, _argPath) -> joinPaths fnPath path
-  | Pdot (inner, name, _) -> joinPaths inner (Nested (name, path))
+  | Pdot (inner, name, _) -> joinPaths inner (name :: path)
 
 let rec makePath modulePath =
   match modulePath with
   | Path.Pident ident when ident.stamp == 0 -> `GlobalMod ident.name
   | Pident ident -> `Stamp ident.stamp
   | Papply (fnPath, _argPath) -> makePath fnPath
-  | Pdot (inner, name, _) -> `Path (joinPaths inner (Tip name))
+  | Pdot (inner, name, _) -> `Path (joinPaths inner [name])
 
 let rec resolvePathInner ~(env : QueryEnv.t) ~path =
   match path with
-  | Tip name -> Some (`Local (env, name))
-  | Nested (subName, subPath) -> (
+  | [] -> None
+  | [name] -> Some (`Local (env, name))
+  | subName :: subPath -> (
     match Hashtbl.find_opt env.exported.modules subName with
     | None -> None
     | Some stamp -> (
@@ -1313,8 +1314,9 @@ let findInScope pos name stamps =
 
 let resolveFromStamps ~(env : QueryEnv.t) ~path ~package ~pos =
   match path with
-  | Tip name -> Some (env, name)
-  | Nested (name, inner) -> (
+  | [] -> None
+  | [name] -> Some (env, name)
+  | name :: inner -> (
     (* Log.log("Finding from stamps " ++ name); *)
     match findInScope pos name env.file.stamps.modules with
     | None -> None

analysis/src/References.ml

@@ -56,10 +56,8 @@ let getLocItem ~full ~line ~col =
     Some li3
   | [
    ({locType = Typed (_, _, LocalReference _)} as li1);
-   ({
-      locType =
-        Typed (_, _, GlobalReference ("Js_OO", Tip "unsafe_downgrade", _));
-    } as li2);
+   ({locType = Typed (_, _, GlobalReference ("Js_OO", ["unsafe_downgrade"], _))}
+   as li2);
    li3;
   ]
   (* For older compiler 9.0 or earlier *)
@@ -409,12 +407,11 @@ let rec pathFromVisibility visibilityPath current =
   match visibilityPath with
   | File _ -> Some current
   | IncludedModule (_, inner) -> pathFromVisibility inner current
-  | ExportedModule (name, inner) ->
-    pathFromVisibility inner (Nested (name, current))
+  | ExportedModule (name, inner) -> pathFromVisibility inner (name :: current)
   | NotVisible -> None
 
 let pathFromVisibility visibilityPath tipName =
-  pathFromVisibility visibilityPath (Tip tipName)
+  pathFromVisibility visibilityPath [tipName]
 
 type references = {
   uri : Uri2.t;

analysis/src/SharedTypes.ml

@@ -179,14 +179,11 @@ let tipToString tip =
 
 type path = Tip of string | Nested of string * path
 
-let rec pathToString path =
-  match path with
-  | Tip name -> name
-  | Nested (name, inner) -> name ^ "." ^ pathToString inner
+let pathToString path = path |> String.concat "."
 
 type locKind =
   | LocalReference of int * tip
-  | GlobalReference of string * path * tip
+  | GlobalReference of string * string list * tip
   | NotFound
   | Definition of int * tip
 
@@ -216,7 +213,8 @@ end)
 
 type extra = {
   internalReferences : (int, Location.t list) Hashtbl.t;
-  externalReferences : (string, (path * tip * Location.t) list) Hashtbl.t;
+  externalReferences :
+    (string, (string list * tip * Location.t) list) Hashtbl.t;
   fileReferences : (string, LocationSet.t) Hashtbl.t;
   mutable locItems : locItem list;
   (* This is the "open location", like the location...