container hierarchy is refactored

Author: ashtum

include/boost/http_proto.hpp

@@ -14,27 +14,21 @@
 #include <boost/http_proto/field.hpp>
 #include <boost/http_proto/fields.hpp>
 #include <boost/http_proto/fields_base.hpp>
-#include <boost/http_proto/fields_view.hpp>
-#include <boost/http_proto/fields_view_base.hpp>
 #include <boost/http_proto/file.hpp>
 #include <boost/http_proto/file_mode.hpp>
 #include <boost/http_proto/file_sink.hpp>
 #include <boost/http_proto/file_source.hpp>
 #include <boost/http_proto/header_limits.hpp>
 #include <boost/http_proto/message_base.hpp>
-#include <boost/http_proto/message_view_base.hpp>
 #include <boost/http_proto/method.hpp>
 #include <boost/http_proto/parser.hpp>
 #include <boost/http_proto/request.hpp>
 #include <boost/http_proto/request_parser.hpp>
-#include <boost/http_proto/request_view.hpp>
 #include <boost/http_proto/response.hpp>
 #include <boost/http_proto/response_parser.hpp>
-#include <boost/http_proto/response_view.hpp>
 #include <boost/http_proto/serializer.hpp>
 #include <boost/http_proto/sink.hpp>
 #include <boost/http_proto/source.hpp>
-#include <boost/http_proto/static_fields.hpp>
 #include <boost/http_proto/static_request.hpp>
 #include <boost/http_proto/static_response.hpp>
 #include <boost/http_proto/status.hpp>

include/boost/http_proto/fields.hpp

@@ -14,8 +14,6 @@
 
 #include <boost/http_proto/detail/config.hpp>
 #include <boost/http_proto/fields_base.hpp>
-#include <boost/http_proto/fields_view.hpp>
-#include <boost/core/detail/string_view.hpp>
 
 namespace boost {
 namespace http_proto {
@@ -79,7 +77,11 @@ class fields final
         Constant.
     */
     BOOST_HTTP_PROTO_DECL
-    fields() noexcept;
+    fields() noexcept
+        : fields_base(detail::kind::fields)
+    {
+    }
+
 
     /** Constructor.
 
@@ -119,7 +121,10 @@ class fields final
     BOOST_HTTP_PROTO_DECL
     explicit
     fields(
-        core::string_view s);
+        core::string_view s)
+        : fields_base(detail::kind::fields, s)
+    {
+    }
 
     /** Constructor.
 
@@ -151,7 +156,12 @@ class fields final
     explicit
     fields(
         std::size_t cap,
-        std::size_t max_cap = std::size_t(-1));
+        std::size_t max_cap = std::size_t(-1))
+        : fields()
+    {
+        reserve_bytes(cap);
+        set_max_capacity_in_bytes(max_cap);
+    }
 
     /** Constructor.
 
@@ -173,28 +183,12 @@ class fields final
         @param f The fields to move from.
     */
     BOOST_HTTP_PROTO_DECL
-    fields(fields&& f) noexcept;
-
-    /** Constructor.
-
-        The newly constructed object contains
-        a copy of `f`.
-
-        @par Postconditions
-        @code
-        this->buffer() == f.buffer() && this->buffer().data() != f.buffer().data()
-        @endcode
+    fields(fields&& f) noexcept
+        : fields_base(f.h_.kind)
+    {
+        swap(f);
+    }
 
-        @par Complexity
-        Linear in `f.size()`.
-
-        @par Exception Safety
-        Calls to allocate may throw.
-
-        @param f The fields to copy.
-    */
-    BOOST_HTTP_PROTO_DECL
-    fields(fields const& f);
 
     /** Constructor.
 
@@ -210,13 +204,12 @@ class fields final
         Linear in `f.size()`.
 
         @par Exception Safety
-        Strong guarantee.
         Calls to allocate may throw.
 
         @param f The fields to copy.
     */
     BOOST_HTTP_PROTO_DECL
-    fields(fields_view const& f);
+    fields(fields const& f) = default;
 
     /** Assignment.
 
@@ -241,38 +234,10 @@ class fields final
     */
     BOOST_HTTP_PROTO_DECL
     fields&
-    operator=(fields&& f) noexcept;
-
-    /** Assignment.
-
-        The contents of `f` are copied and
-        the previous contents of `this` are
-        discarded.
-
-        @par Postconditions
-        @code
-        this->buffer() == f.buffer() && this->buffer().data() != f.buffer().data()
-        @endcode
-
-        @par Complexity
-        Linear in `f.size()`.
-
-        @par Exception Safety
-        Strong guarantee.
-        Calls to allocate may throw.
-        Exception thrown if max capacity exceeded.
-
-        @throw std::length_error
-        Max capacity would be exceeded.
-
-        @return A reference to this object.
-
-        @param f The fields to copy.
-    */
-    fields&
-    operator=(fields const& f) noexcept
+    operator=(fields&& f) noexcept
     {
-        copy_impl(*f.ph_);
+        fields tmp(std::move(f));
+        tmp.swap(*this);
         return *this;
     }
 
@@ -288,7 +253,7 @@ class fields final
         @endcode
 
         @par Complexity
-        Linear in `r.size()`.
+        Linear in `f.size()`.
 
         @par Exception Safety
         Strong guarantee.
@@ -303,24 +268,12 @@ class fields final
         @param f The fields to copy.
     */
     fields&
-    operator=(fields_view const& f)
+    operator=(fields const& f) noexcept
     {
-        copy_impl(*f.ph_);
+        copy_impl(f.h_);
         return *this;
     }
 
-    /** Conversion.
-
-        @see
-            @ref fields_view.
-
-        @return A view of the fields.
-    */
-    operator fields_view() const noexcept
-    {
-        return fields_view(ph_);
-    }
-
     //--------------------------------------------
 
     /** Swap.