Remove class_type_declaration

Author: cristianoc

jscomp/ml/btype.ml

@@ -288,7 +288,6 @@ type type_iterators =
     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_class_type_declaration: type_iterators -> class_type_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;
@@ -351,10 +350,6 @@ let type_iterators =
     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_class_type_declaration it ctd =
-    List.iter (it.it_type_expr it) ctd.clty_params;
-    it.it_class_type it ctd.clty_type;
-    it.it_path ctd.clty_path
   and it_module_type it = function
       Mty_ident p
     | Mty_alias(_, p) -> it.it_path p
@@ -392,7 +387,7 @@ let type_iterators =
   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_type_declaration; it_class_declaration;
+    it_signature; it_class_declaration;
     it_modtype_declaration; it_module_declaration; it_extension_constructor;
     it_type_declaration; it_value_description; it_signature_item; }
 

jscomp/ml/btype.mli

@@ -104,7 +104,6 @@ type type_iterators =
     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_class_type_declaration: type_iterators -> class_type_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;

jscomp/ml/ctype.ml

@@ -4580,19 +4580,6 @@ let nondep_class_declaration env id decl =
   clear_hash ();
   decl
 
-let nondep_cltype_declaration env id decl =
-  assert (not (Path.isfree id decl.clty_path));
-  let decl =
-    { clty_params = List.map (nondep_type_rec env id) decl.clty_params;
-      clty_variance = decl.clty_variance;
-      clty_type = nondep_class_type env id decl.clty_type;
-      clty_path = decl.clty_path;
-      clty_loc = decl.clty_loc;
-      clty_attributes = decl.clty_attributes;
-    }
-  in
-  clear_hash ();
-  decl
 
 (* collapse conjunctive types in class parameters *)
 let rec collapse_conj env visited ty =

jscomp/ml/ctype.mli

@@ -244,8 +244,6 @@ val nondep_extension_constructor:
 val nondep_class_declaration:
         Env.t -> Ident.t -> class_declaration -> class_declaration
         (* Same for class declarations. *)
-val nondep_cltype_declaration:
-        Env.t -> Ident.t -> class_type_declaration -> class_type_declaration
         (* Same for class type declarations. *)
 (*val correct_abbrev: Env.t -> Path.t -> type_expr list -> type_expr -> unit*)
 val cyclic_abbrev: Env.t -> Ident.t -> type_expr -> bool

jscomp/ml/includeclass.ml

@@ -20,17 +20,6 @@ open Types
 let class_types env cty1 cty2 =
   Ctype.match_class_types env cty1 cty2
 
-let class_type_declarations ~loc env cty1 cty2 =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:cty1.clty_loc
-    ~use:cty2.clty_loc
-    loc
-    cty1.clty_attributes cty2.clty_attributes
-    (Path.last cty1.clty_path);
-  Ctype.match_class_declarations env
-    cty1.clty_params cty1.clty_type
-    cty2.clty_params cty2.clty_type
-
 let class_declarations env cty1 cty2 =
   match cty1.cty_new, cty2.cty_new with
     None, Some _ ->

jscomp/ml/includeclass.mli

@@ -21,10 +21,6 @@ open Format
 
 val class_types:
         Env.t -> class_type -> class_type -> class_match_failure list
-val class_type_declarations:
-  loc:Location.t ->
-  Env.t -> class_type_declaration -> class_type_declaration ->
-  class_match_failure list
 val class_declarations:
   Env.t -> class_declaration -> class_declaration ->
   class_match_failure list

jscomp/ml/tast_mapper.ml

@@ -27,8 +27,6 @@ type mapper =
 
     class_signature: mapper -> class_signature -> class_signature;
     class_type: mapper -> class_type -> class_type;
-    class_type_declaration: mapper -> class_type_declaration ->
-      class_type_declaration;
     class_type_field: mapper -> class_type_field -> class_type_field;
     env: mapper -> Env.t -> Env.t;
     expr: mapper -> expression -> expression;
@@ -90,9 +88,6 @@ let module_declaration sub x =
 
 let include_infos f x = {x with incl_mod = f x.incl_mod}
 
-let class_type_declaration sub x =
-  class_infos sub (sub.class_type sub) x
-
 
 let structure_item sub {str_desc; str_loc; str_env} =
   let str_env = sub.env sub str_env in
@@ -570,7 +565,6 @@ let default =
     class_description;
     class_signature;
     class_type;
-    class_type_declaration;
     class_type_field;
     env;
     expr;

jscomp/ml/tast_mapper.mli

