Update to OCaml 4.02

appkit/getopt.ml

@@ -511,7 +511,10 @@ let long_option_callback o f s =
     in
     let a = String.sub s (i+1) (l-i-1) in
     try m.long_callback a
-    with Error(mesg) -> (mesg.[String.index mesg '?'] <- o; raise(Error(mesg)))
+    with Error(mesg) -> ( let i = String.index mesg '?' in
+                          let m = Bytes.of_string mesg in
+                          Bytes.set m i o;
+                          raise(Error(Bytes.to_string mesg)))
   else
     m.long_callback ""
 

appkit/unicode.mli

@@ -1017,14 +1017,22 @@ sig
 
   type tag = string
 
+  type formatter_out_functions = {
+    out_string : string -> int -> int -> unit;
+    out_flush : unit -> unit;
+    out_newline : unit -> unit;
+    out_spaces : int -> unit;
+  }
+
   type formatter_tag_functions = {
     mark_open_tag : tag -> string;
     mark_close_tag : tag -> string;
     print_open_tag : tag -> unit;
     print_close_tag : tag -> unit;
   }
 
-  val formatter_of_out_channel : ?enc:Encoding.t -> Pervasives.out_channel -> formatter
+  val formatter_of_out_channel :
+    ?enc:Encoding.t -> Pervasives.out_channel -> formatter
   val formatter_of_formatter : ?enc:Encoding.t -> Format.formatter -> formatter
   val formatter_of_buffer : ?enc:Encoding.t -> Buffer.t -> formatter
   val stdbuf : Buffer.t
@@ -1087,35 +1095,24 @@ sig
   val pp_get_formatter_output_functions :
     formatter ->
     unit -> (string -> int -> int -> unit) * (unit -> unit)
-  val pp_set_all_formatter_output_functions :
-    formatter ->
-    out:(string -> int -> int -> unit) ->
-    flush:(unit -> unit) ->
-    newline:(unit -> unit) -> spaces:(int -> unit) -> unit
-  val pp_get_all_formatter_output_functions :
-    formatter ->
-    unit ->
-    (string -> int -> int -> unit) * (unit -> unit) * (unit -> unit) *
-    (int -> unit)
   val pp_set_formatter_tag_functions :
     formatter -> formatter_tag_functions -> unit
   val pp_get_formatter_tag_functions :
     formatter -> unit -> formatter_tag_functions
-  val fprintf :
-    formatter -> ('a, Format.formatter, unit) Pervasives.format -> 'a
-  val sprintf : ('a, unit, string) Pervasives.format -> 'a
-  val bprintf :
-    Buffer.t -> ('a, Format.formatter, unit) Pervasives.format -> 'a
-  val kfprintf :
-    (formatter -> 'a) ->
-    formatter ->
-    ('b, Format.formatter, unit, 'a) Pervasives.format4 -> 'b
-  val ifprintf :
-    formatter -> ('a, Format.formatter, unit) Pervasives.format -> 'a
-  val ksprintf :
-    (string -> 'a) -> ('b -> 'c, unit, string, 'a) Pervasives.format4 -> 'b -> 'c
-  val kprintf :
-    (string -> 'a) -> ('b -> 'c, unit, string, 'a) Pervasives.format4 -> 'b -> 'c
+  val pp_set_formatter_out_functions :
+    formatter -> formatter_out_functions -> unit
+  val pp_get_formatter_out_functions :
+    formatter -> unit -> formatter_out_functions
+  val pp_print_list:
+    ?pp_sep:(formatter -> unit -> unit) ->
+    (formatter -> 'a -> unit) -> (formatter -> 'a list -> unit)
+  val pp_print_text : formatter -> string -> unit
+  val fprintf : formatter -> ('a, Format.formatter, unit) format -> 'a
+  val sprintf : ('a, unit, string) format -> 'a
+  val asprintf : ('a, Format.formatter, unit, string) format4 -> 'a
+  val ifprintf : formatter -> ('a, Format.formatter, unit) format -> 'a
+  val ikfprintf : (formatter -> 'a) -> formatter ->
+    ('b, Format.formatter, unit, 'a) format4 -> 'b
 end
 
 

testkit/unitTest.ml

@@ -254,7 +254,7 @@ let pr_generator =
 let pr_name prefix suffix =
   let pr_number = (Random.State.bits pr_generator) land 0xFFFFFF in
   let pr_basename = (sprintf "%s%06x%s" prefix pr_number suffix) in
-    Filename.concat Filename.temp_dir_name pr_basename
+    Filename.concat (Filename.get_temp_dir_name()) pr_basename
 
 let tmpfile prefix suffix r =
   let sname = ref "\000" in	(* An invalid filename *)