X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatitadep.ml;h=70240068fe71624063bac38e4ffdaf33bf652d0d;hb=51d82e0a8a4d4ed86d2646edb2654e565ac34a82;hp=621b20ecff4cfc523ed13ae3af7dd86cb7276dd0;hpb=b8193e0717e01edfcf826a6edce0866496537e8a;p=helm.git

diff --git a/helm/matita/matitadep.ml b/helm/matita/matitadep.ml
index 621b20ecf..70240068f 100644
--- a/helm/matita/matitadep.ml
+++ b/helm/matita/matitadep.ml
@@ -35,11 +35,11 @@ let usage =
   Printf.sprintf "MatitaDep v%s\nUsage: matitadep [options] file...\nOptions:"
     BuildTimeConf.version
 
-module TA = GrafiteAst 
+module GA = GrafiteAst 
 module U = UriManager
 
 let deps = Hashtbl.create (Array.length Sys.argv)
-let baseuri = ref []
+let baseuris = ref []
 let aliases = Hashtbl.create (Array.length Sys.argv)
 
 (*
@@ -53,10 +53,8 @@ let buri alias =
   U.buri_of_uri (U.uri_of_string alias)
 
 let resolve alias =
-  try
-    Some (snd(List.find (fun (u, f) -> u = (buri alias)) !baseuri))
-  with
-  | Not_found -> None
+ let buri = buri alias in
+  if List.exists (fun u -> u = buri) !baseuris then Some buri else None
  
   (*** TODO MANCANO LE URI VERBATIM DENTRO GLI AST DEI TERMINI ****)
 
@@ -77,26 +75,67 @@ let find path =
     raise exc
 ;;
 
+(* note, this function works cause moo files are transitively closed *)
+let process_notation_of_file file =
+    let ic = open_in file in
+    let istream = Stream.of_channel ic in
+    let notation_ids = ref [] in
+    try
+      while true do
+        match GrafiteParser.parse_statement istream with
+        | GA.Executable (_, GA.Command (_, notation)) ->
+          let stm, ids = CicNotation.process_notation notation in
+          notation_ids := ids @ !notation_ids
+        | _ -> ()
+      done; []
+    with
+    | End_of_file -> close_in ic; !notation_ids
+    | CicNotationParser.Parse_error _ as exn ->
+        prerr_endline ("Unable to parse: " ^ file);
+        prerr_endline (MatitaExcPp.to_string exn);
+        raise exn
+
 let main () =
-  Helm_registry.load_from BuildTimeConf.matita_conf;
-  CicNotation.load_notation BuildTimeConf.core_notation_script;
+  MatitaInit.initialize_notation ();
   let files = ref [] in
   Arg.parse arg_spec (add_l files) usage;
-  List.iter (fun file -> 
+  List.iter
+   (fun file -> 
     let ic = open_in file in
     let istream = Stream.of_channel ic in
+    let notation_ids = ref [] in
     (try
       while true do
         try 
-          match GrafiteParser.parse_statement istream with
-          | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", uri))) ->
+          let stm = GrafiteParser.parse_statement istream in
+          (match stm with 
+          | GA.Executable (_, GA.Command (_, notation)) ->
+            let stm, ids = CicNotation.process_notation notation in
+            notation_ids := ids @ !notation_ids
+          | _ -> ());
+          match stm with
+          | GA.Executable (_, GA.Command (_, GA.Set (_, "baseuri", uri))) ->
               let uri = MatitaMisc.strip_trailing_slash uri in
-              baseuri := (uri, file) :: !baseuri
-          | TA.Executable (_, TA.Command 
-              (_, TA.Alias (_, TA.Ident_alias(_, uri)))) -> 
+              baseuris := uri :: !baseuris
+          | GA.Executable (_, GA.Command 
+              (_, GA.Alias (_, GA.Ident_alias(_, uri)))) -> 
                 Hashtbl.add aliases file uri
-          | TA.Executable (_, TA.Command (_, TA.Include (_, path))) ->
-                Hashtbl.add deps file (find path)
+          | GA.Executable (_, GA.Command (_, GA.Include (_, path))) ->
+              (* maybe to process coq.ma is useles since it contains only
+               * interpretations... no idea if notations will be added later *)
+              let moo_file = 
+                MatitaMisc.obj_file_of_script (
+                  if path <> "coq.ma" then find path else path)
+              in
+              let ids = process_notation_of_file moo_file in
+              notation_ids := ids @ !notation_ids;
+              (try
+                Hashtbl.add deps file moo_file
+               with
+                Sys_error _ ->
+                 MatitaLog.error
+                  ("In file " ^ file ^ " unable to include " ^ path)
+              )
           | _ -> ()
         with 
           CicNotationParser.Parse_error _ as exn ->
@@ -111,22 +150,22 @@ let main () =
         let dep = resolve alias in
         match dep with 
         | None -> ()
-        | Some d -> Hashtbl.add deps file d)
-      aliases)
-  !files;
-  List.iter (fun file -> 
+        | Some u -> Hashtbl.add deps file (MatitaMisc.obj_file_of_baseuri u))
+      aliases;
+    (* remove notation ids *)
+    List.iter CicNotation.remove_notation !notation_ids;
+   ) !files;
+  List.iter
+   (fun file -> 
     let deps = Hashtbl.find_all deps file in
     let deps = List.fast_sort Pervasives.compare deps in
     let deps = MatitaMisc.list_uniq deps in
-    let deps = 
-      List.map (fun x -> Pcre.replace ~pat:"ma$" ~templ:"moo" x) deps 
-    in
     let deps = file :: deps in
-    Printf.printf "%s: %s\n" (MatitaMisc.obj_file_of_script file)
-      (String.concat " " deps))
-    !files
+    let moo = MatitaMisc.obj_file_of_script file in
+     Printf.printf "%s: %s\n" moo (String.concat " " deps);
+     Printf.printf "%s: %s\n" (Pcre.replace ~pat:"ma$" ~templ:"mo" file) moo
+   ) !files
 ;;
   
 let _ =
   main ()
-