- cicParser interface simplified

diff --git a/helm/ocaml/cic_annotations_cache/cicCache.ml b/helm/ocaml/cic_annotations_cache/cicCache.ml
index 58a8f4197c8bb47d90374653e6ea4e810299daeb..de5c1926e6f3d569169e3c08b2ee8ae3cd47641d 100644 (file)
--- a/helm/ocaml/cic_annotations_cache/cicCache.ml
+++ b/helm/ocaml/cic_annotations_cache/cicCache.ml
@@ -45,7 +45,7 @@ let get_annobj uri =
     | Some bodyuri ->
        Some (G.getxml (U.cicuri_of_uri bodyuri))
   in
-   let annobj = CicParser.annobj_of_xml cicfilename cicbodyfilename uri in
+   let annobj = CicParser.annobj_of_xml cicfilename cicbodyfilename in
     annobj,
      if U.uri_is_annuri uri then
       begin

diff --git a/helm/ocaml/cic_cache/cicCache.ml b/helm/ocaml/cic_cache/cicCache.ml
index 71fc4e6383032c2f4857015ee8046b5ccbd45696..1080c39e76873171f9cc64e486b2c8de50a5adfd 100644 (file)
--- a/helm/ocaml/cic_cache/cicCache.ml
+++ b/helm/ocaml/cic_cache/cicCache.ml
@@ -41,10 +41,10 @@ let get_annobj uri =
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
    match (U.bodyuri_of_uri uri) with
       None ->
-        CicParser.annobj_of_xml cicfilename None uri
+        CicParser.annobj_of_xml cicfilename None
     | Some bodyuri ->
        let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
-        CicParser.annobj_of_xml cicfilename (Some cicbodyfilename) uri
+        CicParser.annobj_of_xml cicfilename (Some cicbodyfilename)
 ;;
 
 let get_obj uri =
@@ -53,8 +53,8 @@ let get_obj uri =
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
    match (U.bodyuri_of_uri uri) with
       None ->
-        CicParser.obj_of_xml cicfilename None uri
+        CicParser.obj_of_xml cicfilename None
     | Some bodyuri ->
        let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
-        CicParser.obj_of_xml cicfilename (Some cicbodyfilename) uri
+        CicParser.obj_of_xml cicfilename (Some cicbodyfilename)
 ;;