From 2280477a96e19ba5060de2d48dcc8fd7c8079d22 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 13 Nov 2015 11:31:34 +0100 Subject: Imported Upstream version 8.5~beta3+dfsg --- stm/vio_checking.ml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'stm/vio_checking.ml') diff --git a/stm/vio_checking.ml b/stm/vio_checking.ml index b2072221..06bf955c 100644 --- a/stm/vio_checking.ml +++ b/stm/vio_checking.ml @@ -10,7 +10,7 @@ open Util let check_vio (ts,f) = Dumpglob.noglob (); - let long_f_dot_v, _, _, _, tasks, _ = Library.load_library_todo f in + let long_f_dot_v, _, _, _, _, tasks, _ = Library.load_library_todo f in Stm.set_compilation_hints long_f_dot_v; List.fold_left (fun acc ids -> Stm.check_task f tasks ids && acc) true ts @@ -30,7 +30,7 @@ let schedule_vio_checking j fs = let f = if Filename.check_suffix f ".vio" then Filename.chop_extension f else f in - let long_f_dot_v, _,_,_, tasks, _ = Library.load_library_todo f in + let long_f_dot_v, _,_,_,_, tasks, _ = Library.load_library_todo f in Stm.set_compilation_hints long_f_dot_v; let infos = Stm.info_tasks tasks in let eta = List.fold_left (fun a (_,t,_) -> a +. t) 0.0 infos in @@ -104,9 +104,7 @@ let schedule_vio_compilation j fs = let f = if Filename.check_suffix f ".vio" then Filename.chop_extension f else f in - let paths = Loadpath.get_paths () in - let _, long_f_dot_v = - System.find_file_in_path ~warn:(Flags.is_verbose()) paths (f^".v") in + let long_f_dot_v = Loadpath.locate_file (f^".v") in let aux = Aux_file.load_aux_file_for long_f_dot_v in let eta = try float_of_string (Aux_file.get aux Loc.ghost "vo_compile_time") -- cgit v1.2.3