Asts generalized: a lot of tactics where restricted to identifiers in place

[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 52f7b1ab20099709575e37bcbd18eb61f2b96116..263382ef10cfbd2b9aa9c3c3cc885b1092cede61 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,12 +66,12 @@ 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)
+       (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
+  | 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 ^
@@ -84,7 +85,7 @@ let rec pp_tactic = function
      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"
@@ -103,13 +104,13 @@ let rec pp_tactic = function
 (*       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"
@@ -117,7 +118,7 @@ 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)
 
 let pp_flavour = function
   | `Definition -> "Definition"