* 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 7bdfeb5c348fde42c2d9f8ddcd78da650a115e41..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
@@ -51,18 +51,20 @@ module XmlPp =
      in
       let final_s,final_env =
        (List.fold_right
-         (fun (b,n,t) (s,env) ->
-           let acic = acic_of_cic_env 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,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