aboutsummaryrefslogtreecommitdiff
path: root/pretyping/evd.ml
diff options
context:
space:
mode:
authorherbelin2007-02-21 17:07:50 +0000
committerherbelin2007-02-21 17:07:50 +0000
commit673455fadfc0ca4df1fa33a629c57694bf442394 (patch)
treeecf37553eaa5878f349f56c22440d94255f3c719 /pretyping/evd.ml
parent3e5f0e1521168412e3f0982a6c5456fd2978e63b (diff)
Prise en compte de l'environnement dans les pbs de conversion + MAJ CHANGES
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9664 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/evd.ml')
-rw-r--r--pretyping/evd.ml11
1 files changed, 5 insertions, 6 deletions
diff --git a/pretyping/evd.ml b/pretyping/evd.ml
index 2afe4601ff..a247b5b1ef 100644
--- a/pretyping/evd.ml
+++ b/pretyping/evd.ml
@@ -372,18 +372,17 @@ type hole_kind =
| TomatchTypeParameter of inductive * int
type conv_pb = Reduction.conv_pb
-type evar_constraint = conv_pb * constr * constr
+type evar_constraint = conv_pb * Environ.env * constr * constr
type evar_defs =
{ evars : evar_map;
conv_pbs : evar_constraint list;
history : (existential_key * (loc * hole_kind)) list;
metas : clbinding Metamap.t }
-let subst_evar_defs sub evd =
+let subst_evar_defs_light sub evd =
+ assert (evd.evars = (Evarmap.empty,UniverseMap.empty));
+ assert (evd.conv_pbs = []);
{ evd with
- conv_pbs =
- List.map (fun (k,t1,t2) ->(k,subst_mps sub t1,subst_mps sub t2))
- evd.conv_pbs;
metas = Metamap.map (map_clb (subst_mps sub)) evd.metas }
let create_evar_defs sigma =
@@ -567,7 +566,7 @@ let pr_evar_map sigma =
let pr_constraints pbs =
h 0
- (prlist_with_sep pr_fnl (fun (pbty,t1,t2) ->
+ (prlist_with_sep pr_fnl (fun (pbty,_,t1,t2) ->
print_constr t1 ++ spc() ++
str (match pbty with
| Reduction.CONV -> "=="