aboutsummaryrefslogtreecommitdiff
path: root/tools/ocamllibdep.mll
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-07-03 12:54:37 +0200
committerEmilio Jesus Gallego Arias2019-07-08 13:18:47 +0200
commitdda7d129dba6c90d642cd99cd989e5f13c0eb4b4 (patch)
tree23fdc06a01b17e81c0c03831e675bcc2b0bb94e7 /tools/ocamllibdep.mll
parent437063a0c745094c5693d1c5abba46ce375d69c6 (diff)
[core] [api] Support OCaml 4.08
The changes are large due to `Pervasives` deprecation: - the `Pervasives` module has been deprecated in favor of `Stdlib`, we have opted for introducing a few wrapping functions in `Util` and just unqualified the rest of occurrences. We avoid the shims as in the previous attempt. - a bug regarding partial application have been fixed. - some formatting functions have been deprecated, but previous versions don't include a replacement, thus the warning has been disabled. We may want to clean up things a bit more, in particular w.r.t. modules once we can move to OCaml 4.07 as the minimum required version. Note that there is a clash between 4.08.0 modules `Option` and `Int` and Coq's ones. It is not clear if we should resolve that clash or not, see PR #10469 for more discussion. On the good side, OCaml 4.08.0 does provide a few interesting functionalities, including nice new warnings useful for devs.
Diffstat (limited to 'tools/ocamllibdep.mll')
-rw-r--r--tools/ocamllibdep.mll8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/ocamllibdep.mll b/tools/ocamllibdep.mll
index bd19d30409..41a4e2a86a 100644
--- a/tools/ocamllibdep.mll
+++ b/tools/ocamllibdep.mll
@@ -35,7 +35,6 @@ rule mllib_list = parse
{
open Printf
-open Unix
(* Makefile's escaping rules are awful: $ is escaped by doubling and
other special characters are escaped by backslash prefixing while
@@ -99,6 +98,7 @@ let file_name s = function
type dir = string option
let add_directory add_file phys_dir =
+ let open Unix in
Array.iter (fun f ->
(* we avoid all files starting by '.' *)
if f.[0] <> '.' then
@@ -152,7 +152,7 @@ let add_caml_known phys_dir f =
| _ -> ()
let add_caml_dir phys_dir =
- handle_unix_error (add_directory add_caml_known) phys_dir
+ Unix.handle_unix_error (add_directory add_caml_known) phys_dir
let traite_fichier_modules md ext =
try
@@ -192,7 +192,7 @@ let mllib_dependencies () =
efullname efullname;
printf "%s.cmxa:$(addsuffix .cmx,$(%s_MLLIB_DEPENDENCIES))\n"
efullname efullname;
- flush Pervasives.stdout)
+ flush stdout)
(List.rev !mllibAccu)
let mlpack_dependencies () =
@@ -209,7 +209,7 @@ let mlpack_dependencies () =
efullname efullname;
printf "%s.cmx:$(addsuffix .cmx,$(%s_MLPACK_DEPENDENCIES))\n"
efullname efullname;
- flush Pervasives.stdout)
+ flush stdout)
(List.rev !mlpackAccu)
let rec parse = function