X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FgrafiteAstPp.ml;h=3e19ed28140c6b2b5ed1fcdf98e6cc4a58f84001;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=9e4d632712a087da49db3e38813bbeac03d64af5;hpb=22bc6da37df76df92c51165880ba5e0c5065c6ec;p=helm.git

diff --git a/helm/ocaml/cic_notation/grafiteAstPp.ml b/helm/ocaml/cic_notation/grafiteAstPp.ml
index 9e4d63271..3e19ed281 100644
--- a/helm/ocaml/cic_notation/grafiteAstPp.ml
+++ b/helm/ocaml/cic_notation/grafiteAstPp.ml
@@ -29,7 +29,7 @@ open GrafiteAst
 
 module Ast = CicNotationPt
 
-let tactical_terminator = "."
+let tactical_terminator = ""
 let tactic_terminator = tactical_terminator
 let command_terminator = tactical_terminator
 
@@ -313,16 +313,27 @@ let rec pp_tactical = function
   | Try (_, tac) -> "try " ^ pp_tactical tac
   | Solve (_, tac) -> sprintf "solve [%s]" (pp_tacticals ~sep:" | " tac)
 
-and pp_tacticals ~sep tacs =
-  String.concat sep (List.map pp_tactical tacs)
+  | Dot _ -> "."
+  | Semicolon _ -> ";"
+  | Branch _ -> "["
+  | Shift _ -> "|"
+  | Pos (_, i) -> sprintf "%d:" i
+  | Merge _ -> "]"
+  | Focus (_, goals) ->
+      sprintf "focus %s" (String.concat " " (List.map string_of_int goals))
+  | Unfocus _ -> "unfocus"
+  | Skip _ -> "skip"
 
-let pp_tactical tac = pp_tactical tac ^ tactical_terminator
-let pp_tactic tac = pp_tactic tac ^ tactic_terminator
-let pp_command tac = pp_command tac ^ command_terminator
+and pp_tacticals ~sep tacs = String.concat sep (List.map pp_tactical tacs)
+
+let pp_tactical tac = pp_tactical tac
+let pp_tactic tac = pp_tactic tac 
+let pp_command tac = pp_command tac
 
 let pp_executable = function
   | Macro (_,x) -> pp_macro_ast x
-  | Tactical (_,x) -> pp_tactical x
+  | Tactical (_, tac, Some punct) -> pp_tactical tac ^ pp_tactical punct
+  | Tactical (_, tac, None) -> pp_tactical tac
   | Command (_,x) -> pp_command x
                       
 let pp_comment = function