diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-07-06 14:31:13 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-07-06 14:31:13 +0200 |
| commit | 307f08d2ad2aca5d48441394342af4615810d0c7 (patch) | |
| tree | 85f96651d250d107762473ca5d5f320f251c37a3 /printing/prettyp.ml | |
| parent | 1111aeb445261af9e74770c0fe3bfd0ffd4930e2 (diff) | |
| parent | 78f536c7fa1af8a61c3dbc5eafae74ad436958ef (diff) | |
Merge PR #853: Clean 'with Definition' implementation.
Diffstat (limited to 'printing/prettyp.ml')
| -rw-r--r-- | printing/prettyp.ml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/printing/prettyp.ml b/printing/prettyp.ml index faa69f41e..15c0f80b9 100644 --- a/printing/prettyp.ml +++ b/printing/prettyp.ml @@ -511,7 +511,25 @@ let print_constant with_values sep sp = let val_0 = Global.body_of_constant_body cb in let typ = Declareops.type_of_constant cb in let typ = ungeneralized_type_of_constant_type typ in - let univs = Global.universes_of_constant_body cb in + let univs = + let otab = Global.opaque_tables () in + match cb.const_body with + | Undef _ | Def _ -> + begin + match cb.const_universes with + | Monomorphic_const ctx -> ctx + | Polymorphic_const ctx -> Univ.instantiate_univ_context ctx + end + | OpaqueDef o -> + let body_uctxs = Opaqueproof.force_constraints otab o in + match cb.const_universes with + | Monomorphic_const ctx -> + let uctxs = Univ.ContextSet.of_context ctx in + Univ.ContextSet.to_context (Univ.ContextSet.union body_uctxs uctxs) + | Polymorphic_const ctx -> + assert(Univ.ContextSet.is_empty body_uctxs); + Univ.instantiate_univ_context ctx + in let ctx = Evd.evar_universe_context_of_binders (Universes.universe_binders_of_global (ConstRef sp)) |