* The interface of CicTypeChecker now allows the usage of definitions in

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

diff --git a/helm/gTopLevel/sequentPp.ml b/helm/gTopLevel/sequentPp.ml
index 8fbb78b2abdaeafa868453376c86f2a9a730c1a2..fb040dfd82dc71c8f8e9afc7f2fa161390b1f87c 100644 (file)
--- a/helm/gTopLevel/sequentPp.ml
+++ b/helm/gTopLevel/sequentPp.ml
@@ -11,11 +11,11 @@ module TextualPp =
      List.fold_right
       (fun i env ->
         match i with
-           (P.Declaration,n,t) ->
+           P.Declaration (n,t) ->
              print_endline (print_name n ^ ":" ^ CicPp.pp t env) ;
              flush stdout ;
              n::env
-         | (P.Definition,n,t) ->
+         | P.Definition (n,t) ->
              print_endline (print_name n ^ ":=" ^ CicPp.pp t env) ;
              flush stdout ;
              n::env
@@ -38,31 +38,44 @@ module TextualPp =
 
 module XmlPp =
  struct
-  let print_sequent (context,goal) =
+  let print_sequent metasenv (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_env =
+      Cic2acic.acic_of_cic_env' seed ids_to_terms ids_to_father_ids
+       ids_to_inner_sorts ids_to_inner_types metasenv
+     in
+      let final_s,final_env =
        (List.fold_right
-         (fun (b,n,t) (s,env) ->
-           [< 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")
-                 (let (acic,_,_) = Cic2acic.acic_of_cic_env env t in acic)) ;
-           >],(n::env)
+         (fun binding (s,env) ->
+           let b,n,t,cicbinding =
+            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)
          ) context ([<>],[])
        )
       in
-       [< final_s ;
-          Xml.xml_nempty "Goal" []
-           (Cic2Xml.print_term (UriManager.uri_of_string "cic:/dummy.con")
-             (let (acic,_,_) = Cic2acic.acic_of_cic_env final_env goal in acic))
-       >]
-     )
+       let acic = acic_of_cic_env final_env goal in
+        X.xml_nempty "Sequent" []
+         [< 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
 ;;