diff options
| author | Pierre-Marie Pédrot | 2015-10-29 13:04:22 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-10-29 13:11:38 +0100 |
| commit | f970991baef49fa5903e6b7aeb6ac62f8cfdf822 (patch) | |
| tree | 0b14bafe702a6219d960111148ff3a0cdc9e18e6 /engine/uState.mli | |
| parent | 4444f04cfdbe449d184ac1ce0a56eb484805364d (diff) | |
| parent | 78378ba9a79b18a658828d7a110414ad18b9a732 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'engine/uState.mli')
| -rw-r--r-- | engine/uState.mli | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/uState.mli b/engine/uState.mli index 56e0fe14e5..6861035fac 100644 --- a/engine/uState.mli +++ b/engine/uState.mli @@ -28,6 +28,8 @@ val union : t -> t -> t val of_context_set : Univ.universe_context_set -> t +val of_binders : Universes.universe_binders -> t + (** {5 Projections} *) val context_set : t -> Univ.universe_context_set @@ -84,7 +86,7 @@ val univ_flexible_alg : rigid val merge : bool -> rigid -> t -> Univ.universe_context_set -> t val merge_subst : t -> Universes.universe_opt_subst -> t -val emit_side_effects : Declareops.side_effects -> t -> t +val emit_side_effects : Safe_typing.private_constants -> t -> t val new_univ_variable : rigid -> string option -> t -> t * Univ.Level.t val add_global_univ : t -> Univ.Level.t -> t @@ -106,7 +108,7 @@ val normalize : t -> t (** {5 TODO: Document me} *) -val universe_context : ?names:(Id.t Loc.located) list -> t -> Univ.universe_context +val universe_context : ?names:(Id.t Loc.located) list -> t -> (Id.t * Univ.Level.t) list * Univ.universe_context (** {5 Pretty-printing} *) |