Harmonize concepts and identifiers with net-ts (API Change):

fix #321

This synchronizes identifier names and some implementation details
with the Networking-TS document and reference implementation.
The following interfaces have changed:

* async_completion
* is_buffer_sequence (removed)
* is_const_buffer_sequence (was is_ConstBufferSequence)
* is_dynamic_buffer (was is_DynamicBuffer)
* is_mutable_buffer_sequence (was is_MutableBufferSequence)
* async_result (new)
* BEAST_HANDLER_TYPE macro (new)
* BEAST_INITFN_RESULT_TYPE macro (new)

Filename changes:

* async_result.hpp (was async_completion.hpp)

include/beast/http/impl/async_read.ipp

@@ -572,34 +572,34 @@ template<
     class DynamicBuffer,
     bool isRequest, class Derived,
     class ReadHandler>
-typename async_completion<
-    ReadHandler, void(error_code, std::size_t)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code, std::size_t))
 async_read_some(
     AsyncReadStream& stream,
     DynamicBuffer& dynabuf,
     basic_parser<isRequest, true, Derived>& parser,
     ReadHandler&& handler)
 {
-    beast::async_completion<ReadHandler,
-        void(error_code, std::size_t)> completion{handler};
+    async_completion<ReadHandler,
+        void(error_code, std::size_t)> init{handler};
     switch(parser.state())
     {
     case parse_state::header:
     case parse_state::chunk_header:
         detail::read_some_buffer_op<AsyncReadStream,
-            DynamicBuffer, isRequest, true, Derived,
-                decltype(completion.handler)>{
-                    completion.handler, stream, dynabuf, parser};
+            DynamicBuffer, isRequest, true, Derived, BEAST_HANDLER_TYPE(
+                ReadHandler, void(error_code, std::size_t))>{
+                    init.completion_handler, stream, dynabuf, parser};
         break;
 
     default:
         detail::read_some_body_op<AsyncReadStream,
-            DynamicBuffer, isRequest, Derived,
-                decltype(completion.handler)>{
-                    completion.handler, stream, dynabuf, parser};
+            DynamicBuffer, isRequest, Derived, BEAST_HANDLER_TYPE(
+                ReadHandler, void(error_code, std::size_t))>{
+                    init.completion_handler, stream, dynabuf, parser};
         break;
     }
-    return completion.result.get();
+    return init.result.get();
 }
 
 template<
@@ -608,21 +608,21 @@ template<
     bool isRequest, class Derived,
     class ReadHandler>
 inline
-typename async_completion<
-    ReadHandler, void(error_code, std::size_t)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code, std::size_t))
 async_read_some(
     AsyncReadStream& stream,
     DynamicBuffer& dynabuf,
     basic_parser<isRequest, false, Derived>& parser,
     ReadHandler&& handler)
 {
-    beast::async_completion<ReadHandler,
-        void(error_code, std::size_t)> completion{handler};
+    async_completion<ReadHandler,
+        void(error_code, std::size_t)> init{handler};
     detail::read_some_buffer_op<AsyncReadStream,
-        DynamicBuffer, isRequest, false, Derived,
-            decltype(completion.handler)>{
-                completion.handler, stream, dynabuf, parser};
-    return completion.result.get();
+        DynamicBuffer, isRequest, false, Derived, BEAST_HANDLER_TYPE(
+            ReadHandler, void(error_code, std::size_t))>{
+                init.completion_handler, stream, dynabuf, parser};
+    return init.result.get();
 }
 
 } // detail
@@ -634,8 +634,8 @@ template<
     class DynamicBuffer,
     bool isRequest, bool isDirect, class Derived,
     class ReadHandler>
