urimanager removed

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

diff --git a/matita/matita/matitadep.ml b/matita/matita/matitadep.ml
index af811b140741372f7e44b15c98d4764eec3e37fa..3156783071755b5fd6cf0a7c797948b5ee329033 100644 (file)
--- a/matita/matita/matitadep.ml
+++ b/matita/matita/matitadep.ml
@@ -28,7 +28,6 @@
 module S = Set.Make (String)
 
 module GA = GrafiteAst 
-module U = UriManager
 module HR = Helm_registry
 
 let print_times msg = 
@@ -68,7 +67,7 @@ let generate_theory theory_file deps =
    end
 
 let main () =
-(*  let _ = print_times "inizio" in *)
+  let _ = print_times "inizio" in
   let include_paths = ref [] in
   let use_stdout = ref false in
   let theory_file = ref "" in
@@ -104,7 +103,7 @@ let main () =
       HLog.error ("possibly incorrect verbatim URIs in the .ma file.");
       None
   in
-  let buri alias = U.buri_of_uri (U.uri_of_string alias) in
+  let buri alias = NUri.baseuri_of_uri (NUri.uri_of_string alias) in
   let resolve alias current_buri =
     let buri = buri alias in
     if buri <> current_buri then Some buri else None 
@@ -155,9 +154,9 @@ let main () =
               Hashtbl.add include_deps     ma_file ma_file
               Hashtbl.add include_deps_dot ma_file baseuri
   *)
-(*  let _ = print_times "prima di iter1" in *)
+  let _ = print_times "prima di iter1" in 
   List.iter (fun ma_file -> ignore (baseuri_of_script ma_file)) ma_files;
-(*  let _ = print_times "in mezzo alle due iter" in *)
+  let _ = print_times "in mezzo alle due iter" in 
   let map s _ l = s :: l in
   let ma_files = Hashtbl.fold map baseuri_of [] in
   List.iter
@@ -168,9 +167,11 @@ let main () =
       in
       let ma_baseuri = baseuri_of_script ma_file in
       let dependencies = 
+  let _ = print_times "prima deps_of_iter" in 
          try DependenciesParser.deps_of_file ma_file
         with Sys_error _ -> []
       in
+  let _ = print_times "dopo deps_of_iter" in 
       let handle_uri uri =
          if not (Http_getter_storage.is_legacy uri) then
          let dep = resolve uri ma_baseuri in
@@ -188,7 +189,7 @@ let main () =
       List.iter 
        (function
          | DependenciesParser.UriDep uri      ->
-            let uri = UriManager.string_of_uri uri in
+            let uri = NUri.string_of_uri uri in
            handle_uri uri 
          | DependenciesParser.InlineDep path  ->
            if Librarian.is_uri path
@@ -198,7 +199,7 @@ let main () =
        dependencies)
    ma_files;
   (* generate regular depend output *)
-(*  let _ = print_times "dopo di iter2" in *)
+  let _ = print_times "dopo di iter2" in 
   let deps =
     List.fold_left
      (fun acc ma_file -> 
@@ -247,4 +248,4 @@ let main () =
       ignore(Sys.command ("tred "^ !dot_file^"| dot -Tpng -o"^dot_name^".png"));
       HLog.message ("Type 'eog "^dot_name^".png' to view the graph"); 
     end;
-(*    let _ = print_times "fine" in () *)
+    let _ = print_times "fine" in ()