update to use labelled interface

Author: let-def

examples/cbor/cbor_explorer.ml

@@ -57,7 +57,7 @@ let ui_of_cbor (c:C.t) =
     in
     W.unfoldable summary (fun () -> traverse ~fold:false y)
   in
-  let w = Lwd.map2 Ui.Ui.join_y
+  let w = Lwd.map2 ~f:Ui.Ui.join_y
       w_q (Nottui_widgets.scroll_area @@ traverse ~fold:true c)
   in
   quit, w

examples/minesweeper/main.ml

@@ -21,7 +21,7 @@ let event_input event =
   | Some target -> Some (Js.to_string target##.value)
 
 let int_input name value ~set_value =
-  let value = Lwd.map string_of_int value in
+  let value = Lwd.map ~f:string_of_int value in
   children [
     Html.txt (Lwd.pure name);
     Html.input ~a:[

examples/minesweeper/minesweeper.ml

@@ -168,7 +168,7 @@ let cell_image_src cell =
 
 let cell_image cell ~on_click =
   Html.img
-    ~src:(Lwd.map cell_image_src cell)
+    ~src:(Lwd.map ~f:cell_image_src cell)
     ~alt:(Lwd.pure "Hello")
     ~a:[Html.a_onclick (Lwdom.attr (fun _ -> on_click ()))]
     ()

examples/minimal.ml

@@ -38,9 +38,9 @@ let degrees = Lwd.var 0.0
 let farenheit = Lwd.var (nan, ("", 0))
 
 let farenheit_text =
-  Lwd.map2' (Lwd.get degrees) (Lwd.get farenheit)
-    (fun d (d', f) ->
-       if d = d' then f else (string_of_float (c_to_f d), 0))
+  Lwd.map2 (Lwd.get degrees) (Lwd.get farenheit)
+    ~f:(fun d (d', f) ->
+        if d = d' then f else (string_of_float (c_to_f d), 0))
 
 let farenheit_edit =
   Nottui_widgets.edit_field
@@ -57,8 +57,8 @@ let farenheit_edit =
 let celsius = Lwd.var (nan, ("", 0))
 
 let celsius_text =
-  Lwd.map2' (Lwd.get degrees) (Lwd.get celsius)
-    (fun d (d', f) -> if d = d' then f else (string_of_float d, 0))
+  Lwd.map2 (Lwd.get degrees) (Lwd.get celsius)
+    ~f:(fun d (d', f) -> if d = d' then f else (string_of_float d, 0))
 
 let celsius_edit =
   Nottui_widgets.edit_field

examples/pretty.ml

@@ -26,9 +26,8 @@ let fruit =
   let fruits = ["Apple"; "Orange"; "Strawberry"] in
   let choice = Lwd.var (List.hd fruits) in
   Lwd.join (
-    Lwd.map' (Lwd.get choice) (fun current ->
-        selector current (Lwd.set choice) fruits
-      )
+    Lwd.map (Lwd.get choice)
+      ~f:(fun current -> selector current (Lwd.set choice) fruits)
   )
 
 let doc = Lwd_table.make ()
@@ -48,7 +47,7 @@ let () =
         P.hardline; P.ui (Ui.space 0 1); P.hardline;
       ];
     Lwd_table.append' doc
-      (Lwd.map' fruit (fun fruit ->
+      (Lwd.map fruit ~f:(fun fruit ->
            P.group (spring ^^ string "I" ^^ spring ^/^
                     P.group (string "like" ^^ spring ^/^
                              P.ui fruit ^^ spring ^/^
@@ -58,17 +57,16 @@ let () =
 
 let varying_width f =
   let width = Lwd.var 0 in
-  Lwd.map'
-    (f (Lwd.get width))
-    (fun ui ->
-       Ui.size_sensor
-         (fun ~w ~h:_ -> if Lwd.peek width <> w then Lwd.set width w)
-         (Ui.resize ~sw:1 ~sh:1 ~w:0 ui))
+  Lwd.map (f (Lwd.get width)) ~f:(fun ui ->
+      Ui.size_sensor
+        (fun ~w ~h:_ -> if Lwd.peek width <> w then Lwd.set width w)
+        (Ui.resize ~sw:1 ~sh:1 ~w:0 ui)
+    )
 
 let doc =
   Lwd.join (Lwd_table.reduce (Lwd_utils.lift_monoid (P.empty, P.(^^))) doc)
 
-let contents width = Lwd.map2' width doc P.pretty
+let contents width = Lwd.map2 ~f:P.pretty width doc
 
 let () =
   Lwd.set base (

examples/reranger.ml

@@ -47,8 +47,8 @@ let rec dir ?(initial_path = []) ?after_width:(wref = ref 0) path =
     in
     let t = Lwd_utils.pack Ui.pack_y [ Lwd.return header; body ] in
     let t =
-      if constrain then Lwd.map (Ui.resize ~w:12) t
-      else Lwd.map (remember_width ~wref) t
+      if constrain then Lwd.map ~f:(Ui.resize ~w:12) t
+      else Lwd.map ~f:(remember_width ~wref) t
     in
     column $= Lwd_utils.pack Ui.pack_x [ t; Lwd.join (Lwd.get after) ]
   in
@@ -61,7 +61,7 @@ let rec dir ?(initial_path = []) ?after_width:(wref = ref 0) path =
       with exn ->
         Lwd.return (string ~attr:Notty.(A.bg A.red) (Printexc.to_string exn))
     in
-    after $= Lwd.map (Ui.join_x (string " ")) t
+    after $= Lwd.map ~f:(Ui.join_x (string " ")) t
   in
   let highlighted_cell = ref None in
   let rec render_directory ?(highlight = false) cell name =
@@ -137,6 +137,6 @@ let () =
       dir ~initial_path "/"
     ]
   in
-  Lwd.set body (Lwd.map (Ui.resize ~pad:gravity_pad ~crop:gravity_crop) ui);
+  Lwd.set body (Lwd.map ~f:(Ui.resize ~pad:gravity_pad ~crop:gravity_crop) ui);
   Ui_loop.run (Nottui_widgets.window_manager_view wm)
 

lib/lwd/lwd.ml

@@ -82,21 +82,18 @@ let dummy = Pure (Any.any ())
 let operator desc =
   Operator { value = Eval_none; trace = T0; desc; trace_idx = I0 }
 
-let map f x = inj (
+let map x ~f = inj (
     match prj x with
     | Pure vx -> Pure (f vx)
     | x -> operator (Map (x, f))
   )
 
-let map2 f x y = inj (
+let map2 x y ~f = inj (
     match prj x, prj y with
     | Pure vx, Pure vy -> Pure (f vx vy)
     | x, y -> operator (Map2 (x, y, f))
   )
 
-let map' x f = map f x
-let map2' x y f = map2 f x y
-
 let pair x y = inj (
     match prj x, prj y with
     | Pure vx, Pure vy -> Pure (vx, vy)
@@ -115,7 +112,7 @@ let join child = inj (
     | child -> operator (Join { child; intermediate = None })
   )
 
-let bind x f = join (map f x)
+let bind x ~f = join (map ~f x)
 
 (* Management of trace indices *)
 
@@ -624,8 +621,8 @@ let quick_release root =
   flush_or_fail None queue
 
 module Infix = struct
-  let (>>=) = bind
-  let (>|=) = map'
+  let (>>=) x f = bind x ~f
+  let (>|=) x f = map x ~f
   let (<*>) = app
 end
 

lib/lwd/lwd.mli

@@ -17,25 +17,19 @@ val return : 'a -> 'a t
 val pure : 'a -> 'a t
 (** Alias to {!return} *)
 
-val map : ('a -> 'b) -> 'a t -> 'b t
-(** [map f d] is the document that has value [f x] whenever [d] has value [x] *)
+val map : 'a t -> f:('a -> 'b) -> 'b t
+(** [map d ~f] is the document that has value [f x] whenever [d] has value [x] *)
 
-val map2 : ('a -> 'b -> 'c) -> 'a t -> 'b t -> 'c t
-(** [map2 f d1 d2] is the document that has value [f x1 x2] whenever
+val map2 : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+(** [map2 d1 d2 ~f] is the document that has value [f x1 x2] whenever
     [d1] has value [x1] and [d2] has value [x2] *)
 
-val map' : 'a t -> ('a -> 'b) -> 'b t
-(** Alias to {!map} with arguments flipped *)
-
-val map2' : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
-(** Alias to {!map2} with arguments flipped *)
-
 val join : 'a t t -> 'a t
 (** Monadic operator [join d] is the document pointed to by document [d].
     This is powerful but potentially costly in case of recomputation.
 *)
 
-val bind : 'a t -> ('a -> 'b t) -> 'b t
+val bind : 'a t -> f:('a -> 'b t) -> 'b t
 (** Monadic bind, a mix of {!join} and {!map} *)
 
 val app : ('a -> 'b) t -> 'a t -> 'b t

lib/lwd/lwd_infix_letop.ml

@@ -1,6 +1,6 @@
-let (let$) : 'a Lwd.t -> ('a -> 'b) -> 'b Lwd.t = Lwd.map'
+let (let$) : 'a Lwd.t -> ('a -> 'b) -> 'b Lwd.t = Lwd.Infix.(>|=)
 let (and$) : 'a Lwd.t -> 'b Lwd.t -> ('a * 'b) Lwd.t = Lwd.pair
-let (let$*) : 'a Lwd.t -> ('a -> 'b Lwd.t) -> 'b Lwd.t = Lwd.bind
+let (let$*) : 'a Lwd.t -> ('a -> 'b Lwd.t) -> 'b Lwd.t = Lwd.Infix.(>>=)
 
 let ($=) : 'a Lwd.var -> 'a -> unit = Lwd.set
 let ($<-) : 'a Lwd_table.row -> 'a -> unit = Lwd_table.set

lib/lwd/lwd_seq.ml

@@ -462,23 +462,25 @@ let fold ~map ~reduce seq =
   | Some other -> Lwd.pure (Some (pure_map_reduce map reduce other))
   | None ->
     let reducer = ref (Reducer.make ~map ~reduce) in
-    Lwd.map' seq @@ fun seq ->
-    let reducer' = Reducer.update !reducer seq in
-    reducer := reducer';
-    Reducer.reduce reducer'
+    Lwd.map seq ~f:begin fun seq ->
+      let reducer' = Reducer.update !reducer seq in
+      reducer := reducer';
+      Reducer.reduce reducer'
+    end
 
 let fold_monoid map (zero, reduce) seq =
   match Lwd.is_pure seq with
   | Some Nil -> Lwd.pure zero
   | Some other -> Lwd.pure (pure_map_reduce map reduce other)
   | None ->
     let reducer = ref (Reducer.make ~map ~reduce) in
-    Lwd.map' seq @@ fun seq ->
-    let reducer' = Reducer.update !reducer seq in
-    reducer := reducer';
-    match Reducer.reduce reducer' with
-    | None -> zero
-    | Some x -> x
+    Lwd.map seq ~f:begin fun seq ->
+      let reducer' = Reducer.update !reducer seq in
+      reducer := reducer';
+      match Reducer.reduce reducer' with
+      | None -> zero
+      | Some x -> x
+    end
 
 let monoid = (empty, concat)
 
@@ -535,7 +537,7 @@ let to_array x =
 
 let lwd_empty : 'a t Lwd.t = Lwd.pure Nil
 let lwd_monoid : 'a. 'a t Lwd.t Lwd_utils.monoid =
-  (lwd_empty, fun x y -> Lwd.map2 concat x y)
+  (lwd_empty, fun x y -> Lwd.map2 ~f:concat x y)
 
 let map f seq =
   fold_monoid (fun x -> element (f x)) monoid seq
@@ -557,4 +559,4 @@ let seq_bind (seq : 'a seq Lwd.t) (f : 'a -> 'b seq)  : 'b seq Lwd.t =
   fold_monoid f monoid seq
 
 let lift (seq : 'a Lwd.t seq Lwd.t) : 'a seq Lwd.t =
-  bind seq (Lwd.map element)
+  bind seq (Lwd.map ~f:element)