From 23f4804b50307766219392229757e75da9aa41d9 Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Wed, 18 Jun 2014 17:16:59 +0200 Subject: Proofs now take and return an evar_universe_context, simplifying interfaces and avoiding explicit substitutions and merging of contexts, e.g. in obligations.ml. The context produced by typechecking a statement is passed in the proof, allowing the universe name context to be correctly folded as well. Mainly an API cleanup. --- tactics/elimschemes.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tactics/elimschemes.ml') diff --git a/tactics/elimschemes.ml b/tactics/elimschemes.ml index 9b600409a..f497b99d6 100644 --- a/tactics/elimschemes.ml +++ b/tactics/elimschemes.ml @@ -50,7 +50,8 @@ let optimize_non_type_induction_scheme kind dep sort ind = let ctx = if mib.mind_polymorphic then mib.mind_universes else Univ.UContext.empty in let u = Univ.UContext.instance ctx in let ctxset = Univ.ContextSet.of_context ctx in - let sigma, c = build_induction_scheme env (Evd.from_env ~ctx:ctxset env) (ind,u) dep sort in + let ectx = Evd.evar_universe_context_of ctxset in + let sigma, c = build_induction_scheme env (Evd.from_env ~ctx:ectx env) (ind,u) dep sort in (c, Evd.evar_universe_context sigma), Declareops.no_seff let build_induction_scheme_in_type dep sort ind = @@ -61,7 +62,8 @@ let build_induction_scheme_in_type dep sort ind = in let u = Univ.UContext.instance ctx in let ctxset = Univ.ContextSet.of_context ctx in - let sigma, c = build_induction_scheme env (Evd.from_env ~ctx:ctxset env) (ind,u) dep sort in + let ectx = Evd.evar_universe_context_of ctxset in + let sigma, c = build_induction_scheme env (Evd.from_env ~ctx:ectx env) (ind,u) dep sort in c, Evd.evar_universe_context sigma let rect_scheme_kind_from_type = -- cgit v1.2.3