X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftptp_grafite%2Ftptp2grafite.ml;h=63dfe0285bb00cb87374c0a5b20096b95c58dbbc;hb=876ac1889f8b11c97c8d94a0523504a0bcb70ddd;hp=3ed457d958dd64d25ee7d29ab111ad53574563c2;hpb=50afaf262195266d156f594cff7e92a6e8898b3e;p=helm.git diff --git a/helm/software/components/tptp_grafite/tptp2grafite.ml b/helm/software/components/tptp_grafite/tptp2grafite.ml index 3ed457d95..63dfe0285 100644 --- a/helm/software/components/tptp_grafite/tptp2grafite.ml +++ b/helm/software/components/tptp_grafite/tptp2grafite.ml @@ -247,7 +247,7 @@ let convert_ast statements context = function statements @ [ GA.Executable(floc,GA.Command(floc,GA.Obj(floc,o))); GA.Executable(floc,GA.Tactic(floc, Some - (GA.Intros (floc,None,[])),GA.Dot(floc)))] @ + (GA.Intros (floc,(None,[]))),GA.Dot(floc)))] @ (if fv <> [] then (List.flatten (List.map @@ -260,12 +260,12 @@ let convert_ast statements context = function else [])@ [GA.Executable(floc,GA.Tactic(floc, Some ( if ueq_case then - GA.Auto (floc,["paramodulation",""; - "timeout",string_of_int !paramod_timeout]) + GA.AutoBatch (floc,([],["paramodulation",""; + "timeout",string_of_int !paramod_timeout])) else - GA.Auto (floc,["depth",string_of_int !depth]) + GA.AutoBatch (floc,([],["depth",string_of_int !depth])) ), - GA.Dot(floc))); + GA.Semicolon(floc))); GA.Executable(floc,GA.Tactic(floc, Some (GA.Try(floc, GA.Assumption floc)), GA.Dot(floc))) ]@ @@ -339,14 +339,15 @@ let tptp2grafite ?(timeout=600) ?(def_depth=10) ?raw_preamble ~tptppath ~filenam 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 List.hd width markup in + let s = BoxPp.render_to_string List.hd width markup ~map_unicode_to_tex:false 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 CicNotationPp.pp_term in - GrafiteAstPp.pp_statement ~term_pp ~lazy_term_pp ~obj_pp t + GrafiteAstPp.pp_statement + ~map_unicode_to_tex:false ~term_pp ~lazy_term_pp ~obj_pp t in let buri = Pcre.replace ~pat:"\\.p$" ("cic:/matita/TPTP/" ^ filename) in let extra_statements_start = [