Merge pull request #1019 from samer--/improve_list_conversions

raphael-proust · web-flow · commit a9dcafca33af · 2024-05-14T10:45:40.000+02:00
Make Lwt_seq.of_list lazier, Lwt_seq.to_list tail recursive
diff --git a/src/core/lwt_seq.ml b/src/core/lwt_seq.ml
@@ -283,22 +283,16 @@ let unfold_lwt f u () =
   | None -> return_nil
   | Some (x, u') -> Lwt.return (Cons (x, unfold_lwt f u'))
 
-let rec of_list = function
-  | [] -> empty
-  | h :: t -> cons h (of_list t)
-
-let rec to_list seq =
-  seq () >>= function
-  | Nil -> Lwt.return_nil
-  | Cons (x, next) ->
-    let+ l = to_list next in
-    x :: l
-let to_list seq =
-  Lwt.apply seq () >>= function
-  | Nil -> Lwt.return_nil
-  | Cons (x, next) ->
-    let+ l = to_list next in
-    x :: l
+let rec of_list l () =
+  Lwt.return (match l with [] -> Nil | h :: t -> Cons (h, of_list t))
+
+let to_list (seq : 'a t) =
+  let rec aux f seq =
+    Lwt.bind (seq ()) (function
+      | Nil -> Lwt.return (f [])
+      | Cons (h, t) -> aux (fun x -> f (h :: x)) t)
+  in
+  aux (fun x -> x) (Lwt.apply seq)
 
 let rec of_seq seq () =
   match seq () with
