X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAstPp.ml;h=263382ef10cfbd2b9aa9c3c3cc885b1092cede61;hb=9d8e81db720417f58591ea42f72c6750b886a83d;hp=e86f77bd6e998f41035e8548763a4326b16ecf17;hpb=0aa359c7943ea10c70ae1ec053062c658b28b8ce;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index e86f77bd6..263382ef1 100644
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -42,7 +42,23 @@ let pp_reduction_kind = function
   | `Simpl -> "simplify"
   | `Whd -> "whd"
   | `Normalize -> "normalize"
+ 
   
+let pp_pattern (hyp, goal) = 
+  let pp_hyp_pattern l =
+    String.concat "; "
+      (List.map (fun (name, p) -> sprintf "%s : %s" name (pp_term_ast p)) l)
+  in
+  let pp_goal_pattern p = 
+    match p with 
+    | None -> ""
+    | Some p -> pp_term_ast p
+  in
+  let separator = 
+    if hyp <> [] then " \vdash " else " "
+  in
+   "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
@@ -50,13 +66,13 @@ 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)
+(*   | Change_pattern (_, _, _, _) -> assert false  (* TODO *) *)
   | Contradiction _ -> "contradiction"
   | Cut (_, term) -> "cut " ^ pp_term_ast term
-  | Decompose (_, ident, principles) ->
-      sprintf "decompose %s %s" (pp_idents principles) ident
-  | Discriminate (_, ident) -> "discriminate " ^ ident
+  | 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)
@@ -65,9 +81,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"
@@ -75,33 +93,32 @@ 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))
-  | ReduceAt (_, kind, id, term) ->
-      sprintf "%s %s at %s" (pp_reduction_kind kind) id
-       (pp_term_ast term)
+(*   | 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 %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, None) -> 
-      sprintf "rewrite %s %s" 
+(*   | Replace_pattern (_, _, _) -> assert false  (* TODO *) *)
+  | Rewrite (_, pos, t, pattern) -> 
+      sprintf "rewrite %s %s %s" 
         (if pos = `Left then "left" else "right") (pp_term_ast t)
-  | Rewrite _ -> assert false (* TODO *)
+        (pp_pattern pattern)
   | Right _ -> "right"
   | Ring _ -> "ring"
   | 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)
 
 let pp_flavour = function
   | `Definition -> "Definition"