* 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 a30f44d5a1f8618b50c30e7de66c77562ee577d8..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
@@ -40,35 +40,42 @@ module XmlPp =
  struct
   let print_sequent metasenv (context,goal) =
    let module X = Xml in
-    let final_s,final_env =
-     (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! *)
-       ) context ([<>],[])
-     )
-    in
-     let (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,_) =
-      Cic2acic.acic_of_cic_env metasenv final_env goal
+    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
-      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
+      let final_s,final_env =
+       (List.fold_right
+         (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
+       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
 ;;