diff options
| author |  soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-10-15 15:07:10 +0000 |
|---|---|---|
| committer | soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2008-10-15 15:07:10 +0000 |
| commit | d1df4f36c4e304d6ed446d09b64d1b3bf34bac16 (patch) | |
| tree | 957ac29812b949cc7aee31e4dae187fec02b31d5 /library | |
| parent | e9d5db3172cd707288166d3bf31506881ff1c16e (diff) | |
Report des commits 11417 et 11437 de la v8.2
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11454 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'library')
| -rw-r--r-- | library/declaremods.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml index ac5636b58..72f199efb 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -434,10 +434,12 @@ and subst_module_alias ((sp,kn),subst,(entry,substobjs,_)) = mod_entry_expr = Some (MSEident mp')},sub), substobjs, match mbids with - | [] -> + | [] -> let subst = update_subst subst' (map_mp mp' mp) in Some (subst_objects (dir,(mp',empty_dirpath)) - (join subst' (join (map_msid msid mp') - (map_mp mp mp'))) objs) + (join (join subst' subst) (join (map_msid msid mp') + (map_mp mp mp'))) + objs) + | _ -> None) | _ -> anomaly "Modops: Not an alias" |