diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2014-03-31 17:58:53 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2014-03-31 17:58:53 +0000 |
| commit | 8643356b8542e0dcab358716f1e04d47b08b1a6d (patch) | |
| tree | e10cc5a03f7ead69a2d4ed563cbd021df5770ef2 /typing/typedtreeMap.ml | |
| parent | cd1bf4b9fc898cee2f4886ed18ddf6271ec522e8 (diff) | |
| parent | 989ac0b2635443b9c0f183ee6343b663c854f4ea (diff) | |
| download | ocaml-ephemeron.tar.gz | |
merge with trunk at rev 14512ephemeron
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/ephemeron@14514 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'typing/typedtreeMap.ml')
| -rw-r--r-- | typing/typedtreeMap.ml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/typing/typedtreeMap.ml b/typing/typedtreeMap.ml index 5c9229950f..93881a0f12 100644 --- a/typing/typedtreeMap.ml +++ b/typing/typedtreeMap.ml @@ -423,10 +423,11 @@ module MakeMap(Map : MapArgument) = struct let mty = Map.enter_module_type mty in let mty_desc = match mty.mty_desc with - Tmty_ident (path, lid) -> mty.mty_desc + Tmty_ident _ -> mty.mty_desc + | Tmty_alias _ -> mty.mty_desc | Tmty_signature sg -> Tmty_signature (map_signature sg) | Tmty_functor (id, name, mtype1, mtype2) -> - Tmty_functor (id, name, map_module_type mtype1, + Tmty_functor (id, name, Misc.may_map map_module_type mtype1, map_module_type mtype2) | Tmty_with (mtype, list) -> Tmty_with (map_module_type mtype, @@ -456,7 +457,7 @@ module MakeMap(Map : MapArgument) = struct Tmod_ident (p, lid) -> mexpr.mod_desc | Tmod_structure st -> Tmod_structure (map_structure st) | Tmod_functor (id, name, mtype, mexpr) -> - Tmod_functor (id, name, map_module_type mtype, + Tmod_functor (id, name, Misc.may_map map_module_type mtype, map_module_expr mexpr) | Tmod_apply (mexp1, mexp2, coercion) -> Tmod_apply (map_module_expr mexp1, map_module_expr mexp2, coercion) |