*)
let uri_suffix_of_ref_suffix = function
- | "dec"
- | "def" -> "con"
- | "ind"
- | "con" -> "ind"
- | _ -> assert false
+ | "dec" | "fix" | "cfx" | "def" -> "con"
+ | "ind" | "con" -> "ind"
+ | x -> prerr_endline (x ^ " not a valid suffix"); assert false
;;
let reference_of_string =
i,j
in
let get1 s dot =
- let i = int_of_string (String.sub s (dot+5) (String.length s-1)) in
+ let i = int_of_string (String.sub s (dot+5) (String.length s-1-dot-5)) in
i
in
fun s ->
;;
let reference_of_ouri u indinfo =
- let u = NUri.uri_of_string (UriManager.string_of_uri u) in
+ let u = NUri.nuri_of_ouri u in
reference_of_string (string_of_reference (Ref (~-1,u,indinfo)))
;;
-let ouri_of_reference (Ref (_,u,_)) =
- UriManager.uri_of_string (NUri.string_of_uri u)
-;;
+let ouri_of_reference (Ref (_,u,_)) = NUri.ouri_of_nuri u;;