From f407e12321dada7470e561cefd576031cd9e4168 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 1 Apr 2015 10:59:36 +0200
Subject: dowhile cleanup, second dowhile version without separate condition.

---
 async/autotests/asynctest.cpp | 19 ++++++++++++++++++-
 async/src/async.cpp           | 40 ++++++++++++++++++++++++++++++++++++++++
 async/src/async.h             | 40 +++++++++++++---------------------------
 3 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/async/autotests/asynctest.cpp b/async/autotests/asynctest.cpp
index a387dd6..78a834e 100644
--- a/async/autotests/asynctest.cpp
+++ b/async/autotests/asynctest.cpp
@@ -69,6 +69,7 @@ private Q_SLOTS:
     void testLifetimeWithHandle();
 
     void testWhile();
+    void testWhileWithoutCondition();
 
     void benchmarkSyncThenExecutor();
 
@@ -385,7 +386,7 @@ void AsyncTest::testWhile()
     QList<int> processed;
     QList<int> list({1, 2, 3, 4});
     auto it = QSharedPointer<QListIterator<int> >::create(list);
-    Async::dowhile<void>(
+    Async::dowhile(
         [it]() -> bool { return it->hasNext(); },
         [it, &processed](Async::Future<void> future) {
             auto value = it->next();
@@ -396,6 +397,22 @@ void AsyncTest::testWhile()
     QCOMPARE(processed, list);
 }
 
+void AsyncTest::testWhileWithoutCondition()
+{
+
+    QList<int> processed;
+    QList<int> list({1, 2, 3, 4});
+    auto it = QSharedPointer<QListIterator<int> >::create(list);
+    Async::dowhile(
+        [it, &processed](Async::Future<bool> future) {
+            auto value = it->next();
+            processed << value;
+            future.setValue(it->hasNext());
+            future.setFinished();
+        }
+    ).exec().waitForFinished();
+    QCOMPARE(processed, list);
+}
 
 
 
diff --git a/async/src/async.cpp b/async/src/async.cpp
index 6eefd1b..20ba4e6 100644
--- a/async/src/async.cpp
+++ b/async/src/async.cpp
@@ -47,3 +47,43 @@ JobBase::~JobBase()
 {
 }
 
+static void asyncWhile(const std::function<void(std::function<void(bool)>)> &body, const std::function<void()> &completionHandler) {
+    body([body, completionHandler](bool complete) {
+        if (complete) {
+            completionHandler();
+        } else {
+            asyncWhile(body, completionHandler);
+        }
+    });
+}
+
+Job<void> Async::dowhile(Condition condition, ThenTask<void> body)
+{
+    return Async::start<void>([body, condition](Async::Future<void> &future) {
+        asyncWhile([condition, body](std::function<void(bool)> whileCallback) {
+            Async::start<void>(body).then<void>([whileCallback, condition]() {
+                whileCallback(!condition());
+            }).exec();
+        },
+        [&future]() { //while complete
+            future.setFinished();
+        });
+    });
+}
+
+Job<void> Async::dowhile(ThenTask<bool> body)
+{
+    return Async::start<void>([body](Async::Future<void> &future) {
+        asyncWhile([body](std::function<void(bool)> whileCallback) {
+            Async::start<bool>(body).then<bool, bool>([whileCallback](bool result) {
+                whileCallback(!result);
+                //FIXME this return value is only required because .then<bool, void> doesn't work
+                return true;
+            }).exec();
+        },
+        [&future]() { //while complete
+            future.setFinished();
+        });
+    });
+}
+
diff --git a/async/src/async.h b/async/src/async.h
index 0d1d81e..57879a7 100644
--- a/async/src/async.h
+++ b/async/src/async.h
@@ -227,8 +227,19 @@ template<typename ReturnType, typename KJobType, ReturnType (KJobType::*KJobResu
 Job<ReturnType, Args ...> start();
 #endif
 
-template<typename Out>
-Job<Out> dowhile(Condition condition, ThenTask<void> func);
+/**
+ * Async while loop.
+ * 
+ * The loop continues while @param condition returns true.
+ */
+Job<void> dowhile(Condition condition, ThenTask<void> func);
+
+/**
+ * Async while loop.
+ *
+ * Loop continues while body returns true.
+ */
+Job<void> dowhile(ThenTask<bool> body);
 
 
 /**
@@ -249,7 +260,6 @@ Job<Out> null();
 template<typename Out>
 Job<Out> error(int errorCode = 1, const QString &errorMessage = QString());
 
-
 class JobBase
 {
     template<typename Out, typename ... In>
@@ -511,30 +521,6 @@ Job<ReturnType, Args ...> start()
 }
 #endif
 
-static void asyncWhile(const std::function<void(std::function<void(bool)>)> &body, const std::function<void()> &completionHandler) {
-    body([body, completionHandler](bool complete) {
-        if (complete) {
-            completionHandler();
-        } else {
-            asyncWhile(body, completionHandler);
-        }
-    });
-}
-    }
-template<typename Out>
-Job<Out> dowhile(Condition condition, ThenTask<void> body)
-{
-    return Async::start<void>([body, condition](Async::Future<void> &future) {
-        asyncWhile([condition, body](std::function<void(bool)> whileCallback) {
-            Async::start<void>(body).then<void>([whileCallback, condition]() {
-                whileCallback(!condition());
-            }).exec();
-        },
-        [&future]() { //while complete
-            future.setFinished();
-        });
-    });
-}
 
 template<typename Out>
 Job<Out> null()
-- 
cgit v1.2.3