v0.18~preview.130.106+341

Author: public-release

base.opam

@@ -23,9 +23,12 @@ depends: [
   "sexplib0"
   "dune"                    {>= "3.17.0"}
   "dune-configurator"
-  "ppxlib"                  {= "0.33.0+ox"}
+  "ppxlib"                  {>= "0.33.0" & < "0.36.0"}
 ]
 available: arch != "x86_32"
+conflicts: [
+  "oxcaml-compiler" {< "5.2.0minus39"}
+]
 synopsis: "Full standard library replacement for OCaml"
 description: "
 Full standard library replacement for OCaml

dune

@@ -19,7 +19,7 @@ let () =
     let pp = Format.formatter_of_buffer buf in
     Format.pp_set_margin pp max_int;
     (* so we can parse line by line below *)
-    Format.fprintf pp "%a@." Printtyp.Compat.signature cmi.Cmi_format.cmi_sign;
+    Format.fprintf pp "%a@." Printtyp.Compat.signature (fst cmi.Cmi_format.cmi_sign);
     let s = Buffer.contents buf in
     let lines = Str.split (Str.regexp "\n") s in
     Printf.fprintf oc "[@@@warning \"-3\"]\n\n";

ppx/test/dune

@@ -6,8 +6,6 @@ module Option = Option0
 module List = List0
 include Array
 
