diff options
author | soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 15:24:51 +0000 |
---|---|---|
committer | soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 15:24:51 +0000 |
commit | 3e5f0e1521168412e3f0982a6c5456fd2978e63b (patch) | |
tree | be4a75f0d8371ea398533150b4fffb82a38fc94f /library/declaremods.ml | |
parent | cfa3aa27f1141fe732a473efd0cff794694c63bb (diff) |
Removed some useless code in mod_typing that was redundant with safe_typing.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9663 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'library/declaremods.ml')
-rw-r--r-- | library/declaremods.ml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml index eb005e6d6..8bfc7ac85 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -131,7 +131,6 @@ let rec check_sig env = function let rec check_sig_entry env = function | MTEident kn -> check_sig env (Environ.lookup_modtype kn env) - | MTEsig _ -> () | MTEfunsig _ -> Modops.error_result_must_be_signature () | MTEwith (mte,_) -> check_sig_entry env mte @@ -420,9 +419,7 @@ let rec get_modtype_substobjs = function let substobjs = get_modtype_substobjs mty in let modobjs = MPmap.find mp !modtab_substobjs in replace_module_object idl substobjs modobjs - | MTEsig (msid,_) -> - todo "Anonymous module types"; (empty_subst, [], msid, []) - + (* push names of bound modules (and their components) to Nametab *) (* add objects associated to them *) let process_module_bindings argids args = @@ -440,8 +437,7 @@ let replace_module mtb id mb = todo "replace module after with"; mtb let rec get_some_body mty env = match mty with MTEident kn -> Environ.lookup_modtype kn env - | MTEfunsig _ - | MTEsig _ -> anomaly "anonymous module types not supported" + | MTEfunsig _ -> anomaly "anonymous module types not supported" | MTEwith (mty,With_Definition _) -> get_some_body mty env | MTEwith (mty,With_Module (id,mp)) -> replace_module (get_some_body mty env) id (Environ.lookup_module mp env) @@ -517,9 +513,6 @@ let end_module id = (empty_subst, mbids, msid, substitute), keep, special | Some (MTEident ln) -> abstract_substobjs mbids (KNmap.find ln (!modtypetab)), [], [] - | Some (MTEsig (msid,_)) -> - todo "Anonymous signatures not supported"; - (empty_subst, mbids, msid, []), keep, special | Some (MTEwith _ as mty) -> abstract_substobjs mbids (get_modtype_substobjs mty), [], [] | Some (MTEfunsig _) -> @@ -711,8 +704,6 @@ let rec get_module_substobjs env = function | MEfunctor (mbid,mty,mexpr) -> let (subst, mbids, msid, objs) = get_module_substobjs env mexpr in (subst, mbid::mbids, msid, objs) - | MEstruct (msid,_) -> - (empty_subst, [], msid, []) | MEapply (mexpr, MEident mp) -> let feb,ftb = Mod_typing.translate_mexpr env mexpr in let ftb = Modops.scrape_modtype env ftb in @@ -726,7 +717,7 @@ let rec get_module_substobjs env = function objects (that are all non-logical objects) *) (add_mbid mbid mp (Some resolve) subst, mbids, msid, objs) | [] -> match mexpr with - | MEident _ | MEstruct _ -> error "Application of a non-functor" + | MEident _ -> error "Application of a non-functor" | _ -> error "Application of a functor with too few arguments") | MEapply (_,mexpr) -> Modops.error_application_to_not_path mexpr |