Conjectures and Hypotheses inside every conjecture and in the sequents now

[helm.git] / helm / gTopLevel / sequentPp.ml

diff --git a/helm/gTopLevel/sequentPp.ml b/helm/gTopLevel/sequentPp.ml
index fb040dfd82dc71c8f8e9afc7f2fa161390b1f87c..df504e75a248f4a8fc5433681a9e90e33dd7adf3 100644 (file)
--- a/helm/gTopLevel/sequentPp.ml
+++ b/helm/gTopLevel/sequentPp.ml
@@ -2,80 +2,86 @@ module TextualPp =
  struct
   (* It also returns the pretty-printing context! *)
   let print_context ctx =
-   let module P = ProofEngine in
     let print_name =
      function
         Cic.Name n -> n
       | Cic.Anonimous -> "_"
     in
      List.fold_right
-      (fun i env ->
-        match i with
-           P.Declaration (n,t) ->
-             print_endline (print_name n ^ ":" ^ CicPp.pp t env) ;
-             flush stdout ;
-             n::env
-         | P.Definition (n,t) ->
-             print_endline (print_name n ^ ":=" ^ CicPp.pp t env) ;
-             flush stdout ;
-             n::env
-      ) ctx []
+      (fun i (output,context) ->
+        let (newoutput,context') =
+         match i with
+            Some (n,Cic.Decl t) ->
+              print_name n ^ ":" ^ CicPp.pp t context ^ "\n", (Some n)::context
+          | Some (n,Cic.Def t) ->
+              print_name n ^ ":=" ^ CicPp.pp t context ^ "\n", (Some n)::context
+          | None ->
+              "_ ?= _\n", None::context
+        in
+         output^newoutput,context'
+      ) ctx ("",[])
   ;;
 
   exception NotImplemented;;
 
-  let print_sequent (context,goal) =
+  let print_sequent (metano,context,goal) =
    let module P = ProofEngine in
-    print_newline () ;
-    let pretty_printer_env_of_context =
-     print_context context
-    in
-    print_endline "----------------------" ;
-    print_endline (CicPp.pp goal pretty_printer_env_of_context) ; flush stdout
+    "\n" ^
+     let (output,pretty_printer_context_of_context) = print_context context in
+      output ^
+       "---------------------- ?" ^ string_of_int metano ^ "\n" ^
+        CicPp.pp goal pretty_printer_context_of_context
   ;;
  end
 ;;
 
 module XmlPp =
  struct
-  let print_sequent metasenv (context,goal) =
+  let print_sequent metasenv (metano,context,goal) =
    let module X = Xml in
     let ids_to_terms = Hashtbl.create 503 in
     let ids_to_father_ids = Hashtbl.create 503 in
     let ids_to_inner_sorts = Hashtbl.create 503 in
     let ids_to_inner_types = Hashtbl.create 503 in
+    let ids_to_hypotheses = Hashtbl.create 11 in
+    let hypotheses_seed = ref 0 in
     let seed = ref 0 in
-     let acic_of_cic_env =
-      Cic2acic.acic_of_cic_env' seed ids_to_terms ids_to_father_ids
+     let acic_of_cic_context =
+      Cic2acic.acic_of_cic_context' seed ids_to_terms ids_to_father_ids
        ids_to_inner_sorts ids_to_inner_types metasenv
      in
-      let final_s,final_env =
+      let final_s,_ =
        (List.fold_right
-         (fun binding (s,env) ->
-           let b,n,t,cicbinding =
+         (fun binding (s,context) ->
+           let hid = "h" ^ string_of_int !hypotheses_seed in
+            Hashtbl.add ids_to_hypotheses hid binding ;
+            incr hypotheses_seed ;
             match binding with
-               ProofEngine.Definition  (n,t) -> "Def", n, t,Cic.Def t
-             | ProofEngine.Declaration (n,t) -> "Decl", n, t, Cic.Decl t
-           in
-            let acic = acic_of_cic_env env t in
-             [< s ;
-                X.xml_nempty b
-                 ["name",(match n with Cic.Name n -> n | _ -> assert false)]
-                 (Cic2Xml.print_term
-                   (UriManager.uri_of_string "cic:/dummy.con")
-                   ids_to_inner_sorts acic)
-             >],((n,cicbinding)::env)
+               (Some (n,(Cic.Def t as b)) as entry)
+             | (Some (n,(Cic.Decl t as b)) as entry) ->
+                let acic = acic_of_cic_context context t in
+                 [< s ;
+                    X.xml_nempty
+                     (match b with Cic.Decl _ -> "Decl" | Cic.Def _ -> "Def")
+                     ["name",(match n with Cic.Name n -> n | _ -> assert false);
+                      "id",hid]
+                     (Cic2Xml.print_term
+                       (UriManager.uri_of_string "cic:/dummy.con")
+                       ids_to_inner_sorts acic)
+                 >], (entry::context)
+             | None ->
+                [< s ; X.xml_empty "Hidden" [] >], (None::context)
          ) context ([<>],[])
        )
       in
-       let acic = acic_of_cic_env final_env goal in
-        X.xml_nempty "Sequent" []
+       let acic = acic_of_cic_context context goal in
+        X.xml_nempty "Sequent" ["no",string_of_int metano]
          [< final_s ;
             Xml.xml_nempty "Goal" []
              (Cic2Xml.print_term (UriManager.uri_of_string "cic:/dummy.con")
                ids_to_inner_sorts acic)
          >],
-         ids_to_terms,ids_to_father_ids
+         ids_to_terms,ids_to_father_ids,ids_to_hypotheses
   ;;
  end
 ;;