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 --- library/declare.ml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'library/declare.ml') diff --git a/library/declare.ml b/library/declare.ml index 97445755f..e92225637 100644 --- a/library/declare.ml +++ b/library/declare.ml @@ -126,7 +126,7 @@ let open_constant i ((sp,kn), obj) = | (Def _ | Undef _) -> () | OpaqueDef lc -> match Opaqueproof.get_constraints lc with - | Some f when Future.is_val f -> Global.push_context (Future.force f) + | Some f when Future.is_val f -> Global.push_context_set (Future.force f) | _ -> () let exists_name id = @@ -196,7 +196,7 @@ let declare_constant_common id cst = let definition_entry ?(opaque=false) ?(inline=false) ?types ?(poly=false) ?(univs=Univ.UContext.empty) ?(eff=Declareops.no_seff) body = - { const_entry_body = Future.from_val (body,eff); + { const_entry_body = Future.from_val ((body,Univ.ContextSet.empty), eff); const_entry_secctx = None; const_entry_type = types; const_entry_proj = None; @@ -216,8 +216,9 @@ let declare_sideff se = let id_of c = Names.Label.to_id (Names.Constant.label c) in let pt_opaque_of cb = match cb with - | { const_body = Def sc } -> Mod_subst.force_constr sc, false - | { const_body = OpaqueDef fc } -> Opaqueproof.force_proof fc, true + | { const_body = Def sc } -> (Mod_subst.force_constr sc, Univ.ContextSet.empty), false + | { const_body = OpaqueDef fc } -> + (Opaqueproof.force_proof fc, Opaqueproof.force_constraints fc), true | { const_body = Undef _ } -> anomaly(str"Undefined side effect") in let ty_of cb = -- cgit v1.2.3