first moogle template checkin

[helm.git] / helm / ocaml / cic_annotations / cicAnnotationParser.ml

diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser.ml b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
index 9c4a58d5394eb4f4ea4558796b17caec9da2eaf9..2d04cbc80de63dae2952b0092b1f1480748851d1 100644 (file)
--- a/helm/ocaml/cic_annotations/cicAnnotationParser.ml
+++ b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
@@ -23,31 +23,18 @@
  * http://cs.unibo.it/helm/.
  *)
 
-exception Warnings;;
-
-class warner =
-  object 
-    method warn w =
-      print_endline ("WARNING: " ^ w) ;
-      (raise Warnings : unit)
-  end
-;;
-
 exception EmptyUri;;
 
-let annotate filename ids_to_targets =
- let module Y = Pxp_yacc in
+let get_annotations filename =
   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.annotate ids_to_targets d#root
+     CicAnnotationParser2.get_annotations d#root
   with
    e ->
      print_endline (Pxp_types.string_of_exn e) ;