aboutsummaryrefslogtreecommitdiffhomepage
path: root/engine
diff options
context:
space:
mode:
authorGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-12-12 04:34:45 +0100
committerGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-12-13 00:51:37 +0100
commit7799626c67c39c6bd2c5faf247456efb2c26ae82 (patch)
tree0281c86ab79000d09ea0aa4706f2461f732e2ac0 /engine
parent2c2a08083bc535397359299690d0bfb3523a9ee1 (diff)
[econstr] Cleanup in `vernac/classes.ml`.
We fix quite a few types, and perform some cleanup wrt to the evar_map, in particular we prefer to thread it now as otherwise it may become trickier to check when we are using the correct one. Thanks to @SkySkimmer for lots of comments and bug-finding.
Diffstat (limited to 'engine')
-rw-r--r--engine/eConstr.ml2
-rw-r--r--engine/eConstr.mli2
2 files changed, 4 insertions, 0 deletions
diff --git a/engine/eConstr.ml b/engine/eConstr.ml
index d303038c5..53123c933 100644
--- a/engine/eConstr.ml
+++ b/engine/eConstr.ml
@@ -150,6 +150,8 @@ type rel_declaration = (constr, types) Context.Rel.Declaration.pt
type named_context = (constr, types) Context.Named.pt
type rel_context = (constr, types) Context.Rel.pt
+type 'a puniverses = 'a * EInstance.t
+
let in_punivs a = (a, EInstance.empty)
let mkProp = of_kind (Sort (ESorts.make Sorts.prop))
diff --git a/engine/eConstr.mli b/engine/eConstr.mli
index f54c422ad..6f2a30f4a 100644
--- a/engine/eConstr.mli
+++ b/engine/eConstr.mli
@@ -56,6 +56,8 @@ sig
val is_empty : t -> bool
end
+type 'a puniverses = 'a * EInstance.t
+
(** {5 Destructors} *)
val kind : Evd.evar_map -> t -> (t, t, ESorts.t, EInstance.t) Constr.kind_of_term