]> matita.cs.unibo.it Git - helm.git/blobdiff - helm/ocaml/cic_transformations/content2pres.ml
rendering fixes:
[helm.git] / helm / ocaml / cic_transformations / content2pres.ml
index 1301d101772160ed78cd22e9899ea0d69ade1b41..29da14591e9fd6946f1e0062412ece9457985288 100644 (file)
@@ -758,80 +758,109 @@ proof2pres p
 
 exception ToDo;;
 
-let aaa = ref 0
+let counter = ref 0
+
+let conjecture2pres term2pres (id, n, context, ty) =
+  (B.b_h [Some "helm", "xref", id]
+     (((List.map
+          (function
+             | None ->
+                B.b_h []
+                   [ B.b_object (p_mi [] "_") ;
+                     B.b_object (p_mo [] ":?") ;
+                     B.b_object (p_mi [] "_")]
+             | Some (`Declaration d)
+             | Some (`Hypothesis d) ->
+                let { Content.dec_name =
+                    dec_name ; Content.dec_type = ty } = d
+                in
+                  B.b_h []
+                     [ B.b_object
+                        (p_mi []
+                           (match dec_name with
+                                None -> "_"
+                              | Some n -> n));
+                       B.b_text [] ":";
+                       term2pres ty ]
+             | Some (`Definition d) ->
+                 let
+                     { Content.def_name = def_name ;
+                       Content.def_term = bo } = d
+                 in
+                   B.b_h []
+                     [ B.b_object (p_mi []
+                                    (match def_name with
+                                         None -> "_"
+                                       | Some n -> n)) ;
+                       B.b_text [] ":=" ;
+                       term2pres bo]
+             | Some (`Proof p) ->
+                 let proof_name = p.Content.proof_name in
+                   B.b_h []
+                     [ B.b_object (p_mi []
+                                    (match proof_name with
+                                         None -> "_"
+                                       | Some n -> n)) ;
+                       B.b_text [] ":=" ;
+                       proof2pres term2pres p])
+          (List.rev context)) @
+         [ B.b_text [] "|-" ;
+           B.b_object (p_mi [] (string_of_int n)) ;
+           B.b_text [] ":" ;
+           term2pres ty ])))
+
+let metasenv2pres term2pres = function
+  | None -> []
+  | Some metasenv' ->
+      (* Conjectures are in their own table to make *)
+      (* diffing the DOM trees easier.              *)
+      [B.b_v []
+        ((B.b_text []
+            ("Conjectures:" ^
+             (let _ = incr counter; in (string_of_int !counter)))) ::
+         (List.map (conjecture2pres term2pres) metasenv'))]
+
+let get_name = function
+  | Some s -> s
+  | None -> "_"
+
+let pp_params = function
+  | [] -> ""
+  | params ->
+      " (" ^
+      String.concat " ; " (List.map UriManager.string_of_uri params) ^
+      ")"
 
 let content2pres term2pres (id,params,metasenv,obj) =
-  let module K = Content in
-    match obj with
-       `Def (K.Const,thesis,`Proof p) ->
-         B.b_v
-          [None,"helm:xref","id"]
-          ([B.b_text [] ("UNFINISHED PROOF " ^ id ^"(" ^ String.concat " ; " (List.map UriManager.string_of_uri params)^ ")") ;
-            B.b_text [] "THESIS:" ;
-           B.indent (term2pres thesis)] @
-           (match metasenv with
-               None -> []
-              | Some metasenv' ->
-                    (* Conjectures are in their own table to make *)
-                    (* diffing the DOM trees easier.              *)
-                    (B.b_v []
-                       ((B.b_text [] ("CONJECTURES:" ^ (let _ = incr aaa; in (string_of_int !aaa))))::
-                       (List.map
-                         (function
-                              (id,n,context,ty) ->
-                                (B.b_h [Some "helm", "xref", id]
-                                   (((List.map
-                                        (function
-                                             None ->
-                                               B.b_h []
-                                               [ B.b_object (p_mi [] "_") ;
-                                                 B.b_object (p_mo [] ":?") ;
-                                                 B.b_object (p_mi [] "_")]
-                                           | Some (`Declaration d)
-                                           | Some (`Hypothesis d) ->
-                                               let
-                                                 { K.dec_name = dec_name ;
-                                                   K.dec_type = ty } = d
-                                               in
-                                                 B.b_h []
-                                                   [ B.b_object (p_mi []
-                                                                    (match dec_name with
-                                                                         None -> "_"
-                                                                       | Some n -> n)) ;
-                                                     B.b_text [] ":" ;
-                                                     term2pres ty]
-                                           | Some (`Definition d) ->
-                                               let
-                                                 { K.def_name = def_name ;
-                                                   K.def_term = bo } = d
-                                               in
-                                                 B.b_h []
-                                                   [ B.b_object (p_mi []
-                                                                    (match def_name with
-                                                                         None -> "_"
-                                                                       | Some n -> n)) ;
-                                                     B.b_text [] ":=" ;
-                                                     term2pres bo]
-                                           | Some (`Proof p) ->
-                                               let proof_name = p.K.proof_name in
-                                                 B.b_h []
-                                                   [ B.b_object (p_mi []
-                                                                    (match proof_name with
-                                                                         None -> "_"
-                                                                       | Some n -> n)) ;
-                                                     B.b_text [] ":=" ;
-                                                     proof2pres term2pres p]
-                                        ) (List.rev context)) @
-                                     [ B.b_text [] "|-" ;
-                                       B.b_object (p_mi [] (string_of_int n)) ;
-                                       B.b_text [] ":" ;
-                                       term2pres ty ])
-                                   ))
-                         ) metasenv'))
-                    )::[proof2pres term2pres p]
-          )
-         )
-      | _ -> raise ToDo
+  match obj with
+  | `Def (Content.Const, thesis, `Proof p) ->
+      let name = get_name p.Content.proof_name in
+      B.b_v
+        [None,"helm:xref","id"]
+        ([ B.b_text [] ("Proof " ^ name ^ pp_params params);
+           B.b_text [] "Thesis:";
+           B.indent (term2pres thesis) ] @
+         metasenv2pres term2pres metasenv @
+         [proof2pres term2pres p])
+  | `Def (_, ty, `Definition body) ->
+      let name = get_name body.Content.def_name in
+      B.b_v
+        [None,"helm:xref","id"]
+        ([B.b_text [] ("Definition " ^ name ^ pp_params params);
+          B.b_text [] "Type:";
+          B.indent (term2pres ty)] @
+          metasenv2pres term2pres metasenv @
+          [term2pres body.Content.def_term])
+  | `Decl (_, `Declaration decl)
+  | `Decl (_, `Hypothesis decl) ->
+      let name = get_name decl.Content.dec_name in
+      B.b_v
+        [None,"helm:xref","id"]
+        ([B.b_text [] ("Axiom " ^ name ^ pp_params params);
+          B.b_text [] "Type:";
+          B.indent (term2pres decl.Content.dec_type)] @
+          metasenv2pres term2pres metasenv)
+  | _ -> raise ToDo
 ;;
 
 (*