;;
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
aux (aux [] ty) proofterm
in
let lit =
- match ty with
- | Terms.Node [ Terms.Leaf eq ; ty; l; r ] when B.eq B.eqP eq ->
+ match B.is_eq ty with
+ | Some(ty,l,r) ->
let o = Order.compare_terms l r in
Terms.Equation (l, r, ty, o)
- | t -> Terms.Predicate t
+ | None -> Terms.Predicate ty
in
let proof = Terms.Exact proofterm in
fresh_unit_clause maxvar (0, lit, varlist, proof)