Add last declarative tactics, modify rewriting tactics

[helm.git] / matita / components / grafite / grafiteAstPp.ml

diff --git a/matita/components/grafite/grafiteAstPp.ml b/matita/components/grafite/grafiteAstPp.ml
index 4e685c26dabe285f9d9f814cbcb766d37f30ad5a..a4a5788d9fbb4c1a637cb95259f5f4618137c5dc 100644 (file)
--- a/matita/components/grafite/grafiteAstPp.ml
+++ b/matita/components/grafite/grafiteAstPp.ml
@@ -131,11 +131,48 @@ let rec pp_ntactic status ~map_unicode_to_tex =
   (match ident with None -> " " | Some id -> "(" ^ id ^ ")") ^ (match term1 with None -> " " | Some t1
   -> "or equivalently" ^ NotationPp.pp_term status t1)
   | Bydone (_, just) -> pp_just status just ^ "done"
-  (*
-  | ExistsElim (_, just, ident, term, term1, ident1) -> pp_just ~term_pp just ^ "let " ^ ident ^ ":"
-  ^ NotationPp.pp_term term ^ "such that " ^ NotationPp.pp_term term1 ^ "(" ^ ident1 ^ ")"
-  | AndElim (_, just, term1, ident1, term2, ident2) -> pp_just ~NotationPp.pp_term just ^ "we have " ^ NotationPp.pp_term term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ NotationPp.pp_term term2 ^ " (" ^ ident2 ^ ")" 
-  *)
+  | ExistsElim (_, just, ident, term, term1, ident1) -> pp_just status just ^ "let " ^ ident ^ ":"
+  ^ NotationPp.pp_term status term ^ "such that " ^ NotationPp.pp_term status term1 ^ "(" ^ ident1 ^ ")"
+  | AndElim (_, just, term1, ident1, term2, ident2) -> pp_just status just ^ "we have " ^
+  NotationPp.pp_term status term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ NotationPp.pp_term status term2
+  ^ " (" ^ ident2 ^ ")" 
+  | Thesisbecomes (_, term1, term2) -> "the thesis becomes " ^ NotationPp.pp_term status term1 ^ (match
+  term2 with None -> " " | Some term2 -> NotationPp.pp_term status term2)
+  | RewritingStep (_, rhs, just, cont) -> 
+      "=" ^
+      NotationPp.pp_term status rhs ^ 
+      (match just with 
+      | `Auto params -> pp_auto_params params status
+      | `Term t -> " exact " ^ NotationPp.pp_term status t
+      | `Proof -> " proof"
+      | `SolveWith t -> " using " ^ NotationPp.pp_term status t)
+      ^ (if cont then " done" else "")
+(*
+  | RewritingStep (_, term, term1, term2, cont) -> 
+      (match term with 
+      | None -> " " 
+      | Some (None,term) -> "conclude " ^ NotationPp.pp_term status term 
+      | Some (Some name,term) -> 
+          "obtain (" ^ name ^ ") " ^ NotationPp.pp_term status term) 
+      ^ "=" ^
+      NotationPp.pp_term status term1 ^ 
+      (match term2 with 
+      | `Auto params -> pp_auto_params params status
+      | `Term term2 -> " exact " ^ NotationPp.pp_term status term2 
+      | `Proof -> " proof"
+      | `SolveWith term -> " using " ^ NotationPp.pp_term status term)
+      ^ (if cont then " done" else "")
+*)
+  | Obtain (_,id,t1) -> "obtain (" ^ id ^ ")" ^ NotationPp.pp_term status t1
+  | Conclude (_,t1) -> "conclude " ^ NotationPp.pp_term status t1
+  | We_proceed_by_cases_on (_, term, term1) -> "we proceed by cases on" ^ NotationPp.pp_term status term ^ "to prove" ^ NotationPp.pp_term status  term1
+  | We_proceed_by_induction_on (_, term, term1) -> "we proceed by induction on" ^ NotationPp.pp_term status  term ^ "to prove" ^ NotationPp.pp_term status  term1
+  | Byinduction (_, term, ident) -> "by induction hypothesis we know" ^ NotationPp.pp_term status  term ^ "(" ^ ident ^ ")"
+  | Case (_, id, args) ->
+     "case" ^ id ^
+       String.concat " "
+        (List.map (function (id,term) -> "(" ^ id ^ ": " ^ NotationPp.pp_term status  term ^  ")")
+         args)
 ;;
 
 let pp_nmacro status = function