X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAstPp.ml;h=bd26fb387492dcc6947b23945d7769a2bd64a03b;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=3275953651e01ddb1af92dca556b7917b78dc2ba;hpb=249d79bebff886846fbab65cc079623d90684baf;p=helm.git diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml index 327595365..bd26fb387 100644 --- a/helm/ocaml/cic_transformations/tacticAstPp.ml +++ b/helm/ocaml/cic_transformations/tacticAstPp.ml @@ -30,7 +30,6 @@ open TacticAst let tactical_terminator = "." let tactic_terminator = tactical_terminator let command_terminator = tactical_terminator -let tactical_separator = ";" let pp_term_ast term = CicAstPp.pp_term term let pp_term_cic term = CicPp.ppterm term @@ -245,14 +244,15 @@ let rec pp_tactical = function | Tactic (_, tac) -> pp_tactic tac | Do (_, count, tac) -> sprintf "do %d %s" count (pp_tactical tac) | Repeat (_, tac) -> "repeat " ^ pp_tactical tac - | Seq (_, tacs) -> pp_tacticals tacs + | Seq (_, tacs) -> pp_tacticals ~sep:"; " tacs | Then (_, tac, tacs) -> - sprintf "%s [%s]" (pp_tactical tac) (pp_tacticals tacs) - | Tries (_, tacs) -> sprintf "tries [%s]" (pp_tacticals tacs) + sprintf "%s; [%s]" (pp_tactical tac) (pp_tacticals ~sep:" | " tacs) + | First (_, tacs) -> sprintf "tries [%s]" (pp_tacticals ~sep:" | " tacs) | Try (_, tac) -> "try " ^ pp_tactical tac + | Solve (_, tac) -> sprintf "solve [%s]" (pp_tacticals ~sep:" | " tac) -and pp_tacticals tacs = - String.concat (tactical_separator ^ " ") (List.map pp_tactical tacs) +and pp_tacticals ~sep tacs = + String.concat sep (List.map pp_tactical tacs) let pp_tactical tac = pp_tactical tac ^ tactical_terminator let pp_tactic tac = pp_tactic tac ^ tactic_terminator