- let istream = Stream.of_channel ic in
- (try
- while true do
- try
- match GrafiteParser.parse_statement istream with
- | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", uri))) ->
- let uri = MatitaMisc.strip_trailing_slash uri in
- baseuris := uri :: !baseuris
- | TA.Executable (_, TA.Command
- (_, TA.Alias (_, TA.Ident_alias(_, uri)))) ->
- Hashtbl.add aliases file uri
- | TA.Executable (_, TA.Command (_, TA.Include (_, path))) ->
- if path <> "coq.ma" then
- (try
- Hashtbl.add deps file (MatitaMisc.obj_file_of_script (find path))
- 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
- ) !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 = MatitaMisc.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)
+ !files;
+ 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;