X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAstPp.ml;h=e98e7acfefefc6d446033f0bca45b2abd357f46b;hb=a7ab0ef67114c3152920f03ae1d7bfaaf1fae290;hp=50ef218f8e822c562188820c4bce41d7a6f11931;hpb=f065a68682b23976d185370d85869c196da3f20b;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index 50ef218f8..e98e7acfe 100644
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -38,7 +38,7 @@ let pp_reduction_kind = function
 
 let rec pp_tactic = function
   | LocatedTactic (loc, tac) -> pp_tactic tac
-  | Absurd -> "absurd"
+  | Absurd term -> "absurd" ^ pp_term term
   | Apply term -> "apply " ^ pp_term term
   | Assumption -> "assumption"
   | Change (t1, t2, where) ->
@@ -52,18 +52,19 @@ let rec pp_tactic = function
   | Discriminate ident -> "discriminate " ^ ident
   | Elim (term, using) ->
       sprintf "elim " ^ pp_term term ^
-      (match using with None -> "" | Some term -> "using " ^ pp_term term)
+      (match using with None -> "" | Some term -> " using " ^ pp_term term)
   | ElimType term -> "elim type " ^ pp_term term
   | Exact term -> "exact " ^ pp_term term
   | Exists -> "exists"
   | Fold (kind, term) ->
       sprintf "fold %s %s" (pp_reduction_kind kind) (pp_term term)
   | Fourier -> "fourier"
+  | Hint -> "hint"
   | Injection ident -> "injection " ^ ident
   | Intros (num, idents) ->
       sprintf "intros%s%s"
         (match num with None -> "" | Some num -> " " ^ string_of_int num)
-        (match idents with [] -> "" | idents -> pp_idents idents)
+        (match idents with [] -> "" | idents -> " " ^ pp_idents idents)
   | Left -> "left"
   | LetIn (term, ident) -> sprintf "let %s in %s" (pp_term term) ident
   | Reduce (_, _, _) -> assert false  (* TODO *)
@@ -77,17 +78,50 @@ let rec pp_tactic = function
   | Symmetry -> "symmetry"
   | Transitivity term -> "transitivity " ^ pp_term term
 
+let pp_flavour = function
+  | `Definition -> "Definition"
+  | `Fact -> "Fact"
+  | `Goal -> "Goal"
+  | `Lemma -> "Lemma"
+  | `Remark -> "Remark"
+  | `Theorem -> "Theorem"
+
+let pp_command = function
+  | Abort -> "Abort"
+  | Check term -> sprintf "Check %s" (CicAstPp.pp_term term)
+  | Proof -> "Proof"
+  | Qed name ->
+      (match name with None -> "Qed" | Some name -> sprintf "Save %s" name)
+  | Quit -> "Quit"
+  | Redo None -> "Redo"
+  | Redo (Some n) -> sprintf "Redo %d" n
+  | Theorem (flavour, name, typ, body) ->
+      sprintf "%s %s: %s %s"
+        (pp_flavour flavour)
+        (match name with None -> "" | Some name -> name)
+        (CicAstPp.pp_term typ)
+        (match body with
+        | None -> ""
+        | Some body -> "\\def " ^ CicAstPp.pp_term body)
+  | Undo None -> "Undo"
+  | Undo (Some n) -> sprintf "Undo %d" n
+
 let rec pp_tactical = function
   | LocatedTactical (loc, tac) -> pp_tactical tac
+
+  | Tactic tac -> pp_tactic tac
+  | Command cmd -> pp_command cmd
+
   | Fail -> "fail"
   | Do (count, tac) -> sprintf "do %d %s" count (pp_tactical tac)
   | IdTac -> "id"
   | Repeat tac -> "repeat " ^ pp_tactical tac
   | Seq tacs -> pp_tacticals tacs
-  | Tactic tac -> pp_tactic tac
-  | Then (tac, tacs) -> sprintf "%s; [%s]" (pp_tactical tac) (pp_tacticals tacs)
+  | Then (tac, tacs) -> sprintf "%s [%s]" (pp_tactical tac) (pp_tacticals tacs)
   | Tries tacs -> sprintf "tries [%s]" (pp_tacticals tacs)
   | Try tac -> "try " ^ pp_tactical tac
 
 and pp_tacticals tacs = String.concat "; " (List.map pp_tactical tacs)
 
+let pp_tactical tac = pp_tactical tac ^ "."
+