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 a5c0478acc65b9e2b24e6ef3f795285b5c05be63..b9babaa65a7e5b4b47f7b0da9ea70603525b82d9 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -163,42 +163,45 @@ let pp_fields fields =
   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_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
-  | Record (_,params,name,ty,fields) ->
-      "record " ^ name ^ " " ^ pp_params params ^ " \\def {" ^
-      pp_fields fields ^ "}"
-      
+  | Obj (_,obj) -> pp_obj obj
 
 let rec pp_tactical = function
   | Tactic (_, tac) -> pp_tactic tac