@@ -25,8 +25,6 @@ type mapper =
     class_description: mapper -> class_description -> class_description;
     class_signature: mapper -> class_signature -> class_signature;
     class_type: mapper -> class_type -> class_type;
-    class_type_declaration: mapper -> class_type_declaration ->
-      class_type_declaration;
     class_type_field: mapper -> class_type_field -> class_type_field;
     env: mapper -> Env.t -> Env.t;
     expr: mapper -> expression -> expression;

jscomp/ml/typedecl.ml

@@ -1266,29 +1266,6 @@ let add_injectivity =
       | Invariant -> (false, false, false)
     )
 
-(* for typeclass.ml *)
-let compute_variance_decls env cldecls =
-  let decls, required =
-    List.fold_right
-      (fun (obj_id, obj_abbr, _cl_abbr, _clty, _cltydef, ci) (decls, req) ->
-        let variance = List.map snd ci.ci_params in
-        (obj_id, obj_abbr) :: decls,
-        (add_injectivity variance, ci.ci_loc) :: req)
-      cldecls ([],[])
-  in
-  let (decls, _) =
-    compute_properties_fixpoint env decls required
-      (List.map init_variance decls)
-      (List.map (fun _ -> false) decls)
-  in
-  List.map2
-    (fun (_,decl) (_, _, cl_abbr, clty, cltydef, _) ->
-      let variance = decl.type_variance in
-      (decl, {cl_abbr with type_variance = variance},
-       {clty with cty_variance = variance},
-       {cltydef with clty_variance = variance}))
-    decls cldecls
-
 (* Check multiple declarations of labels/constructors *)
 
 let check_duplicates sdecl_list =

jscomp/ml/typedecl.mli

@@ -50,15 +50,6 @@ val check_coherence:
 (* for fixed types *)
 val is_fixed_type : Parsetree.type_declaration -> bool
 
-(* for typeclass.ml *)
-val compute_variance_decls:
-    Env.t ->
-    (Ident.t * Types.type_declaration * Types.type_declaration *
-     Types.class_declaration * Types.class_type_declaration *
-     'a Typedtree.class_infos) list ->
-    (Types.type_declaration * Types.type_declaration *
-     Types.class_declaration * Types.class_type_declaration) list
-
 (* for typeopt.ml *)
 val get_unboxed_type_representation: Env.t -> type_expr -> type_expr option
 

jscomp/ml/typedtree.ml

@@ -460,9 +460,6 @@ and class_type_field_desc =
 and class_description =
   class_type class_infos
 
-and class_type_declaration =
-  class_type class_infos
-
 and 'a class_infos =
   { ci_virt: virtual_flag;
     ci_params: (core_type * variance) list;
@@ -473,7 +470,6 @@ and 'a class_infos =
     ci_id_typehash: Ident.t;
     ci_expr: 'a;
     ci_decl: Types.class_declaration;
-    ci_type_decl: Types.class_type_declaration;
     ci_loc: Location.t;
     ci_attributes: attribute list;
    }

jscomp/ml/typedtree.mli

@@ -578,9 +578,6 @@ and class_type_field_desc =
 and class_description =
   class_type class_infos
 
-and class_type_declaration =
-  class_type class_infos
-
 and 'a class_infos =
   { ci_virt: virtual_flag;
     ci_params: (core_type * variance) list;
@@ -591,7 +588,6 @@ and 'a class_infos =
     ci_id_typehash : Ident.t;
     ci_expr: 'a;
     ci_decl: Types.class_declaration;
-    ci_type_decl : Types.class_type_declaration;
     ci_loc: Location.t;
     ci_attributes: attributes;
    }

jscomp/ml/types.ml

@@ -231,15 +231,6 @@ type class_declaration =
     cty_attributes: Parsetree.attributes;
  }
 
-type class_type_declaration =
-  { clty_params: type_expr list;
-    clty_type: class_type;
-    clty_path: Path.t;
-    clty_variance: Variance.t list;
-    clty_loc: Location.t;
-    clty_attributes: Parsetree.attributes;
-  }
-
 (* Type expressions for the module language *)
 
 type module_type =

jscomp/ml/types.mli

@@ -383,14 +383,6 @@ type class_declaration =
     cty_attributes: Parsetree.attributes;
   }
 
-type class_type_declaration =
-  { clty_params: type_expr list;
-    clty_type: class_type;
-    clty_path: Path.t;
-    clty_variance: Variance.t list;
-    clty_loc: Location.t;
-    clty_attributes: Parsetree.attributes;
-  }
 
 (* Type expressions for the module language *)