aboutsummaryrefslogtreecommitdiff
path: root/printing
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2015-03-11 13:52:35 +0100
committerPierre-Marie Pédrot2015-03-11 13:52:35 +0100
commitf90dde7b3b6eabf1f8441fe442bcf7f0263c0793 (patch)
treea02237882a2753d65040b552389d211c982e3d26 /printing
parent33b7c678d6c828f012cae3a0ab8265ffde3bdaa4 (diff)
parent106b002b8e2d45c8824b145f29f5680317de78c4 (diff)
Merge branch 'v8.5'
Diffstat (limited to 'printing')
-rw-r--r--printing/prettyp.ml12
1 files changed, 7 insertions, 5 deletions
diff --git a/printing/prettyp.ml b/printing/prettyp.ml
index 0e6c595e1a..4a66c33df8 100644
--- a/printing/prettyp.ml
+++ b/printing/prettyp.ml
@@ -197,11 +197,13 @@ 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 Flags.is_universe_polymorphism () || poly || template_poly then
+ [ pr_global ref ++ str " is " ++ str
(if poly then "universe polymorphic"
else if template_poly then
"template universe polymorphic"
- else "not universe polymorphic")
+ else "not universe polymorphic") ]
+ else []
let print_primitive_record mipv = function
| Some (Some (_, ps,_)) ->
@@ -214,9 +216,8 @@ let print_primitive ref =
let mib,_ = Global.lookup_inductive ind in
print_primitive_record mib.mind_packets mib.mind_record
| _ -> []
-
+
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 =
@@ -228,7 +229,8 @@ let print_name_infos ref =
print_ref true ref; blankline]
else
[] in
- poly :: print_primitive ref @
+ print_polymorphism ref @
+ print_primitive ref @
type_info_for_implicit @
print_renames_list (mt()) renames @
print_impargs_list (mt()) impls @