From dda7d129dba6c90d642cd99cd989e5f13c0eb4b4 Mon Sep 17 00:00:00 2001 From: Emilio Jesus Gallego Arias Date: Wed, 3 Jul 2019 12:54:37 +0200 Subject: [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. --- interp/dumpglob.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'interp/dumpglob.ml') diff --git a/interp/dumpglob.ml b/interp/dumpglob.ml index dc6a1ae180..0ec8b1e0c8 100644 --- a/interp/dumpglob.ml +++ b/interp/dumpglob.ml @@ -12,13 +12,13 @@ open Util (* Dump of globalization (to be used by coqdoc) *) -let glob_file = ref Pervasives.stdout +let glob_file = ref stdout let open_glob_file f = - glob_file := Pervasives.open_out f + glob_file := open_out f let close_glob_file () = - Pervasives.close_out !glob_file + close_out !glob_file type glob_output_t = | NoGlob @@ -37,7 +37,7 @@ let dump_to_dotglob () = glob_output := MultFiles let dump_into_file f = if String.equal f "stdout" then - (glob_output := StdOut; glob_file := Pervasives.stdout) + (glob_output := StdOut; glob_file := stdout) else (glob_output := File f; open_glob_file f) @@ -45,7 +45,7 @@ let feedback_glob () = glob_output := Feedback let dump_string s = if dump () && !glob_output != Feedback then - Pervasives.output_string !glob_file s + output_string !glob_file s let start_dump_glob ~vfile ~vofile = match !glob_output with -- cgit v1.2.3