Clean up Sig_class_type and dead code.

Author: cristianoc

jscomp/ml/btype.ml

@@ -330,7 +330,7 @@ let type_iterators =
     | Sig_module (_, md, _) -> it.it_module_declaration it md
     | Sig_modtype (_, mtd)  -> it.it_modtype_declaration it mtd
     | Sig_class ()  -> assert false
-    | Sig_class_type (_, ctd, _) -> it.it_class_type_declaration it ctd
+    | Sig_class_type () -> assert false
   and it_value_description it vd =
     it.it_type_expr it vd.val_type
   and it_type_declaration it td =

jscomp/ml/env.ml

@@ -1577,12 +1577,9 @@ let rec prefix_idents root pos sub = function
                       (Subst.add_modtype id (Mty_ident p) sub) rem in
       (p::pl, final_sub)
   | Sig_class _ :: _ ->
-    assert false
-  | Sig_class_type(id, _, _) :: rem ->
-      let p = Pdot(root, Ident.name id, nopos) in
-      let (pl, final_sub) =
-        prefix_idents root pos (Subst.add_type id p sub) rem in
-      (p::pl, final_sub)
+      assert false
+  | Sig_class_type _ :: _ ->
+      assert false
 
 let prefix_idents root sub sg =
   if sub = Subst.identity then
@@ -1688,10 +1685,7 @@ and components_of_module_maker (env, sub, path, mty) =
               Tbl.add (Ident.name id) (decl', nopos) c.comp_modtypes;
             env := store_modtype id decl !env
         | Sig_class () -> assert false
-        | Sig_class_type(id, decl, _) ->
-            let decl' = Subst.cltype_declaration sub decl in
-            c.comp_cltypes <-
-              Tbl.add (Ident.name id) (decl', !pos) c.comp_cltypes)
+        | Sig_class_type () -> assert false)
         sg pl;
         Some (Structure_comps c)
   | Mty_functor(param, ty_arg, ty_res) ->
@@ -1946,8 +1940,8 @@ let add_item comp env =
   | Sig_typext(id, ext, _)  -> add_extension ~check:false id ext env
   | Sig_module(id, md, _)   -> add_module_declaration ~check:false id md env
   | Sig_modtype(id, decl)   -> add_modtype id decl env
-  | Sig_class()  -> env
-  | Sig_class_type(id, decl, _) -> add_cltype id decl env
+  | Sig_class ()  -> env
+  | Sig_class_type () -> env
 
 let rec add_signature sg env =
   match sg with

jscomp/ml/includemod.ml

@@ -78,16 +78,6 @@ let extension_constructors ~loc env cxt subst id ext1 ext2 =
   then ()
   else raise(Error[cxt, env, Extension_constructors(id, ext1, ext2)])
 
-(* Inclusion between class declarations *)
-
-let class_type_declarations ~loc ~old_env env cxt subst id decl1 decl2 =
-  let decl2 = Subst.cltype_declaration subst decl2 in
-  match Includeclass.class_type_declarations ~loc env decl1 decl2 with
-    []     -> ()
-  | reason ->
-      raise(Error[cxt, old_env,
-                  Class_type_declarations(id, decl1, decl2, reason)])
-
 
 (* Expand a module type identifier when possible *)
 
@@ -123,15 +113,13 @@ type field_desc =
   | Field_typext of string
   | Field_module of string
   | Field_modtype of string
-  | Field_classtype of string
 
 let kind_of_field_desc = function
   | Field_value _ -> "value"
   | Field_type _ -> "type"
   | Field_typext _ -> "extension constructor"
   | Field_module _ -> "module"
   | Field_modtype _ -> "module type"
-  | Field_classtype _ -> "class type"
 
 let item_ident_name = function
     Sig_value(id, d) -> (id, d.val_loc, Field_value(Ident.name id))
@@ -140,13 +128,13 @@ let item_ident_name = function
   | Sig_module(id, d, _) -> (id, d.md_loc, Field_module(Ident.name id))
   | Sig_modtype(id, d) -> (id, d.mtd_loc, Field_modtype(Ident.name id))
   | Sig_class () -> assert false
-  | Sig_class_type(id, d, _) -> (id, d.clty_loc, Field_classtype(Ident.name id))
+  | Sig_class_type () -> assert false
 
 let is_runtime_component = function
   | Sig_value(_,{val_kind = Val_prim _})
   | Sig_type(_,_,_)
   | Sig_modtype(_,_)
-  | Sig_class_type(_,_,_) -> false
+  | Sig_class_type() -> false
   | Sig_value(_,_)
   | Sig_typext(_,_,_)
   | Sig_module(_,_,_)
@@ -315,9 +303,9 @@ and signatures ~loc env cxt subst sig1 sig2 =
       | Sig_module (i,_,_)
       | Sig_typext (i,_,_)
       | Sig_modtype(i,_)
-      | Sig_class_type(i,_,_)
       | Sig_type(i,_,_) -> Ident.name i 
-      | Sig_class () -> assert false in
+      | Sig_class ()
+      | Sig_class_type () -> assert false in
      List.fold_right (fun item fields ->
         if is_runtime_component item then get_id item :: fields else fields) sig2 [] in
 
@@ -379,7 +367,7 @@ and signatures ~loc env cxt subst sig1 sig2 =
             | Sig_modtype _ ->
                 Subst.add_modtype id2 (Mty_ident (Pident id1)) subst
             | Sig_value _ | Sig_typext _
-            | Sig_class _ | Sig_class_type _ ->
+            | Sig_class _ | Sig_class_type () ->
                 subst
           in
           pair_components new_subst
@@ -420,11 +408,9 @@ and signature_components ~loc old_env env cxt subst paired =
   | (Sig_modtype(id1, info1), Sig_modtype(_id2, info2), _pos) :: rem ->
       modtype_infos ~loc env cxt subst id1 info1 info2;
       comps_rec rem
-  | (Sig_class _, Sig_class _ , _) :: _ -> assert false
-  | (Sig_class_type(id1, info1, _),
-     Sig_class_type(_id2, info2, _), _pos) :: rem ->
-      class_type_declarations ~loc ~old_env env cxt subst id1 info1 info2;
-      comps_rec rem
+  | (Sig_class (), Sig_class () , _) :: _ -> assert false
+  | (Sig_class_type(),
+     Sig_class_type(), _pos) :: _ -> assert false
   | _ ->
       assert false
 

jscomp/ml/mtype.ml

@@ -162,10 +162,8 @@ let nondep_supertype env mid mty =
                                      mtd_attributes=[]}) :: rem'
             | _  -> raise Not_found
           end
