diff options
| author |  Samuel Mimram <smimram@debian.org> | 2007-08-18 20:34:57 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2007-08-18 20:34:57 +0000 |
| commit | 72b9a7df489ea47b3e5470741fd39f6100d31676 (patch) | |
| tree | 60108a573d2a80d2dd4e3833649890e32427ff8d /kernel/mod_typing.ml | |
| parent | 55ce117e8083477593cf1ff2e51a3641c7973830 (diff) | |
Imported Upstream version 8.1.pl1+dfsgupstream/8.1.pl1+dfsg
Diffstat (limited to 'kernel/mod_typing.ml')
| -rw-r--r-- | kernel/mod_typing.ml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml index 352a1e46..70de3034 100644 --- a/kernel/mod_typing.ml +++ b/kernel/mod_typing.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: mod_typing.ml 9558 2007-01-30 14:58:42Z soubiran $ i*) +(*i $Id: mod_typing.ml 9980 2007-07-12 13:32:37Z soubiran $ i*) open Util open Names @@ -131,8 +131,12 @@ and merge_with env mtb with_decl = let equiv = match old.msb_equiv with | None -> Some mp - | Some mp' -> - check_modpath_equiv env' mp mp'; + | Some mp' -> + begin + try + check_modpath_equiv env' mp mp' + with Not_equiv_path -> error_not_equal mp mp + end; Some mp in let msb = |