X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAstPp.ml;h=0d539ddbe93cf0c5f450d4fd6fd8c90cde708ed2;hb=7e9904185ceff75884783dbf0bad506b8521b857;hp=089f8b896073a256682a0b6428e94295ae9f385d;hpb=9e67c082f0021849b411ec8acbd041137f1fb73a;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index 089f8b896..0d539ddbe 100644
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -27,19 +27,23 @@ open Printf
 
 open TacticAst
 
+let tactical_terminator = "."
+let tactical_separator = ";"
+
 let pp_term term = CicAstPp.pp_term term
 
 let pp_idents idents = "[" ^ String.concat "; " idents ^ "]"
 
 let pp_reduction_kind = function
   | `Reduce -> "reduce"
-  | `Simpl -> "simpl"
+  | `Simpl -> "simplify"
   | `Whd -> "whd"
 
 let rec pp_tactic = function
   | LocatedTactic (loc, tac) -> pp_tactic tac
-  | Absurd -> "absurd"
+  | Absurd term -> "absurd" ^ pp_term term
   | Apply term -> "apply " ^ pp_term term
+  | Auto -> "auto"
   | Assumption -> "assumption"
   | Change (t1, t2, where) ->
       sprintf "change %s with %s%s" (pp_term t1) (pp_term t2)
@@ -59,14 +63,25 @@ let rec pp_tactic = function
   | Fold (kind, term) ->
       sprintf "fold %s %s" (pp_reduction_kind kind) (pp_term term)
   | Fourier -> "fourier"
+  | Hint -> "hint"
   | Injection ident -> "injection " ^ ident
+  | Intros (None, []) -> "intro"
   | Intros (num, idents) ->
       sprintf "intros%s%s"
         (match num with None -> "" | Some num -> " " ^ string_of_int num)
         (match idents with [] -> "" | idents -> " " ^ pp_idents idents)
   | Left -> "left"
   | LetIn (term, ident) -> sprintf "let %s in %s" (pp_term term) ident
-  | Reduce (_, _, _) -> assert false  (* TODO *)
+  | 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 terms))
+  | Reduce (kind, Some (terms, `Everywhere)) ->
+      sprintf "%s in hyp %s" (pp_reduction_kind kind)
+        (String.concat ", " (List.map pp_term terms))
   | Reflexivity -> "reflexivity"
   | Replace (t1, t2) -> sprintf "replace %s with %s" (pp_term t1) (pp_term t2)
   | Replace_pattern (_, _) -> assert false  (* TODO *)
@@ -85,23 +100,63 @@ let pp_flavour = function
   | `Remark -> "Remark"
   | `Theorem -> "Theorem"
 
+let pp_search_kind = function
+  | `Locate -> "locate"
+  | `Hint -> "hint"
+  | `Match -> "match"
+  | `Elim -> "elim"
+
 let pp_command = function
   | Abort -> "Abort"
-  | Check term -> sprintf "Check %s" (CicAstPp.pp_term term)
+  | Baseuri (Some uri) -> sprintf "Baseuri \"%s\"" uri
+  | Baseuri None -> "Baseuri"
+  | Check term -> sprintf "Check %s" (pp_term term)
   | Proof -> "Proof"
   | Qed name ->
       (match name with None -> "Qed" | Some name -> sprintf "Save %s" name)
   | Quit -> "Quit"
   | Redo None -> "Redo"
   | Redo (Some n) -> sprintf "Redo %d" n
+  | Search_pat (kind, pat) ->
+      sprintf "search %s \"%s\"" (pp_search_kind kind) pat
+  | Search_term (kind, term) ->
+      sprintf "search %s %s" (pp_search_kind kind) (pp_term term)
+  | Inductive (params, types) ->
+      let pp_params = function
+        | [] -> ""
+        | params ->
+            " " ^
+            String.concat " "
+              (List.map
+                (fun (name, typ) -> sprintf "(%s:%s)" name (pp_term typ))
+                params)
+      in
+      let pp_constructors constructors =
+        String.concat "\n"
+          (List.map (fun (name, typ) -> sprintf "| %s: %s" name (pp_term typ))
+            constructors)
+      in
+      let pp_type (name, _, typ, constructors) =
+        sprintf "\nwith %s: %s \\def\n%s" name (pp_term typ)
+          (pp_constructors constructors)
+      in
+      (match types with
+      | [] -> assert false
+      | (name, inductive, typ, constructors) :: tl ->
+          let fst_typ_pp =
+            sprintf "%sinductive %s%s: %s \\def\n%s"
+              (if inductive then "" else "co") name (pp_params params)
+              (pp_term typ) (pp_constructors constructors)
+          in
+          fst_typ_pp ^ String.concat "" (List.map pp_type tl))
   | Theorem (flavour, name, typ, body) ->
       sprintf "%s %s: %s %s"
         (pp_flavour flavour)
         (match name with None -> "" | Some name -> name)
-        (CicAstPp.pp_term typ)
+        (pp_term typ)
         (match body with
         | None -> ""
-        | Some body -> "\\def " ^ CicAstPp.pp_term body)
+        | Some body -> "\\def " ^ pp_term body)
   | Undo None -> "Undo"
   | Undo (Some n) -> sprintf "Undo %d" n
 
@@ -120,7 +175,8 @@ let rec pp_tactical = function
   | Tries tacs -> sprintf "tries [%s]" (pp_tacticals tacs)
   | Try tac -> "try " ^ pp_tactical tac
 
-and pp_tacticals tacs = String.concat "; " (List.map pp_tactical tacs)
+and pp_tacticals tacs =
+  String.concat (tactical_separator ^ " ") (List.map pp_tactical tacs)
 
-let pp_tactical tac = pp_tactical tac ^ "."
+let pp_tactical tac = pp_tactical tac ^ tactical_terminator