X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_annotations%2FcicAnnotationParser.ml;h=2d04cbc80de63dae2952b0092b1f1480748851d1;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=33782d4f24e27cad5d338a64f475666d2b039d33;hpb=f5b64337026ab6c98b33583ea85d0ab5d1410966;p=helm.git diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser.ml b/helm/ocaml/cic_annotations/cicAnnotationParser.ml index 33782d4f2..2d04cbc80 100644 --- a/helm/ocaml/cic_annotations/cicAnnotationParser.ml +++ b/helm/ocaml/cic_annotations/cicAnnotationParser.ml @@ -23,30 +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.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