tagging rc-1

[helm.git] / matita / matitaprover.ml

diff --git a/matita/matitaprover.ml b/matita/matitaprover.ml
index 9ddef38e6a969c62ee6979e80f7a21f9f15805b6..7a6503ab36e7f15c2730770ce5c55d3aa7a3d504 100644 (file)
--- a/matita/matitaprover.ml
+++ b/matita/matitaprover.ml
@@ -41,6 +41,15 @@ theorem trans_eq :
 intros.elim H1.assumption.
 qed.
 
+default \"equality\"
+ " ^ buri ^ "/eq.ind
+ " ^ buri ^ "/sym_eq.con
+ " ^ buri ^ "/trans_eq.con
+ " ^ buri ^ "/eq_ind.con
+ " ^ buri ^ "/eq_elim_r.con
+ " ^ buri ^ "/eq_f.con
+ " ^ buri ^ "/eq_f1.con.
+
 theorem eq_f: \\forall  A,B:Type.\\forall f:A\\to B.
   \\forall x,y:A. eq A x y \\to eq B (f x) (f y).
 intros.elim H.reflexivity.
@@ -51,15 +60,6 @@ theorem eq_f1: \\forall  A,B:Type.\\forall f:A\\to B.
 intros.elim H.reflexivity.
 qed.
 
-default \"equality\"
- " ^ buri ^ "/eq.ind
- " ^ buri ^ "/sym_eq.con
- " ^ buri ^ "/trans_eq.con
- " ^ buri ^ "/eq_ind.con
- " ^ buri ^ "/eq_elim_r.con
- " ^ buri ^ "/eq_f.con
- " ^ buri ^ "/eq_f1.con.
-
 inductive ex (A:Type) (P:A \\to Prop) : Prop \\def
     ex_intro: \\forall x:A. P x \\to ex A P.
 interpretation \"exists\" 'exists \\eta.x =
@@ -74,15 +74,23 @@ for @{ 'exists ${default
 "
 ;;
 
+let p_to_ma ?timeout ~tptppath ~filename () = 
+  let data = 
+     Tptp2grafite.tptp2grafite ?timeout ~filename ~tptppath:tptppath
+     ~raw_preamble ()
+  in
+  data
+;;
+
 let main () =
-  MatitaInit.fill_registry ();
   let tptppath = ref "./" in
+  let timeout = ref 600 in
   MatitaInit.add_cmdline_spec
     ["-tptppath",Arg.String (fun s -> tptppath:= s),
-      "Where to find the Axioms/ and Problems/ directory"];
-  MatitaInit.parse_cmdline ();
-  MatitaInit.load_configuration_file ();
-  Helm_registry.set_bool "db.nodb" true;
+       "Where to find the Axioms/ and Problems/ directory";
+     "-timeout", Arg.Int (fun x -> timeout := x),
+       "Timeout in seconds"];
+  MatitaInit.parse_cmdline_and_configuration_file ();
   Helm_registry.set_bool "matita.nodisk" true;
   HLog.set_log_callback (fun _ _ -> ()); 
   let args = Helm_registry.get_list Helm_registry.string "matita.args" in
@@ -92,8 +100,7 @@ let main () =
     | _ -> prerr_endline "You must specify exactly one .p file."; exit 1
   in
   let data = 
-     Tptp2grafite.tptp2grafite ~filename:inputfile ~tptppath:!tptppath
-     ~raw_preamble ()
+    p_to_ma ~timeout:!timeout ~filename:inputfile ~tptppath:!tptppath ()
   in
 (*   prerr_endline data; *)
   let is = Ulexing.from_utf8_string data in