X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FsequentPp.ml;h=d0430162e848951e2a692e9dd7008f52c41c270c;hb=89262281b6e83bd2321150f81f1a0583645eb0c8;hp=7bfa6b36a5d875789f4cc3b620b75b9c36149bce;hpb=d1d5f6ee41209f05c072ba20e3cd50bc774ebff4;p=helm.git

diff --git a/helm/gTopLevel/sequentPp.ml b/helm/gTopLevel/sequentPp.ml
index 7bfa6b36a..d0430162e 100644
--- a/helm/gTopLevel/sequentPp.ml
+++ b/helm/gTopLevel/sequentPp.ml
@@ -1,74 +1,112 @@
+(* Copyright (C) 2000-2002, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
 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
-    X.xml_nempty "Sequent" []
-     (let final_s,final_env =
+    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_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,_ =
        (List.fold_right
-         (fun (b,n,t) (s,env) ->
-           let (acic,_,_,ids_to_inner_sorts) =
-            Cic2acic.acic_of_cic_env metasenv env t
-           in
-            [< s ;
-               X.xml_nempty
-                (match b with
-                    ProofEngine.Definition  -> "Definition"
-                  | ProofEngine.Declaration -> "Declaration"
-                ) ["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,t)::env) (* CSC: sbagliato!!! Giusto solo se Declaration! *)
+         (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
+               (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 None 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,_,_,ids_to_inner_sorts) =
-        Cic2acic.acic_of_cic_env metasenv final_env goal
-       in
-        [< final_s ;
-           Xml.xml_nempty "Goal" []
-            (Cic2Xml.print_term (UriManager.uri_of_string "cic:/dummy.con")
-              ids_to_inner_sorts acic)
-        >]
-     )
+       let acic = acic_of_cic_context context goal None 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_hypotheses
   ;;
  end
 ;;