- let istream = Stream.of_channel ic in
- (try
- while true do
- match GrafiteParser.parse_statement istream with
- | TA.Executable (_, TA.Command (_, TA.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)))) ->
- Hashtbl.add aliases file uri
- | TA.Executable (_, TA.Command (_, TA.Include (_, path))) ->
- Hashtbl.add deps file (find path)
- | _ -> ()
- done
- with
- | CicNotationParser.Parse_error _ as exn ->
- prerr_endline ("Unable to parse: " ^ file);
- prerr_endline (MatitaExcPp.to_string exn);
- exit 1
- | End_of_file -> close_in ic);
- Hashtbl.iter
- (fun file alias ->
- let dep = resolve alias in
- match dep with
- | None -> ()
- | Some d -> Hashtbl.add deps file d)
- aliases)
+ 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)