Replace all uses of details::do_while() with internal _do_while()

Author: ras0219-msft

Release/include/cpprest/astreambuf.h

@@ -24,6 +24,21 @@
 
 namespace Concurrency
 {
+    namespace details
+    {
+        template<bool B=true>
+        task<bool> _do_while(std::function<task<bool>(void)> func)
+        {
+            task<bool> first = func();
+            return first.then([=](bool guard) -> task<bool> {
+                if (guard)
+                    return Concurrency::details::_do_while<B>(func);
+                else
+                    return first;
+            });
+        }
+    }
+
 /// Library for asynchronous streams.
 namespace streams
 {

Release/include/cpprest/streams.h

@@ -801,7 +801,7 @@ namespace Concurrency { namespace streams
                     return true;
                 };
 
-            auto loop = pplx::details::do_while([=]() mutable -> pplx::task<bool>
+            auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
                 {
                     while (buffer.in_avail() > 0)
                     {
@@ -892,7 +892,7 @@ namespace Concurrency { namespace streams
                     return pplx::task_from_result(false);
                 };
 
-            auto loop = pplx::details::do_while([=]() mutable -> pplx::task<bool>
+            auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
                 {
                     while ( buffer.in_avail() > 0 )
                     {
@@ -975,7 +975,7 @@ namespace Concurrency { namespace streams
                 });
             };
 
-            auto loop = pplx::details::do_while(copy_to_target);
+            auto loop = Concurrency::details::_do_while(copy_to_target);
 
             return loop.then([=](bool) mutable -> size_t
                 {
@@ -1149,7 +1149,7 @@ pplx::task<void> concurrency::streams::_type_parser_base<CharType>::_skip_whites
             return false;
         };
 
-    auto loop = pplx::details::do_while([=]() mutable -> pplx::task<bool>
+    auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
         {
             while (buffer.in_avail() > 0)
             {
@@ -1224,7 +1224,7 @@ pplx::task<ReturnType> concurrency::streams::_type_parser_base<CharType>::_parse
     return _skip_whitespace(buffer).then([=](pplx::task<void> op) -> pplx::task<ReturnType>
         {
             op.wait();
-            return pplx::details::do_while(peek_char).then(finish);
+            return Concurrency::details::_do_while(peek_char).then(finish);
         });
 }
 

Release/include/pplx/pplxtasks.h

@@ -7345,29 +7345,6 @@ task<_TaskType> task_from_exception(_ExType _Exception, const task_options& _Tas
     return create_task(_Tce, _TaskOptions);
 }
 
-namespace details
-{
-    /// <summary>
-    /// A convenient extension to Concurrency: loop until a condition is no longer met
-    /// </summary>
-    /// <param name="func">
-    ///   A function representing the body of the loop. It will be invoked at least once and 
-    ///   then repetitively as long as it returns true.
-    /// </param>
-    inline
-    task<bool> do_while(std::function<task<bool>(void)> func)
-    {
-        task<bool> first = func();
-        return first.then([=](bool guard) -> task<bool> {
-            if (guard)
-                return do_while(func);
-            else
-                return first;
-            });
-    }
-
-} // namespace details
-
 } // namespace Concurrency
 
 #pragma pop_macro("new")

Release/tests/functional/streams/istream_tests.cpp

@@ -714,7 +714,7 @@ TEST(fstream_read_to_end_3)
             else
                 return pplx::task_from_result(false);
         };
-    pplx::details::do_while([=]()-> pplx::task<bool> {
+    Concurrency::details::_do_while([=]()-> pplx::task<bool> {
         return stream.read().then(lambda1);
     }).wait();
 

Release/tests/functional/streams/memstream_tests.cpp

@@ -48,7 +48,7 @@ void streambuf_putc(StreamBufferType& wbuf)
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.in_avail());
 
@@ -83,7 +83,7 @@ void streambuf_putc(concurrency::streams::rawptr_buffer<CharType>& wbuf)
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.block().size());
 
@@ -119,7 +119,7 @@ void streambuf_putc(concurrency::streams::container_buffer<CollectionType>& wbuf
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.collection().size());
 
@@ -150,7 +150,7 @@ void streambuf_putn(StreamBufferType& wbuf)
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
     VERIFY_ARE_EQUAL(s.size() * 12, wbuf.in_avail());
 
     wbuf.close().get();
@@ -180,7 +180,7 @@ void streambuf_putn(concurrency::streams::rawptr_buffer<CharType>& wbuf)
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     wbuf.close().get();
     VERIFY_IS_FALSE(wbuf.can_write());
@@ -209,7 +209,7 @@ void streambuf_putn(concurrency::streams::container_buffer<CollectionType>& wbuf
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     wbuf.close().get();
     VERIFY_IS_FALSE(wbuf.can_write());
@@ -1935,7 +1935,7 @@ void IStreamTest11()
     auto seg2 = [&ch](int val) { return (val != -1) && (++ch <= 'z'); };
     auto seg1 = [=,&ch,&rbuf]() { return rbuf.putc(ch).then(seg2); };
 
-    pplx::details::do_while(seg1).wait();
+    Concurrency::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(26u, rbuf.in_avail());