moved term indexing (in both discrimination and path tree forms) from paramodulation...

[helm.git] / helm / ocaml / paramodulation / saturate_main.ml

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index 3b5f999cf1a3604348328801111ffec47d11e31f..758437b76c7f925e13f412c1e612e96c13ce56a8 100644 (file)
--- a/helm/ocaml/paramodulation/saturate_main.ml
+++ b/helm/ocaml/paramodulation/saturate_main.ml
@@ -47,9 +47,10 @@ struct
   exception Exit
   module Callbacks =
   struct
+    let non p x = not (p x)
     let interactive_user_uri_choice ~selection_mode ?ok
           ?(enable_button_for_non_vars = true) ~title ~msg ~id uris =
-              raise Exit
+            List.filter (non UriManager.uri_is_var) uris
     let interactive_interpretation_choice interp = raise Exit
     let input_or_locate_uri ~(title:string) ?id = raise Exit
   end
@@ -99,6 +100,7 @@ let _ =
     | "lpo" -> Utils.compare_terms := Utils.lpo
     | "kbo" -> Utils.compare_terms := Utils.kbo
     | "nr-kbo" -> Utils.compare_terms := Utils.nonrec_kbo
+    | "ao" -> Utils.compare_terms := Utils.ao
     | o -> raise (Arg.Bad ("Unknown term ordering: " ^ o))
   and set_fullred b = S.use_fullred := b
   and set_time_limit v = S.time_limit := float_of_int v
@@ -139,8 +141,8 @@ let _ =
   ] (fun a -> ()) "Usage:"
 in
 Helm_registry.load_from !configuration_file;
-CicNotation.load_notation core_notation_script;
-CicNotation.load_notation "../../matita/coq.ma";
+CicNotation2.load_notation core_notation_script;
+CicNotation2.load_notation "../../matita/coq.ma";
 let dbd = HMysql.quick_connect
   ~host:(Helm_registry.get "db.host")
   ~user:(Helm_registry.get "db.user")