From 162f06f2d580bfcbda9976296e95c6e581c1dc92 Mon Sep 17 00:00:00 2001
From: aspiwack
Date: Mon, 4 Oct 2010 17:57:23 +0000
Subject: Two [Evd.fold] turned into [Evd.fold_undefined].

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13491 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 tactics/class_tactics.ml4 | 6 +++---
 toplevel/himsg.ml         | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4
index c86ab581bb..04f2a12247 100644
--- a/tactics/class_tactics.ml4
+++ b/tactics/class_tactics.ml4
@@ -197,7 +197,7 @@ let rec catchable = function
   | e -> Logic.catchable_exception e
 
 let nb_empty_evars s =
-  Evd.fold (fun ev evi acc -> if evi.evar_body = Evar_empty then succ acc else acc) s 0
+  Evd.fold_undefined (fun ev evi acc -> succ acc) s 0
 
 let pr_ev evs ev = Printer.pr_constr_env (Goal.V82.env evs ev) (Evarutil.nf_evar evs (Goal.V82.concl evs ev))
 
@@ -471,8 +471,8 @@ let _ =
   Typeclasses.solve_instanciation_problem := (fun x y z -> resolve_one_typeclass x ~sigma:y z)
 
 let has_undefined p oevd evd =
-  Evd.fold (fun ev evi has -> has ||
-    (evi.evar_body = Evar_empty && snd (p oevd ev evi)))
+  Evd.fold_undefined (fun ev evi has -> has ||
+    snd (p oevd ev evi))
     evd false
 
 let rec merge_deps deps = function
diff --git a/toplevel/himsg.ml b/toplevel/himsg.ml
index 6f1d0473a0..c3eb23ff64 100644
--- a/toplevel/himsg.ml
+++ b/toplevel/himsg.ml
@@ -524,10 +524,9 @@ let explain_no_instance env (_,id) l =
     prlist_with_sep pr_spc (pr_lconstr_env env) l
 
 let undefined_evars evm =
-  Evd.fold (fun ev evi undef ->
-    if evi.evar_body = Evar_empty then
+  Evd.fold_undefined (fun ev evi undef ->
       Evd.add undef ev (Evarutil.nf_evar_info evm evi)
-    else undef) evm Evd.empty
+  ) evm Evd.empty
 
 let pr_constraints printenv env evm =
   let evm = undefined_evars evm in
-- 
cgit v1.2.3