v0.18~preview.130.48+372

Author: public-release

.github/workflows/workflow.yml

@@ -17,19 +17,23 @@ jobs:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
         ocaml:
-          - 5
+          - ocaml-base-compiler.5.0.0~alpha0
+          - 4.14.0
+        include:
+          - {os: ubuntu-latest, ocaml: 4.13.1}
+          - {os: ubuntu-latest, ocaml: 4.12.1}
+          - {os: ubuntu-latest, ocaml: 4.11.2}
+        exclude:
+          - {os: windows-latest, ocaml: ocaml-base-compiler.5.0.0~alpha0}
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-            ref: ${{ github.event.pull_request.head.ref }}
-            repository: ${{ github.event.pull_request.head.repo.full_name }}
+        uses: actions/checkout@v3
 
       - name: Setup OCaml ${{ matrix.ocaml }}
-        uses: ocaml/setup-ocaml@v3
+        uses: ocaml/setup-ocaml@v2
         with:
           cache-prefix: v1-${{ matrix.os }}-${{ matrix.ocaml }}
           dune-cache: true

base.opam

@@ -13,6 +13,7 @@ depends: [
   "ocaml" {>= "5.1.0"}
   "basement"
   "ocaml_intrinsics_kernel"
+  "ppx_array_base"
   "ppx_base"
   "ppx_cold"
   "ppx_hash"

generate/zarith.ml

@@ -1,4 +1,5 @@
 module Big_int_Z = Big_int_Z
 module Q = Q
 module Z = Z
+module Zarith = Zarith
 module Zarith_version = Zarith_version

shadow-stdlib/gen/mapper.mll

@@ -274,6 +274,10 @@ let module_replacement = function
   | "Gc"       -> Some No_equivalent
   | "Printexc" -> Some (Repl_text "Use [Exn] or [Backtrace] instead")
   | "Seq"      -> Some (Approx "Sequence")
+  | "Atomic"   ->
+    Some (Repl_text "\
+Use [Atomic] from [Portable] (or [Core], which reexports it from\n\
+[Portable]) instead")
   | _          -> None
 
 let replace ~is_exn id replacement =

src/applicative.ml

@@ -224,16 +224,16 @@ module Make_let_syntax
     (Intf)
     (Impl)]
 
-module Ident = struct
+module%template [@mode p = (portable, nonportable)] Ident = struct
   type 'a t = 'a
 
-  let return = Fn.id
+  let return x = x
   let apply f a = f a
   let both a b = a, b
   let map3 a b c ~f = f a b c
   let map2 a b ~f = f a b
   let map a ~f = f a
-  let all = Fn.id
+  let all x = x
   let all_unit = ignore
 
   module Applicative_infix = struct

src/applicative_intf.ml

@@ -19,10 +19,14 @@ open! Import
 
 module Definitions = struct
   [%%template
-  [@@@mode.default m = (global, local)]
+  [@@@mode.default m = (global, local), p = (nonportable, portable)]
 
   (** Module types below provide both global and local versions. In OxCaml, the latter
-      accept local [~f] closures. *)
+      accept local [~f] closures.
+
+      Both [local] and [portable] versions are designed with a strict data structure in
+      mind. The types won't make sense for Applicatives whose evaluation is delayed (e.g.
+      most monads, Command.Param, or anything like a database query applicative). *)
 
   (** Applicative operations. An applicative abstracts the notion of computations whose
       results can be combined. An ['a t] represents a computation returning ['a].
@@ -78,14 +82,14 @@ module Definitions = struct
   module type S2_kernel = sig
     type ('a, 'p) t
 
-    include S3_kernel [@mode m] with type ('a, 'p, _) t := ('a, 'p) t
+    include S3_kernel [@mode m p] with type ('a, 'p, _) t := ('a, 'p) t
   end
 
   (** Applicative operations for applicatives with one type parameter. *)
   module type S_kernel = sig
     type 'a t
 
-    include S3_kernel [@mode m] with type ('a, _, _) t := 'a t
+    include S3_kernel [@mode m p] with type ('a, _, _) t := 'a t
   end
 
   (** Infix operators. This module type subsumes the other [Index*] types below. *)
@@ -102,14 +106,14 @@ module Definitions = struct
   module type Applicative_infix2 = sig
     type ('a, 'p) t
 
-    include Applicative_infix3 [@mode m] with type ('a, 'p, _) t := ('a, 'p) t
+    include Applicative_infix3 [@mode m p] with type ('a, 'p, _) t := ('a, 'p) t
   end
 
   (** Infix operators for applicatives with one type parameter. *)
   module type Applicative_infix = sig
     type 'a t
 
-    include Applicative_infix3 [@mode m] with type ('a, _, _) t := 'a t
+    include Applicative_infix3 [@mode m p] with type ('a, _, _) t := 'a t
   end
 
   (** Complete applicative interface. Extends [_kernel] with infix operators.
@@ -118,25 +122,25 @@ module Definitions = struct
   module type S3 = sig
     type ('a, 'p, 'q) t
 
-    include S3_kernel [@mode m] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
-    include Applicative_infix3 [@mode m] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
+    include S3_kernel [@mode m p] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
+    include Applicative_infix3 [@mode m p] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
 
     module Applicative_infix :
-      Applicative_infix3 [@mode m] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
+      Applicative_infix3 [@mode m p] with type ('a, 'p, 'q) t := ('a, 'p, 'q) t
   end
 
   (** Complete applicative interface with two type parameters. *)
   module type S2 = sig
     type ('a, 'p) t
 
-    include S3 [@mode m] with type ('a, 'p, _) t := ('a, 'p) t
+    include S3 [@mode m p] with type ('a, 'p, _) t := ('a, 'p) t
   end
 
   (** Complete applicative interface with one type parameter. *)
   module type S = sig
     type 'a t
 
-    include S3 [@mode m] with type ('a, _, _) t := 'a t
+    include S3 [@mode m p] with type ('a, _, _) t := 'a t
   end
 
   (** Supports [let%map] syntax. See [ppx_let] documentation.
@@ -287,8 +291,9 @@ module type Applicative = sig
   [%%template:
   (** The identity applicative. Useful as an argument to functors that require a monad, to
       produce a non-applicative result. *)
-  module Ident : sig
-      include S [@mode local]
+  module%template
+    [@mode p = (portable, nonportable)] Ident : sig
+      include S [@mode local p]
     end
     with type 'a t = 'a