X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=76651753f92cbe6c6232f7b53ab43efc84b654a8;hb=ad8d37cce3b39565861014d870b91b1add0ec0e3;hp=0ec8b91756c9e83da6e08d27bf08988dc85e1af3;hpb=a82bb964ad0bf0969dae008a4de854532846e455;p=helm.git diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml index 0ec8b9175..76651753f 100644 --- a/helm/software/components/grafite/grafiteAstPp.ml +++ b/helm/software/components/grafite/grafiteAstPp.ml @@ -96,25 +96,29 @@ let rec pp_ntactic ~map_unicode_to_tex = pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in function | NApply (_,t) -> "napply " ^ CicNotationPp.pp_term t + | NAuto (_,(l,flgs)) -> + "nauto" ^ + (if l <> [] then (" by " ^ + (String.concat "," (List.map CicNotationPp.pp_term l))) else "") ^ + String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs) | NCases (_,what,where) -> "ncases " ^ CicNotationPp.pp_term what ^ assert false ^ " " ^ assert false - | NConstructor (_,None) -> "@" - | NConstructor (_,Some x) -> "@" ^ string_of_int x + | NConstructor (_,None,l) -> "@ " ^ + String.concat " " (List.map CicNotationPp.pp_term l) + | NConstructor (_,Some x,l) -> "@" ^ string_of_int x ^ " " ^ + String.concat " " (List.map CicNotationPp.pp_term l) | NCase1 (_,n) -> "*" ^ n ^ ":" | NChange (_,what,wwhat) -> "nchange " ^ assert false ^ " with " ^ CicNotationPp.pp_term wwhat + | NCut (_,t) -> "ncut " ^ CicNotationPp.pp_term t | NElim (_,what,where) -> "nelim " ^ CicNotationPp.pp_term what ^ assert false ^ " " ^ assert false | NId _ -> "nid" | NIntro (_,n) -> "#" ^ n + | NLApply (_,t) -> "lapply " ^ CicNotationPp.pp_term t | NRewrite (_,dir,n,where) -> "nrewrite " ^ (match dir with `LeftToRight -> ">" | `RightToLeft -> "<") ^ " " ^ CicNotationPp.pp_term n ^ " " ^ pp_tactic_pattern where - | NAuto (_,(l,flgs)) -> - "nauto" ^ - (if l <> [] then (" by " ^ - (String.concat "," (List.map CicNotationPp.pp_term l))) else "") ^ - String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs) | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> "TO BE IMPLEMENTED" | NDot _ -> "##." | NSemicolon _ -> "##;" @@ -299,6 +303,7 @@ let pp_arg ~term_pp arg = let pp_nmacro = function | NCheck (_, term) -> Printf.sprintf "ncheck %s" (CicNotationPp.pp_term term) + | Screenshot (_, name) -> Printf.sprintf "screenshot \"%s\"" name ;; let pp_macro ~term_pp ~lazy_term_pp =