eta_fix default to false

[helm.git] / components / binaries / tptp2grafite / main.ml

diff --git a/components/binaries/tptp2grafite/main.ml b/components/binaries/tptp2grafite/main.ml
index 03f8f2e9f7e2a65c30e130a8c8ade30e0c51664d..980f2b456e9cbae881a940b419031910ac5ad515 100644 (file)
--- a/components/binaries/tptp2grafite/main.ml
+++ b/components/binaries/tptp2grafite/main.ml
@@ -196,11 +196,12 @@ let convert_ast statements context = function
                 (fun _ -> 
                   [GA.Executable(floc,GA.Tactical(floc, GA.Tactic(floc,
                     GA.Exists floc),Some (GA.Branch floc)));
-                   GA.Executable(floc,GA.Tactical(floc, GA.Pos (floc,2),None))])
+                   GA.Executable(floc,GA.Tactical(floc,
+                    GA.Pos (floc,[2]),None))])
                 fv)) 
            else [])@
             [GA.Executable(floc,GA.Tactical(floc, GA.Tactic(floc,
-              GA.Auto (floc,None,None,Some "paramodulation",None)),
+            GA.Auto (floc,["paramodulation",""])),
                 Some (GA.Dot(floc))))]@
           (if fv <> [] then     
             (List.flatten
@@ -291,8 +292,9 @@ let _ =
       let pres_term = TermContentPres.pp_ast content_term in
       let dummy_tbl = Hashtbl.create 1 in
       let markup = CicNotationPres.render dummy_tbl pres_term in
-      let s = BoxPp.render_to_string width markup in
-      s
+      let s = BoxPp.render_to_string List.hd width markup in
+      Pcre.substitute 
+        ~pat:"\\\\forall [Ha-z][a-z0-9_]*" ~subst:(fun x -> "\n" ^ x) s
     in
     CicNotationPp.set_pp_term term_pp;
     let lazy_term_pp = fun x -> assert false in
@@ -303,7 +305,7 @@ let _ =
   let extra_statements_start = [
     GA.Executable(floc,GA.Command(floc,
       GA.Set(floc,"baseuri","cic:/matita/TPTP/" ^ !inputfile)));
-    GA.Executable(floc,GA.Command(floc, GA.Include(floc,"legacy/coq.ma")))]
+    GA.Executable(floc,GA.Command(floc, GA.Include(floc,"logic/equality.ma")))]
   in
   List.iter pp extra_statements_start;
   List.iter 
@@ -312,11 +314,11 @@ let _ =
     (LexiconAstPp.pp_command 
       (LA.Alias(floc,
         LA.Ident_alias(n,s))) ^ "."))
-   [("eq","cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)");
+   [(*("eq","cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)");
    ("trans_eq","cic:/Coq/Init/Logic/trans_eq.con");
    ("eq_ind_r","cic:/Coq/Init/Logic/eq_ind_r.con");
    ("eq_ind","cic:/Coq/Init/Logic/eq_ind.con");
    ("sym_eq","cic:/Coq/Init/Logic/sym_eq.con");
-   ("refl_equal","cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)")];
+   ("refl_equal","cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)") *)];
   List.iter pp grafite_ast_statements;
   exit 0