diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coqdep.ml | 2 | ||||
| -rw-r--r-- | tools/coqdep_common.ml | 2 | ||||
| -rw-r--r-- | tools/coqdoc/main.ml | 2 | ||||
| -rw-r--r-- | tools/coqdoc/output.ml | 16 | ||||
| -rw-r--r-- | tools/ocamllibdep.mll | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/tools/coqdep.ml b/tools/coqdep.ml index 7a07e815ce..6f81be475b 100644 --- a/tools/coqdep.ml +++ b/tools/coqdep.ml @@ -297,7 +297,7 @@ module DAG = DAG(struct type t = string let compare = compare end) (** TODO: we should share this code with Coqdep_common *) module VData = struct type t = string list option * string list - let compare = Pervasives.compare + let compare = Util.pervasives_compare end module VCache = Set.Make(VData) diff --git a/tools/coqdep_common.ml b/tools/coqdep_common.ml index d98242ef17..8beb314046 100644 --- a/tools/coqdep_common.ml +++ b/tools/coqdep_common.ml @@ -357,7 +357,7 @@ let canonize f = module VData = struct type t = string list option * string list - let compare = Pervasives.compare + let compare = compare end module VCache = Set.Make(VData) diff --git a/tools/coqdoc/main.ml b/tools/coqdoc/main.ml index 1c22efa513..3442ebb731 100644 --- a/tools/coqdoc/main.ml +++ b/tools/coqdoc/main.ml @@ -396,7 +396,7 @@ let copy src dst = try let cout = open_out dst in try - while true do Pervasives.output_char cout (input_char cin) done + while true do output_char cout (input_char cin) done with End_of_file -> close_out cout; close_in cin diff --git a/tools/coqdoc/output.ml b/tools/coqdoc/output.ml index 9b7da862a8..02f0290802 100644 --- a/tools/coqdoc/output.ml +++ b/tools/coqdoc/output.ml @@ -13,9 +13,9 @@ open Index (*s Low level output *) -let output_char c = Pervasives.output_char !out_channel c +let output_char c = output_char !out_channel c -let output_string s = Pervasives.output_string !out_channel s +let output_string s = output_string !out_channel s let printf s = Printf.fprintf !out_channel s @@ -527,13 +527,13 @@ module Html = struct let header () = if !header_trailer then if !header_file_spec then - let cin = Pervasives.open_in !header_file in + let cin = open_in !header_file in try while true do - let s = Pervasives.input_line cin in + let s = input_line cin in printf "%s\n" s done - with End_of_file -> Pervasives.close_in cin + with End_of_file -> close_in cin else begin printf "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"; @@ -548,13 +548,13 @@ module Html = struct let trailer () = if !header_trailer && !footer_file_spec then - let cin = Pervasives.open_in !footer_file in + let cin = open_in !footer_file in try while true do - let s = Pervasives.input_line cin in + let s = input_line cin in printf "%s\n" s done - with End_of_file -> Pervasives.close_in cin + with End_of_file -> close_in cin else begin if !index && (get_module false) <> "Index" then 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 |