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

4.09: caml_sys_modify_arg rather than Obj.truncate

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

22
src/lib/uTop_main.ml
View File

@ -1284,14 +1284,28 @@ let prepare () =
Format.eprintf "Uncaught exception: %s\n" (Printexc.to_string exn);
false
#if OCAML_VERSION >= (4, 09, 0)
external caml_sys_modify_argv : string array -> unit =
"caml_sys_modify_argv"
let override_argv () =
let len = Array.length Sys.argv - !Arg.current in
let copy = Array.init len (fun i -> Sys.argv.(i+ !Arg.current)) in
caml_sys_modify_argv copy;
Arg.current := 0
#else
let override_argv () =
let len = Array.length Sys.argv - !Arg.current in
Array.blit Sys.argv !Arg.current Sys.argv 0 len;
Obj.truncate (Obj.repr Sys.argv) len;
Arg.current := 0
#endif
let run_script name =
(* To prevent message from camlp4 *)
Sys.interactive := false;
if not (prepare ()) then exit 2;
let len = Array.length Sys.argv - !Arg.current in
Array.blit Sys.argv !Arg.current Sys.argv 0 len;
Obj.truncate (Obj.repr Sys.argv) len;
Arg.current := 0;
override_argv ();
Toploop.initialize_toplevel_env ();
Location.input_name := UTop.input_name;
if Toploop.use_silently Format.err_formatter name then