From 84cbc09bd1400f732a6c70e8a840e4c13d018478 Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau
Date: Thu, 17 Oct 2013 14:55:57 +0200
Subject: Correct rebase on STM code. Thanks to E. Tassi for help on dealing
 with latent universes. Now the universes in the type of a definition/lemma
 are eagerly added to the environment so that later proofs can be checked
 independently of the original (delegated) proof body.

- Fixed firstorder, ring to work correctly with universe polymorphism.
- Changed constr_of_global to raise an anomaly if side effects would be lost by
turning a polymorphic constant into a constr.
- Fix a non-termination issue in solve_evar_evar.
-
---
 pretyping/program.mli | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'pretyping/program.mli')

diff --git a/pretyping/program.mli b/pretyping/program.mli
index 0572a93a07..5b40b2e719 100644
--- a/pretyping/program.mli
+++ b/pretyping/program.mli
@@ -7,29 +7,33 @@
 (************************************************************************)
 
 open Term
+open Globnames
 
 (** A bunch of Coq constants used by Progam *)
 
-val sig_typ : unit -> constr
-val sig_intro : unit -> constr
-val sig_proj1 : unit -> constr
-val sigT_typ : unit -> constr
-val sigT_intro : unit -> constr
-val sigT_proj1 : unit -> constr
-val sigT_proj2 : unit -> constr
+val sig_typ : unit -> global_reference
+val sig_intro : unit -> global_reference
+val sig_proj1 : unit -> global_reference
+val sigT_typ : unit -> global_reference
+val sigT_intro : unit -> global_reference
+val sigT_proj1 : unit -> global_reference
+val sigT_proj2 : unit -> global_reference
 
-val prod_typ : unit -> constr
-val prod_intro : unit -> constr
-val prod_proj1 : unit -> constr
-val prod_proj2 : unit -> constr
+val prod_typ : unit -> global_reference
+val prod_intro : unit -> global_reference
+val prod_proj1 : unit -> global_reference
+val prod_proj2 : unit -> global_reference
 
-val coq_eq_ind : unit -> constr
-val coq_eq_refl : unit -> constr
-val coq_eq_refl_ref : unit -> Globnames.global_reference
-val coq_eq_rect : unit -> constr
+val coq_eq_ind : unit -> global_reference
+val coq_eq_refl : unit -> global_reference
+val coq_eq_refl_ref : unit -> global_reference
+val coq_eq_rect : unit -> global_reference
 
-val coq_JMeq_ind : unit -> constr
-val coq_JMeq_refl : unit -> constr
+val coq_JMeq_ind : unit -> global_reference
+val coq_JMeq_refl : unit -> global_reference
 
 val mk_coq_and : constr list -> constr
 val mk_coq_not : constr -> constr
+
+(** Polymorphic application of delayed references *)
+val papp : Evd.evar_map ref -> (unit -> global_reference) -> constr array -> constr
-- 
cgit v1.2.3