From 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Fri, 8 Nov 2013 11:31:22 +0100 Subject: - Fix bug preventing apply from unfolding Fixpoints. - Remove Universe Polymorphism flags everywhere. - Properly infer, discharge template arities and fix substitution inside them (kernel code to check for correctness). - Fix tactics that were supposing universe polymorphic constants/inductives to be parametric on that status. Required to make interp_constr* return the whole evar universe context now. - Fix the univ/level/instance hashconsing to respect the fact that marshalling doesn't preserve sharing, sadly losing most of its benefits. Short-term solution is to add hashes to these for faster comparison, longer term requires rewriting all serialization code. Conflicts: kernel/univ.ml tactics/tactics.ml theories/Logic/EqdepFacts.v --- plugins/cc/cctac.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/cc') diff --git a/plugins/cc/cctac.ml b/plugins/cc/cctac.ml index 783abc5d8d..b85b7995cb 100644 --- a/plugins/cc/cctac.ml +++ b/plugins/cc/cctac.ml @@ -395,7 +395,7 @@ let discriminate_tac (cstr,u as cstru) p = let neweq=new_app_global _eq [|intype;t1;t2|] in Tacticals.New.tclTHEN (Proofview.V82.tclEVARS evm) (Tacticals.New.tclTHENS (neweq (assert_tac (Name hid))) - [proof_tac p; Proofview.V82.tactic (endt exact_check)]) + [proof_tac p; Proofview.V82.tactic (endt refine_exact_check)]) end (* wrap everything *) -- cgit v1.2.3