WIP: Gutting the message implementation.

deanberris · deanberris · commit 0e521d02e2b1 · 2011-09-30T16:44:19.000+10:00
diff --git a/boost/network/message.hpp b/boost/network/message.hpp
@@ -64,11 +64,15 @@ namespace boost { namespace network {
         }
 
         headers_container_type & headers() {
-          return pimpl->headers_;
+          if (!headers_) {
+            headers_ = headers_container_type();
+            this->get_headers(*headers_);
+          }
+          return *headers_;
         }
 
         void headers(headers_container_type const & headers_) const {
-          pimpl->headers_ = headers_;
+          this->set_headers(headers_);
         }
 
         void add_header(typename headers_container_type::value_type const & pair_) const {
@@ -80,44 +84,77 @@ namespace boost { namespace network {
         }
 
         headers_container_type const & headers() const {
-          return pimpl->headers_;
+          if (!headers_) {
+            headers_ = headers_container_type();
+            this->get_headers(*headers_);
+          }
+          return *headers_;
         }
 
         string_type & body() {
-          return pimpl->body_;
+          if (!body_) {
+            body_ = String();
+            this->get_body(*body_);
+          }
+          return *body_;
         }
 
         void body(string_type const & body_) const {
           this->set_body(body_);
         }
 
         string_type const & body() const {
-          return pimpl->body_;
+          if (!body_) {
+            body_ = String();
+            this->get_body(*body_);
+          }
+          return *body_;
         }
         
         string_type & source() {
-          return pimpl->source_;
+          if (!source_) {
+            source_ = String();
+            this->get_source(*source_);
+          }
+          return *source_;
         }
 
         void source(string_type const & source_) const {
           this->set_source(source_);
         }
 
         string_type const & source() const {
-          return pimpl->source_;
+          if (!source_) {
+            source_ = String();
+            this->get_source(*source_);
+          }
+          return *source_;
         }
 
         string_type & destination() {
-          return pimpl->destination_;
+          if (!destination_) {
+            destination_ = String();
+            this->get_destination(*destination_);
+          }
+          return *destination_;
         }
 
         void destination(string_type const & destination_) const {
           this->set_destination(destination_);
         }
 
         string_type const & destination() const {
-          return pimpl->destination_;
+          if (!destination_) {
+            destination_ = String();
+            this->get_destination(*destination_);
+          }
+          return *destination_;
         }
+
+      protected:
+        optional<String> source_, destination_;
+        optional<headers_container_type> headers_;
+        optional<String> body_;
     };
 
     template <class String>
diff --git a/boost/network/protocol/http/message/directives/status.hpp b/boost/network/protocol/http/message/directives/status.hpp
@@ -1,76 +1,40 @@
 #ifndef BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_STATUS_HPP_20100603
 #define BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_STATUS_HPP_20100603
 
-// Copyright 2010 (c) Dean Michael Berris
 // Copyright 2010 (c) Sinefunc, Inc.
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/future.hpp>
 #include <boost/mpl/if.hpp>
-#include <boost/variant/variant.hpp>
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/apply_visitor.hpp>
 #include <boost/cstdint.hpp>
 
 namespace boost { namespace network { namespace http {
 
-    template <class Tag>
-    struct basic_response;
-    
-    struct status_directive {
+template <class String>
+struct status_directive {
 
-        boost::variant<
-            boost::uint16_t,
-            boost::shared_future<boost::uint16_t>
-        > status_;
+  status_directive(String const & s)
+  : status_(s)
+  {}
 
-        explicit status_directive(boost::uint16_t status)
-            : status_(status) {}
+  void operator()(response_base & response) {
+    response.set_status(status_);
+  }
 
-        explicit status_directive(boost::shared_future<boost::uint16_t> const & status)
-            : status_(status) {}
+ protected:
+  
+  String status_;
 
-        status_directive(status_directive const & other)
-            : status_(other.status_) {}
+};
 
-        template <class Tag>
-        struct value
-            : mpl::if_<
-                is_async<Tag>,
-                boost::shared_future<boost::uint16_t>,
-                boost::uint16_t
-            >
-        {};
-
-        template <class Tag>
-        struct status_visitor : boost::static_visitor<> {
-            basic_response<Tag> const & response;
-            status_visitor(basic_response<Tag> const & response)
-                : response(response) {}
-
-            void operator()(typename value<Tag>::type const & status_) const {
-                response.status(status_);
-            }
-
-            template <class T>
-            void operator()(T const &) const {
-                // FIXME fail here!
-            }
-        };
-
-        template <class Tag> basic_response<Tag> const & operator() (basic_response<Tag> const & response) const {
-            apply_visitor(status_visitor<Tag>(response), status_);
-            return response;
-        }
-
-    };
-
-    template <class T>
-    inline status_directive const status(T const & status_) {
-        return status_directive(status_);
-    }
+template <class String>
+inline status_directive<String> status(String const & response) {
+  return status_directive<String>(response);
+}
 
 } // namespace http
 
diff --git a/boost/network/protocol/http/request.ipp b/boost/network/protocol/http/request.ipp
@@ -33,7 +33,7 @@ struct request_storage_base {
   virtual void append_header(std::string const &name, std::string const &value);
 };
 
-struct request_base : request_storage_base {
+struct request_base : message_base, request_storage_base {
  protected:
   using request_storage_base::body_stream;
   request_base();
