Factorized "find_equalities" in demodulation_tac.

diff --git a/components/tactics/paramodulation/saturation.ml b/components/tactics/paramodulation/saturation.ml
index dc1f1273f650731f130d5f00d77c794363f5566a..c23401e9cd6a0c4eba84a5fde37475ed332ca809 100644 (file)
--- a/components/tactics/paramodulation/saturation.ml
+++ b/components/tactics/paramodulation/saturation.ml
@@ -1554,23 +1554,12 @@ let given_clause
 let demodulate_tac ~dbd ((proof,goal)(*s initialstatus*)) = 
   let curi,metasenv,pbo,pty = proof in
   let metano,context,ty = CicUtil.lookup_meta goal metasenv in
-  let eq_uri = eq_of_goal ty in
-  let bag = Equality.mk_equality_bag () in
-  let eq_indexes, equalities, maxm, cache = 
-    Equality_retrieval.find_context_equalities 0 bag None context proof AutoCache.cache_empty
-  in
-  let lib_eq_uris, library_equalities, maxm, cache =
-    Equality_retrieval.find_library_equalities bag None
-      false dbd context (proof, goal) (maxm+2)  cache 
-  in
-  if library_equalities = [] then prerr_endline "VUOTA!!!";
   let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
-  let library_equalities = List.map snd library_equalities in
   let initgoal = [], [], ty in
-  let env = (metasenv, context, CicUniv.empty_ugraph) in
-  let equalities = 
-    simplify_equalities bag eq_uri env (equalities@library_equalities) 
-  in   
+  let eq_uri = eq_of_goal ty in
+  let bag, equalities, cache, maxm =
+    find_equalities dbd (proof,goal) false None AutoCache.cache_empty 
+  in 
   let table = 
     List.fold_left 
       (fun tbl eq -> Indexing.index tbl eq)