X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_annotations%2FcicAnnotationParser.ml;h=2d04cbc80de63dae2952b0092b1f1480748851d1;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=7b4fdad6a5e3d328c8823ff4022622177f0974d9;hpb=ae326f646ef4c01b43d6da04201b427d1e175400;p=helm.git

diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser.ml b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
index 7b4fdad6a..2d04cbc80 100644
--- a/helm/ocaml/cic_annotations/cicAnnotationParser.ml
+++ b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
@@ -23,28 +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
-(*PXP       (Y.ExtID (Pxp_types.System filename,
-         new Pxp_reader.resolve_as_file ~url_of_id ()))
-*)     (PxpUriResolver.from_file 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