diff options
| author | Pierre-Marie Pédrot | 2018-05-28 13:38:23 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2018-05-28 13:38:23 +0200 |
| commit | 81535edc4b21015bd63d23e57ca9d707b4b71f6b (patch) | |
| tree | 6a76bc46b66cade1b53d2c878ae2aa7c5e1f5dc5 /tactics/inv.ml | |
| parent | b2f746e41abf53fc481f90804ba4d70edd73fc86 (diff) | |
| parent | dfaf7e1ca5aebfdfbef5f32d235a948335f7fda0 (diff) | |
Merge PR #7419: Remove 100 occurrences of Evd.empty
Diffstat (limited to 'tactics/inv.ml')
| -rw-r--r-- | tactics/inv.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tactics/inv.ml b/tactics/inv.ml index 4129549898..b346ed2230 100644 --- a/tactics/inv.ml +++ b/tactics/inv.ml @@ -292,7 +292,7 @@ let error_too_many_names pats = str "Unexpected " ++ str (String.plural (List.length pats) "introduction pattern") ++ str ": " ++ pr_enum (Miscprint.pr_intro_pattern - (fun c -> Printer.pr_constr_env env sigma (EConstr.Unsafe.to_constr (snd (c env Evd.empty))))) pats ++ + (fun c -> Printer.pr_constr_env env sigma (EConstr.Unsafe.to_constr (snd (c env (Evd.from_env env)))))) pats ++ str ".") let get_names (allow_conj,issimple) ({CAst.loc;v=pat} as x) = match pat with @@ -496,9 +496,10 @@ let wrap_inv_error id = function (e, info) -> match e with | Indrec.RecursionSchemeError (Indrec.NotAllowedCaseAnalysis (_,(Type _ | Prop Pos as k),i)) -> Proofview.tclENV >>= fun env -> + Proofview.tclEVARMAP >>= fun sigma -> tclZEROMSG ( (strbrk "Inversion would require case analysis on sort " ++ - pr_sort Evd.empty k ++ + pr_sort sigma k ++ strbrk " which is not allowed for inductive definition " ++ pr_inductive env (fst i) ++ str ".")) | e -> Proofview.tclZERO ~info e |