ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_transformations / applyTransformation.ml

diff --git a/helm/ocaml/cic_transformations/applyTransformation.ml b/helm/ocaml/cic_transformations/applyTransformation.ml
index 57d26f1681fda95c87abdf3ea8d0fca5dfd7994f..54402e0bc12372d17207fa16085b605521aaca06 100644 (file)
--- a/helm/ocaml/cic_transformations/applyTransformation.ml
+++ b/helm/ocaml/cic_transformations/applyTransformation.ml
@@ -34,20 +34,23 @@
 (***************************************************************************)
 
 let mpres_document pres_box =
-  let obj2xml obj = Mpresentation.print_mpres (fun _ -> assert false) obj in
-  Ast2pres.add_xml_declaration (Box.box2xml ~obj2xml pres_box)
+  Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
 
 let mml_of_cic_sequent metasenv sequent =
-  let asequent,ids_to_terms,
-    ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses =
-    Cic2acic.asequent_of_sequent metasenv sequent in
+  let unsh_sequent,(asequent,ids_to_terms,
+    ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses)
+  =
+    Cic2acic.asequent_of_sequent metasenv sequent
+  in
   let content_sequent = Cic2content.map_sequent asequent in 
   let pres_sequent = 
-    (Sequent2pres.sequent2pres ~ids_to_inner_sorts content_sequent) in
+    (Sequent2pres.sequent2pres ~ids_to_inner_sorts content_sequent)
+  in
   let xmlpres = mpres_document pres_sequent in
-  Xml2Gdome.document_of_xml Misc.domImpl xmlpres,
+  (Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres,
+   unsh_sequent,
    (asequent,
-    (ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts))
+    (ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts)))
 
 let mml_of_cic_object obj =
   let (annobj, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
@@ -60,7 +63,7 @@ let mml_of_cic_object obj =
   in
   let pres = Content2pres.content2pres ~ids_to_inner_sorts content in
   let xmlpres = mpres_document pres in
-  let mathml = Xml2Gdome.document_of_xml Misc.domImpl xmlpres in
+  let mathml = Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres in
   (mathml,(annobj,
    (ids_to_terms, ids_to_father_ids, ids_to_conjectures, ids_to_hypotheses,
   ids_to_inner_sorts,ids_to_inner_types)))