aboutsummaryrefslogtreecommitdiff
path: root/engine/uState.mli
diff options
context:
space:
mode:
authorGaëtan Gilbert2018-09-03 14:37:12 +0200
committerGaëtan Gilbert2018-09-03 14:37:12 +0200
commitc880e9e01d57eb4beca561e209839caa66d38742 (patch)
tree87752aad1c8aab7afece5d83f4d38175d0f2768c /engine/uState.mli
parentbb5c4eee0807cd988d236d4538a2fa2f05ef0daf (diff)
parent6d998b5a0e6090b5c7d87d575016adc127b666d9 (diff)
Merge PR #891: Check universes are declared
Diffstat (limited to 'engine/uState.mli')
-rw-r--r--engine/uState.mli2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/uState.mli b/engine/uState.mli
index a59e61b894..f833508ebf 100644
--- a/engine/uState.mli
+++ b/engine/uState.mli
@@ -103,7 +103,7 @@ val univ_rigid : rigid
val univ_flexible : rigid
val univ_flexible_alg : rigid
-val merge : ?loc:Loc.t -> bool -> rigid -> t -> Univ.ContextSet.t -> t
+val merge : ?loc:Loc.t -> sideff:bool -> extend:bool -> rigid -> t -> Univ.ContextSet.t -> t
val merge_subst : t -> UnivSubst.universe_opt_subst -> t
val emit_side_effects : Safe_typing.private_constants -> t -> t