generator patched

[helm.git] / helm / ocaml / cic / cicParser.ml

diff --git a/helm/ocaml/cic/cicParser.ml b/helm/ocaml/cic/cicParser.ml
index 5149cfd6a24fe737cd9f13ee0e3fe87dce0ee1fe..cb3a064fd7db72481759ea660331cd3981298b48 100644 (file)
--- a/helm/ocaml/cic/cicParser.ml
+++ b/helm/ocaml/cic/cicParser.ml
@@ -48,50 +48,31 @@ class warner =
 
 exception EmptyUri of string;;
 
-(* given an uri u it returns the list of tokens of the base uri of u *)
-(* e.g.: token_of_uri "cic:/a/b/c/d.xml" returns ["a" ; "b" ; "c"]   *)
-let tokens_of_uri uri =
- let uri' = UriManager.string_of_uri uri in
- let rec chop_list =
-  function
-     [] -> raise (EmptyUri uri')
-   | [fn] -> []
-   | he::[fn] -> [he]
-   | he::tl -> he::(chop_list tl)
- in
-  let trimmed_uri = Str.replace_first (Str.regexp "cic:") "" uri' in
-   let list_of_tokens = Str.split (Str.regexp "/") trimmed_uri in
-    chop_list list_of_tokens
-;;
-
 (* given the filename of an xml file of a cic object it returns its internal *)
 (* representation.                                                           *)
-let annobj_of_xml filename filenamebody uri =
+let annobj_of_xml filename filenamebody =
  let module Y = Pxp_yacc in
   try 
     let root, rootbody =
-      (* sets the current base uri to resolve relative URIs *)
-      CicParser3.current_sp := tokens_of_uri uri ;
-      CicParser3.current_uri := uri ;
-      let config = {Y.default_config with Y.warner = new warner} in
-       let doc =
-        Y.parse_document_entity config
-         (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
-         CicParser3.domspec in
+     let config = {Y.default_config with Y.warner = new warner} in
+      let doc =
+       Y.parse_document_entity config
+        (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
+        CicParser3.domspec in
 (* CSC: Until PXP bug is resolved *)
 PxpUrlResolver.url_resolver#close_all ;
-       let docroot = doc#root in
-        match filenamebody with
-           None -> docroot,None
-         | Some filename ->
-            let docbody =
-             Y.parse_document_entity config
-              (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
-              CicParser3.domspec
-            in
+      let docroot = doc#root in
+       match filenamebody with
+          None -> docroot,None
+        | Some filename ->
+           let docbody =
+            Y.parse_document_entity config
+             (Y.from_file ~alt:[PxpUrlResolver.url_resolver] filename)
+             CicParser3.domspec
+           in
 (* CSC: Until PXP bug is resolved *)
 PxpUrlResolver.url_resolver#close_all ;
-             docroot,Some docbody#root
+            docroot,Some docbody#root
     in
      CicParser2.get_term root rootbody
   with
@@ -102,6 +83,6 @@ PxpUrlResolver.url_resolver#close_all ;
      raise e
 ;;
 
-let obj_of_xml filename filenamebody uri =
- Deannotate.deannotate_obj (annobj_of_xml filename filenamebody uri)
+let obj_of_xml filename filenamebody =
+ Deannotate.deannotate_obj (annobj_of_xml filename filenamebody)
 ;;