X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Furimanager%2FuriManager.ml;h=b4bf073e2733401ffe760a1aa5ab14ff444563c9;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=0697fb73b9a32a50d8961ba48a2237201cac2c5b;hpb=34b02ee2b293ff779eb1231b189ee38ea747c6ff;p=helm.git

diff --git a/helm/ocaml/urimanager/uriManager.ml b/helm/ocaml/urimanager/uriManager.ml
index 0697fb73b..b4bf073e2 100644
--- a/helm/ocaml/urimanager/uriManager.ml
+++ b/helm/ocaml/urimanager/uriManager.ml
@@ -24,29 +24,42 @@
  *)
 
 (*
-* "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)" |]
-*)
-type uri = string array;;
+ * "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
+  function () ->
+    incr id;
+    !id
+
+(* (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) ]
+let string_of_uri (uri,_) =
+ 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 xpointer_offset = 
+    try String.rindex uri '#' with Not_found -> String.length uri - 1
+  in
+  let index = String.rindex_from uri xpointer_offset '/' in
+  String.sub uri 0 index
 
 module OrderedStrings =
  struct
@@ -55,152 +68,140 @@ module OrderedStrings =
  end
 ;;
 
-module SetOfStrings = 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;;
-
-  
-(* 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  
-    
+module MapStringsToUri = Map.Make(OrderedStrings);;
 
-(* 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
-;;
+(* 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;;
 
 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) in
-      add_to_uriset ~suri:str uri
-;;
-
-let strip_xpointer uri =
-  let stripped_uri = Array.copy uri in
-  stripped_uri.(Array.length uri - 1) <- "";  (* reset xpointer field *)
-  let suri = string_of_uri stripped_uri in
-  add_to_uriset ~suri stripped_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 newuri = Array.copy uri in
-     newuri.(Array.length uri - 3) <- newcompleteuri ;
-     add_to_uriset newuri
-;;
-
-let annuri_of_uri uri =
- let completeuri = string_of_uri uri in
-  if Str.string_match (Str.regexp ".*\\.ann$") completeuri 0 then
-   uri
+let _dottypes = ".types"
+let _types = "types",5
+let _dotuniv = ".univ"
+let _univ = "univ",4
+let _dotann = ".ann"
+let _ann = "ann",3
+let _var = "var",3
+let _dotbody = ".body"
+let _con = "con",3
+let _ind = "ind",3
+let _xpointer = "#xpointer(1/"
+let _con3 = "con"
+let _var3 = "var"
+let _ind3 = "ind"
+let _ann3 = "ann"
+let _univ4 = "univ"
+let _types5 = "types"
+let _xpointer8 = "xpointer"
+let _cic5 = "cic:/"
+
+let is_malformed suri =
+  try 
+    if String.sub suri 0 5 <> _cic5 then true
+    else
+      let len = String.length suri - 5 in
+      let last5 = String.sub suri len 5 in
+      let last4 = String.sub last5 1 4 in
+      let last3 = String.sub last5 2 3 in
+      if last3 = _con3 || last3 = _var3 || last3 = _ind3 || 
+         last3 = _ann3 || last5 = _types5 || last5 = _dotbody ||
+         last4 = _univ4 then 
+           false
+      else 
+        try
+          let index = String.rindex suri '#' + 1 in
+          let xptr = String.sub suri index 8 in
+          if xptr = _xpointer8 then
+            false
+          else
+            true
+        with Not_found -> true
+  with Invalid_argument _ -> true
+    
+(* hash conses an uri *)
+let uri_of_string suri =
+  try
+    MapStringsToUri.find suri !set_of_uri
+  with Not_found -> 
+    if is_malformed suri then
+      raise (IllFormedUri suri) 
+    else
+      let new_uri = suri, fresh_id () in
+      set_of_uri := MapStringsToUri.add suri new_uri !set_of_uri;
+      new_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="",0) 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 fst pat1 = suffix || fst pat2 = suffix then
+      String.sub uri 0 index
+    else
+      uri
+  with
+    Not_found -> assert false
+
+let has_suffix uri (pat,n) =
+  try
+    let suffix = String.sub uri (String.length uri - n) n in
+    pat = suffix 
+  with
+    Not_found -> assert false
+
+ 
+let cicuri_of_uri (uri, _) = uri_of_string (clear_suffix uri ~pat2:_types _ann)
+
+let annuri_of_uri (uri , _) = uri_of_string ((clear_suffix uri _ann) ^ _dotann)
+
+let uri_is_annuri (uri, _) = has_suffix uri _ann
+
+let uri_is_var (uri, _) = has_suffix uri _var
+
+let uri_is_con (uri, _) = has_suffix uri _con
+
+let uri_is_ind (uri, _) = has_suffix uri _ind
+
+let bodyuri_of_uri (uri, _) =
+  if has_suffix uri _con then
+    Some (uri_of_string (uri ^ _dotbody))
   else
-   let newuri = Array.copy uri in
-    newuri.(Array.length uri - 3) <- completeuri ^ ".ann" ;
-    add_to_uriset newuri
+    None
 ;;
 
-let uri_is_annuri uri =
- Str.string_match (Str.regexp ".*\\.ann$") (string_of_uri uri) 0
+(* these are bugged!
+ * we should remove _types, _univ, _ann all toghether *)
+let innertypesuri_of_uri (uri, _) =
+  uri_of_string ((clear_suffix uri _types) ^ _dottypes)
 ;;
-
-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 - 3) <- struri ^ ".body" ;
-    Some (add_to_uriset newuri)
-  else
-   None
+let univgraphuri_of_uri (uri,_) = 
+  uri_of_string ((clear_suffix uri _univ) ^ _dotuniv)
 ;;
+  
 
-let innertypesuri_of_uri uri =
- let cicuri = cicuri_of_uri uri in
-  let newuri = Array.copy cicuri in
-   newuri.(Array.length cicuri - 3) <- (string_of_uri cicuri) ^ ".types" ;
-   add_to_uriset newuri
-;;
-
-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 u1 u2 =
-  let su1 = string_of_uri u1 in
-  let su2 = string_of_uri u2 in
-  Pervasives.compare su1 su2
+let compare (_,id1) (_,id2) = id1 - id2
 
 module OrderedUri =
 struct
@@ -210,3 +211,13 @@ end
 
 module UriSet = Set.Make (OrderedUri)
 
+module HashedUri =
+struct
+  type t = uri
+  let equal = eq
+  let hash = snd
+end
+
+module UriHashtbl = Hashtbl.Make (HashedUri)
+
+