From 870075f34dd9fa5792bfbf413afd3b96f17e76a0 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Fri, 8 Aug 2008 13:18:42 +0200 Subject: Imported Upstream version 8.2~beta4+dfsg --- library/declaremods.ml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'library/declaremods.ml') diff --git a/library/declaremods.ml b/library/declaremods.ml index 123417a6..b630b5dc 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: declaremods.ml 11142 2008-06-18 15:37:31Z soubiran $ i*) +(*i $Id: declaremods.ml 11246 2008-07-22 15:10:05Z soubiran $ i*) open Pp open Util open Names @@ -433,10 +433,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" -- cgit v1.2.3