Release 0.5.9.

[helm.git] / helm / software / components / ng_paramodulation / foUtils.ml

diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml
index 826687afc788b49d842b639d83467c94b88fd5de..7b57e5bb3d2037b98ff681521c3b55d1ecd6a2cc 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -28,7 +28,7 @@ module Utils (B : Orderings.Blob) = struct
   let rec eq_foterm x y =
     x == y ||
     match x, y with
-    | Terms.Leaf t1, Terms.Leaf t2 -> B.eq t1 t2 
+    | Terms.Leaf t1, Terms.Leaf t2 -> B.eq t1 t2
     | Terms.Var i, Terms.Var j -> i = j
     | Terms.Node l1, Terms.Node l2 -> List.for_all2 eq_foterm l1 l2
     | _ -> false
@@ -80,23 +80,21 @@ module Utils (B : Orderings.Blob) = struct
   ;;
 
   let fresh_unit_clause maxvar (id, lit, varlist, proof) =
-    (* prerr_endline 
-      ("varlist = " ^ (String.concat "," (List.map string_of_int varlist)));*)
     let maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
     let lit = 
       match lit with
       | Terms.Equation (l,r,ty,o) ->
-          let l = Subst.reloc_subst subst l in
-          let r = Subst.reloc_subst subst r in
-          let ty = Subst.reloc_subst subst ty in
+          let l = Subst.apply_subst subst l in
+          let r = Subst.apply_subst subst r in
+          let ty = Subst.apply_subst subst ty in
           Terms.Equation (l,r,ty,o)
       | Terms.Predicate p ->
-          let p = Subst.reloc_subst subst p in
+          let p = Subst.apply_subst subst p in
           Terms.Predicate p
     in
     let proof =
       match proof with
-      | Terms.Exact t -> Terms.Exact (Subst.reloc_subst subst t)
+      | Terms.Exact t -> Terms.Exact (Subst.apply_subst subst t)
       | Terms.Step (rule,c1,c2,dir,pos,s) ->
           Terms.Step(rule,c1,c2,dir,pos,Subst.concat subst s)
     in
@@ -114,11 +112,11 @@ module Utils (B : Orderings.Blob) = struct
        aux (aux [] ty) proofterm
     in
     let lit = 
-      match B.is_eq ty with
-      | Some(ty,l,r) ->
+      match ty with
+      | Terms.Node [ Terms.Leaf eq ; ty; l; r ] when B.eq B.eqP eq ->
            let o = Order.compare_terms l r in
            Terms.Equation (l, r, ty, o)
-      | None -> Terms.Predicate ty
+      | t -> Terms.Predicate t
     in
     let proof = Terms.Exact proofterm in
     fresh_unit_clause maxvar (0, lit, varlist, proof)