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

4.09: use Persistent_env

This commit is contained in:
Florian Angeletti 2019-09-16 14:28:08 +02:00
parent 2405c8dd8f
commit 0debad9aaf
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/uTop_main.ml
View File

@ -625,13 +625,23 @@ let bind_expressions name phrase =
let execute_phrase = let execute_phrase =
let new_cmis = ref []in let new_cmis = ref []in
let default_load = !Env.Persistent_signature.load in let default_load =
#if OCAML_VERSION >= (4, 09, 0)
!Persistent_env.Persistent_signature.load
#else
!Env.Persistent_signature.load
#endif
in
let load ~unit_name = let load ~unit_name =
let res = default_load ~unit_name in let res = default_load ~unit_name in
(match res with None -> () | Some x -> new_cmis := x.cmi :: !new_cmis); (match res with None -> () | Some x -> new_cmis := x.cmi :: !new_cmis);
res res
in in
#if OCAML_VERSION >= (4, 09, 0)
Persistent_env.Persistent_signature.load := load;
#else
Env.Persistent_signature.load := load; Env.Persistent_signature.load := load;
#endif
let rec collect_printers path signature acc = let rec collect_printers path signature acc =
List.fold_left (fun acc item -> List.fold_left (fun acc item ->