Remove uses of class declaration, and made class_type abstract before trying to remove it.

Author: cristianoc

jscomp/ml/btype.ml

@@ -287,9 +287,7 @@ type type_iterators =
     it_extension_constructor: type_iterators -> extension_constructor -> unit;
     it_module_declaration: type_iterators -> module_declaration -> unit;
     it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
-    it_class_declaration: type_iterators -> class_declaration -> unit;
     it_module_type: type_iterators -> module_type -> unit;
-    it_class_type: type_iterators -> class_type -> unit;
     it_type_kind: type_iterators -> type_kind -> unit;
     it_do_type_expr: type_iterators -> type_expr -> unit;
     it_type_expr: type_iterators -> type_expr -> unit;
@@ -345,32 +343,13 @@ let type_iterators =
     it.it_module_type it md.md_type
   and it_modtype_declaration it mtd =
     may (it.it_module_type it) mtd.mtd_type
-  and it_class_declaration it cd =
-    List.iter (it.it_type_expr it) cd.cty_params;
-    it.it_class_type it cd.cty_type;
-    may (it.it_type_expr it) cd.cty_new;
-    it.it_path cd.cty_path
   and it_module_type it = function
       Mty_ident p
     | Mty_alias(_, p) -> it.it_path p
     | Mty_signature sg -> it.it_signature it sg
     | Mty_functor (_, mto, mt) ->
         may (it.it_module_type it) mto;
         it.it_module_type it mt
-  and it_class_type it = function
-      Cty_constr (p, tyl, cty) ->
-        it.it_path p;
-        List.iter (it.it_type_expr it) tyl;
-        it.it_class_type it cty
-    | Cty_signature cs ->
-        it.it_type_expr it cs.csig_self;
-        Vars.iter (fun _ (_,_,ty) -> it.it_type_expr it ty) cs.csig_vars;
-        List.iter
-          (fun (p, tl) -> it.it_path p; List.iter (it.it_type_expr it) tl)
-          cs.csig_inher
-    | Cty_arrow  (_, ty, cty) ->
-        it.it_type_expr it ty;
-        it.it_class_type it cty
   and it_type_kind it kind =
     iter_type_expr_kind (it.it_type_expr it) kind
   and it_do_type_expr it ty =
@@ -386,8 +365,8 @@ let type_iterators =
   and it_path _p = ()
   in
   { it_path; it_type_expr = it_do_type_expr; it_do_type_expr;
-    it_type_kind; it_class_type; it_module_type;
-    it_signature; it_class_declaration;
+    it_type_kind; it_module_type;
+    it_signature;
     it_modtype_declaration; it_module_declaration; it_extension_constructor;
     it_type_declaration; it_value_description; it_signature_item; }
 
@@ -525,9 +504,6 @@ let unmark_class_signature sign =
   unmark_type sign.csig_self;
   Vars.iter (fun _l (_m, _v, t) -> unmark_type t) sign.csig_vars
 
-let unmark_class_type cty =
-  unmark_iterators.it_class_type unmark_iterators cty
-
 
                   (*******************************************)
                   (*  Memorization of abbreviation expansion *)

jscomp/ml/btype.mli

@@ -103,9 +103,7 @@ type type_iterators =
     it_extension_constructor: type_iterators -> extension_constructor -> unit;
     it_module_declaration: type_iterators -> module_declaration -> unit;
     it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
-    it_class_declaration: type_iterators -> class_declaration -> unit;
     it_module_type: type_iterators -> module_type -> unit;
-    it_class_type: type_iterators -> class_type -> unit;
     it_type_kind: type_iterators -> type_kind -> unit;
     it_do_type_expr: type_iterators -> type_expr -> unit;
     it_type_expr: type_iterators -> type_expr -> unit;
@@ -144,7 +142,6 @@ val mark_type_params: type_expr -> unit
 val unmark_type: type_expr -> unit
 val unmark_type_decl: type_declaration -> unit
 val unmark_extension_constructor: extension_constructor -> unit
-val unmark_class_type: class_type -> unit
 val unmark_class_signature: class_signature -> unit
         (* Remove marks from a type *)