-[@@@warning "-incompatible-with-upstream"]
-
 type ('a : any mod separable) t = 'a array
 
 [%%template
@@ -48,7 +46,8 @@ type%template ('a : k) t = 'a array
    - http://www.sorting-algorithms.com/quick-sort-3-way *)
 
 module%template.portable
-  [@kind k = base_or_null_with_ext] [@modality p] Sorter (S : sig
+  [@kind k = (base_or_null_with_ext, value_or_null mod external64 non_float)]
+  [@modality p] Sorter (S : sig
     [@@@kind k = k mod separable]
 
     type ('a : k) t
@@ -330,7 +329,8 @@ struct
 end
 [@@inline]
 
-module%template [@kind k = base_or_null_with_ext] Sort =
+module%template
+  [@kind k = (base_or_null_with_ext, value_or_null mod external64 non_float)] Sort =
 Sorter [@kind k] [@modality portable] (struct
     type nonrec ('a : k mod separable) t = 'a t
 
@@ -820,34 +820,6 @@ let filteri t ~f =
   (filter_mapi [@kind k1 k1]) t ~f:(fun i x -> if f i x then Some x else None) [@nontail]
 ;;
 
-[%%template
-[@@@kind.default k1 = k1, k2 = base_or_null, k3 = base_or_null]
-
-let foldi_until t ~init ~f ~finish =
-  let length = length t in
-  let rec loop i acc =
-    if i < length
-    then (
-      match
-        ((f [@inlined hint]) i acc (unsafe_get t i)
-         : (_ Container.Continue_or_stop.t
-           [@kind (k2 or value_or_null) (k3 or value_or_null)]))
-      with
-      | Continue acc -> loop (i + 1) acc
-      | Stop res -> res)
-    else finish i acc
-  in
-  (loop [@inlined]) 0 init [@nontail]
-;;
-
-let fold_until t ~init ~f ~finish =
-  (foldi_until [@kind k1 k2 k3] [@inlined])
-    t
-    ~init
-    ~f:(fun _i acc x -> f acc x)
-    ~finish:(fun _i acc -> finish acc) [@nontail]
-;;]
-
 [@@@kind.default k2 = base_or_null_with_ext]
 
 let of_list_rev_map xs ~f =
@@ -860,36 +832,58 @@ let of_list_rev_mapi xs ~f =
   let t = (of_list_mapi [@kind k1 k2]) xs ~f in
   (rev_inplace [@kind k2]) t;
   t
-;;
+;;]
 
-[@@@kind.default k3 = base_or_null_with_ext]
+[%%template
+[@@@kind.default k = base_or_null_with_ext]
 
 let partition_mapi t ~f =
-  let (both : (_ Either0.t[@kind (k2 or value_or_null) (k3 or value_or_null)]) t) =
-    (mapi [@kind k1 value_or_null]) t ~f
+  let (both : (_ Either0.t[@kind (k or value_or_null) (k or value_or_null)]) t) =
+    (mapi [@kind k value_or_null]) t ~f
   in
   let firsts =
-    (filter_map [@kind value_or_null k2]) both ~f:(function
-      | First x -> (Some x : (_ Option.t[@kind k2 or value_or_null]))
+    (filter_map [@kind value_or_null k]) both ~f:(function
+      | First x -> (Some x : (_ Option.t[@kind k or value_or_null]))
       | Second _ -> None)
   in
   let seconds =
-    (filter_map [@kind value_or_null k3]) both ~f:(function
-      | First _ -> (None : (_ Option.t[@kind k3 or value_or_null]))
+    (filter_map [@kind value_or_null k]) both ~f:(function
+      | First _ -> (None : (_ Option.t[@kind k or value_or_null]))
       | Second x -> Some x)
   in
   firsts, seconds
+;;]
+
+let partition_map t ~f = partition_mapi t ~f:(fun _ x -> f x) [@nontail]
+
+let foldi_until t ~init ~f ~finish =
+  let length = length t in
+  let rec loop i acc =
+    if i < length
+    then (
+      match
+        ((f [@inlined hint]) i acc (unsafe_get t i) : _ Container.Continue_or_stop.t)
+      with
+      | Continue acc -> loop (i + 1) acc
+      | Stop res -> res)
+    else finish i acc
+  in
+  (loop [@inlined]) 0 init [@nontail]
 ;;
 
-let partition_map t ~f =
-  (partition_mapi [@kind k1 k2 k3]) t ~f:(fun _ x -> f x) [@nontail]
-;;]
+let fold_until t ~init ~f ~finish =
+  (foldi_until [@inlined])
+    t
+    ~init
+    ~f:(fun _i acc x -> f acc x)
+    ~finish:(fun _i acc -> finish acc) [@nontail]
+;;
 
 [%%template
 [@@@kind.default k = base_or_null_with_ext]
 
 let partitioni_tf t ~f =
-  (partition_mapi [@kind k k k]) t ~f:(fun i x -> if f i x then First x else Second x)
+  (partition_mapi [@kind k]) t ~f:(fun i x -> if f i x then First x else Second x)
   [@nontail]
 ;;
 
@@ -1181,8 +1175,6 @@ let transpose_exn tt =
   | Some tt' -> tt'
 ;;
 
-[@@@warning "-incompatible-with-upstream"]
-
 let%template[@kind k1 = base_or_null_with_ext, k2 = base_or_null_with_ext] map t ~f =
   (map [@kind k1 k2]) t ~f
 ;;
@@ -1239,9 +1231,14 @@ let sub t ~pos ~len = sub t ~pos ~len
 let invariant invariant_a t = iter t ~f:invariant_a
 
 module Private = struct
-  module%template [@kind k = base_or_null_with_ext] Sort = Sort [@kind k]
+  module%template
+    [@kind k = (base_or_null_with_ext, value_or_null mod external64 non_float)] Sort =
+    Sort
+    [@kind k]
 
-  module%template.portable [@kind k = base_or_null_with_ext] [@modality p] Sorter =
+  module%template.portable
+    [@kind k = (base_or_null_with_ext, value_or_null mod external64 non_float)]
+    [@modality p] Sorter =
     Sorter
     [@kind k]
     [@modality p]

ppx/test/test.mlt

@@ -8,8 +8,6 @@
    [Array.set]. Defining [module Array = Array0] is also necessary because it prevents
    ocamldep from mistakenly causing a file to depend on [Base.Array]. *)
 
-[@@@warning "-incompatible-with-upstream"]
-
 open! Import0
 module Sys = Sys0
 

shadow-stdlib/gen/gen.ml

@@ -1,7 +1,5 @@
 @@ portable
 
-[@@@warning "-incompatible-with-upstream"]
-
 [%%template:
   external create
     : ('a : any mod separable).

src/array.ml

@@ -4,8 +4,6 @@ open! Import
 module Option = Option0
 module List = List0.Constructors
 
-[@@@warning "-incompatible-with-upstream"]
-
 [%%template
 [@@@kind_set.define base_or_null_with_ext = (base_or_null, value_or_null mod external64)]
 
@@ -116,7 +114,7 @@ module Definitions = struct
     [%%template:
       external create
         : ('a : any mod separable).
-        len:int -> 'a -> 'a array @ m
+        len:int -> 'a -> 'a array @ m unique
         = "%makearray_dynamic"
       [@@ocaml.doc
         {| [create ~len x] creates an array of length [len] with the value [x] populated in
@@ -126,7 +124,7 @@ module Definitions = struct
 
     external create_local
       : ('a : any mod separable).
-      len:int -> 'a -> 'a array @ local
+      len:int -> 'a -> 'a array @ local unique
       = "%makearray_dynamic"
     [@@ocaml.doc
       {| [create_local ~len x] is like [create]. It allocates the array on the local
@@ -541,7 +539,7 @@ module type Array = sig @@ portable
     end
 
     module%template.portable
-      [@kind k = base_or_null_with_ext] Sorter (S : sig
+      [@kind k = (base_or_null_with_ext, value_or_null mod external64 non_float)] Sorter (S : sig
         [@@@kind k = k mod separable]
 
         type ('a : k) t

src/array0.ml

@@ -224,7 +224,7 @@ let rec add t ~replace ~compare ~added ~key:k ~data:v =
       if !added then (balance [@kind k v]) t else t)
 ;;
 
-let[@kind k = k, v = v, a = all, b = all, r = all]
+let[@kind k = k, v = v, a = value_or_null, b = value_or_null, r = (v, value_or_null)]
    [@mode c = (uncontended, shared)]
    [@inline always] rec findi_and_call_impl
   : type (k : k mod c) (v : v) (a : a) (b : b) (r : r) if_ in_.
@@ -265,9 +265,9 @@ let[@kind k = k, v = v, a = all, b = all, r = all]
 
 [%%template
 [@@@mode.default c = (uncontended, shared)]
-[@@@kind r = all]
+[@@@kind r = v]
 
-let[@kind k = k, v = v, r = r] find_and_call =
+let[@kind k = k, v = v, r = (r, value_or_null)] find_and_call =
   let call_if_found ~if_found ~key:_ ~data () () = if_found data in
   let call_if_not_found ~if_not_found key () () = if_not_found key in
   fun (t @ c) ~compare k ~if_found ~if_not_found ->
@@ -299,7 +299,7 @@ let[@kind k = k, v = v, r = r] findi_and_call =
       ~if_not_found
 ;;
 
-[@@@kind a = all]
+[@@@kind a = value_or_null]
 
 let[@kind k = k, v = v, a = a, r = r] find_and_call1 =
   let call_if_found ~if_found ~key:_ ~data arg () = if_found data arg in
@@ -333,7 +333,7 @@ let[@kind k = k, v = v, a = a, r = r] findi_and_call1 =
       ~if_not_found
 ;;
 
-[@@@kind b = all]
+[@@@kind b = value_or_null]
 
 let[@kind k = k, v = v, a = a, b = b, r = r] find_and_call2 =
   let call_if_found ~if_found ~key:_ ~data arg1 arg2 = if_found data arg1 arg2 in