- use PxpHelmConf

- no longer use deprecated Pxp_yacc module

diff --git a/helm/ocaml/cic/cicParser.ml b/helm/ocaml/cic/cicParser.ml
index 38fe9e210c41787004f1f970000d88d938f121ec..5ad48b0799d5906f458d5123f211781648f15104 100644 (file)
--- a/helm/ocaml/cic/cicParser.ml
+++ b/helm/ocaml/cic/cicParser.ml
@@ -36,36 +36,25 @@
 (*                                                                            *)
 (******************************************************************************)
 
-exception Warnings;;
-
-class warner =
-  object 
-    method warn w =
-      prerr_endline ("WARNING: " ^ w) ;
-      (raise Warnings : unit)
-  end
-;;
-
-exception EmptyUri of string;;
+exception EmptyUri of string
 
 (* given the filename of an xml file of a cic object it returns its internal *)
 (* representation.                                                           *)
 let annobj_of_xml filename filenamebody =
- let module Y = Pxp_yacc in
   try 
     let root, rootbody =
-     let config = {Y.default_config with Y.warner = new warner} in
+     let config = PxpHelmConf.pxp_config in
       let doc =
-       Y.parse_document_entity config
-        (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
+       Pxp_tree_parser.parse_document_entity config
+        (Pxp_types.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
         CicParser3.domspec in
       let docroot = doc#root in
        match filenamebody with
           None -> docroot,None
         | Some filename ->
            let docbody =
-            Y.parse_document_entity config
-             (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
+            Pxp_tree_parser.parse_document_entity config
+             (Pxp_types.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
              CicParser3.domspec
            in
             docroot,Some docbody#root
@@ -77,8 +66,7 @@ let annobj_of_xml filename filenamebody =
       (match filenamebody with None -> "" | Some s -> ", " ^ s)) ;
      prerr_endline ("Exception: " ^ Pxp_types.string_of_exn e) ;
      raise e
-;;
 
 let obj_of_xml filename filenamebody =
  Deannotate.deannotate_obj (annobj_of_xml filename filenamebody)
-;;
+