Big commit and major code clean-up:

[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 eebc73c89c1e1cdb5b01a5ff32c2a02590573af2..b9babaa65a7e5b4b47f7b0da9ea70603525b82d9 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -41,7 +41,8 @@ let pp_reduction_kind = function
   | `Reduce -> "reduce"
   | `Simpl -> "simplify"
   | `Whd -> "whd"
-
+  | `Normalize -> "normalize"
+  
 let rec pp_tactic = function
   | Absurd (_, term) -> "absurd" ^ pp_term_ast term
   | Apply (_, term) -> "apply " ^ pp_term_ast term
@@ -84,6 +85,9 @@ let rec pp_tactic = function
   | 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)
   | Reflexivity _ -> "reflexivity"
   | Replace (_, t1, t2) ->
       sprintf "replace %s with %s" (pp_term_ast t1) (pp_term_ast t2)
@@ -120,17 +124,17 @@ let pp_macro pp_term = function
   | WElim (_, t) -> "whelp elim " ^ pp_term t
   | WMatch (_, term) -> "whelp match " ^ pp_term term
   (* real macros *)
-  | Abort _ -> "Abort"
+(*   | Abort _ -> "Abort" *)
   | Check (_, term) -> sprintf "Check %s" (pp_term term)
   | Hint _ -> "hint"
-  | Redo (_, None) -> "Redo"
-  | Redo (_, Some n) -> sprintf "Redo %d" n
+(*   | 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)
-  | Undo (_, None) -> "Undo"
-  | Undo (_, Some n) -> sprintf "Undo %d" n
+(*   | Undo (_, None) -> "Undo"
+  | Undo (_, Some n) -> sprintf "Undo %d" n *)
   | Print (_, name) -> sprintf "Print \"%s\"" name
   | Quit _ -> "Quit"
 
@@ -145,47 +149,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