-typename async_completion<
-    ReadHandler, void(error_code, std::size_t)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code, std::size_t))
 async_read_some(
     AsyncReadStream& stream,
     DynamicBuffer& dynabuf,
@@ -644,7 +644,7 @@ async_read_some(
 {
     static_assert(is_AsyncReadStream<AsyncReadStream>::value,
         "AsyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
     return detail::async_read_some(stream, dynabuf, parser,
@@ -656,8 +656,8 @@ template<
     class DynamicBuffer,
     bool isRequest, bool isDirect, class Derived,
     class ReadHandler>
-typename async_completion<
-    ReadHandler, void(error_code)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code))
 async_read(
     AsyncReadStream& stream,
     DynamicBuffer& dynabuf,
@@ -666,15 +666,16 @@ async_read(
 {
     static_assert(is_AsyncReadStream<AsyncReadStream>::value,
         "AsyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
-    beast::async_completion<ReadHandler,
-        void(error_code)> completion{handler};
+    async_completion<ReadHandler,
+        void(error_code)> init{handler};
     detail::parse_op<AsyncReadStream, DynamicBuffer,
-        isRequest, isDirect, Derived, decltype(completion.handler)>{
-            completion.handler, stream, dynabuf, parser};
-    return completion.result.get();
+        isRequest, isDirect, Derived, BEAST_HANDLER_TYPE(
+            ReadHandler, void(error_code))>{
+                init.completion_handler, stream, dynabuf, parser};
+    return init.result.get();
 }
 
 template<
@@ -682,8 +683,8 @@ template<
     class DynamicBuffer,
     bool isRequest, class Body, class Fields,
     class ReadHandler>
-typename async_completion<
-    ReadHandler, void(error_code)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    ReadHandler, void(error_code))
 async_read(
     AsyncReadStream& stream,
     DynamicBuffer& dynabuf,
@@ -692,7 +693,7 @@ async_read(
 {
     static_assert(is_AsyncReadStream<AsyncReadStream>::value,
         "AsyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     static_assert(is_Body<Body>::value,
         "Body requirements not met");
@@ -701,13 +702,13 @@ async_read(
     static_assert(is_Reader<typename Body::reader,
         message<isRequest, Body, Fields>>::value,
             "Reader requirements not met");
-    beast::async_completion<ReadHandler,
-        void(error_code)> completion{handler};
+    async_completion<ReadHandler,
+        void(error_code)> init{handler};
     detail::read_message_op<AsyncReadStream, DynamicBuffer,
-        isRequest, Body, Fields, decltype(
-            completion.handler)>{completion.handler,
-                stream, dynabuf, msg};
-    return completion.result.get();
+        isRequest, Body, Fields, BEAST_HANDLER_TYPE(
+            ReadHandler, void(error_code))>{
+                init.completion_handler, stream, dynabuf, msg};
+    return init.result.get();
 }
 
 } // http

include/beast/http/impl/basic_parser.ipp

@@ -71,7 +71,7 @@ basic_parser<isRequest, isDirect, Derived>::
 write(ConstBufferSequence const& buffers,
     error_code& ec)
 {
-    static_assert(is_ConstBufferSequence<
+    static_assert(is_const_buffer_sequence<
         ConstBufferSequence>::value,
             "ConstBufferSequence requirements not met");
     auto const buffer = maybe_flatten(buffers);

include/beast/http/impl/read.ipp

@@ -192,7 +192,7 @@ read_some(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
     error_code ec;
@@ -216,7 +216,7 @@ read_some(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
     return detail::read_some(stream, dynabuf, parser, ec);
@@ -234,7 +234,7 @@ read(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
     error_code ec;
@@ -256,7 +256,7 @@ read(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     BOOST_ASSERT(! parser.is_complete());
     do
@@ -282,7 +282,7 @@ read(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     static_assert(is_Body<Body>::value,
         "Body requirements not met");
@@ -310,7 +310,7 @@ read(
 {
     static_assert(is_SyncReadStream<SyncReadStream>::value,
         "SyncReadStream requirements not met");
-    static_assert(is_DynamicBuffer<DynamicBuffer>::value,
+    static_assert(is_dynamic_buffer<DynamicBuffer>::value,
         "DynamicBuffer requirements not met");
     static_assert(is_Body<Body>::value,
         "Body requirements not met");

include/beast/http/impl/write.ipp

@@ -213,16 +213,16 @@ write(SyncWriteStream& stream,
 template<class AsyncWriteStream,
     bool isRequest, class Fields,
         class WriteHandler>
-typename async_completion<
-    WriteHandler, void(error_code)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    WriteHandler, void(error_code))
 async_write(AsyncWriteStream& stream,
     header<isRequest, Fields> const& msg,
         WriteHandler&& handler)
 {
     static_assert(is_AsyncWriteStream<AsyncWriteStream>::value,
         "AsyncWriteStream requirements not met");
-    beast::async_completion<WriteHandler,
-        void(error_code)> completion{handler};
+    async_completion<WriteHandler,
+        void(error_code)> init{handler};
     multi_buffer b;
     {
         auto os = ostream(b);
@@ -231,9 +231,9 @@ async_write(AsyncWriteStream& stream,
         os << "\r\n";
     }
     detail::write_streambuf_op<AsyncWriteStream,
-        decltype(completion.handler)>{
-            completion.handler, stream, std::move(b)};
-    return completion.result.get();
+        BEAST_HANDLER_TYPE(WriteHandler, void(error_code))>{
+            init.completion_handler, stream, std::move(b)};
+    return init.result.get();
 }
 
 //------------------------------------------------------------------------------
@@ -641,8 +641,8 @@ write(SyncWriteStream& stream,
 template<class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
         class WriteHandler>
-typename async_completion<
-    WriteHandler, void(error_code)>::result_type
+BEAST_INITFN_RESULT_TYPE(
+    WriteHandler, void(error_code))
 async_write(AsyncWriteStream& stream,
     message<isRequest, Body, Fields> const& msg,
         WriteHandler&& handler)
@@ -656,11 +656,12 @@ async_write(AsyncWriteStream& stream,
     static_assert(is_Writer<typename Body::writer,
         message<isRequest, Body, Fields>>::value,
             "Writer requirements not met");
-    beast::async_completion<WriteHandler,
-        void(error_code)> completion{handler};
-    detail::write_op<AsyncWriteStream, decltype(completion.handler),
-        isRequest, Body, Fields>{completion.handler, stream, msg};
-    return completion.result.get();
+    async_completion<WriteHandler,
+        void(error_code)> init{handler};
+    detail::write_op<AsyncWriteStream, BEAST_HANDLER_TYPE(
+        WriteHandler, void(error_code)), isRequest,
+            Body, Fields>{init.completion_handler, stream, msg};
+    return init.result.get();
 }
 
 //------------------------------------------------------------------------------