diff options
| author | Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr> | 2001-02-20 22:16:02 +0000 |
|---|---|---|
| committer | Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr> | 2001-02-20 22:16:02 +0000 |
| commit | b6041b0eb40e5cf221dff9953aab6d6ec51e99c4 (patch) | |
| tree | b8bea4a0b739627649af3897efc08622d7e126a0 | |
| parent | 1aba3c1d4a4be2ffe1350a5101392471013027ee (diff) | |
Correction d'un bug d'unification
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3432 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | typing/ctype.ml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/typing/ctype.ml b/typing/ctype.ml index b9451d385..71ee179ac 100644 --- a/typing/ctype.ml +++ b/typing/ctype.ml @@ -1053,6 +1053,12 @@ let occur env ty0 ty = +let rec has_cached_expansion p abbrev = + match abbrev with + Mnil -> false + | Mcons(p', _, _, rem) -> Path.same p p' || has_cached_expansion p rem + | Mlink rem -> has_cached_expansion p !rem + (**** Transform error trace ****) (* +++ Move it to some other place ? *) @@ -1131,7 +1137,13 @@ let rec unify env t1 t2 = occur env t2 t1; update_level env t2.level t1; t2.desc <- Tlink t1 - | (Tconstr (p1, [], _), Tconstr (p2, [], _)) when Path.same p1 p2 -> + | (Tconstr (p1, [], a1), Tconstr (p2, [], a2)) + when Path.same p1 p2 + (* This optimization assumes that t1 does not expand to t2 + (and conversely), so we fall back to the general case + when any of the types has a cached expansion. *) + && not (has_cached_expansion p1 !a1 + || has_cached_expansion p2 !a2) -> update_level env t1.level t2; t1.desc <- Tlink t2 | _ -> |