*)
(*
-* "cic:/a/b/c.con" => [| "cic:/a" ; "cic:/a/b" ; "cic:/a/b/c.con" ; "c"; "" |]
-* "cic:/a/b/c.ind#xpointer(1/1)" =>
-* [| "cic:/a" ; "cic:/a/b" ; "cic:/a/b/c.con" ; "c"; "#xpointer(1/1)" |]
-* "cic:/a/b/c.ind#xpointer(1/1/1)" =>
-* [| "cic:/a" ; "cic:/a/b" ; "cic:/a/b/c.con" ; "c"; "#xpointer(1/1/1)" |]
-*)
+ * "cic:/a/b/c.con" => ("cic:/a/b/c.con", id )
+ * "cic:/a/b/c.ind#xpointer(1/1)" => ("cic:/a/b/c.con#xpointer(1/1)", id)
+ * "cic:/a/b/c.ind#xpointer(1/1/1)" => ("cic:/a/b/c.con#xpointer(1/1/1)", id)
+ *)
let fresh_id =
let id = ref 0 in
incr id;
!id
-type uri = string array * int;;
+(* (uriwithxpointer, uniqueid)
+ * where uniqueid is used to build a set of uri *)
+type uri = string * int;;
let eq uri1 uri2 =
uri1 == uri2
;;
let string_of_uri (uri,_) =
- match uri.(Array.length uri - 1) with
- | "" ->
- uri.(Array.length uri - 3)
- | _ ->
- String.concat "#"
- [ uri.(Array.length uri - 3); uri.(Array.length uri - 1) ]
+ uri
-let name_of_uri (uri,_) = uri.(Array.length uri - 2);;
-let buri_of_uri (uri,_) = uri.(Array.length uri - 4);;
-let depth_of_uri (uri,_) = Array.length uri - 3;;
+let name_of_uri (uri, _) =
+ let xpointer_offset =
+ try String.rindex uri '#' with Not_found -> String.length uri - 1
+ in
+ let index1 = String.rindex_from uri xpointer_offset '/' + 1 in
+ let index2 = String.rindex uri '.' in
+ String.sub uri index1 (index2 - index1)
+
+let buri_of_uri (uri,_) =
+ let index = String.rindex uri '/' in
+ String.sub uri 0 index
module OrderedStrings =
struct
end
;;
-module SetOfStrings = Map.Make(OrderedStrings);;
+module MapStringsToUri = Map.Make(OrderedStrings);;
-(*CSC: commento obsoleto ed errato *)
-(* Invariant: the map is the identity function, *)
-(* i.e. (SetOfStrings.find str !set_of_uri) == str *)
-let set_of_uri = ref SetOfStrings.empty;;
-let set_of_prefixes = ref SetOfStrings.empty;;
+(* Invariant: the map is the identity function,
+ * i.e.
+ * let str' = (MapStringsToUri.find str !set_of_uri) in
+ * str' == (MapStringsToUri.find str' !set_of_uri)
+ *)
+let set_of_uri = ref MapStringsToUri.empty;;
-
(* hash conses an uri *)
-let add_to_uriset ?suri uri =
- let lookup_suri suri =
- try
- SetOfStrings.find suri !set_of_uri
- with Not_found -> assert false
- in
- let suri =
- match suri with
- | None -> string_of_uri uri
- | Some suri -> suri
- in
- if not(SetOfStrings.mem suri !set_of_uri) then
- set_of_uri := SetOfStrings.add suri uri !set_of_uri;
- lookup_suri suri
-
-
-(* similar to uri_of_string, but used for prefixes of uris *)
-let normalize prefix =
- try
- SetOfStrings.find prefix !set_of_prefixes
- with
- Not_found ->
- set_of_prefixes := SetOfStrings.add prefix prefix !set_of_prefixes ;
- prefix
-;;
+let uri_of_string suri =
+ try
+ MapStringsToUri.find suri !set_of_uri
+ with Not_found ->
+prerr_endline ("@@@ " ^ suri);
+ let new_uri = suri, fresh_id () in
+ set_of_uri := MapStringsToUri.add suri new_uri !set_of_uri;
+ new_uri
exception IllFormedUri of string;;
-let mk_prefixes str xpointer =
- let rec aux curi =
- function
- [he] ->
- let prefix_uri = curi ^ "/" ^ he
- and name = List.hd (Str.split (Str.regexp "\\.") he) in
- [ normalize prefix_uri ; name ]
- | he::tl ->
- let prefix_uri = curi ^ "/" ^ he in
- (normalize prefix_uri)::(aux prefix_uri tl)
- | _ -> raise (IllFormedUri str)
- in
- let tokens = (Str.split (Str.regexp "/") str) in
- (* ty = "cic:" *)
- let (ty, sp) =
- (try (List.hd tokens, List.tl tokens)
- with Failure "hd" | Failure "tl" ->
- raise (IllFormedUri str))
- in
- (aux ty sp) @ [xpointer]
-;;
-
-
-let sharp_rex =
- Str.regexp "#"
-;;
-
-let uri_of_string str =
- let base, xpointer =
- match Str.split sharp_rex str with
- | [base] -> base,""
- | [base; xpointer] -> base,xpointer
- | _ -> raise (IllFormedUri str)
- in
- try
- SetOfStrings.find str !set_of_uri
- with
- Not_found ->
- let uri = Array.of_list (mk_prefixes base xpointer), fresh_id () in
- add_to_uriset ~suri:str uri
+let strip_xpointer ((uri,_) as olduri) =
+ try
+ let index = String.rindex uri '#' in
+ let no_xpointer = String.sub uri 0 index in
+ uri_of_string no_xpointer
+ with
+ Not_found -> olduri
+
+let clear_suffix uri ?(pat2="") pat1 =
+ try
+ let index = String.rindex uri '.' in
+ let index' = index + 1 in
+ let suffix = String.sub uri index' (String.length uri - index') in
+ if pat1 = suffix || pat2 = suffix then
+ String.sub uri 0 index
+ else
+ uri
+ with
+ Not_found -> assert false
+
+let has_suffix uri pat =
+ try
+ let index = String.rindex uri '.' + 1 in
+ let suffix = String.sub uri index (String.length uri - index) in
+ pat = suffix
+ with
+ Not_found -> assert false
+
+let _types = "types"
+let _dottypes = ".types"
+let _ann = "ann"
+let _dotann = ".ann"
+let _var = "var"
+let _dotbody = ".body"
+let _con = "con"
+let _xpointer = "#xpointer(1/"
+
+let cicuri_of_uri (uri, _) =
+ uri_of_string (clear_suffix uri ~pat2:_types _ann)
;;
-let strip_xpointer (uri,_) =
- let stripped_uri = Array.copy uri in
- stripped_uri.(Array.length uri - 1) <- ""; (* reset xpointer field *)
- let new_uri = stripped_uri,fresh_id () in
- let suri = string_of_uri new_uri in
- add_to_uriset ~suri new_uri
-
-
-let cicuri_of_uri uri =
- let completeuri = string_of_uri uri in
- let newcompleteuri =
- (Str.replace_first (Str.regexp "\\.types$") ""
- (Str.replace_first (Str.regexp "\\.ann$") "" completeuri))
- in
- if completeuri = newcompleteuri then
- uri
- else
- let uri = fst uri in
- let newuri = Array.copy uri in
- newuri.(Array.length uri - 3) <- newcompleteuri ;
- add_to_uriset (newuri,fresh_id ())
+let annuri_of_uri (uri , _) =
+ uri_of_string ((clear_suffix uri _ann) ^ _dotann)
;;
-let annuri_of_uri uri =
- let completeuri = string_of_uri uri in
- if Str.string_match (Str.regexp ".*\\.ann$") completeuri 0 then
- uri
- else
- let uri = fst uri in
- let newuri = Array.copy uri in
- newuri.(Array.length uri - 3) <- completeuri ^ ".ann" ;
- add_to_uriset (newuri,fresh_id ())
+let uri_is_annuri (uri, _) =
+ has_suffix uri _ann
;;
-let uri_is_annuri uri =
- Str.string_match (Str.regexp ".*\\.ann$") (string_of_uri uri) 0
+let uri_is_var (uri, _) =
+ has_suffix uri _var
;;
-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 uri = fst uri in
- let newuri = Array.copy uri in
- newuri.(Array.length uri - 3) <- struri ^ ".body" ;
- Some (add_to_uriset (newuri,fresh_id ()))
+let bodyuri_of_uri (uri, _) =
+ if has_suffix uri _con then
+ Some (uri_of_string (uri ^ _dotbody))
else
- None
+ None
;;
-let innertypesuri_of_uri uri =
- let cicuri = cicuri_of_uri uri in
- let newuri = Array.copy (fst cicuri) in
- newuri.(Array.length (fst cicuri) - 3) <- (string_of_uri cicuri) ^ ".types" ;
- add_to_uriset (newuri,fresh_id ())
+let innertypesuri_of_uri (uri, _) =
+ uri_of_string ((clear_suffix uri _types) ^ _dottypes)
;;
-type uriref = uri * (int list)
-
-let string_of_uriref (uri, fi) =
- let str = string_of_uri uri in
- let xp t = "#xpointer(1/" ^ string_of_int (t + 1) in
- match fi with
- | [] -> str
- | [t] -> str ^ xp t ^ ")"
- | t :: c :: _ -> str ^ xp t ^ "/" ^ string_of_int c ^ ")"
+let uri_of_uriref (uri, _) typeno consno =
+ let typeno = typeno + 1 in
+ let suri =
+ match consno with
+ | None -> Printf.sprintf "%s%s%d)" uri _xpointer typeno
+ | Some n -> Printf.sprintf "%s%s%d/%d)" uri _xpointer typeno n
+ in
+ uri_of_string suri
let compare (_,id1) (_,id2) = id1 - id2
projects / helm.git / blobdiff