Remove support for class types

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/document/generator.ml

@@ -288,7 +288,6 @@ module Make (Syntax : SYNTAX) = struct
       | Module v -> to_link v
       | ModuleType v -> to_link v
       | Type v -> to_link v
-      | ClassType v -> to_link v
       | Value v -> to_link v
 
     let source id syntax_info infos source_code =

src/loader/implementation.ml

@@ -320,10 +320,6 @@ let process_occurrences env poses loc_to_id local_ident_to_loc =
           process p Ident_env.Path.read_module
           |> Option.iter @@ fun l ->
              AnnotHashtbl.replace occ_tbl (Module l, pos_of_loc loc) ()
-      | ClassType p, loc ->
-          process p Ident_env.Path.read_class_type
-          |> Option.iter @@ fun l ->
-             AnnotHashtbl.replace occ_tbl (ClassType l, pos_of_loc loc) ()
       | ModuleType p, loc ->
           process p Ident_env.Path.read_module_type
           |> Option.iter @@ fun l ->

src/loader/typedtree_traverse.ml

@@ -5,7 +5,6 @@ module Analysis = struct
     | LocalDefinition of Ident.t
     | Value of Path.t
     | Module of Path.t
-    | ClassType of Path.t
     | ModuleType of Path.t
     | Type of Path.t
 
@@ -53,13 +52,6 @@ module Analysis = struct
         poses := (Module p, mod_loc) :: !poses
     | _ -> ()
 
-  let class_type poses cltyp =
-    match cltyp with
-    | { Typedtree.cltyp_desc = Tcty_constr (p, _, _); cltyp_loc; _ }
-      when not cltyp_loc.loc_ghost ->
-        poses := (ClassType p, cltyp_loc) :: !poses
-    | _ -> ()
-
   let module_type poses mty_expr =
     match mty_expr with
     | { Typedtree.mty_desc = Tmty_ident (p, _); mty_loc; _ }
@@ -98,10 +90,6 @@ let of_cmt env structure =
     Analysis.module_type poses mty;
     iter.module_type iterator mty
   in
-  let class_type iterator cl_type =
-    Analysis.class_type poses cl_type;
-    iter.class_type iterator cl_type
-  in
   let module_binding iterator mb =
     Analysis.module_binding env poses mb;
     iter.module_binding iterator mb
@@ -114,7 +102,6 @@ let of_cmt env structure =
       module_expr;
       typ;
       module_type;
-      class_type;
       module_binding;
     }
   in

src/model/lang.ml

@@ -31,7 +31,6 @@ module Source_info = struct
     | Definition of Paths.Identifier.SourceLocation.t
     | Value of Path.Value.t jump_to
     | Module of Path.Module.t jump_to
-    | ClassType of Path.ClassType.t jump_to
     | ModuleType of Path.ModuleType.t jump_to
     | Type of Path.Type.t jump_to
 

src/odoc/occurrences.ml

@@ -136,8 +136,6 @@ let count ~dst ~warnings_options:_ directories include_hidden =
               _ ) ->
               incr htbl p
           | Value { documentation = Some (`Resolved p); _ }, _ -> incr htbl p
-          | ClassType { documentation = Some (`Resolved p); _ }, _ ->
-              incr htbl p
           | ModuleType { documentation = Some (`Resolved p); _ }, _ ->
               incr htbl p
           | Type { documentation = Some (`Resolved p); _ }, _ -> incr htbl p

src/xref2/compile.ml

@@ -91,7 +91,6 @@ and source_info_infos env infos =
             | Module v -> Module (map_doc (module_path env) v)
             | ModuleType v -> ModuleType (map_doc (module_type_path env) v)
             | Type v -> Type (map_doc (type_path env) v)
-            | ClassType v -> ClassType (map_doc (class_type_path env) v)
             | Definition _ as d -> d
           in
           (v, pos))

src/xref2/link.ml

