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.
-
---
 kernel/safe_typing.ml | 3 ++-
 kernel/term_typing.ml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'kernel')

diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml
index 7d49e452c9..35577239b4 100644
--- a/kernel/safe_typing.ml
+++ b/kernel/safe_typing.ml
@@ -193,7 +193,8 @@ type constraints_addition =
 
 let add_constraints cst senv =
   match cst with
-  | Later fc -> {senv with future_cst = fc :: senv.future_cst}
+  | Later fc -> 
+    {senv with future_cst = fc :: senv.future_cst}
   | Now cst ->
   { senv with
     env = Environ.add_constraints cst senv.env;
diff --git a/kernel/term_typing.ml b/kernel/term_typing.ml
index 352ef40d90..a7f2125a7a 100644
--- a/kernel/term_typing.ml
+++ b/kernel/term_typing.ml
@@ -24,7 +24,7 @@ open Entries
 open Typeops
 open Fast_typeops
 
-let debug = false
+let debug = true
 let prerr_endline =
   if debug then prerr_endline else fun _ -> ()
 
-- 
cgit v1.2.3