diff options
| author | Matthieu Sozeau | 2013-10-17 14:55:57 +0200 |
|---|---|---|
| committer | Matthieu Sozeau | 2014-05-06 09:58:53 +0200 |
| commit | 84cbc09bd1400f732a6c70e8a840e4c13d018478 (patch) | |
| tree | f6b3417e653bea9de8f0d8f510ad19ccdbb4840e /kernel | |
| parent | 57bee17f928fc67a599d2116edb42a59eeb21477 (diff) | |
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.
-
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/safe_typing.ml | 3 | ||||
| -rw-r--r-- | kernel/term_typing.ml | 2 |
2 files changed, 3 insertions, 2 deletions
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 _ -> () |