1. Several files in grafite that should be in grafite_parser moved there.

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

diff --git a/helm/matita/matitadep.ml b/helm/matita/matitadep.ml
index c40f1636d76e8a3a5e6c1b18cfcfe63e730a6f10..c845954ed36776a99c3496628e6f853d8894f4a7 100644 (file)
--- a/helm/matita/matitadep.ml
+++ b/helm/matita/matitadep.ml
@@ -34,51 +34,37 @@ let main () =
   let buri alias = U.buri_of_uri (U.uri_of_string alias) in
   let resolve alias current_buri =
     let buri = buri alias in
-    if buri <> current_buri then Some buri else None
-  in
-  let find path = 
-    let rec aux = function
-    | [] -> close_in (open_in path); path
-    | p :: tl ->
-        try
-          close_in (open_in (p ^ "/" ^ path)); p ^ "/" ^ path
-        with Sys_error _ -> aux tl
-    in
-    let paths = Helm_registry.get_list Helm_registry.string "matita.includes" in
-    try
-      aux paths
-    with Sys_error _ as exc ->
-      HLog.error ("Unable to read " ^ path);
-      HLog.error ("opts.include_paths was " ^ String.concat ":" paths);
-      raise exc
-  in
+    if buri <> current_buri then Some buri else None in
+  let include_paths =
+   Helm_registry.get_list Helm_registry.string "matita.includes" in
   MatitaInit.load_configuration_file ();
   MatitaInit.parse_cmdline ();
   let basedir = Helm_registry.get "matita.basedir" in
   List.iter
-   (fun file -> 
-    let ic = open_in file in
+   (fun ma_file -> 
+    let ic = open_in ma_file in
     let istream = Ulexing.from_utf8_channel ic in
     let dependencies = GrafiteParser.parse_dependencies istream in
     close_in ic;
     List.iter 
-      (function
-      | GrafiteAst.UriDep uri -> 
+     (function
+       | GrafiteAst.UriDep uri -> 
           let uri = UriManager.string_of_uri uri in
-          Hashtbl.add uri_deps file uri
-      | GrafiteAst.BaseuriDep uri -> 
+          Hashtbl.add uri_deps ma_file uri
+       | GrafiteAst.BaseuriDep uri -> 
           let uri = Http_getter_misc.strip_trailing_slash uri in
-          Hashtbl.add baseuri_of file uri
-      | GrafiteAst.IncludeDep path -> 
+          Hashtbl.add baseuri_of ma_file uri
+       | GrafiteAst.IncludeDep path -> 
           try 
-            let ma_file = if path <> "coq.ma" then find path else path in
-            let moo_file = GrafiteMisc.obj_file_of_script ~basedir ma_file in
-            Hashtbl.add include_deps file moo_file
+            let baseuri =
+             GrafiteParserMisc.baseuri_of_script ~include_paths path in
+            let moo_file = LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri in
+            Hashtbl.add include_deps ma_file moo_file
           with Sys_error _ -> 
             HLog.warn 
-              ("Unable to find " ^ path ^ " that is included in " ^ file))
-    dependencies)
-  (Helm_registry.get_list Helm_registry.string "matita.args");
+              ("Unable to find " ^ path ^ " that is included in " ^ ma_file)
+     ) dependencies
+   ) (Helm_registry.get_list Helm_registry.string "matita.args");
   Hashtbl.iter 
     (fun file alias -> 
       let dep = resolve alias (Hashtbl.find baseuri_of file) in
@@ -89,13 +75,14 @@ let main () =
           (LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri:u))
   uri_deps;
   List.iter
-   (fun file -> 
-    let deps = Hashtbl.find_all include_deps file in
+   (fun ma_file -> 
+    let deps = Hashtbl.find_all include_deps ma_file in
     let deps = List.fast_sort Pervasives.compare deps in
     let deps = HExtlib.list_uniq deps in
-    let deps = file :: deps in
-    let moo = GrafiteMisc.obj_file_of_script ~basedir file in
+    let deps = ma_file :: deps in
+    let baseuri = Hashtbl.find baseuri_of ma_file in
+    let moo = LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri in
      Printf.printf "%s: %s\n" moo (String.concat " " deps);
-     Printf.printf "%s: %s\n" (Pcre.replace ~pat:"ma$" ~templ:"mo" file) moo)
+     Printf.printf "%s: %s\n" (Pcre.replace ~pat:"ma$" ~templ:"mo" ma_file) moo)
    (Helm_registry.get_list Helm_registry.string "matita.args")