From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Thu, 9 Sep 2004 16:00:00 +0000 (+0000)
Subject: ported to pxp 1.1.95's event parser
X-Git-Tag: moogle_mathql~10
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=11469c708704f96fde66e5bbc297f51a58173fb1;p=helm.git

ported to pxp 1.1.95's event parser
---

diff --git a/helm/ocaml/cic_disambiguation/make_table.ml b/helm/ocaml/cic_disambiguation/make_table.ml
index 9aaa4a06c..13301bce7 100644
--- a/helm/ocaml/cic_disambiguation/make_table.ml
+++ b/helm/ocaml/cic_disambiguation/make_table.ml
@@ -52,7 +52,7 @@ let iter_entities_file f pull_parser =
   ignore (find_first_tag pull_parser); (* <entities-table> *)
   let rec aux () =
     match pull_parser () with
-    | Some (E_start_tag ("entity", attrs, _)) ->
+    | Some (E_start_tag ("entity", attrs, _, _)) ->
 	(try
 	  let name = List.assoc "name" attrs in
 	  let value = List.assoc "value" attrs in
@@ -68,7 +68,7 @@ let iter_dictionary_file f pull_parser =
   ignore (find_first_tag pull_parser); (* <dictionary> *)
   let rec aux () =
     match pull_parser () with
-    | Some (E_start_tag ("entry", attrs, _)) ->
+    | Some (E_start_tag ("entry", attrs, _, _)) ->
 	(try
 	  let name = List.assoc "name" attrs in
 	  let value = List.assoc "val" attrs in
diff --git a/helm/ocaml/getter/http_getter.ml b/helm/ocaml/getter/http_getter.ml
index d8d3166dc..a9884596b 100644
--- a/helm/ocaml/getter/http_getter.ml
+++ b/helm/ocaml/getter/http_getter.ml
@@ -221,14 +221,14 @@ let resolve_remote uri =
   (* deliver resolve request to http_getter *)
   let doc = ClientHTTP.get (sprintf "%sresolve?uri=%s" (getter_url ()) uri) in
   let res = ref Unknown in
-   Pxp_yacc.process_entity PxpHelmConf.pxp_config (`Entry_content [])
-    (Pxp_yacc.create_entity_manager ~is_document:true PxpHelmConf.pxp_config
+   Pxp_ev_parser.process_entity PxpHelmConf.pxp_config (`Entry_content [])
+    (Pxp_ev_parser.create_entity_manager ~is_document:true PxpHelmConf.pxp_config
      (Pxp_yacc.from_string doc))
     (function
-      | Pxp_yacc.E_start_tag ("url",["value",url],_) -> res := Resolved url
-      | Pxp_yacc.E_start_tag ("unresolved",[],_) ->
+      | Pxp_types.E_start_tag ("url",["value",url],_,_) -> res := Resolved url
+      | Pxp_types.E_start_tag ("unresolved",[],_,_) ->
           res := Exception (Unresolvable_URI uri)
-      | Pxp_yacc.E_start_tag _ -> res := Exception UnexpectedGetterOutput
+      | Pxp_types.E_start_tag _ -> res := Exception UnexpectedGetterOutput
       | _ -> ());
    match !res with
    | Unknown -> raise UnexpectedGetterOutput