-      | Sig_class _ -> assert false
-      | Sig_class_type(id, d, rs) ->
-          Sig_class_type(id, Ctype.nondep_cltype_declaration env mid d, rs)
-          :: rem'
+      | Sig_class () -> assert false
+      | Sig_class_type () -> assert false
 
   and nondep_modtype_decl env mtd =
     {mtd with mtd_type = Misc.may_map (nondep_mty env Strict) mtd.mtd_type}

jscomp/ml/printtyp.ml

@@ -1295,8 +1295,7 @@ and trees_of_sigitem = function
       [tree_of_modtype_declaration id decl]
   | Sig_class() ->
       []
-  | Sig_class_type(id, decl, rs) ->
-      [tree_of_cltype_declaration id decl rs]
+  | Sig_class_type() -> []
 
 and tree_of_modtype_declaration id decl =
   let mty =

jscomp/ml/subst.ml

@@ -381,10 +381,7 @@ let rec rename_bound_idents s idents = function
       let id' = Ident.rename id in
       rename_bound_idents (add_modtype id (Mty_ident(Pident id')) s)
                           (id' :: idents) sg
-  |  Sig_class_type(id, _, _) :: sg ->
-      (* cheat and pretend they are types cf. PR#6650 *)
-      let id' = Ident.rename id in
-      rename_bound_idents (add_type id (Pident id') s) (id' :: idents) sg
+  |  Sig_class_type () :: _ -> assert false
   | (Sig_value(id, _) | Sig_typext(id, _, _)) :: sg ->
       let id' = Ident.rename id in
       rename_bound_idents s (id' :: idents) sg
@@ -430,8 +427,8 @@ and signature_component s comp newid =
       Sig_modtype(newid, modtype_declaration s d)
   | Sig_class() ->
       Sig_class()
-  | Sig_class_type(_id, d, rs) ->
-      Sig_class_type(newid, cltype_declaration s d, rs)
+  | Sig_class_type () ->
+      Sig_class_type ()
 
 and module_declaration s decl =
   {

jscomp/ml/types.ml

@@ -261,7 +261,7 @@ and signature_item =
   | Sig_module of Ident.t * module_declaration * rec_status
   | Sig_modtype of Ident.t * modtype_declaration
   | Sig_class of unit
-  | Sig_class_type of Ident.t * class_type_declaration * rec_status
+  | Sig_class_type of unit (* Dummy AST node *)
 
 and module_declaration =
   {

jscomp/ml/types.mli

@@ -413,7 +413,7 @@ and signature_item =
   | Sig_module of Ident.t * module_declaration * rec_status
   | Sig_modtype of Ident.t * modtype_declaration
   | Sig_class of unit
-  | Sig_class_type of Ident.t * class_type_declaration * rec_status
+  | Sig_class_type of unit (* Dummy AST node *)
 
 and module_declaration =
   {