X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2FgTopLevel%2FsequentPp.ml;h=bffb3030c27cc81b76693b7e1d83c3221697f3e0;hb=4d04f9f79e41245f6ed83ff0e45e9b5a97ecee1a;hp=ba2d5140f10f8c1692d40853942260255fef5e82;hpb=cba2bdcb2944a5d2a4f2e1560262430fd45e61e6;p=helm.git

diff --git a/helm/gTopLevel/sequentPp.ml b/helm/gTopLevel/sequentPp.ml
index ba2d5140f..bffb3030c 100644
--- a/helm/gTopLevel/sequentPp.ml
+++ b/helm/gTopLevel/sequentPp.ml
@@ -2,73 +2,80 @@ 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 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  -> "Def"
-                  | ProofEngine.Declaration -> "Decl"
-                ) ["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) ->
+           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 in
+                [< s ;
+                   X.xml_nempty
+                    (match b with Cic.Decl _ -> "Decl" | Cic.Def _ -> "Def")
+                    ["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)
+                >], (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 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
   ;;
  end
 ;;