X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAstPp.ml;h=eeaa500cde0b3d18e44bf9121d34e44321a29a02;hb=0eab2248345360e8e4b261f653f897db645998a7;hp=822618eb4a18d0c70616086f287ccb21d4f438fb;hpb=c05b36907ed2bf71300dffc2f4a6602dc1288045;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index 822618eb4..eeaa500cd 100644
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -42,6 +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
+   "in " ^ pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
 
 let rec pp_tactic = function
   | Absurd (_, term) -> "absurd" ^ pp_term_ast term
@@ -50,13 +66,15 @@ 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)
+  | Compare (_,term) -> "compare " ^ pp_term_ast term
+  | Constructor (_,n) -> "constructor " ^ string_of_int n
   | Contradiction _ -> "contradiction"
   | Cut (_, term) -> "cut " ^ pp_term_ast term
-  | Decompose (_, ident, principles) ->
-      sprintf "decompose %s %s" (pp_idents principles) ident
-  | Discriminate (_, ident) -> "discriminate " ^ ident
+  | DecideEquality _ -> "decide equality"
+  | 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 +83,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,32 +95,24 @@ 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, 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" 
+  | 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 (_, term) -> sprintf "fwd %s" (pp_term_ast term)
+  | LApply (_, term_opt, term) -> 
+      sprintf "lapply %s%s" (pp_term_ast term) 
+        (match term_opt with | None -> "" | Some t -> " to " ^ pp_term_ast t)
 
 let pp_flavour = function
   | `Definition -> "Definition"
@@ -149,47 +161,59 @@ let pp_alias = function
   | Number_alias (instance,desc) ->
       sprintf "alias num (instance %d) = \"%s\"" instance desc
   
+let pp_params = function
+  | [] -> ""
+  | params ->
+      " " ^
+      String.concat " "
+        (List.map
+          (fun (name, typ) -> sprintf "(%s:%s)" name (pp_term_ast typ))
+          params)
+      
+let pp_fields fields =
+  (if fields <> [] then "\n" else "") ^ 
+  String.concat ";\n" 
+    (List.map (fun (name,ty) -> " " ^ name ^ ": " ^ pp_term_ast ty) fields)
+        
+let pp_obj = function
+ | Inductive (params, types) ->
+    let pp_constructors constructors =
+      String.concat "\n"
+        (List.map (fun (name, typ) -> sprintf "| %s: %s" name (pp_term_ast typ))
+          constructors)
+    in
+    let pp_type (name, _, typ, constructors) =
+      sprintf "\nwith %s: %s \\def\n%s" name (pp_term_ast 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_ast 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)
+      name
+      (pp_term_ast typ)
+      (match body with
+      | None -> ""
+      | Some body -> "\\def " ^ pp_term_ast body)
+ | Record (params,name,ty,fields) ->
+    "record " ^ name ^ " " ^ pp_params params ^ " \\def {" ^
+    pp_fields fields ^ "}"
+
+
 let pp_command = function
   | Qed _ -> "qed"
   | Set (_, name, value) -> sprintf "Set \"%s\" \"%s\"" name value
-  | Inductive (_, params, types) ->
-      let pp_params = function
-        | [] -> ""
-        | params ->
-            " " ^
-            String.concat " "
-              (List.map
-                (fun (name, typ) -> sprintf "(%s:%s)" name (pp_term_ast typ))
-                params)
-      in
-      let pp_constructors constructors =
-        String.concat "\n"
-          (List.map (fun (name, typ) -> sprintf "| %s: %s" name (pp_term_ast typ))
-            constructors)
-      in
-      let pp_type (name, _, typ, constructors) =
-        sprintf "\nwith %s: %s \\def\n%s" name (pp_term_ast 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_ast 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)
-        (pp_term_ast typ)
-        (match body with
-        | None -> ""
-        | Some body -> "\\def " ^ pp_term_ast body)
   | Coercion (_,_) -> "Coercion IMPLEMENT ME!!!!!"
   | Alias (_,s) -> pp_alias s
+  | Obj (_,obj) -> pp_obj obj
 
 let rec pp_tactical = function
   | Tactic (_, tac) -> pp_tactic tac