diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2013-11-08 11:31:22 +0100 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2014-05-06 09:58:58 +0200 |
| commit | 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 (patch) | |
| tree | 471afc13a25bfe689d30447a6042c9f62c72f92e /dev/top_printers.ml | |
| parent | 62fb849cf9410ddc2d9f355570f4fb859f3044c3 (diff) | |
- 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
Diffstat (limited to 'dev/top_printers.ml')
| -rw-r--r-- | dev/top_printers.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/top_printers.ml b/dev/top_printers.ml index ec7716356..c35d04e9d 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() ++ |