Commits

bergsoe committed bb1f655

Prefor BatEnum.from to BatEnum.from_while.

Comments (0)

Files changed (1)

 
 let (<&>) = PaplConstraint.(<&>)
 
+let stop () = raise BatEnum.No_more_elements
+
 let zip_pair f (x0, x1) (y0, y1) = (f x0 y0, f x1 y1)
 
 let make time q = { time = time; q = q; }
   let make st sq =
     let next () =
       match (BatEnum.get st, BatEnum.get sq) with
-          (Some t, Some q) -> Some (make t q)
-        | _ -> None
-    in BatEnum.from_while next
+          (Some t, Some q) -> make t q
+        | _ -> stop ()
+    in BatEnum.from next
 
   let to_option s = BatEnum.map (fun x -> Some x) s