debug takes lazy strings. Moved here the are_alpha_eq test.

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

diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml
index 379aca1dcf906d8d96624a24f7d3e115cffa19bb..6096d88dae1bfd358d4593abe95081c40c196594 100644 (file)
--- a/helm/software/components/ng_paramodulation/nCicParamod.ml
+++ b/helm/software/components/ng_paramodulation/nCicParamod.ml
@@ -11,31 +11,37 @@
 
 (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *)
 
+
+module B(C : NCicBlob.NCicContext): Orderings.Blob 
+  with type t = NCic.term and type input = NCic.term 
+  = Orderings.LPO(NCicBlob.NCicBlob(C))
+
+module NCicParamod(C : NCicBlob.NCicContext) = Paramod.Paramod(B(C))
+
 let nparamod rdb metasenv subst context t table =
-  let module C = 
-    struct
+  let module C =
+    struct 
       let metasenv = metasenv
       let subst = subst
-      let context = context
-    end
+      let context = context 
+    end 
   in
-  let module B : Terms.Blob 
-      with type t = NCic.term and type input = NCic.term 
-    = NCicBlob.NCicBlob(C) 
-  in
-  let module P = Paramod.Paramod(B) in
+  let module B = B(C) in
+  let module P = NCicParamod(C) in
   let module Pp = Pp.Pp(B) in
   let bag, maxvar = Terms.empty_bag, 0 in
-  let (bag,maxvar), passives = 
-    HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table
-  in
   let (bag,maxvar), goals = 
     HExtlib.list_mapi_acc (fun x _ a -> P.mk_goal a x) (bag,maxvar) [t]
   in
-  let solutions = 
-    P.paramod ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) 
-      ~g_passives:goals ~passives (bag,maxvar) 
+  let (bag,maxvar), passives = 
+    HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table
   in
+  match 
+    P.paramod ~useage:true ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) 
+      ~g_passives:goals ~passives (bag,maxvar) 
+  with 
+  | P.Error _ | P.GaveUp | P.Timeout _ -> []
+  | P.Unsatisfiable solutions ->
   List.map 
     (fun (bag,i,l) ->
       (* List.iter (fun x ->
@@ -49,7 +55,9 @@ let nparamod rdb metasenv subst context t table =
         let rec aux k metasenv = function
           | NCic.Meta _ as t -> metasenv, t
           | NCic.Implicit _ -> 
-              let metasenv,i,_,_=NCicMetaSubst.mk_meta metasenv context `Term in
+              let metasenv, i, _, _ =
+                NCicMetaSubst.mk_meta metasenv context `IsTerm 
+              in
               metasenv, NCic.Meta (i,(k,NCic.Irl (List.length context)))
           | t -> NCicUntrusted.map_term_fold_a 
                   (fun _ k -> k+1) k aux metasenv t