* Major code cleanup.

[helm.git] / helm / ocaml / cic_cache / cicCache.ml

diff --git a/helm/ocaml/cic_cache/cicCache.ml b/helm/ocaml/cic_cache/cicCache.ml
index 7dfd8242d1ff724f06d75ce0a5fdf35b89df0cc2..adfeb0575dcbe909d75895eb6e957ee3d7221726 100644 (file)
--- a/helm/ocaml/cic_cache/cicCache.ml
+++ b/helm/ocaml/cic_cache/cicCache.ml
@@ -39,11 +39,12 @@ let get_annobj uri =
  let module G = Getter in
  let module U = UriManager in
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
-   match CicParser.term_of_xml cicfilename uri false with
-      (_, Some _) -> assert false
-    | (annobj, None) -> annobj
+   CicParser.annobj_of_xml cicfilename uri
 ;;
 
 let get_obj uri =
- Deannotate.deannotate_obj (get_annobj uri)
+ let module G = Getter in
+ let module U = UriManager in
+  let cicfilename = G.getxml (U.cicuri_of_uri uri) in
+   CicParser.obj_of_xml cicfilename uri
 ;;