haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle errors in UTop_main.interact

This commit is contained in:
Jeremie Dimino 2016-02-24 10:46:18 +00:00
parent 05a0816d95
commit a51d79079a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/uTop_main.cppo.ml
View File

@ -1422,8 +1422,12 @@ let interact ~search_path ~unit ~loc:(fname, lnum, cnum, _) ~values =
match search#lift_Cmt_format_cmt_infos cmt_infos with match search#lift_Cmt_format_cmt_infos cmt_infos with
| () -> failwith "Couldn't find location in cmt file" | () -> failwith "Couldn't find location in cmt file"
| exception (Found env) -> | exception (Found env) ->
Clflags.include_dirs := cmt_infos.cmt_loadpath @ !Clflags.include_dirs; try
let env = Env.env_of_only_summary Envaux.env_from_summary env in Clflags.include_dirs := cmt_infos.cmt_loadpath @ !Clflags.include_dirs;
List.iter (fun (V (name, v)) -> Toploop.setvalue name (Obj.repr v)) values; let env = Env.env_of_only_summary Envaux.env_from_summary env in
main_internal ~initial_env:(Some env) List.iter (fun (V (name, v)) -> Toploop.setvalue name (Obj.repr v)) values;
main_internal ~initial_env:(Some env)
with exn ->
Location.report_exception Format.err_formatter exn;
exit 2
;; ;;