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
---
 dev/include         | 1 +
 dev/top_printers.ml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/include b/dev/include
index a8c4e1d493..4a025d077c 100644
--- a/dev/include
+++ b/dev/include
@@ -35,6 +35,7 @@
 #install_printer  (* constraints *)  ppconstraints;;
 #install_printer  (* univ constraints *)  ppuniverseconstraints;;
 #install_printer  (* universe *)  ppuni;;
+#install_printer  (* universes *)  ppuniverse;;
 #install_printer  (* universes *)  ppuniverses;;
 #install_printer  (* univ level *) ppuni_level;;
 #install_printer  (* univ context *) ppuniverse_context;;
diff --git a/dev/top_printers.ml b/dev/top_printers.ml
index ec7716356c..c35d04e9d2 100644
--- a/dev/top_printers.ml
+++ b/dev/top_printers.ml
@@ -179,7 +179,7 @@ let pppftreestate p = pp(print_pftreestate p)
 
 let ppuni u = pp(pr_uni u)
 let ppuni_level u = pp (Level.pr u)
-let ppuniverses u = pp (str"[" ++ Universe.pr u ++ str"]")
+let ppuniverse u = pp (str"[" ++ Universe.pr u ++ str"]")
 
 let ppuniverse_set l = pp (LSet.pr l)
 let ppuniverse_instance l = pp (Instance.pr l)
@@ -195,6 +195,7 @@ let ppuniverseconstraints c = pp (UniverseConstraints.pr c)
 let ppuniverse_context_future c = 
   let ctx = Future.force c in
     ppuniverse_context ctx
+let ppuniverses u = pp (Univ.pr_universes u)
 
 let ppenv e = pp
   (str "[" ++ pr_named_context_of e ++ str "]" ++ spc() ++
-- 
cgit v1.2.3