More tactics are now available to matita.

[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 2cc4d0c658fc735306b45b6ebbed2a86c210f18c..eeaa500cde0b3d18e44bf9121d34e44321a29a02 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -57,7 +57,8 @@ let pp_pattern (hyp, goal) =
   let separator = 
     if hyp <> [] then " \vdash " else " "
   in
-  pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
+   "in " ^ pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
+
 let rec pp_tactic = function
   | Absurd (_, term) -> "absurd" ^ pp_term_ast term
   | Apply (_, term) -> "apply " ^ pp_term_ast term
@@ -65,13 +66,15 @@ let rec pp_tactic = function
   | Assumption _ -> "assumption"
   | Change (_, t1, t2, where) ->
       sprintf "change %s with %s%s" (pp_term_ast t1) (pp_term_ast t2)
-        (match where with None -> "" | Some ident -> "in " ^ ident)
-(*   | Change_pattern (_, _, _, _) -> assert false  (* TODO *) *)
+       (pp_pattern where)
+  | Compare (_,term) -> "compare " ^ pp_term_ast term
+  | Constructor (_,n) -> "constructor " ^ string_of_int n
   | Contradiction _ -> "contradiction"
   | Cut (_, term) -> "cut " ^ pp_term_ast term
-  | Decompose (_, ident, principles) ->
-      sprintf "decompose %s %s" (pp_idents principles) ident
-  | Discriminate (_, ident) -> "discriminate " ^ ident
+  | DecideEquality _ -> "decide equality"
+  | Decompose (_, term) ->
+      sprintf "decompose %s" (pp_term_ast term)
+  | Discriminate (_, term) -> "discriminate " ^ pp_term_ast term
   | Elim (_, term, using) ->
       sprintf "elim " ^ pp_term_ast term ^
       (match using with None -> "" | Some term -> " using " ^ pp_term_ast term)
@@ -80,9 +83,11 @@ let rec pp_tactic = function
   | 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)
   | Goal (_, n) -> "goal " ^ string_of_int n
   | Fourier _ -> "fourier"
-  | Injection (_, ident) -> "injection " ^ ident
+  | Injection (_, term) -> "injection " ^ pp_term_ast term
   | Intros (_, None, []) -> "intro"
   | Intros (_, num, idents) ->
       sprintf "intros%s%s"
@@ -90,24 +95,13 @@ let rec pp_tactic = function
         (match idents with [] -> "" | idents -> " " ^ pp_idents idents)
   | Left _ -> "left"
   | LetIn (_, term, ident) -> sprintf "let %s in %s" (pp_term_ast term) ident
-(*   | Reduce (_, kind, None) *)
-(*   | Reduce (_, kind, Some ([], `Goal)) -> pp_reduction_kind kind *)
-(*   | Reduce (_, kind, Some ([], `Everywhere)) -> *)
-(*       sprintf "%s in hyp" (pp_reduction_kind kind) *)
-(*   | Reduce (_, kind, Some (terms, `Goal)) -> *)
-(*       sprintf "%s %s" (pp_reduction_kind kind) *)
-(*         (String.concat ", " (List.map pp_term_ast terms)) *)
-(*   | Reduce (_, kind, Some (terms, `Everywhere)) -> *)
-(*       sprintf "%s in hyp %s" (pp_reduction_kind kind) *)
-(*         (String.concat ", " (List.map pp_term_ast terms)) *)
   | Reduce (_, kind, pat) ->
-      sprintf "%s in %s" (pp_reduction_kind kind) (pp_pattern 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 (_, _, _) -> assert false  (* TODO *) *)
   | Rewrite (_, pos, t, pattern) -> 
-      sprintf "rewrite %s %s in %s" 
+      sprintf "rewrite %s %s %s" 
         (if pos = `Left then "left" else "right") (pp_term_ast t)
         (pp_pattern pattern)
   | Right _ -> "right"
@@ -115,7 +109,10 @@ let rec pp_tactic = function
   | Split _ -> "split"
   | Symmetry _ -> "symmetry"
   | Transitivity (_, term) -> "transitivity " ^ pp_term_ast term
-  | FwdSimpl (_, ident) -> sprintf "fwd %s" ident
+  | 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)
 
 let pp_flavour = function
   | `Definition -> "Definition"