1995-08-09 08:06:35 -07:00
|
|
|
(***********************************************************************)
|
|
|
|
(* *)
|
1996-04-30 07:53:58 -07:00
|
|
|
(* Objective Caml *)
|
1995-08-09 08:06:35 -07:00
|
|
|
(* *)
|
|
|
|
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
|
|
|
|
(* *)
|
1996-04-30 07:53:58 -07:00
|
|
|
(* Copyright 1996 Institut National de Recherche en Informatique et *)
|
1999-11-17 10:59:06 -08:00
|
|
|
(* en Automatique. All rights reserved. This file is distributed *)
|
|
|
|
(* under the terms of the Q Public License version 1.0. *)
|
1995-08-09 08:06:35 -07:00
|
|
|
(* *)
|
|
|
|
(***********************************************************************)
|
|
|
|
|
|
|
|
(* $Id$ *)
|
|
|
|
|
1995-05-04 03:15:53 -07:00
|
|
|
(* Type-checking of the module language *)
|
|
|
|
|
|
|
|
open Misc
|
1995-09-28 03:42:38 -07:00
|
|
|
open Longident
|
1995-05-04 03:15:53 -07:00
|
|
|
open Path
|
|
|
|
open Parsetree
|
1996-09-23 04:33:27 -07:00
|
|
|
open Types
|
1995-05-04 03:15:53 -07:00
|
|
|
open Typedtree
|
2000-03-06 14:12:09 -08:00
|
|
|
open Format
|
1995-05-04 03:15:53 -07:00
|
|
|
|
|
|
|
type error =
|
|
|
|
Unbound_module of Longident.t
|
|
|
|
| Unbound_modtype of Longident.t
|
|
|
|
| Cannot_apply of module_type
|
|
|
|
| Not_included of Includemod.error list
|
|
|
|
| Cannot_eliminate_dependency of module_type
|
|
|
|
| Signature_expected
|
|
|
|
| Structure_expected of module_type
|
1995-10-01 06:39:43 -07:00
|
|
|
| With_no_component of Longident.t
|
1996-07-25 06:18:53 -07:00
|
|
|
| With_mismatch of Longident.t * Includemod.error list
|
1995-08-28 04:23:33 -07:00
|
|
|
| Repeated_name of string * string
|
1995-09-02 11:55:37 -07:00
|
|
|
| Non_generalizable of type_expr
|
1998-06-24 12:22:26 -07:00
|
|
|
| Non_generalizable_class of Ident.t * class_declaration
|
1996-05-22 09:22:33 -07:00
|
|
|
| Non_generalizable_module of module_type
|
1995-05-04 03:15:53 -07:00
|
|
|
|
|
|
|
exception Error of Location.t * error
|
|
|
|
|
|
|
|
(* Extract a signature from a module type *)
|
|
|
|
|
|
|
|
let extract_sig env loc mty =
|
|
|
|
match Mtype.scrape env mty with
|
|
|
|
Tmty_signature sg -> sg
|
|
|
|
| _ -> raise(Error(loc, Signature_expected))
|
|
|
|
|
|
|
|
let extract_sig_open env loc mty =
|
|
|
|
match Mtype.scrape env mty with
|
|
|
|
Tmty_signature sg -> sg
|
|
|
|
| _ -> raise(Error(loc, Structure_expected mty))
|
|
|
|
|
1995-10-01 06:39:43 -07:00
|
|
|
(* Lookup the type of a module path *)
|
|
|
|
|
|
|
|
let type_module_path env loc lid =
|
|
|
|
try
|
|
|
|
Env.lookup_module lid env
|
|
|
|
with Not_found ->
|
|
|
|
raise(Error(loc, Unbound_module lid))
|
|
|
|
|
2003-04-01 22:57:15 -08:00
|
|
|
(* Record a module type *)
|
|
|
|
let rm node =
|
|
|
|
Stypes.record (Stypes.Ti_mod node);
|
|
|
|
node
|
|
|
|
|
1995-09-28 03:42:38 -07:00
|
|
|
(* Merge one "with" constraint in a signature *)
|
|
|
|
|
1996-07-25 06:18:53 -07:00
|
|
|
let merge_constraint initial_env loc sg lid constr =
|
|
|
|
let rec merge env sg namelist =
|
1995-10-01 06:39:43 -07:00
|
|
|
match (sg, namelist, constr) with
|
|
|
|
([], _, _) ->
|
|
|
|
raise(Error(loc, With_no_component lid))
|
|
|
|
| (Tsig_type(id, decl) :: rem, [s], Pwith_type sdecl)
|
|
|
|
when Ident.name id = s ->
|
1996-07-25 06:18:53 -07:00
|
|
|
let newdecl = Typedecl.transl_with_constraint initial_env sdecl in
|
|
|
|
Includemod.type_declarations env id newdecl decl;
|
1995-09-28 03:42:38 -07:00
|
|
|
Tsig_type(id, newdecl) :: rem
|
1995-10-01 06:39:43 -07:00
|
|
|
| (Tsig_module(id, mty) :: rem, [s], Pwith_module lid)
|
|
|
|
when Ident.name id = s ->
|
1996-07-25 06:18:53 -07:00
|
|
|
let (path, mty') = type_module_path initial_env loc lid in
|
|
|
|
let newmty = Mtype.strengthen env mty' path in
|
1999-02-24 07:21:50 -08:00
|
|
|
ignore(Includemod.modtypes env newmty mty);
|
1996-07-25 06:18:53 -07:00
|
|
|
Tsig_module(id, newmty) :: rem
|
1995-10-01 06:39:43 -07:00
|
|
|
| (Tsig_module(id, mty) :: rem, s :: namelist, _) when Ident.name id = s ->
|
1996-07-25 06:18:53 -07:00
|
|
|
let newsg = merge env (extract_sig env loc mty) namelist in
|
1995-09-28 03:42:38 -07:00
|
|
|
Tsig_module(id, Tmty_signature newsg) :: rem
|
1995-10-01 06:39:43 -07:00
|
|
|
| (item :: rem, _, _) ->
|
1996-07-25 06:18:53 -07:00
|
|
|
item :: merge (Env.add_item item env) rem namelist in
|
|
|
|
try
|
|
|
|
merge initial_env sg (Longident.flatten lid)
|
|
|
|
with Includemod.Error explanation ->
|
|
|
|
raise(Error(loc, With_mismatch(lid, explanation)))
|
1995-09-28 03:42:38 -07:00
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
(* Auxiliary for translating recursively-defined module types.
|
|
|
|
Return a module type that approximates the shape of the given module
|
|
|
|
type AST. Retain only module, type, and module type
|
|
|
|
components of signatures. For types, retain only their arity,
|
|
|
|
making them abstract otherwise. *)
|
|
|
|
|
|
|
|
let approx_modtype transl_mty init_env smty =
|
|
|
|
|
|
|
|
let rec approx_mty env smty =
|
|
|
|
match smty.pmty_desc with
|
|
|
|
Pmty_ident lid ->
|
|
|
|
begin try
|
|
|
|
let (path, info) = Env.lookup_modtype lid env in
|
|
|
|
Tmty_ident path
|
|
|
|
with Not_found ->
|
|
|
|
raise(Error(smty.pmty_loc, Unbound_modtype lid))
|
|
|
|
end
|
|
|
|
| Pmty_signature ssg ->
|
|
|
|
Tmty_signature(approx_sig env ssg)
|
|
|
|
| Pmty_functor(param, sarg, sres) ->
|
|
|
|
let arg = approx_mty env sarg in
|
|
|
|
let (id, newenv) = Env.enter_module param arg env in
|
|
|
|
let res = approx_mty newenv sres in
|
|
|
|
Tmty_functor(id, arg, res)
|
|
|
|
| Pmty_with(sbody, constraints) ->
|
|
|
|
approx_mty env sbody
|
|
|
|
|
|
|
|
and approx_sig env ssg =
|
|
|
|
match ssg with
|
|
|
|
[] -> []
|
|
|
|
| item :: srem ->
|
|
|
|
match item.psig_desc with
|
|
|
|
| Psig_type sdecls ->
|
|
|
|
let decls = Typedecl.approx_type_decl env sdecls in
|
|
|
|
let rem = approx_sig env srem in
|
|
|
|
map_end (fun (id, info) -> Tsig_type(id, info)) decls rem
|
|
|
|
| Psig_module(name, smty) ->
|
|
|
|
let mty = approx_mty env smty in
|
|
|
|
let (id, newenv) = Env.enter_module name mty env in
|
|
|
|
Tsig_module(id, mty) :: approx_sig newenv srem
|
|
|
|
| Psig_recmodule sdecls ->
|
|
|
|
let decls =
|
|
|
|
List.map
|
|
|
|
(fun (name, smty) ->
|
|
|
|
(Ident.create name, approx_mty env smty))
|
|
|
|
sdecls in
|
|
|
|
let newenv =
|
|
|
|
List.fold_left (fun env (id, mty) -> Env.add_module id mty env)
|
|
|
|
env decls in
|
|
|
|
map_end (fun (id, mty) -> Tsig_module(id, mty)) decls
|
|
|
|
(approx_sig newenv srem)
|
|
|
|
| Psig_modtype(name, sinfo) ->
|
|
|
|
let info = approx_mty_info env sinfo in
|
|
|
|
let (id, newenv) = Env.enter_modtype name info env in
|
|
|
|
Tsig_modtype(id, info) :: approx_sig newenv srem
|
|
|
|
| Psig_open lid ->
|
|
|
|
let (path, mty) = type_module_path env item.psig_loc lid in
|
|
|
|
let sg = extract_sig_open env item.psig_loc mty in
|
|
|
|
let newenv = Env.open_signature path sg env in
|
|
|
|
approx_sig newenv srem
|
|
|
|
| Psig_include smty ->
|
|
|
|
let mty = transl_mty init_env smty in
|
|
|
|
let sg = Subst.signature Subst.identity
|
|
|
|
(extract_sig env smty.pmty_loc mty) in
|
|
|
|
let newenv = Env.add_signature sg env in
|
|
|
|
sg @ approx_sig newenv srem
|
|
|
|
| Psig_class sdecls | Psig_class_type sdecls ->
|
|
|
|
let decls = Typeclass.approx_class_declarations env sdecls in
|
|
|
|
let rem = approx_sig env srem in
|
|
|
|
List.flatten
|
|
|
|
(List.map
|
|
|
|
(fun (i1, d1, i2, d2, i3, d3) ->
|
|
|
|
[Tsig_cltype(i1, d1); Tsig_type(i2, d2); Tsig_type(i3, d3)])
|
|
|
|
decls)
|
|
|
|
@ rem
|
|
|
|
| _ ->
|
|
|
|
approx_sig env srem
|
|
|
|
|
|
|
|
and approx_mty_info env sinfo =
|
|
|
|
match sinfo with
|
|
|
|
Pmodtype_abstract ->
|
|
|
|
Tmodtype_abstract
|
|
|
|
| Pmodtype_manifest smty ->
|
|
|
|
Tmodtype_manifest(approx_mty env smty)
|
|
|
|
|
|
|
|
in approx_mty init_env smty
|
|
|
|
|
2003-07-01 06:05:43 -07:00
|
|
|
(* Additional validity checks on type definitions arising from
|
|
|
|
recursive modules *)
|
|
|
|
|
|
|
|
let check_recmod_typedecls env sdecls decls =
|
|
|
|
let recmod_ids = List.map fst decls in
|
|
|
|
List.iter2
|
|
|
|
(fun (_, smty) (id, mty) ->
|
|
|
|
List.iter
|
|
|
|
(fun path ->
|
|
|
|
Typedecl.check_recmod_typedecl env smty.pmty_loc recmod_ids
|
|
|
|
path (Env.find_type path env))
|
|
|
|
(Mtype.type_paths env (Pident id) mty))
|
|
|
|
sdecls decls
|
|
|
|
|
1999-03-02 06:49:38 -08:00
|
|
|
(* Auxiliaries for checking uniqueness of names in signatures and structures *)
|
|
|
|
|
|
|
|
module StringSet = Set.Make(struct type t = string let compare = compare end)
|
|
|
|
|
|
|
|
let check cl loc set_ref name =
|
|
|
|
if StringSet.mem name !set_ref
|
|
|
|
then raise(Error(loc, Repeated_name(cl, name)))
|
|
|
|
else set_ref := StringSet.add name !set_ref
|
|
|
|
|
|
|
|
let check_sig_item type_names module_names modtype_names loc = function
|
|
|
|
Tsig_type(id, _) ->
|
|
|
|
check "type" loc type_names (Ident.name id)
|
|
|
|
| Tsig_module(id, _) ->
|
|
|
|
check "module" loc module_names (Ident.name id)
|
|
|
|
| Tsig_modtype(id, _) ->
|
|
|
|
check "module type" loc modtype_names (Ident.name id)
|
|
|
|
| _ -> ()
|
|
|
|
|
1995-05-04 03:15:53 -07:00
|
|
|
(* Check and translate a module type expression *)
|
|
|
|
|
|
|
|
let rec transl_modtype env smty =
|
|
|
|
match smty.pmty_desc with
|
|
|
|
Pmty_ident lid ->
|
|
|
|
begin try
|
|
|
|
let (path, info) = Env.lookup_modtype lid env in
|
|
|
|
Tmty_ident path
|
|
|
|
with Not_found ->
|
|
|
|
raise(Error(smty.pmty_loc, Unbound_modtype lid))
|
|
|
|
end
|
1995-08-28 04:23:33 -07:00
|
|
|
| Pmty_signature ssg ->
|
|
|
|
Tmty_signature(transl_signature env ssg)
|
1995-05-04 03:15:53 -07:00
|
|
|
| Pmty_functor(param, sarg, sres) ->
|
|
|
|
let arg = transl_modtype env sarg in
|
|
|
|
let (id, newenv) = Env.enter_module param arg env in
|
|
|
|
let res = transl_modtype newenv sres in
|
|
|
|
Tmty_functor(id, arg, res)
|
1995-09-28 03:42:38 -07:00
|
|
|
| Pmty_with(sbody, constraints) ->
|
1995-05-04 03:15:53 -07:00
|
|
|
let body = transl_modtype env sbody in
|
1995-09-28 03:42:38 -07:00
|
|
|
let init_sg = extract_sig env sbody.pmty_loc body in
|
|
|
|
let final_sg =
|
|
|
|
List.fold_left
|
|
|
|
(fun sg (lid, sdecl) ->
|
|
|
|
merge_constraint env smty.pmty_loc sg lid sdecl)
|
|
|
|
init_sg constraints in
|
|
|
|
Tmty_signature final_sg
|
1995-05-04 03:15:53 -07:00
|
|
|
|
|
|
|
and transl_signature env sg =
|
1999-03-02 06:49:38 -08:00
|
|
|
let type_names = ref StringSet.empty
|
|
|
|
and module_names = ref StringSet.empty
|
|
|
|
and modtype_names = ref StringSet.empty in
|
|
|
|
let rec transl_sig env sg =
|
|
|
|
Ctype.init_def(Ident.current_time());
|
|
|
|
match sg with
|
|
|
|
[] -> []
|
|
|
|
| item :: srem ->
|
|
|
|
match item.psig_desc with
|
|
|
|
| Psig_value(name, sdesc) ->
|
|
|
|
let desc = Typedecl.transl_value_decl env sdesc in
|
|
|
|
let (id, newenv) = Env.enter_value name desc env in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
Tsig_value(id, desc) :: rem
|
|
|
|
| Psig_type sdecls ->
|
|
|
|
List.iter
|
|
|
|
(fun (name, decl) -> check "type" item.psig_loc type_names name)
|
|
|
|
sdecls;
|
|
|
|
let (decls, newenv) = Typedecl.transl_type_decl env sdecls in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
map_end (fun (id, info) -> Tsig_type(id, info)) decls rem
|
|
|
|
| Psig_exception(name, sarg) ->
|
|
|
|
let arg = Typedecl.transl_exception env sarg in
|
|
|
|
let (id, newenv) = Env.enter_exception name arg env in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
Tsig_exception(id, arg) :: rem
|
|
|
|
| Psig_module(name, smty) ->
|
2001-03-05 04:59:23 -08:00
|
|
|
check "module" item.psig_loc module_names name;
|
1999-03-02 06:49:38 -08:00
|
|
|
let mty = transl_modtype env smty in
|
|
|
|
let (id, newenv) = Env.enter_module name mty env in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
Tsig_module(id, mty) :: rem
|
2003-06-19 08:53:53 -07:00
|
|
|
| Psig_recmodule sdecls ->
|
|
|
|
List.iter
|
|
|
|
(fun (name, smty) ->
|
|
|
|
check "module" item.psig_loc module_names name)
|
|
|
|
sdecls;
|
|
|
|
let (decls, newenv) =
|
|
|
|
transl_recmodule_modtypes item.psig_loc env sdecls in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
map_end (fun (id, mty) -> Tsig_module(id, mty)) decls rem
|
1999-03-02 06:49:38 -08:00
|
|
|
| Psig_modtype(name, sinfo) ->
|
2001-03-05 04:59:23 -08:00
|
|
|
check "module type" item.psig_loc modtype_names name;
|
1999-03-02 06:49:38 -08:00
|
|
|
let info = transl_modtype_info env sinfo in
|
|
|
|
let (id, newenv) = Env.enter_modtype name info env in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
Tsig_modtype(id, info) :: rem
|
|
|
|
| Psig_open lid ->
|
|
|
|
let (path, mty) = type_module_path env item.psig_loc lid in
|
|
|
|
let sg = extract_sig_open env item.psig_loc mty in
|
|
|
|
let newenv = Env.open_signature path sg env in
|
|
|
|
transl_sig newenv srem
|
|
|
|
| Psig_include smty ->
|
|
|
|
let mty = transl_modtype env smty in
|
2000-12-01 01:35:00 -08:00
|
|
|
let sg = Subst.signature Subst.identity
|
|
|
|
(extract_sig env smty.pmty_loc mty) in
|
1999-03-02 06:49:38 -08:00
|
|
|
List.iter
|
|
|
|
(check_sig_item type_names module_names modtype_names
|
|
|
|
item.psig_loc)
|
|
|
|
sg;
|
|
|
|
let newenv = Env.add_signature sg env in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
sg @ rem
|
|
|
|
| Psig_class cl ->
|
|
|
|
List.iter
|
|
|
|
(fun {pci_name = name} ->
|
|
|
|
check "type" item.psig_loc type_names name)
|
|
|
|
cl;
|
|
|
|
let (classes, newenv) = Typeclass.class_descriptions env cl in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
List.flatten
|
|
|
|
(map_end
|
|
|
|
(fun (i, d, i', d', i'', d'', i''', d''', _, _, _) ->
|
|
|
|
[Tsig_class(i, d); Tsig_cltype(i', d');
|
|
|
|
Tsig_type(i'', d''); Tsig_type(i''', d''')])
|
|
|
|
classes [rem])
|
|
|
|
| Psig_class_type cl ->
|
|
|
|
List.iter
|
|
|
|
(fun {pci_name = name} ->
|
|
|
|
check "type" item.psig_loc type_names name)
|
|
|
|
cl;
|
|
|
|
let (classes, newenv) = Typeclass.class_type_declarations env cl in
|
|
|
|
let rem = transl_sig newenv srem in
|
|
|
|
List.flatten
|
|
|
|
(map_end
|
|
|
|
(fun (i, d, i', d', i'', d'') ->
|
|
|
|
[Tsig_cltype(i, d);
|
|
|
|
Tsig_type(i', d'); Tsig_type(i'', d'')])
|
|
|
|
classes [rem])
|
|
|
|
in transl_sig env sg
|
1995-05-04 03:15:53 -07:00
|
|
|
|
|
|
|
and transl_modtype_info env sinfo =
|
|
|
|
match sinfo with
|
|
|
|
Pmodtype_abstract ->
|
|
|
|
Tmodtype_abstract
|
|
|
|
| Pmodtype_manifest smty ->
|
|
|
|
Tmodtype_manifest(transl_modtype env smty)
|
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
and transl_recmodule_modtypes loc env sdecls =
|
|
|
|
let make_env curr =
|
|
|
|
List.fold_left
|
|
|
|
(fun env (id, mty) -> Env.add_module id mty env)
|
|
|
|
env curr in
|
|
|
|
let transition env_c curr =
|
|
|
|
List.map2
|
|
|
|
(fun (_, smty) (id, mty) -> (id, transl_modtype env_c smty))
|
|
|
|
sdecls curr in
|
|
|
|
let init =
|
|
|
|
List.map
|
|
|
|
(fun (name, smty) ->
|
|
|
|
(Ident.create name, approx_modtype transl_modtype env smty))
|
|
|
|
sdecls in
|
|
|
|
let first = transition (make_env init) init in
|
|
|
|
let final_env = make_env first in
|
|
|
|
let final_decl = transition final_env init in
|
2003-07-01 06:05:43 -07:00
|
|
|
check_recmod_typedecls final_env sdecls final_decl;
|
2003-06-19 08:53:53 -07:00
|
|
|
(final_decl, final_env)
|
|
|
|
|
1995-08-23 04:55:54 -07:00
|
|
|
(* Try to convert a module expression to a module path. *)
|
|
|
|
|
|
|
|
exception Not_a_path
|
|
|
|
|
|
|
|
let rec path_of_module mexp =
|
|
|
|
match mexp.mod_desc with
|
|
|
|
Tmod_ident p -> p
|
|
|
|
| Tmod_apply(funct, arg, coercion) ->
|
|
|
|
Papply(path_of_module funct, path_of_module arg)
|
|
|
|
| _ -> raise Not_a_path
|
|
|
|
|
1995-09-02 11:55:37 -07:00
|
|
|
(* Check that all core type schemes in a structure are closed *)
|
|
|
|
|
1996-05-22 09:22:33 -07:00
|
|
|
let rec closed_modtype = function
|
|
|
|
Tmty_ident p -> true
|
|
|
|
| Tmty_signature sg -> List.for_all closed_signature_item sg
|
|
|
|
| Tmty_functor(id, param, body) -> closed_modtype body
|
|
|
|
|
|
|
|
and closed_signature_item = function
|
1997-03-18 13:06:28 -08:00
|
|
|
Tsig_value(id, desc) -> Ctype.closed_schema desc.val_type
|
1996-05-22 09:22:33 -07:00
|
|
|
| Tsig_module(id, mty) -> closed_modtype mty
|
|
|
|
| _ -> true
|
|
|
|
|
|
|
|
let check_nongen_scheme env = function
|
|
|
|
Tstr_value(rec_flag, pat_exp_list) ->
|
|
|
|
List.iter
|
|
|
|
(fun (pat, exp) ->
|
1997-03-18 13:06:28 -08:00
|
|
|
if not (Ctype.closed_schema exp.exp_type) then
|
1996-05-22 09:22:33 -07:00
|
|
|
raise(Error(exp.exp_loc, Non_generalizable exp.exp_type)))
|
|
|
|
pat_exp_list
|
|
|
|
| Tstr_module(id, md) ->
|
|
|
|
if not (closed_modtype md.mod_type) then
|
|
|
|
raise(Error(md.mod_loc, Non_generalizable_module md.mod_type))
|
|
|
|
| _ -> ()
|
|
|
|
|
1996-04-22 04:15:41 -07:00
|
|
|
let check_nongen_schemes env str =
|
1996-05-22 09:22:33 -07:00
|
|
|
List.iter (check_nongen_scheme env) str
|
1995-09-02 11:55:37 -07:00
|
|
|
|
2000-12-01 01:35:00 -08:00
|
|
|
(* Extract the list of "value" identifiers bound by a signature.
|
|
|
|
"Value" identifiers are identifiers for signature components that
|
2001-09-10 08:11:14 -07:00
|
|
|
correspond to a run-time value: values, exceptions, modules, classes.
|
|
|
|
Note: manifest primitives do not correspond to a run-time value! *)
|
2000-12-01 01:35:00 -08:00
|
|
|
|
|
|
|
let rec bound_value_identifiers = function
|
|
|
|
[] -> []
|
2001-09-10 08:11:14 -07:00
|
|
|
| Tsig_value(id, {val_kind = Val_reg}) :: rem ->
|
|
|
|
id :: bound_value_identifiers rem
|
2000-12-01 01:35:00 -08:00
|
|
|
| Tsig_exception(id, decl) :: rem -> id :: bound_value_identifiers rem
|
|
|
|
| Tsig_module(id, mty) :: rem -> id :: bound_value_identifiers rem
|
|
|
|
| Tsig_class(id, decl) :: rem -> id :: bound_value_identifiers rem
|
|
|
|
| _ :: rem -> bound_value_identifiers rem
|
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
(* Helpers for typing recursive modules *)
|
|
|
|
|
|
|
|
let anchor_submodule name anchor =
|
|
|
|
match anchor with None -> None | Some p -> Some(Pdot(p, name, nopos))
|
|
|
|
let anchor_recmodule id anchor =
|
|
|
|
Some (Pident id)
|
|
|
|
|
|
|
|
let enrich_type_decls anchor decls oldenv newenv =
|
|
|
|
match anchor with
|
|
|
|
None -> newenv
|
|
|
|
| Some p ->
|
|
|
|
List.fold_left
|
|
|
|
(fun e (id, info) ->
|
|
|
|
let info' =
|
|
|
|
Mtype.enrich_typedecl oldenv (Pdot(p, Ident.name id, nopos)) info
|
|
|
|
in
|
|
|
|
Env.add_type id info' e)
|
|
|
|
oldenv decls
|
|
|
|
|
|
|
|
let enrich_module_type anchor name mty env =
|
|
|
|
match anchor with
|
|
|
|
None -> mty
|
|
|
|
| Some p -> Mtype.enrich_modtype env (Pdot(p, name, nopos)) mty
|
|
|
|
|
1995-05-05 03:05:18 -07:00
|
|
|
(* Type a module value expression *)
|
1995-05-04 03:15:53 -07:00
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
let rec type_module anchor env smod =
|
1995-05-04 03:15:53 -07:00
|
|
|
match smod.pmod_desc with
|
|
|
|
Pmod_ident lid ->
|
|
|
|
let (path, mty) = type_module_path env smod.pmod_loc lid in
|
2003-04-01 22:57:15 -08:00
|
|
|
rm { mod_desc = Tmod_ident path;
|
|
|
|
mod_type = Mtype.strengthen env mty path;
|
|
|
|
mod_env = env;
|
|
|
|
mod_loc = smod.pmod_loc }
|
1995-05-04 03:15:53 -07:00
|
|
|
| Pmod_structure sstr ->
|
2003-06-19 08:53:53 -07:00
|
|
|
let (str, sg, finalenv) = type_structure anchor env sstr in
|
2003-04-01 22:57:15 -08:00
|
|
|
rm { mod_desc = Tmod_structure str;
|
|
|
|
mod_type = Tmty_signature sg;
|
|
|
|
mod_env = env;
|
|
|
|
mod_loc = smod.pmod_loc }
|
1995-05-04 03:15:53 -07:00
|
|
|
| Pmod_functor(name, smty, sbody) ->
|
|
|
|
let mty = transl_modtype env smty in
|
|
|
|
let (id, newenv) = Env.enter_module name mty env in
|
2003-06-19 08:53:53 -07:00
|
|
|
let body = type_module None newenv sbody in
|
2003-04-01 22:57:15 -08:00
|
|
|
rm { mod_desc = Tmod_functor(id, mty, body);
|
|
|
|
mod_type = Tmty_functor(id, mty, body.mod_type);
|
|
|
|
mod_env = env;
|
|
|
|
mod_loc = smod.pmod_loc }
|
1995-05-04 03:15:53 -07:00
|
|
|
| Pmod_apply(sfunct, sarg) ->
|
2003-06-19 08:53:53 -07:00
|
|
|
let funct = type_module None env sfunct in
|
|
|
|
let arg = type_module None env sarg in
|
1995-05-04 03:15:53 -07:00
|
|
|
begin match Mtype.scrape env funct.mod_type with
|
|
|
|
Tmty_functor(param, mty_param, mty_res) as mty_functor ->
|
|
|
|
let coercion =
|
|
|
|
try
|
|
|
|
Includemod.modtypes env arg.mod_type mty_param
|
|
|
|
with Includemod.Error msg ->
|
|
|
|
raise(Error(sarg.pmod_loc, Not_included msg)) in
|
|
|
|
let mty_appl =
|
1997-05-19 08:42:21 -07:00
|
|
|
try
|
|
|
|
let path = path_of_module arg in
|
1995-08-23 04:55:54 -07:00
|
|
|
Subst.modtype (Subst.add_module param path Subst.identity)
|
1997-05-19 08:42:21 -07:00
|
|
|
mty_res
|
|
|
|
with Not_a_path ->
|
1995-05-04 03:15:53 -07:00
|
|
|
try
|
|
|
|
Mtype.nondep_supertype
|
|
|
|
(Env.add_module param arg.mod_type env) param mty_res
|
|
|
|
with Not_found ->
|
|
|
|
raise(Error(smod.pmod_loc,
|
|
|
|
Cannot_eliminate_dependency mty_functor)) in
|
2003-04-01 22:57:15 -08:00
|
|
|
rm { mod_desc = Tmod_apply(funct, arg, coercion);
|
|
|
|
mod_type = mty_appl;
|
|
|
|
mod_env = env;
|
|
|
|
mod_loc = smod.pmod_loc }
|
1995-05-04 03:15:53 -07:00
|
|
|
| _ ->
|
|
|
|
raise(Error(sfunct.pmod_loc, Cannot_apply funct.mod_type))
|
|
|
|
end
|
|
|
|
| Pmod_constraint(sarg, smty) ->
|
2003-06-19 08:53:53 -07:00
|
|
|
let arg = type_module anchor env sarg in
|
1995-05-04 03:15:53 -07:00
|
|
|
let mty = transl_modtype env smty in
|
|
|
|
let coercion =
|
|
|
|
try
|
|
|
|
Includemod.modtypes env arg.mod_type mty
|
|
|
|
with Includemod.Error msg ->
|
|
|
|
raise(Error(sarg.pmod_loc, Not_included msg)) in
|
2003-04-01 22:57:15 -08:00
|
|
|
rm { mod_desc = Tmod_constraint(arg, mty, coercion);
|
|
|
|
mod_type = mty;
|
|
|
|
mod_env = env;
|
|
|
|
mod_loc = smod.pmod_loc }
|
1995-05-04 03:15:53 -07:00
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
and type_structure anchor env sstr =
|
2000-12-01 01:35:00 -08:00
|
|
|
let type_names = ref StringSet.empty
|
|
|
|
and module_names = ref StringSet.empty
|
|
|
|
and modtype_names = ref StringSet.empty in
|
|
|
|
let rec type_struct env sstr =
|
|
|
|
Ctype.init_def(Ident.current_time());
|
|
|
|
match sstr with
|
|
|
|
[] ->
|
|
|
|
([], [], env)
|
|
|
|
| {pstr_desc = Pstr_eval sexpr} :: srem ->
|
|
|
|
let expr = Typecore.type_expression env sexpr in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct env srem in
|
|
|
|
(Tstr_eval expr :: str_rem, sig_rem, final_env)
|
|
|
|
| {pstr_desc = Pstr_value(rec_flag, sdefs)} :: srem ->
|
|
|
|
let (defs, newenv) =
|
|
|
|
Typecore.type_binding env rec_flag sdefs in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
let bound_idents = let_bound_idents defs in
|
|
|
|
let make_sig_value id =
|
|
|
|
Tsig_value(id, Env.find_value (Pident id) newenv) in
|
|
|
|
(Tstr_value(rec_flag, defs) :: str_rem,
|
|
|
|
map_end make_sig_value bound_idents sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_primitive(name, sdesc)} :: srem ->
|
|
|
|
let desc = Typedecl.transl_value_decl env sdesc in
|
|
|
|
let (id, newenv) = Env.enter_value name desc env in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_primitive(id, desc) :: str_rem,
|
|
|
|
Tsig_value(id, desc) :: sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_type sdecls; pstr_loc = loc} :: srem ->
|
|
|
|
List.iter
|
|
|
|
(fun (name, decl) -> check "type" loc type_names name)
|
|
|
|
sdecls;
|
|
|
|
let (decls, newenv) = Typedecl.transl_type_decl env sdecls in
|
2003-06-19 08:53:53 -07:00
|
|
|
let newenv' =
|
|
|
|
enrich_type_decls anchor decls env newenv in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv' srem in
|
2000-12-01 01:35:00 -08:00
|
|
|
(Tstr_type decls :: str_rem,
|
|
|
|
map_end (fun (id, info) -> Tsig_type(id, info)) decls sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_exception(name, sarg)} :: srem ->
|
|
|
|
let arg = Typedecl.transl_exception env sarg in
|
|
|
|
let (id, newenv) = Env.enter_exception name arg env in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_exception(id, arg) :: str_rem,
|
|
|
|
Tsig_exception(id, arg) :: sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_exn_rebind(name, longid); pstr_loc = loc} :: srem ->
|
|
|
|
let (path, arg) = Typedecl.transl_exn_rebind env loc longid in
|
|
|
|
let (id, newenv) = Env.enter_exception name arg env in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_exn_rebind(id, path) :: str_rem,
|
|
|
|
Tsig_exception(id, arg) :: sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_module(name, smodl); pstr_loc = loc} :: srem ->
|
|
|
|
check "module" loc module_names name;
|
2003-06-19 08:53:53 -07:00
|
|
|
let modl = type_module (anchor_submodule name anchor) env smodl in
|
|
|
|
let mty = enrich_module_type anchor name modl.mod_type env in
|
|
|
|
let (id, newenv) = Env.enter_module name mty env in
|
2000-12-01 01:35:00 -08:00
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_module(id, modl) :: str_rem,
|
|
|
|
Tsig_module(id, modl.mod_type) :: sig_rem,
|
|
|
|
final_env)
|
2003-06-19 08:53:53 -07:00
|
|
|
| {pstr_desc = Pstr_recmodule sbind; pstr_loc = loc} :: srem ->
|
|
|
|
List.iter
|
|
|
|
(fun (name, _, _) -> check "module" loc module_names name)
|
|
|
|
sbind;
|
|
|
|
let (decls, newenv) =
|
|
|
|
transl_recmodule_modtypes loc env
|
|
|
|
(List.map (fun (name, smty, smodl) -> (name, smty)) sbind) in
|
|
|
|
let type_recmodule_binding (id, mty) (name, smty, smodl) =
|
|
|
|
let modl =
|
|
|
|
type_module (anchor_recmodule id anchor) newenv smodl in
|
|
|
|
let coercion =
|
|
|
|
try
|
|
|
|
Includemod.modtypes newenv
|
|
|
|
(Mtype.strengthen env modl.mod_type (Pident id))
|
|
|
|
mty
|
|
|
|
with Includemod.Error msg ->
|
|
|
|
raise(Error(smodl.pmod_loc, Not_included msg)) in
|
|
|
|
let modl' =
|
|
|
|
{ mod_desc = Tmod_constraint(modl, mty, coercion);
|
|
|
|
mod_type = mty;
|
|
|
|
mod_env = newenv;
|
|
|
|
mod_loc = smodl.pmod_loc } in
|
|
|
|
(id, modl') in
|
|
|
|
let bind = List.map2 type_recmodule_binding decls sbind in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_recmodule bind :: str_rem,
|
|
|
|
map_end (fun (id, modl) -> Tsig_module(id, modl.mod_type))
|
|
|
|
bind sig_rem,
|
|
|
|
final_env)
|
2000-12-01 01:35:00 -08:00
|
|
|
| {pstr_desc = Pstr_modtype(name, smty); pstr_loc = loc} :: srem ->
|
|
|
|
check "module type" loc modtype_names name;
|
|
|
|
let mty = transl_modtype env smty in
|
|
|
|
let (id, newenv) = Env.enter_modtype name (Tmodtype_manifest mty) env in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct newenv srem in
|
|
|
|
(Tstr_modtype(id, mty) :: str_rem,
|
|
|
|
Tsig_modtype(id, Tmodtype_manifest mty) :: sig_rem,
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_open lid; pstr_loc = loc} :: srem ->
|
|
|
|
let (path, mty) = type_module_path env loc lid in
|
|
|
|
let sg = extract_sig_open env loc mty in
|
|
|
|
type_struct (Env.open_signature path sg env) srem
|
2001-08-13 02:35:49 -07:00
|
|
|
| {pstr_desc = Pstr_class cl; pstr_loc = loc} :: srem ->
|
|
|
|
List.iter
|
|
|
|
(fun {pci_name = name} -> check "type" loc type_names name)
|
|
|
|
cl;
|
2000-12-01 01:35:00 -08:00
|
|
|
let (classes, new_env) = Typeclass.class_declarations env cl in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct new_env srem in
|
|
|
|
(Tstr_class
|
|
|
|
(List.map (fun (i, _,_,_,_,_,_,_, s, m, c) ->
|
|
|
|
(i, s, m, c)) classes) ::
|
|
|
|
Tstr_cltype
|
|
|
|
(List.map (fun (_,_, i, d, _,_,_,_,_,_,_) -> (i, d)) classes) ::
|
|
|
|
Tstr_type
|
|
|
|
(List.map (fun (_,_,_,_, i, d, _,_,_,_,_) -> (i, d)) classes) ::
|
|
|
|
Tstr_type
|
|
|
|
(List.map (fun (_,_,_,_,_,_, i, d, _,_,_) -> (i, d)) classes) ::
|
|
|
|
str_rem,
|
|
|
|
List.flatten
|
|
|
|
(map_end
|
|
|
|
(fun (i, d, i', d', i'', d'', i''', d''', _, _, _) ->
|
|
|
|
[Tsig_class(i, d); Tsig_cltype(i', d');
|
|
|
|
Tsig_type(i'', d''); Tsig_type(i''', d''')])
|
|
|
|
classes [sig_rem]),
|
|
|
|
final_env)
|
2001-08-13 02:35:49 -07:00
|
|
|
| {pstr_desc = Pstr_class_type cl; pstr_loc = loc} :: srem ->
|
|
|
|
List.iter
|
|
|
|
(fun {pci_name = name} -> check "type" loc type_names name)
|
|
|
|
cl;
|
2000-12-01 01:35:00 -08:00
|
|
|
let (classes, new_env) = Typeclass.class_type_declarations env cl in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct new_env srem in
|
|
|
|
(Tstr_cltype
|
|
|
|
(List.map (fun (i, d, _, _, _, _) -> (i, d)) classes) ::
|
|
|
|
Tstr_type
|
|
|
|
(List.map (fun (_, _, i, d, _, _) -> (i, d)) classes) ::
|
|
|
|
Tstr_type
|
|
|
|
(List.map (fun (_, _, _, _, i, d) -> (i, d)) classes) ::
|
|
|
|
str_rem,
|
|
|
|
List.flatten
|
|
|
|
(map_end
|
|
|
|
(fun (i, d, i', d', i'', d'') ->
|
|
|
|
[Tsig_cltype(i, d); Tsig_type(i', d'); Tsig_type(i'', d'')])
|
|
|
|
classes [sig_rem]),
|
|
|
|
final_env)
|
|
|
|
| {pstr_desc = Pstr_include smodl; pstr_loc = loc} :: srem ->
|
2003-06-19 08:53:53 -07:00
|
|
|
let modl = type_module None env smodl in
|
2000-12-01 01:35:00 -08:00
|
|
|
(* Rename all identifiers bound by this signature to avoid clashes *)
|
|
|
|
let sg = Subst.signature Subst.identity
|
|
|
|
(extract_sig_open env smodl.pmod_loc modl.mod_type) in
|
|
|
|
List.iter
|
|
|
|
(check_sig_item type_names module_names modtype_names loc) sg;
|
|
|
|
let new_env = Env.add_signature sg env in
|
|
|
|
let (str_rem, sig_rem, final_env) = type_struct new_env srem in
|
|
|
|
(Tstr_include (modl, bound_value_identifiers sg) :: str_rem,
|
|
|
|
sg @ sig_rem,
|
|
|
|
final_env)
|
|
|
|
in type_struct env sstr
|
1995-05-04 03:15:53 -07:00
|
|
|
|
2003-06-19 08:53:53 -07:00
|
|
|
let type_module = type_module None
|
|
|
|
let type_structure = type_structure None
|
|
|
|
|
1998-02-26 04:54:44 -08:00
|
|
|
(* Fill in the forward declaration *)
|
|
|
|
let _ =
|
|
|
|
Typecore.type_module := type_module
|
|
|
|
|
2000-02-24 02:18:25 -08:00
|
|
|
(* Normalize types in a signature *)
|
|
|
|
|
|
|
|
let rec normalize_modtype env = function
|
|
|
|
Tmty_ident p -> ()
|
|
|
|
| Tmty_signature sg -> normalize_signature env sg
|
|
|
|
| Tmty_functor(id, param, body) -> normalize_modtype env body
|
|
|
|
|
|
|
|
and normalize_signature env = List.iter (normalize_signature_item env)
|
|
|
|
|
|
|
|
and normalize_signature_item env = function
|
|
|
|
Tsig_value(id, desc) -> Ctype.normalize_type env desc.val_type
|
|
|
|
| Tsig_module(id, mty) -> normalize_modtype env mty
|
|
|
|
| _ -> ()
|
|
|
|
|
2002-03-12 04:35:10 -08:00
|
|
|
(* Simplify multiple specifications of a value or an exception in a signature.
|
|
|
|
(Other signature components, e.g. types, modules, etc, are checked for
|
|
|
|
name uniqueness.) If multiple specifications with the same name,
|
|
|
|
keep only the last (rightmost) one. *)
|
|
|
|
|
|
|
|
let rec simplify_modtype mty =
|
|
|
|
match mty with
|
|
|
|
Tmty_ident path -> mty
|
|
|
|
| Tmty_functor(id, arg, res) -> Tmty_functor(id, arg, simplify_modtype res)
|
|
|
|
| Tmty_signature sg -> Tmty_signature(simplify_signature sg)
|
|
|
|
|
|
|
|
and simplify_signature sg =
|
|
|
|
let rec simplif val_names exn_names res = function
|
|
|
|
[] -> res
|
|
|
|
| (Tsig_value(id, descr) as component) :: sg ->
|
|
|
|
let name = Ident.name id in
|
|
|
|
simplif (StringSet.add name val_names) exn_names
|
|
|
|
(if StringSet.mem name val_names then res else component :: res)
|
|
|
|
sg
|
|
|
|
| (Tsig_exception(id, decl) as component) :: sg ->
|
|
|
|
let name = Ident.name id in
|
|
|
|
simplif val_names (StringSet.add name exn_names)
|
|
|
|
(if StringSet.mem name exn_names then res else component :: res)
|
|
|
|
sg
|
2003-03-10 08:57:04 -08:00
|
|
|
| Tsig_module(id, mty) :: sg ->
|
|
|
|
simplif val_names exn_names
|
|
|
|
(Tsig_module(id, simplify_modtype mty) :: res) sg
|
2002-03-12 04:35:10 -08:00
|
|
|
| component :: sg ->
|
|
|
|
simplif val_names exn_names (component :: res) sg
|
|
|
|
in
|
|
|
|
simplif StringSet.empty StringSet.empty [] (List.rev sg)
|
|
|
|
|
2003-03-10 08:57:04 -08:00
|
|
|
(* Typecheck an implementation file *)
|
|
|
|
|
|
|
|
let type_implementation sourcefile prefixname modulename initial_env ast =
|
|
|
|
Typecore.reset_delayed_checks ();
|
2003-04-01 17:32:09 -08:00
|
|
|
let (str, sg, finalenv) =
|
|
|
|
Misc.try_finally (fun () -> type_structure initial_env ast)
|
2003-06-12 05:52:17 -07:00
|
|
|
(fun () -> Stypes.dump (prefixname ^ ".annot"))
|
2003-04-01 17:32:09 -08:00
|
|
|
in
|
2003-03-10 08:57:04 -08:00
|
|
|
Typecore.force_delayed_checks ();
|
2003-06-23 07:00:49 -07:00
|
|
|
if !Clflags.print_types then begin
|
2003-03-10 08:57:04 -08:00
|
|
|
fprintf std_formatter "%a@." Printtyp.signature (simplify_signature sg);
|
2003-06-23 07:00:49 -07:00
|
|
|
(str, Tcoerce_none)
|
|
|
|
end else begin
|
|
|
|
let coercion =
|
|
|
|
if Sys.file_exists (prefixname ^ !Config.interface_suffix) then begin
|
|
|
|
let intf_file =
|
|
|
|
try find_in_path !Config.load_path (prefixname ^ ".cmi")
|
|
|
|
with Not_found -> prefixname ^ ".cmi" in
|
|
|
|
let dclsig = Env.read_signature modulename intf_file in
|
|
|
|
Includemod.compunit sourcefile sg intf_file dclsig
|
|
|
|
end else begin
|
|
|
|
check_nongen_schemes finalenv str;
|
|
|
|
normalize_signature finalenv sg;
|
|
|
|
if not !Clflags.dont_write_files then
|
|
|
|
Env.save_signature sg modulename (prefixname ^ ".cmi");
|
|
|
|
Tcoerce_none
|
|
|
|
end in
|
|
|
|
(str, coercion)
|
|
|
|
end
|
2003-03-10 08:57:04 -08:00
|
|
|
|
2002-02-08 08:55:44 -08:00
|
|
|
(* "Packaging" of several compilation units into one unit
|
|
|
|
having them as sub-modules. *)
|
|
|
|
|
|
|
|
let rec package_signatures subst = function
|
|
|
|
[] -> []
|
|
|
|
| (name, sg) :: rem ->
|
|
|
|
let sg' = Subst.signature subst sg in
|
|
|
|
let oldid = Ident.create_persistent name
|
|
|
|
and newid = Ident.create name in
|
|
|
|
Tsig_module(newid, Tmty_signature sg') ::
|
|
|
|
package_signatures (Subst.add_module oldid (Pident newid) subst) rem
|
|
|
|
|
|
|
|
let package_units objfiles cmifile modulename =
|
|
|
|
(* Read the signatures of the units *)
|
|
|
|
let units =
|
|
|
|
List.map
|
|
|
|
(fun f ->
|
|
|
|
let pref = chop_extension_if_any f in
|
|
|
|
let modname = String.capitalize(Filename.basename pref) in
|
|
|
|
(modname, Env.read_signature modname (pref ^ ".cmi")))
|
|
|
|
objfiles in
|
|
|
|
(* Compute signature of packaged unit *)
|
|
|
|
let sg = package_signatures Subst.identity units in
|
2003-03-06 07:59:55 -08:00
|
|
|
(* See if explicit interface is provided *)
|
|
|
|
let mlifile =
|
|
|
|
chop_extension_if_any cmifile ^ !Config.interface_suffix in
|
|
|
|
if Sys.file_exists mlifile then begin
|
|
|
|
let dclsig = Env.read_signature modulename cmifile in
|
|
|
|
Includemod.compunit "(obtained by packing)" sg mlifile dclsig
|
|
|
|
end else begin
|
|
|
|
(* Determine imports *)
|
|
|
|
let unit_names = List.map fst units in
|
|
|
|
let imports =
|
|
|
|
List.filter
|
|
|
|
(fun (name, crc) -> not (List.mem name unit_names))
|
|
|
|
(Env.imported_units()) in
|
|
|
|
(* Write packaged signature *)
|
|
|
|
Env.save_signature_with_imports sg modulename cmifile imports;
|
|
|
|
Tcoerce_none
|
|
|
|
end
|
2002-02-08 08:55:44 -08:00
|
|
|
|
1995-05-04 03:15:53 -07:00
|
|
|
(* Error report *)
|
|
|
|
|
|
|
|
open Printtyp
|
|
|
|
|
2000-03-06 14:12:09 -08:00
|
|
|
let report_error ppf = function
|
|
|
|
| Unbound_module lid -> fprintf ppf "Unbound module %a" longident lid
|
|
|
|
| Unbound_modtype lid -> fprintf ppf "Unbound module type %a" longident lid
|
2000-03-21 07:16:48 -08:00
|
|
|
| Cannot_apply mty ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[This module is not a functor; it has type@ %a@]" modtype mty
|
|
|
|
| Not_included errs ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[<v>Signature mismatch:@ %a@]" Includemod.report_error errs
|
|
|
|
| Cannot_eliminate_dependency mty ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[This functor has type@ %a@ \
|
|
|
|
The parameter cannot be eliminated in the result type.@ \
|
|
|
|
Please bind the argument to a module identifier.@]" modtype mty
|
2000-03-06 14:12:09 -08:00
|
|
|
| Signature_expected -> fprintf ppf "This module type is not a signature"
|
2000-03-21 07:16:48 -08:00
|
|
|
| Structure_expected mty ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[This module is not a structure; it has type@ %a" modtype mty
|
|
|
|
| With_no_component lid ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[The signature constrained by `with' has no component named %a@]"
|
|
|
|
longident lid
|
|
|
|
| With_mismatch(lid, explanation) ->
|
|
|
|
fprintf ppf
|
2001-07-23 08:35:49 -07:00
|
|
|
"@[<v>\
|
2000-03-21 07:16:48 -08:00
|
|
|
@[In this `with' constraint, the new definition of %a@ \
|
|
|
|
does not match its original definition@ \
|
|
|
|
in the constrained signature:@]@ \
|
|
|
|
%a@]"
|
|
|
|
longident lid Includemod.report_error explanation
|
|
|
|
| Repeated_name(kind, name) ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[Multiple definition of the %s name %s.@ \
|
|
|
|
Names must be unique in a given structure or signature.@]" kind name
|
|
|
|
| Non_generalizable typ ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[The type of this expression,@ %a,@ \
|
|
|
|
contains type variables that cannot be generalized@]" type_scheme typ
|
|
|
|
| Non_generalizable_class (id, desc) ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[The type of this class,@ %a,@ \
|
|
|
|
contains type variables that cannot be generalized@]"
|
|
|
|
(class_declaration id) desc
|
|
|
|
| Non_generalizable_module mty ->
|
|
|
|
fprintf ppf
|
|
|
|
"@[The type of this module,@ %a,@ \
|
|
|
|
contains type variables that cannot be generalized@]" modtype mty
|