@@ -421,11 +421,6 @@ let rec unit env t =
                       (jump_to v
                          (Shape_tools.lookup_type_path env)
                          (type_path env))
-                | ClassType v ->
-                    ClassType
-                      (jump_to v
-                         (Shape_tools.lookup_class_type_path env)
-                         (class_type_path env))
                 | i -> i
               in
               (info, pos))

test/occurrences/double_wrapped.t/a.ml

@@ -7,5 +7,3 @@ module type M = sig end
 let ( ||> ) x y = x + y
 
 let _ = x + x
-
-class ct = object end

test/occurrences/double_wrapped.t/b.ml

@@ -13,7 +13,3 @@ module type Y = A.M
 let _ =
   let open A in
   1 ||> 2
-
-let ob = new A.ct
-
-class ct : A.ct = A.ct

test/occurrences/double_wrapped.t/run.t

@@ -16,8 +16,6 @@ occurrences information.
   $ odoc compile --count-occurrences -I . main__A.cmt
   $ odoc compile --count-occurrences -I . main__C.cmt
   $ odoc compile --count-occurrences -I . main__B.cmt
-  File "main__B.cmt":
-  Warning: Failed to compile expansion for class (root Main__B).ct
   $ odoc compile --count-occurrences -I . main__.cmt
   $ odoc compile --count-occurrences -I . main.cmt
 
@@ -70,11 +68,10 @@ A only uses "persistent" values: one it defines itself.
 
 "Aliased" values are not counted since they become persistent
   $ occurrences_print occurrences-main__B.odoc | sort
-  Main was used directly 0 times and indirectly 8 times
-  Main.A was used directly 2 times and indirectly 6 times
+  Main was used directly 0 times and indirectly 7 times
+  Main.A was used directly 2 times and indirectly 5 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
-  Main.A.ct was used directly 1 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
   Main.A.x was used directly 1 times and indirectly 0 times
 
@@ -95,11 +92,10 @@ Now we can merge all tables
 
   $ occurrences_print occurrences-aggregated.odoc | sort > all_merged
   $ cat all_merged
-  Main was used directly 0 times and indirectly 12 times
-  Main.A was used directly 4 times and indirectly 7 times
+  Main was used directly 0 times and indirectly 11 times
+  Main.A was used directly 4 times and indirectly 6 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
-  Main.A.ct was used directly 1 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
   Main.A.x was used directly 2 times and indirectly 0 times
   Main.B was used directly 1 times and indirectly 0 times
@@ -114,11 +110,10 @@ We can also include hidden ids:
 
   $ odoc count-occurrences -I main__B -o occurrences-b.odoc --include-hidden
   $ occurrences_print occurrences-b.odoc | sort
-  Main was used directly 0 times and indirectly 8 times
-  Main.A was used directly 2 times and indirectly 6 times
+  Main was used directly 0 times and indirectly 7 times
+  Main.A was used directly 2 times and indirectly 5 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
-  Main.A.ct was used directly 1 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
   Main.A.x was used directly 1 times and indirectly 0 times
   Main__ was used directly 0 times and indirectly 2 times
@@ -127,11 +122,10 @@ We can also include hidden ids:
 
   $ odoc count-occurrences -I . -o occurrences-all.odoc --include-hidden
   $ occurrences_print occurrences-all.odoc | sort
-  Main was used directly 0 times and indirectly 12 times
-  Main.A was used directly 4 times and indirectly 7 times
+  Main was used directly 0 times and indirectly 11 times
+  Main.A was used directly 4 times and indirectly 6 times
   Main.A.(||>) was used directly 1 times and indirectly 0 times
   Main.A.M was used directly 2 times and indirectly 0 times
-  Main.A.ct was used directly 1 times and indirectly 0 times
   Main.A.t was used directly 1 times and indirectly 0 times
   Main.A.x was used directly 2 times and indirectly 0 times
   Main.B was used directly 1 times and indirectly 0 times