* new binary matitatop

[helm.git] / helm / ocaml / cic_transformations / tacticAstPp.ml

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index bbb2c935b7e8233f47a4f214ad22dcc441ae244e..ee099e4202a4539e97bfa3baa975c57e9f804051 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -55,7 +55,7 @@ let pp_pattern (hyp, goal) =
     | Some p -> pp_term_ast p
   in
   let separator = 
-    if hyp <> [] then " \vdash " else " "
+    if hyp <> [] then " \\vdash " else " "
   in
    "in " ^ pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
 
@@ -65,8 +65,10 @@ let rec pp_tactic = function
   | Auto _ -> "auto"
   | Assumption _ -> "assumption"
   | Change (_, t1, t2, where) ->
-      sprintf "change %s with %s%s" (pp_term_ast t1) (pp_term_ast t2)
+      sprintf "change %s with %s %s" (pp_term_ast t1) (pp_term_ast t2)
        (pp_pattern where)
+  | Clear (_,id) -> sprintf "clear %s" id
+  | ClearBody (_,id) -> sprintf "clearbody %s" id
   | Compare (_,term) -> "compare " ^ pp_term_ast term
   | Constructor (_,n) -> "constructor " ^ string_of_int n
   | Contradiction _ -> "contradiction"
@@ -83,12 +85,17 @@ let rec pp_tactic = function
   | ElimType (_, term) -> "elim type " ^ pp_term_ast term
   | Exact (_, term) -> "exact " ^ pp_term_ast term
   | Exists _ -> "exists"
-  | Fold (_, kind, term) ->
-      sprintf "fold %s %s" (pp_reduction_kind kind) (pp_term_ast term)
-  | Generalize (_, term, pattern) ->
-     sprintf "generalize %s %s" (pp_term_ast term) (pp_pattern pattern)
+  | Fold (_, kind, term, pattern) ->
+      sprintf "fold %s %s %s" (pp_reduction_kind kind) (pp_term_ast term)
+       (pp_pattern pattern)
+  | Generalize (_, term, ident, pattern) ->
+     sprintf "generalize %s%s %s" (pp_term_ast term)
+      (match ident with None -> "" | Some id -> " as " ^ id)
+      (pp_pattern pattern)
   | Goal (_, n) -> "goal " ^ string_of_int n
+  | Fail _ -> "fail"
   | Fourier _ -> "fourier"
+  | IdTac _ -> "id"
   | Injection (_, term) -> "injection " ^ pp_term_ast term
   | Intros (_, None, []) -> "intro"
   | Intros (_, num, idents) ->
@@ -100,8 +107,8 @@ let rec pp_tactic = function
   | Reduce (_, kind, pat) ->
       sprintf "%s %s" (pp_reduction_kind kind) (pp_pattern pat)
   | Reflexivity _ -> "reflexivity"
-  | Replace (_, t1, t2) ->
-      sprintf "replace %s with %s" (pp_term_ast t1) (pp_term_ast t2)
+  | Replace (_, pattern, t) ->
+      sprintf "replace %s with %s" (pp_pattern pattern) (pp_term_ast t)
   | Rewrite (_, pos, t, pattern) -> 
       sprintf "rewrite %s %s %s" 
         (if pos = `Left then "left" else "right") (pp_term_ast t)
@@ -112,9 +119,10 @@ let rec pp_tactic = function
   | Symmetry _ -> "symmetry"
   | Transitivity (_, term) -> "transitivity " ^ pp_term_ast term
   | FwdSimpl (_, term) -> sprintf "fwd %s" (pp_term_ast term)
-  | LApply (_, term_opt, term) -> 
-      sprintf "lapply %s%s" (pp_term_ast term) 
-        (match term_opt with | None -> "" | Some t -> " to " ^ pp_term_ast t)
+  | LApply (_, term_opt, term, ident) -> 
+      sprintf "lapply %s%s%s" (pp_term_ast term) 
+        (match term_opt with None -> "" | Some t -> " to " ^ pp_term_ast t)
+        (match ident with None -> "" | Some id -> " " ^ id)
 
 let pp_flavour = function
   | `Definition -> "Definition"
@@ -212,6 +220,7 @@ let pp_obj = function
 
 let pp_command = function
   | Qed _ -> "qed"
+  | Drop _ -> "drop"
   | Set (_, name, value) -> sprintf "Set \"%s\" \"%s\"" name value
   | Coercion (_,_) -> "Coercion IMPLEMENT ME!!!!!"
   | Alias (_,s) -> pp_alias s
@@ -219,10 +228,7 @@ let pp_command = function
 
 let rec pp_tactical = function
   | Tactic (_, tac) -> pp_tactic tac
-
-  | 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
   | Then (_, tac, tacs) ->