Fixes to resumable while (#202)

Author: TheAngryByrd

src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs

@@ -105,17 +105,22 @@ module CancellableTaskResultCE =
                 [<InlineIfLambda>] condition: unit -> bool,
                 body: CancellableTaskResultCode<'TOverall, 'Error, unit>
             ) : CancellableTaskResultCode<'TOverall, 'Error, unit> =
+            let mutable keepGoing = true
+
             ResumableCode.While(
-                condition,
+                (fun () ->
+                    keepGoing
+                    && condition ()
+                ),
                 CancellableTaskResultCode<_, _, _>(fun sm ->
                     sm.Data.ThrowIfCancellationRequested()
-                    let __stack_body_fin = body.Invoke(&sm)
 
                     if sm.Data.IsResultError then
+                        keepGoing <- false
                         sm.Data.MethodBuilder.SetResult sm.Data.Result
-                        false
+                        true
                     else
-                        __stack_body_fin
+                        body.Invoke(&sm)
                 )
             )
 

src/FsToolkit.ErrorHandling.TaskResult/TaskOptionCE.fs

@@ -519,16 +519,20 @@ type TaskOptionBuilderBase() =
             [<InlineIfLambda>] condition: unit -> bool,
             body: TaskOptionCode<'TOverall, unit>
         ) : TaskOptionCode<'TOverall, unit> =
+        let mutable keepGoing = true
+
         ResumableCode.While(
-            condition,
+            (fun () ->
+                keepGoing
+                && condition ()
+            ),
             TaskOptionCode<_, _>(fun sm ->
-                let __stack_body_fin = body.Invoke(&sm)
-
                 if sm.Data.IsResultNone then
+                    keepGoing <- false
                     sm.Data.SetResult()
-                    false
+                    true
                 else
-                    __stack_body_fin
+                    body.Invoke(&sm)
             )
         )
 
@@ -639,9 +643,8 @@ type TaskOptionBuilderBase() =
 
     member inline this.Source(taskOption: TaskOption<'T>) : TaskOption<'T> = taskOption
 
-    member inline this.Source(taskOption: ValueTask<'T option>) : TaskOption<'T> = task {
-        return! taskOption
-    }
+    member inline this.Source(taskOption: ValueTask<'T option>) : TaskOption<'T> =
+        taskOption.AsTask()
 
 
 type TaskOptionBuilder() =

src/FsToolkit.ErrorHandling.TaskResult/TaskResultCE.fs

@@ -564,16 +564,20 @@ type TaskResultBuilderBase() =
             [<InlineIfLambda>] condition: unit -> bool,
             body: TaskResultCode<'TOverall, 'Error, unit>
         ) : TaskResultCode<'TOverall, 'Error, unit> =
+        let mutable keepGoing = true
+
         ResumableCode.While(
-            condition,
+            (fun () ->
+                keepGoing
+                && condition ()
+            ),
             TaskResultCode<_, _, _>(fun sm ->
-                let __stack_body_fin = body.Invoke(&sm)
-
                 if sm.Data.IsResultError then
+                    keepGoing <- false
                     sm.Data.MethodBuilder.SetResult sm.Data.Result
-                    false
+                    true
                 else
-                    __stack_body_fin
+                    body.Invoke(&sm)
             )
         )