Much simpler (and slightly more performant) implementation of the UriManager.

[helm.git] / helm / matita / matitaSync.ml

diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml
index 3a7f6dd32099beff643b6e87d7cd7b8a695f0900..df29edc3b7421049ec63eb5a4616560fbfcb07fd 100644 (file)
--- a/helm/matita/matitaSync.ml
+++ b/helm/matita/matitaSync.ml
@@ -32,41 +32,19 @@ open MatitaTypes
 let extract_alias types uri = 
   fst(List.fold_left (
     fun (acc,i) (name, _, _, cl) -> 
-      ((name, UriManager.string_of_uriref (uri,[i]))
+      (name, UriManager.string_of_uri (UriManager.uri_of_uriref uri i None))
       ::
       (fst(List.fold_left (
         fun (acc,j) (name,_) ->
-          (((name,UriManager.string_of_uriref (uri,[i;j])) :: acc) , j+1)
-        ) (acc,1) cl))),i+1
+          (((name,UriManager.string_of_uri (UriManager.uri_of_uriref uri i
+          (Some j))) :: acc) , j+1)
+        ) (acc,1) cl)),i+1
   ) ([],0) types)
 
 let env_of_list l env =
- let l' = List.map (fun (name,suri) -> name,suri,CicUtil.term_of_uri suri) l in
+ let l' = List.map (fun (name,suri) -> name,suri,CicUtil.term_of_uri (UriManager.uri_of_string suri)) l in
   DisambiguateTypes.env_of_list l' env
 
-(*
-let add_aliases_for_inductive_def status types suri = 
-  let uri = UriManager.uri_of_string suri in
-  (* aliases for the constructors and types *)
-  let aliases = env_of_list (extract_alias types uri) status.aliases in
-  (* aliases for the eliminations principles *)
-  let base = String.sub suri 0 (String.length suri - 4)  in
-  let alisases = 
-    env_of_list
-      (List.fold_left (
-        fun acc suffix -> 
-          if List.exists (
-            fun (uri,_) -> UriManager.string_of_uri uri = base ^ suffix
-          ) status.objects then
-            let u = base ^ suffix in
-            (UriManager.name_of_uri (UriManager.uri_of_string u),u)::acc
-          else
-            acc
-      ) [] ["_ind.con";"_rec.con";"_rec_t.con"]) aliases
-  in
-  {status with aliases = aliases }
-*)
-
 let add_aliases_for_inductive_def status types suri = 
   let uri = UriManager.uri_of_string suri in
   let aliases = env_of_list (extract_alias types uri) status.aliases in
@@ -145,9 +123,6 @@ let save_object_to_disk status uri obj =
          [bodyuri,xmlbodypath]
      | _-> assert false) 
 
-let unregister_if_some = function 
-  | Some u -> Http_getter.unregister' u | None -> ()
-
 let remove_object_from_disk uri path =
   Sys.remove path;
   Http_getter.unregister' uri