| _,[] -> 1
;;
-module Utils (B : Terms.Blob) = struct
- module Subst = FoSubst;; (*.Subst(B) ;;*)
- module Order = Orderings.Orderings(B) ;;
+module Utils (B : Orderings.Blob) = struct
+ module Subst = FoSubst;;
+ module Order = B;;
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
;;
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.apply_subst subst l in
- let r = Subst.apply_subst subst r in
- let ty = Subst.apply_subst subst ty in
+ let l = Subst.reloc_subst subst l in
+ let r = Subst.reloc_subst subst r in
+ let ty = Subst.reloc_subst subst ty in
Terms.Equation (l,r,ty,o)
| Terms.Predicate p ->
- let p = Subst.apply_subst subst p in
+ let p = Subst.reloc_subst subst p in
Terms.Predicate p
in
let proof =
match proof with
- | Terms.Exact t -> Terms.Exact (Subst.apply_subst subst t)
+ | Terms.Exact t -> Terms.Exact (Subst.reloc_subst subst t)
| Terms.Step (rule,c1,c2,dir,pos,s) ->
Terms.Step(rule,c1,c2,dir,pos,Subst.concat subst s)
in