added support for patterns current goal

[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 e86f77bd6e998f41035e8548763a4326b16ecf17..2cc4d0c658fc735306b45b6ebbed2a86c210f18c 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -42,7 +42,22 @@ 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
+  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
@@ -51,7 +66,7 @@ let rec pp_tactic = function
   | 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 *)
+(*   | Change_pattern (_, _, _, _) -> assert false  (* TODO *) *)
   | Contradiction _ -> "contradiction"
   | Cut (_, term) -> "cut " ^ pp_term_ast term
   | Decompose (_, ident, principles) ->
@@ -75,27 +90,26 @@ 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 in %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 in %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"