From 5b7eafd0f00a16d78f99a27f5c7d5a0de77dc7e6 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Wed, 21 Jul 2010 09:46:51 +0200
Subject: Imported Upstream snapshot 8.3~beta0+13298

---
 pretyping/evarconv.mli | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'pretyping/evarconv.mli')

diff --git a/pretyping/evarconv.mli b/pretyping/evarconv.mli
index f92a6fdb..9a4247bc 100644
--- a/pretyping/evarconv.mli
+++ b/pretyping/evarconv.mli
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: evarconv.mli 9141 2006-09-15 10:07:01Z herbelin $ i*)
+(*i $Id$ i*)
 
 (*i*)
 open Term
@@ -17,21 +17,27 @@ open Evd
 (*i*)
 
 (* returns exception Reduction.NotConvertible if not unifiable *)
-val the_conv_x     : env -> constr -> constr -> evar_defs -> evar_defs
-val the_conv_x_leq : env -> constr -> constr -> evar_defs -> evar_defs
+val the_conv_x     : env -> constr -> constr -> evar_map -> evar_map
+val the_conv_x_leq : env -> constr -> constr -> evar_map -> evar_map
 
-(* The same function resolving evars by side-effect and 
+(* The same function resolving evars by side-effect and
    catching the exception *)
-val e_conv  : env -> evar_defs ref -> constr -> constr -> bool
-val e_cumul : env -> evar_defs ref -> constr -> constr -> bool
+val e_conv  : env -> evar_map ref -> constr -> constr -> bool
+val e_cumul : env -> evar_map ref -> constr -> constr -> bool
 
 (*i For debugging *)
 val evar_conv_x :
-  env -> evar_defs -> conv_pb -> constr -> constr -> evar_defs * bool
-val evar_eqappr_x : 
-  env -> evar_defs ->
+  env -> evar_map -> conv_pb -> constr -> constr -> evar_map * bool
+val evar_eqappr_x :
+  env -> evar_map ->
     conv_pb -> constr * constr list -> constr * constr list ->
-      evar_defs * bool
+      evar_map * bool
 (*i*)
 
-val consider_remaining_unif_problems : env -> evar_defs -> evar_defs * bool
+val consider_remaining_unif_problems : env -> evar_map -> evar_map * bool
+
+val check_conv_record : constr * types list -> constr * types list ->
+  constr * constr list * (constr list * constr list) *
+    (constr list * types list) *
+    (constr list * types list) * constr *
+    (int * constr)
-- 
cgit v1.2.3