First compiling version

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

diff --git a/helm/software/components/ng_paramodulation/nCicProof.ml b/helm/software/components/ng_paramodulation/nCicProof.ml
index 35c3c02b13b2e84202398b7fb1e7f94d3ce7b3c3..b1373819ced7250bd7ae2a01d04a06a874383c67 100644 (file)
--- a/helm/software/components/ng_paramodulation/nCicProof.ml
+++ b/helm/software/components/ng_paramodulation/nCicProof.ml
@@ -71,9 +71,16 @@
           match t with
           | Terms.Leaf _ 
           | Terms.Var _ -> 
-(*                prerr_endline ("term: " ^ ppfot ft);             *)
+             let module Pp = 
+               Pp.Pp(NCicBlob.NCicBlob(
+                       struct
+                         let metasenv = [] let subst = [] let context = []
+                       end))
+             in  
+               prerr_endline ("term: " ^ Pp.pp_foterm ft);
                prerr_endline ("path: " ^ String.concat "," 
                  (List.map string_of_int p1));
+              prerr_endline ("leading to: " ^ Pp.pp_foterm t);
                assert false
           | Terms.Node l -> 
               let l = 
@@ -113,11 +120,11 @@
        t vl  
     in
     let get_literal id =
-      let _, lit, vl, proof = Terms.M.find id bag in
-      let lit =match lit with 
-          | Terms.Predicate t -> assert false 
-          | Terms.Equation (l,r,ty,_) -> 
+      let (_, nlit, plit, vl, proof),_,_ = Terms.get_from_bag id bag in
+      let lit = match nlit,plit with 
+          | [],[Terms.Equation (l,r,ty,_),_] -> 
               Terms.Node [ Terms.Leaf eqP(); ty; l; r]
+          | _ -> assert false
       in
        lit, vl, proof
     in
@@ -150,7 +157,7 @@
                if ongoal then id1,id,get_literal id1
                else id,id1,(lit,vl,proof)
              in
-             let vl = if ongoal then Subst.filter subst vl else vl in
+             let vl = if ongoal then [](*Subst.filter subst vl*) else vl in
               let proof_of_id id = 
                 let vars = List.rev (vars_of id seen) in
                 let args = List.map (Subst.apply_subst subst) vars in