Initial revision

[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..33782d4f24e27cad5d338a64f475666d2b039d33 100644 (file)
--- a/helm/ocaml/cic_annotations/cicAnnotationParser.ml
+++ b/helm/ocaml/cic_annotations/cicAnnotationParser.ml
@@ -35,7 +35,7 @@ class warner =
 
 exception EmptyUri;;
 
-let annotate filename ids_to_targets =
+let get_annotations filename =
  let module Y = Pxp_yacc in
   try 
     let d =
@@ -43,11 +43,13 @@ let annotate filename ids_to_targets =
       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)
+*)
+(*       (PxpUriResolver.from_file filename)   *)
+       (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
        Y.default_spec
 
     in
-     CicAnnotationParser2.annotate ids_to_targets d#root
+     CicAnnotationParser2.get_annotations d#root
   with
    e ->
      print_endline (Pxp_types.string_of_exn e) ;