X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatitadep.ml;h=5b22cb70b9cbe9abce580c4d254a0344b009a3d4;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=4e260dcf60b7dc8b2a93bf9352bd47c048be4b9e;hpb=65de996c8b18f6c7f7a8aeaccb83b984d62d4ce5;p=helm.git diff --git a/helm/matita/matitadep.ml b/helm/matita/matitadep.ml index 4e260dcf6..5b22cb70b 100644 --- a/helm/matita/matitadep.ml +++ b/helm/matita/matitadep.ml @@ -23,150 +23,77 @@ * http://helm.cs.unibo.it/ *) -let paths_to_search_in = ref [];; - -let add_l l = fun s -> l := s :: !l ;; - -let arg_spec = [ - "-I", Arg.String (add_l paths_to_search_in), - " Adds path to the list of searched paths for the include command"; -] -let usage = - Printf.sprintf "MatitaDep v%s\nUsage: matitadep [options] file...\nOptions:" - BuildTimeConf.version - module GA = GrafiteAst module U = UriManager -let deps = Hashtbl.create (Array.length Sys.argv) -let baseuris = ref [] -let aliases = Hashtbl.create (Array.length Sys.argv) - -(* -let uri_of_alias = function - | Ident_alias (_, uri) - | Symbol_alias (_, _, uri) - | Number_alias (_, uri) -> uri -*) - -let buri alias = - U.buri_of_uri (U.uri_of_string alias) - -let resolve alias = - 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 ****) - -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 +let main () = + (* all are maps from "file" to "something" *) + let include_deps = Hashtbl.create (Array.length Sys.argv) in + let baseuri_of = Hashtbl.create (Array.length Sys.argv) in + let uri_deps = Hashtbl.create (Array.length Sys.argv) in + 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 paths = !paths_to_search_in in - try - aux paths - with Sys_error _ as exc -> - MatitaLog.error ("Unable to read " ^ path); - MatitaLog.error ("opts.include_paths was " ^ String.concat ":" paths); - 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 + 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 - 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; - let files = ref [] in - Arg.parse arg_spec (add_l files) usage; + aux paths + with Sys_error _ as exc -> + MatitaLog.error ("Unable to read " ^ path); + MatitaLog.error ("opts.include_paths was " ^ String.concat ":" paths); + raise exc + in + MatitaInit.load_configuration_file (); + MatitaInit.parse_cmdline (); 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 - 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 - baseuris := uri :: !baseuris - | GA.Executable (_, GA.Command - (_, GA.Alias (_, GA.Ident_alias(_, uri)))) -> - Hashtbl.add aliases file uri - | 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 -> - prerr_endline ("Unable to parse: " ^ file); - prerr_endline (MatitaExcPp.to_string exn); - () - done - with - | End_of_file -> close_in ic); - Hashtbl.iter - (fun file alias -> - let dep = resolve alias in - match dep with - | None -> () - | Some u -> Hashtbl.add deps file (MatitaMisc.obj_file_of_baseuri u)) - aliases; - (* remove notation ids *) - List.iter CicNotation.remove_notation !notation_ids; - ) !files; + let istream = Ulexing.from_utf8_channel ic in + let dependencies = GrafiteParser.parse_dependencies istream in + close_in ic; + List.iter + (function + | GrafiteAst.UriDep uri -> + let uri = UriManager.string_of_uri uri in + Hashtbl.add uri_deps file uri + | GrafiteAst.BaseuriDep uri -> + let uri = MatitaMisc.strip_trailing_slash uri in + Hashtbl.add baseuri_of file uri + | GrafiteAst.IncludeDep path -> + try + let ma_file = if path <> "coq.ma" then find path else path in + let moo_file = MatitacleanLib.obj_file_of_script ma_file in + Hashtbl.add include_deps file moo_file + with Sys_error _ -> + MatitaLog.warn + ("Unable to find " ^ path ^ " that is included in " ^ 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 + match dep with + | None -> () + | Some u -> + Hashtbl.add include_deps file (MatitaMisc.obj_file_of_baseuri u)) + uri_deps; List.iter (fun file -> - let deps = Hashtbl.find_all deps file in + let deps = Hashtbl.find_all include_deps file in let deps = List.fast_sort Pervasives.compare deps in - let deps = MatitaMisc.list_uniq deps in + let deps = HExtlib.list_uniq deps in let deps = file :: deps in - let moo = MatitaMisc.obj_file_of_script file in + let moo = MatitacleanLib.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 () + Printf.printf "%s: %s\n" (Pcre.replace ~pat:"ma$" ~templ:"mo" file) moo) + (Helm_registry.get_list Helm_registry.string "matita.args") +