diff options
| author | Matthieu Sozeau | 2013-11-08 11:31:22 +0100 |
|---|---|---|
| committer | Matthieu Sozeau | 2014-05-06 09:58:58 +0200 |
| commit | 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 (patch) | |
| tree | 471afc13a25bfe689d30447a6042c9f62c72f92e /printing | |
| 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 'printing')
| -rw-r--r-- | printing/prettyp.ml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/printing/prettyp.ml b/printing/prettyp.ml index e36019887d..7c386da8e8 100644 --- a/printing/prettyp.ml +++ b/printing/prettyp.ml @@ -72,7 +72,9 @@ let print_ref reduce ref = let ctx,ccl = Reductionops.splay_prod_assum (Global.env()) Evd.empty typ in it_mkProd_or_LetIn ccl ctx else typ in - hov 0 (pr_global ref ++ str " :" ++ spc () ++ pr_ltype typ) + let univs = Global.universes_of_global ref in + hov 0 (pr_global ref ++ str " :" ++ spc () ++ pr_ltype typ ++ + Printer.pr_universe_ctx univs) (********************************) (** Printing implicit arguments *) @@ -193,7 +195,17 @@ let print_opacity ref = (*******************) (* *) +let print_polymorphism ref = + let poly = Global.is_polymorphic ref in + let template_poly = Global.is_template_polymorphic ref in + pr_global ref ++ str " is " ++ str + (if poly then "universe polymorphic" + else if template_poly then + "template universe polymorphic" + else "monomorphic") + let print_name_infos ref = + let poly = print_polymorphism ref in let impls = implicits_of_global ref in let scopes = Notation.find_arguments_scope ref in let renames = @@ -205,6 +217,7 @@ let print_name_infos ref = print_ref true ref; blankline] else [] in + poly :: type_info_for_implicit @ print_renames_list (mt()) renames @ print_impargs_list (mt()) impls @ |