aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorMatthieu Sozeau2014-05-26 13:58:56 +0200
committerMatthieu Sozeau2014-05-26 14:16:26 +0200
commit15999903f875f4b5dbb3d5240d2ca39acc3cd777 (patch)
tree9906d3cf7d95d4d3f0e996811aa429532b825f0d /dev
parentd8176e6baaa33692ed82b9ac3c6e57e85f51dff0 (diff)
- Fix in kernel conversion not folding the universe constraints
correctly when comparing stacks. - Disallow Type i <= Prop/Set constraints, that would otherwise allow constraints that make a universe lower than Prop. - Fix stm/lemmas that was pushing constraints to the global context, it is done depending on the constant/variable polymorphic status now. - Adapt generalized rewriting in Type code to these fixes.
Diffstat (limited to 'dev')
-rw-r--r--dev/base_include1
-rw-r--r--dev/printers.mllib1
2 files changed, 0 insertions, 2 deletions
diff --git a/dev/base_include b/dev/base_include
index fa6add7d36..6e10dac3f9 100644
--- a/dev/base_include
+++ b/dev/base_include
@@ -155,7 +155,6 @@ open Command
open Indschemes
open Ind_tables
open Auto_ind_decl
-(* open Lemmas *)
open Coqinit
open Coqtop
open Discharge
diff --git a/dev/printers.mllib b/dev/printers.mllib
index 5a9acb6dd4..2eae9d5985 100644
--- a/dev/printers.mllib
+++ b/dev/printers.mllib
@@ -194,4 +194,3 @@ Discharge
Declare
Ind_tables
Top_printers
-