let ng_generate_tactics fv ueq_case context arities =
[ GA.Executable(floc,GA.NTactic(floc,
- (GA.NIntro (floc,"Univ")),GA.Dot(floc))) ]
+ [GA.NIntro (floc,"Univ") ; GA.NDot(floc)])) ]
@
(HExtlib.list_mapi
(fun (name,_) _->
GA.Executable(floc,GA.NTactic(floc,
- (GA.NIntro (floc,name)),GA.Dot(floc))))
+ [GA.NIntro (floc,name);GA.NDot(floc)])))
arities)
@
(HExtlib.list_mapi
(fun _ i->
GA.Executable(floc,GA.NTactic(floc,
- (GA.NIntro (floc,"H"^string_of_int i)),GA.Dot(floc))))
+ [GA.NIntro (floc,"H"^string_of_int i);GA.NDot(floc)])))
context)
@
(if fv <> [] then
(List.map
(fun _ ->
[GA.Executable(floc,GA.NTactic(floc,
- (GA.NApply (floc,mk_ident "ex_intro")),GA.Branch floc));
- GA.Executable(floc,GA.NTactic(floc, GA.NId floc ,
- (GA.Pos (floc,[2]))))])
+ [GA.NApply (floc,
+ PT.Appl [mk_ident "ex_intro";PT.Implicit;PT.Implicit;
+ PT.Implicit;PT.Implicit]);GA.NBranch floc]));
+ GA.Executable(floc,GA.NTactic(floc,
+ [GA.NPos (floc,[2])]))])
fv))
else [])@
- [GA.Executable(floc,GA.NTactic(floc, (
+ [GA.Executable(floc,GA.NTactic(floc, [
if (*ueq_case*) true then
GA.NAuto (floc,(
HExtlib.list_mapi
"size",string_of_int 20;
"timeout",string_of_int 10;
]))
- ),
- GA.Semicolon(floc)));
+ ;
+ GA.NSemicolon(floc)]));
(*
GA.Executable(floc,GA.NTactic(floc, Some (GA.Try(floc,
GA.Assumption floc)), GA.Dot(floc)))
(List.flatten
(List.map
(fun _ ->
- [GA.Executable(floc,GA.NTactic(floc, GA.NId floc, GA.Shift floc));
- GA.Executable(floc,GA.NNonPunctuationTactical(floc, GA.Skip floc,
- (GA.Merge floc)))])
+ [GA.Executable(floc,GA.NTactic(floc, [GA.NShift floc;
+ GA.NSkip floc; GA.NMerge floc]))])
fv))
else [])@
- [GA.Executable(floc,GA.Command(floc, GA.NQed(floc)))]
+ [GA.Executable(floc,GA.NCommand(floc, GA.NQed(floc)))]
;;
let generate_tactics fv ueq_case =
* 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 term_pp prec content_term =
let pres_term = TermContentPres.pp_ast content_term in
let lookup_uri = fun _ -> None in
- let markup = CicNotationPres.render ~lookup_uri pres_term in
+ let markup = CicNotationPres.render ~lookup_uri ~prec pres_term in
let s = BoxPp.render_to_string List.hd width markup ~map_unicode_to_tex:false in
Pcre.substitute
~rex:(Pcre.regexp ~flags:[`UTF8] "∀[Ha-z][a-z0-9_]*") ~subst:(fun x -> "\n" ^ x)
s
in
- CicNotationPp.set_pp_term term_pp;
+ CicNotationPp.set_pp_term (term_pp 90);
let lazy_term_pp = fun x -> assert false in
let obj_pp = CicNotationPp.pp_obj CicNotationPp.pp_term in
Pcre.replace ~pat:"theorem" ~templ:"ntheorem"
(GrafiteAstPp.pp_statement
- ~map_unicode_to_tex:false ~term_pp ~lazy_term_pp ~obj_pp t)
+ ~map_unicode_to_tex:false ~term_pp:(term_pp 19) ~lazy_term_pp ~obj_pp t)
in
let buri = Pcre.replace ~pat:"\\.p$" ("cic:/matita/TPTP/" ^ filename) in
let extra_statements_start = [