aboutsummaryrefslogtreecommitdiffhomepage
path: root/library/declaremods.ml
diff options
context:
space:
mode:
authorGravatar soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7>2008-04-21 07:40:43 +0000
committerGravatar soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7>2008-04-21 07:40:43 +0000
commit1c38e7101eb54594b06111271369cbffac50c3b6 (patch)
tree5ff88aa5ea73d48b9d6d65754212ee042b59b435 /library/declaremods.ml
parentc82f88f9dd833dc33dacfe03822bc5987041e6ac (diff)
Correction bug 1838 + doc modules.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10821 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'library/declaremods.ml')
-rw-r--r--library/declaremods.ml8
1 files changed, 6 insertions, 2 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml
index bc1fa6f24..14851eced 100644
--- a/library/declaremods.ml
+++ b/library/declaremods.ml
@@ -560,7 +560,9 @@ let rec get_modtype_substobjs env = function
let mp = Environ.scrape_alias mp env in
let sub_alias = (Environ.lookup_modtype mp env).typ_alias in
let sub_alias = match Modops.eval_struct env (SEBident mp) with
- | SEBstruct (msid,sign) -> subst_key (map_msid msid mp) sub_alias
+ | SEBstruct (msid,sign) -> join_alias
+ (subst_key (map_msid msid mp) sub_alias)
+ (map_msid msid mp)
| _ -> sub_alias in
let sub_alias = join_alias sub_alias (map_mbid farg_id mp None) in
let sub_alias = update_subst_alias sub_alias
@@ -866,7 +868,9 @@ let rec get_module_substobjs env = function
let mp = Environ.scrape_alias mp env in
let sub_alias = (Environ.lookup_modtype mp env).typ_alias in
let sub_alias = match Modops.eval_struct env (SEBident mp) with
- | SEBstruct (msid,sign) -> subst_key (map_msid msid mp) sub_alias
+ | SEBstruct (msid,sign) -> join_alias
+ (subst_key (map_msid msid mp) sub_alias)
+ (map_msid msid mp)
| _ -> sub_alias in
let sub_alias = join_alias sub_alias (map_mbid farg_id mp None) in
let sub_alias = update_subst_alias sub_alias