* Major code cleanup.

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

diff --git a/helm/ocaml/cic_annotations_cache/cicCache.ml b/helm/ocaml/cic_annotations_cache/cicCache.ml
index b26bddbf8fb86a171e6448a6a5405cfab3262504..8bc4be6c4fcca3f77d88a9b7c97b26c325ae77bc 100644 (file)
--- a/helm/ocaml/cic_annotations_cache/cicCache.ml
+++ b/helm/ocaml/cic_annotations_cache/cicCache.ml
@@ -39,13 +39,13 @@ 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 true with
-      (_, None) -> assert false
-    | (annobj, Some ids_to_targets) ->
-        if U.uri_is_annuri uri then
-         begin
-          let annfilename = G.getxml (U.annuri_of_uri uri) in
-           CicAnnotationParser.annotate annfilename ids_to_targets
-         end ;
-        (annobj, ids_to_targets)
+   let annobj = CicParser.annobj_of_xml cicfilename uri in
+    annobj,
+     if U.uri_is_annuri uri then
+      begin
+       let annfilename = G.getxml (U.annuri_of_uri uri) in
+        Some (CicAnnotationParser.get_annotations annfilename)
+      end
+     else
+      None
 ;;