Attempts at build time optimization.

* Breaking up Boost.Spirit include files.
* Adding simplified modular headers.

Author: deanberris

boost/network/include/http/client.hpp

@@ -0,0 +1,14 @@
+#ifndef BOOST_NETWORK_INCLUDE_HTTP_CLIENT_HPP_
+#define BOOST_NETWORK_INCLUDE_HTTP_CLIENT_HPP_
+
+// Copyright 2009 Dean Michael Berris
+// 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)
+//
+// This is the modular include file for using the HTTP Client
+
+#include <boost/network/protocol/http/client.hpp>
+
+#endif // BOOST_NETWORK_INCLUDE_HTTP_CLIENT_HPP_
+

boost/network/include/message.hpp

@@ -0,0 +1,14 @@
+#ifndef BOOST_NETWORK_INCLUDE_MESSAGE_HPP_
+#define BOOST_NETWORK_INCLUDE_MESSAGE_HPP_
+
+// Copyright 2009 Dean Michael Berris
+// 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)
+//
+// This is the modular include file for using the basic message type
+
+#include <boost/network/message.hpp>
+
+#endif // BOOST_NETWORK_INCLUDE_MESSAGE_HPP_
+

boost/network/uri/basic_uri.hpp

@@ -6,9 +6,7 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/spirit/home/qi.hpp>
 #include <boost/fusion/adapted/std_pair.hpp>
-#include <boost/spirit/home/phoenix.hpp>
 #include <boost/range.hpp>
 
 #include <boost/network/tags.hpp>

boost/network/uri/detail/parse_uri.hpp

@@ -9,6 +9,12 @@
 #include <boost/fusion/tuple.hpp>
 #include <boost/network/uri/detail/uri_parts.hpp>
 
+#include <boost/spirit/include/qi_core.hpp>
+#include <boost/spirit/include/qi_sequence.hpp>
+#include <boost/spirit/include/qi_parse.hpp>
+#include <boost/spirit/include/qi_char_.hpp>
+#include <boost/spirit/include/qi_lexeme.hpp>
+
 namespace boost { namespace network { namespace uri {
 
     namespace detail {
@@ -33,7 +39,7 @@ namespace boost { namespace network { namespace uri {
                 bool ok = qi::parse(
                         start_, end_, 
                         (
-                            (qi::alpha > *(qi::alnum | qi::char_("+.-")))
+                            qi::lexeme[(qi::alpha >> *(qi::alnum | qi::char_("+.-")))]
                          >> ':'
                          >> 
                             +(qi::char_ - (qi::cntrl | qi::space))

boost/network/uri/http/detail/parse_specific.hpp

@@ -11,6 +11,20 @@
 #include <boost/network/uri/detail/parse_uri.hpp>
 #include <boost/network/traits/string.hpp>
 
+#include <boost/spirit/include/qi_core.hpp>
+#include <boost/spirit/include/qi_sequence.hpp>
+#include <boost/spirit/include/qi_raw.hpp>
+#include <boost/spirit/include/qi_plus.hpp>
+#include <boost/spirit/include/qi_parse.hpp>
+#include <boost/spirit/include/qi_char_.hpp>
+#include <boost/spirit/include/qi_uint.hpp>
+#include <boost/spirit/include/qi_lexeme.hpp>
+#include <boost/spirit/include/qi_eps.hpp>
+#include <boost/spirit/include/qi_optional.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/include/support_ascii.hpp>
+#include <boost/spirit/include/support_argument.hpp>
+
 namespace boost { namespace network { namespace uri { 
 
     namespace detail {
@@ -101,7 +115,7 @@ namespace boost { namespace network { namespace uri {
                          >> -qi::lexeme[qi::raw[*(unreserved | pct_encoded | sub_delims | qi::char_(":"))] >> '@']
                          >> hostname
                          >> -qi::lexeme[':' >> qi::ushort_]
-                         >> -qi::lexeme['/' > qi::raw[*pchar >> *('/' > *pchar)]]
+                         >> -qi::lexeme['/' >> qi::raw[*pchar >> *('/' > *pchar)]]
                          >> -qi::lexeme['?' >> qi::raw[*(pchar | qi::char_("/?"))]]
                          >> -qi::lexeme['#' >> qi::raw[*(pchar | qi::char_("/?"))]]
                         ),

libs/network/test/http_1_0_test.cpp

@@ -7,7 +7,7 @@
 #define BOOST_TEST_MODULE http 1.0 test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/network.hpp>
+#include <boost/network/include/http/client.hpp>
 #include <iostream>
 #include <boost/mpl/list.hpp>
 

libs/network/test/http_1_1_test.cpp

@@ -7,7 +7,7 @@
 #define BOOST_TEST_MODULE http 1.1 test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/network.hpp>
+#include <boost/network/include/http/client.hpp>
 #include <iostream>
 #include <boost/mpl/list.hpp>
 

libs/network/test/http_localhost_tests.cpp

@@ -12,7 +12,7 @@
 #include <boost/config/warning_disable.hpp>
 #include <boost/config.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/network.hpp>
+#include <boost/network/include/http/client.hpp>
 #include <boost/cast.hpp>
 #include <string>
 #include <fstream>

libs/network/test/message_transform_test.cpp

@@ -7,7 +7,7 @@
 #define BOOST_TEST_MODULE message test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/network.hpp>
+#include <boost/network/include/message.hpp>
 #include <algorithm>
 
 BOOST_AUTO_TEST_CASE ( message_transform_toupper ) {