diff options
| author |  msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-05-05 11:36:22 +0000 |
|---|---|---|
| committer | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-05-05 11:36:22 +0000 |
| commit | ce36fb68500966c9eed8f54943f62d8b31edda5c (patch) | |
| tree | e7c5788a2bc8b7a647ee30e58eb0e6a63971e87e /pretyping | |
| parent | be299971b29dbed7837c497fd59c192e4d0add72 (diff) | |
Merge branch 'subclasses' into coq-trunk
Stop using hnf_constr in unify_type, which might unfold constants
that are marked opaque for unification.
Conflicts:
pretyping/unification.ml
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14092 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/unification.ml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pretyping/unification.ml b/pretyping/unification.ml index c50346a00..c76055d4f 100644 --- a/pretyping/unification.ml +++ b/pretyping/unification.ml @@ -630,9 +630,8 @@ let w_coerce env evd mv c = let unify_to_type env sigma flags c status u = let c = refresh_universes c in let t = get_type_of env sigma c in - let t = Tacred.hnf_constr env sigma (nf_betaiota sigma (nf_meta sigma t)) in - let u = Tacred.hnf_constr env sigma u in - unify_0 env sigma CUMUL flags t u + let t = nf_betaiota sigma (nf_meta sigma t) in + unify_0 env sigma Cumul flags t u let unify_type env sigma flags mv status c = let mvty = Typing.meta_type sigma mv in |