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 --- checker/mod_checking.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'checker/mod_checking.ml') diff --git a/checker/mod_checking.ml b/checker/mod_checking.ml index 7800dff01..53316a2cb 100644 --- a/checker/mod_checking.ml +++ b/checker/mod_checking.ml @@ -28,7 +28,7 @@ let check_constant_declaration env kn cb = (* let env = add_constraints cb.const_constraints env in*) (match cb.const_type with ty -> - let env' = add_constraints (Future.force cb.const_constraints) env in + let env' = add_constraints cb.const_constraints env in (*MS: FIXME*) let _ = infer_type env' ty in (match body_of_constant cb with | Some bd -> -- cgit v1.2.3