Remove dead code.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16511 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

typing/ctype.ml

@@ -153,7 +153,6 @@ let proper_abbrevs path tl abbrev =
 
 let newty2             = Btype.newty2
 let newty desc         = newty2 !current_level desc
-let new_global_ty desc = newty2 !global_level desc
 
 let newvar ?name ()         = newty2 !current_level (Tvar name)
 let newvar2 ?name level     = newty2 level (Tvar name)
@@ -190,17 +189,6 @@ let umode = ref Expression
 let generate_equations = ref false
 let assume_injective = ref false
 
-let set_mode_expression f =
-  let old_unification_mode = !umode in
-  try
-    umode := Expression;
-    let ret = f () in
-    umode := old_unification_mode;
-    ret
-  with e ->
-    umode := old_unification_mode;
-    raise e
-
 let set_mode_pattern ~generate ~injective f =
   let old_unification_mode = !umode
   and old_gen = !generate_equations
@@ -1339,7 +1327,7 @@ let apply env params body args =
    type or module definition is overridden in the environnement.
 *)
 let previous_env = ref Env.empty
-let string_of_kind = function Public -> "public" | Private -> "private"
+(*let string_of_kind = function Public -> "public" | Private -> "private"*)
 let check_abbrev_env env =
   if env != !previous_env then begin
     (* prerr_endline "cleanup expansion cache"; *)
@@ -2595,9 +2583,6 @@ and unify_kind k1 k2 =
   | (Fpresent, Fpresent)          -> ()
   | _                             -> assert false
 
-and unify_pairs mode env tpl =
-  List.iter (fun (t1, t2) -> unify env t1 t2) tpl
-
 and unify_row env row1 row2 =
   let row1 = row_repr row1 and row2 = row_repr row2 in
   let rm1 = row_more row1 and rm2 = row_more row2 in
@@ -3163,11 +3148,6 @@ let matches env ty ty' =
                  (*  Equivalence between parameterized types  *)
                  (*********************************************)
 
-let rec get_object_row ty =
-  match repr ty with
-  | {desc=Tfield (_, _, _, tl)} -> get_object_row tl
-  | ty -> ty
-
 let expand_head_rigid env ty =
   let old = !rigid_variants in
   rigid_variants := true;
@@ -3882,23 +3862,6 @@ let subtypes = TypePairs.create 17
 let subtype_error env trace =
   raise (Subtype (expand_trace env (List.rev trace), []))
 
-(* check list inclusion, assuming lists are ordered *)
-let rec included nl1 nl2 =
-  match nl1, nl2 with
-    (a::nl1', b::nl2') ->
-      if a = b then included nl1' nl2' else
-      a > b && included nl1 nl2'
-  | ([], _) -> true
-  | (_, []) -> false
-
-let rec extract_assoc nl1 nl2 tl2 =
-  match (nl1, nl2, tl2) with
-    (a::nl1', b::nl2, t::tl2) ->
-      if a = b then t :: extract_assoc nl1' nl2 tl2
-      else extract_assoc nl1 nl2 tl2
-  | ([], _, _) -> []
-  | _ -> assert false
-
 let rec subtype_rec env trace t1 t2 cstrs =
   let t1 = repr t1 in
   let t2 = repr t2 in
@@ -3972,11 +3935,6 @@ let rec subtype_rec env trace t1 t2 cstrs =
         with Unify _ ->
           (trace, t1, t2, !univar_pairs)::cstrs
         end
-(*    | (Tpackage (p1, nl1, tl1), Tpackage (p2, nl2, tl2))
-      when eq_package_path env p1 p2 && included nl2 nl1 ->
-        List.map2 (fun t1 t2 -> (trace, t1, t2, !univar_pairs))
-          (extract_assoc nl2 nl1 tl1) tl2
-        @ cstrs *)
     | (Tpackage (p1, nl1, tl1), Tpackage (p2, nl2, tl2)) ->
         begin try
           let ntl1 = complete_type_list env nl2 t1.level (Mty_ident p1) nl1 tl1