Clean up more unused class code.

Author: cristianoc

jscomp/ml/env.ml

@@ -877,8 +877,6 @@ and find_type_full =
   find (fun env -> env.types) (fun sc -> sc.comp_types)
 and find_modtype =
   find (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
-and find_class =
-  find (fun env -> env.classes) (fun sc -> sc.comp_classes)
 and find_cltype =
   find (fun env -> env.cltypes) (fun sc -> sc.comp_cltypes)
 
@@ -1238,8 +1236,6 @@ let lookup_type =
   lookup (fun env -> env.types) (fun sc -> sc.comp_types)
 let lookup_modtype =
   lookup (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
-let lookup_class =
-  lookup (fun env -> env.classes) (fun sc -> sc.comp_classes)
 let lookup_cltype =
   lookup (fun env -> env.cltypes) (fun sc -> sc.comp_cltypes)
 
@@ -1370,13 +1366,6 @@ let lookup_all_labels ?loc lid env =
   with
     Not_found when is_lident lid -> []
 
-let lookup_class ?loc lid env =
-  let (_, desc) as r = lookup_class ?loc lid env in
-  (* special support for Typeclass.unbound_class *)
-  if Path.name desc.cty_path = "" then ignore (lookup_type ?loc lid env)
-  else mark_type_path env desc.cty_path;
-  r
-
 let lookup_cltype ?loc lid env =
   let (_, desc) as r = lookup_cltype ?loc lid env in
   if Path.name desc.clty_path = "" then ignore (lookup_type ?loc lid env)

jscomp/ml/env.mli

@@ -65,7 +65,6 @@ val find_type: Path.t -> t -> type_declaration
 val find_type_descrs: Path.t -> t -> type_descriptions
 val find_module: Path.t -> t -> module_declaration
 val find_modtype: Path.t -> t -> modtype_declaration
-val find_class: Path.t -> t -> class_declaration
 val find_cltype: Path.t -> t -> class_type_declaration
 
 val find_type_expansion:
@@ -119,8 +118,6 @@ val lookup_module:
   load:bool -> ?loc:Location.t -> Longident.t -> t -> Path.t
 val lookup_modtype:
   ?loc:Location.t -> Longident.t -> t -> Path.t * modtype_declaration
-val lookup_class:
-  ?loc:Location.t -> Longident.t -> t -> Path.t * class_declaration
 val lookup_cltype:
   ?loc:Location.t -> Longident.t -> t -> Path.t * class_type_declaration
 

jscomp/ml/typecore.ml

@@ -98,7 +98,7 @@ let type_open :
 let type_package =
   ref (fun _ -> assert false)
 
-(* Forward declaration, to be filled in by Typeclass.class_structure *)
+(* Forward declaration, to be filled in by Typemod.type_package *)
 
 (*
   Saving and outputting type information.
@@ -200,7 +200,7 @@ let iter_expression f e =
     | Pstr_exception _
     | Pstr_modtype _
     | Pstr_open _
-    | Pstr_class_type _
+    | Pstr_class_type ()
     | Pstr_attribute _
     | Pstr_extension _ -> ()
     | Pstr_include {pincl_mod = me}
@@ -1638,7 +1638,7 @@ and is_nonexpansive_mod mexp =
       List.for_all
         (fun item -> match item.str_desc with
           | Tstr_eval _ | Tstr_primitive _ | Tstr_type _
-          | Tstr_modtype _ | Tstr_open _ | Tstr_class_type _  -> true
+          | Tstr_modtype _ | Tstr_open _ | Tstr_class_type ()  -> true
           | Tstr_value (_, pat_exp_list) ->
               List.for_all (fun vb -> is_nonexpansive vb.vb_expr) pat_exp_list
           | Tstr_module {mb_expr=m;_}
@@ -1654,7 +1654,7 @@ and is_nonexpansive_mod mexp =
                 (function {ext_kind = Text_decl _} -> false
                         | {ext_kind = Text_rebind _} -> true)
                 te.tyext_constructors
-          | Tstr_class _ -> false (* could be more precise *)
+          | Tstr_class () -> assert false (* impossible *)
           | Tstr_attribute _ -> true
         )
         str.str_items

jscomp/ml/typecore.mli

@@ -128,7 +128,7 @@ val type_open:
   (?used_slot:bool ref -> override_flag -> Env.t -> Location.t ->
    Longident.t loc -> Path.t * Env.t)
     ref
-(* Forward declaration, to be filled in by Typeclass.class_structure *)
+(* Forward declaration, to be filled in by Typemod.type_package *)
 val type_package:
   (Env.t -> Parsetree.module_expr -> Path.t -> Longident.t list ->
   Typedtree.module_expr * type_expr list) ref

jscomp/ml/typetexp.ml

@@ -144,12 +144,6 @@ let find_label =
 let find_all_labels =
   find_component Env.lookup_all_labels (fun lid -> Unbound_label lid)
 
-let find_class env loc lid =
-  let (path, decl) as r =
-    find_component Env.lookup_class (fun lid -> Unbound_class lid) env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.cty_attributes (Path.name path);
-  r
 
 let find_value env loc lid =
   Env.check_value_name (Longident.last lid) loc;
@@ -177,14 +171,6 @@ let find_modtype env loc lid =
   Builtin_attributes.check_deprecated loc decl.mtd_attributes (Path.name path);
   r
 
-let find_class_type env loc lid =
-  let (path, decl) as r =
-    find_component Env.lookup_cltype (fun lid -> Unbound_cltype lid)
-      env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.clty_attributes (Path.name path);
-  r
-
 let unbound_constructor_error env lid =
   narrow_unbound_lid_error env lid.loc lid.txt
     (fun lid -> Unbound_constructor lid)

jscomp/ml/typetexp.mli

@@ -100,16 +100,12 @@ val find_all_labels:
     (label_description * (unit -> unit)) list
 val find_value:
     Env.t -> Location.t -> Longident.t -> Path.t * value_description
-val find_class:
-    Env.t -> Location.t -> Longident.t -> Path.t * class_declaration
 val find_module:
     Env.t -> Location.t -> Longident.t -> Path.t * module_declaration
 val lookup_module:
     ?load:bool -> Env.t -> Location.t -> Longident.t -> Path.t
 val find_modtype:
     Env.t -> Location.t -> Longident.t -> Path.t * modtype_declaration
-val find_class_type:
-    Env.t -> Location.t -> Longident.t -> Path.t * class_type_declaration
 
 val unbound_constructor_error: Env.t -> Longident.t Location.loc -> 'a
 val unbound_label_error: Env.t -> Longident.t Location.loc -> 'a