generator patched

[helm.git] / helm / ocaml / urimanager / uriManager.ml

diff --git a/helm/ocaml/urimanager/uriManager.ml b/helm/ocaml/urimanager/uriManager.ml
index 0fa24cfcdc8504bffff1a0be2bb8099507403e8c..df707c956f2ba8f5e9de95d46480cf75d7cefdf9 100644 (file)
--- a/helm/ocaml/urimanager/uriManager.ml
+++ b/helm/ocaml/urimanager/uriManager.ml
@@ -96,7 +96,11 @@ let mk_prefixes str =
  in
   let tokens = (Str.split (Str.regexp "/") str) in
    (* ty = "cic:" *)
-   let (ty, sp) = (List.hd tokens, List.tl tokens) in
+   let (ty, sp) =
+    (try (List.hd tokens, List.tl tokens)
+     with Failure "hd" | Failure "tl" ->
+      raise (IllFormedUri str))
+    in
     aux ty sp
 ;;
 
@@ -137,3 +141,20 @@ let annuri_of_uri uri =
 let uri_is_annuri uri =
  Str.string_match (Str.regexp ".*\.ann$") (string_of_uri uri) 0
 ;;
+
+let bodyuri_of_uri uri =
+ let struri = string_of_uri uri in
+  if Str.string_match (Str.regexp ".*\.con$") (string_of_uri uri) 0 then
+   let newuri = Array.copy uri in
+    newuri.(Array.length uri - 2) <- struri ^ ".body" ;
+    Some newuri
+  else
+   None
+;;
+
+let innertypesuri_of_uri uri =
+ let cicuri = cicuri_of_uri uri in
+  let newuri = Array.copy cicuri in
+   newuri.(Array.length cicuri - 2) <- (string_of_uri cicuri) ^ ".types" ;
+   newuri
+;;