X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fbinaries%2Ftptp2grafite%2Fmain.ml;h=871ff7b56a6299f0a497f913dfed177e9b978f68;hb=df1aeb9c716af1f18c3df8b3cb0484a45f5b436e;hp=03f8f2e9f7e2a65c30e130a8c8ade30e0c51664d;hpb=613077e2729b7a66cf10b4b930b431b73a0062c2;p=helm.git diff --git a/components/binaries/tptp2grafite/main.ml b/components/binaries/tptp2grafite/main.ml index 03f8f2e9f..871ff7b56 100644 --- a/components/binaries/tptp2grafite/main.ml +++ b/components/binaries/tptp2grafite/main.ml @@ -196,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, @@ -292,7 +293,8 @@ let _ = 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 + 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