X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fbinaries%2Ftptp2grafite%2Fmain.ml;h=871ff7b56a6299f0a497f913dfed177e9b978f68;hb=8ced9658902a93c14e5d5b43511e4cbcd90337e0;hp=4a57812432a6c4ead7ee46c66fe5aaf5eb96f989;hpb=25835a1eac5698fedca50ebae1e18bef49a67c87;p=helm.git

diff --git a/components/binaries/tptp2grafite/main.ml b/components/binaries/tptp2grafite/main.ml
index 4a5781243..871ff7b56 100644
--- a/components/binaries/tptp2grafite/main.ml
+++ b/components/binaries/tptp2grafite/main.ml
@@ -4,6 +4,8 @@ module PT = CicNotationPt;;
 module A = Ast;;
 let floc = HExtlib.dummy_floc;;
 
+let universe = "Univ" ;;
+
 let kw = [
  "and","myand"
 ];;
@@ -85,7 +87,7 @@ let build_ctx_for_arities univesally arities t =
     | (name,nargs)::tl ->
         PT.Binder 
           (binder,
-            (mk_ident name,Some (mk_arrow "A" nargs)),
+            (mk_ident name,Some (mk_arrow universe nargs)),
             aux tl)
   in
   aux arities
@@ -101,7 +103,7 @@ let convert_atom universally a =
   | A.False -> mk_ident "False"
   | A.Eq (l,r)
   | A.NotEq (l,r) -> (* removes the negation *)
-      PT.Appl [mk_ident "eq";mk_ident "A";convert_term l;convert_term r]
+      PT.Appl [mk_ident "eq";mk_ident universe;convert_term l;convert_term r]
   in
   build_ctx_for_arities universally 
     (List.map (fun x -> (x,0)) (collect_fv_from_atom a)) (aux a)
@@ -180,7 +182,7 @@ let convert_ast statements context = function
           let f = 
             PT.Binder 
              (`Forall,
-               (mk_ident "A",Some (PT.Sort `Set)), 
+               (mk_ident universe,Some (PT.Sort `Set)), 
                convert_formula fv false context f)
           in
           let o = PT.Theorem (`Theorem,name,f,None) in
@@ -194,7 +196,8 @@ 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,
@@ -281,8 +284,19 @@ let _ =
       ([],[]) statements 
   in
   let pp t = 
-    (* for a correct pp we should disambiguate the term... *)
-    let term_pp = CicNotationPp.pp_term in
+    (* ZACK: setting width to 80 will trigger a bug of BoxPp.render_to_string
+     * which will show up using the following command line:
+     * ./tptp2grafite -tptppath ~tassi/TPTP-v3.1.1 GRP170-1 *)
+    let width = max_int in
+    let term_pp content_term =
+      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
+      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
     let obj_pp = CicNotationPp.pp_obj in
     print_endline 
@@ -291,12 +305,20 @@ 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;
-  print_endline
+  List.iter 
+   (fun (n,s) -> 
+   print_endline
     (LexiconAstPp.pp_command 
       (LA.Alias(floc,
-        LA.Ident_alias("eq","cic:/Coq/Init/Logic/eq.ind#xpointer(1/1)"))) ^ ".");
+        LA.Ident_alias(n,s))) ^ "."))
+   [(*("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)") *)];
   List.iter pp grafite_ast_statements;
   exit 0