- use PxpHelmConf

- no longer use deprecated Pxp_yacc

diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser.ml b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
index d8c67ea635b8d08926ba22acd1621ecfb31dfe1e..2d04cbc80de63dae2952b0092b1f1480748851d1 100644 (file)
--- a/helm/ocaml/cic_annotations/cicAnnotationParser.ml
+++ b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
@@ -23,26 +23,15 @@
  * http://cs.unibo.it/helm/.
  *)
 
-exception Warnings;;
-
-class warner =
-  object 
-    method warn w =
-      print_endline ("WARNING: " ^ w) ;
-      (raise Warnings : unit)
-  end
-;;
-
 exception EmptyUri;;
 
 let get_annotations filename =
- let module Y = Pxp_yacc in
   try 
     let d =
-     let config = {Y.default_config with Y.warner = new warner} in
-      Y.parse_document_entity config
-       (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
-       Y.default_spec
+     let config = PxpHelmConf.pxp_config in
+      Pxp_tree_parser.parse_document_entity config
+       (Pxp_types.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
+       PxpHelmConf.pxp_spec
 
     in
      CicAnnotationParser2.get_annotations d#root