bugfixes:

- added missing Makefile dep for saturate
- ported to new CicNotation2 module
- implemented interactive_user_uri_choice callback

diff --git a/helm/ocaml/paramodulation/Makefile b/helm/ocaml/paramodulation/Makefile
index ff724fa6c900fb048e92083ae0ac0f1871450e5e..df2c25d22d775246a3fb6161213d130d7eff781b 100644 (file)
--- a/helm/ocaml/paramodulation/Makefile
+++ b/helm/ocaml/paramodulation/Makefile
@@ -31,7 +31,7 @@ $(ARCHIVE_OPT): paramodulation.cmx $(LIBRARIES_OPT)
 PARAMOD_OBJS = $(IMPLEMENTATION_FILES:%.ml=%.cmo)
 PARAMOD_OBJS_OPT = $(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
-LOCALLINKOPTS = -package helm-cic_disambiguation,helm-content_pres,helm-grafite
+LOCALLINKOPTS = -package helm-cic_disambiguation,helm-content_pres,helm-grafite,helm-grafite_parser
 saturate: saturate_main.ml $(PARAMOD_OBJS) $(LIBRARIES)
        $(OCAMLC) $(LOCALLINKOPTS) -thread -linkpkg -o $@ $(PARAMOD_OBJS) $<
 saturate.opt: saturate_main.ml $(PARAMOD_OBJS_OPT) $(LIBRARIES)

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index 3b5f999cf1a3604348328801111ffec47d11e31f..14d81569aab72dd96fe2f512cb9aa82c737a553c 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
@@ -139,8 +140,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")