diff options
| author | Pierre-Marie Pédrot | 2015-11-20 11:27:45 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-11-20 11:27:45 +0100 |
| commit | f01b73bd6f5a66cde730c584df6be08e06bf2042 (patch) | |
| tree | 294b074f4752fdb39f24ea4e2f55349558e9db26 /proofs | |
| parent | 5ccadc40d54090df5e6b61b4ecbb6083d01e5a88 (diff) | |
| parent | 574e510ba069f1747ecb1e5a17cf86c902d79d44 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'proofs')
| -rw-r--r-- | proofs/clenv.ml | 4 | ||||
| -rw-r--r-- | proofs/clenv.mli | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/proofs/clenv.ml b/proofs/clenv.ml index bc6e75c38d..cb4b54ffcb 100644 --- a/proofs/clenv.ml +++ b/proofs/clenv.ml @@ -373,12 +373,12 @@ let fchain_flags () = { (default_unify_flags ()) with allow_K_in_toplevel_higher_order_unification = true } -let clenv_fchain ?(flags=fchain_flags ()) mv clenv nextclenv = +let clenv_fchain ?with_univs ?(flags=fchain_flags ()) mv clenv nextclenv = (* Add the metavars of [nextclenv] to [clenv], with their name-environment *) let clenv' = { templval = clenv.templval; templtyp = clenv.templtyp; - evd = meta_merge nextclenv.evd clenv.evd; + evd = meta_merge ?with_univs nextclenv.evd clenv.evd; env = nextclenv.env } in (* unify the type of the template of [nextclenv] with the type of [mv] *) let clenv'' = diff --git a/proofs/clenv.mli b/proofs/clenv.mli index ca62c985ec..5995d8700c 100644 --- a/proofs/clenv.mli +++ b/proofs/clenv.mli @@ -50,7 +50,7 @@ val refresh_undefined_univs : clausenv -> clausenv * Univ.universe_level_subst (** {6 linking of clenvs } *) val clenv_fchain : - ?flags:unify_flags -> metavariable -> clausenv -> clausenv -> clausenv + ?with_univs:bool -> ?flags:unify_flags -> metavariable -> clausenv -> clausenv -> clausenv (** {6 Unification with clenvs } *) |