Fixed bug where the parser didn't ignore optional URI parts.

glynos · glynos · commit b86fa8c79e91 · 2011-12-13T09:43:44.000+01:00
diff --git a/boost/network/uri/detail/uri_parts.hpp b/boost/network/uri/detail/uri_parts.hpp
@@ -7,6 +7,9 @@
 # define BOOST_NETWORK_URL_DETAIL_URL_PARTS_HPP_
 
 
+# include <boost/optional.hpp>
+
+
 namespace boost {
 namespace network {
 namespace uri {
@@ -15,14 +18,10 @@ template <
     class String
     >
 struct hierarchical_part {
-    String user_info, host, port, path;
-
-    void clear() {
-        user_info.clear();
-        host.clear();
-        port.clear();
-        path.clear();
-    }
+    boost::optional<String> user_info;
+    boost::optional<String> host;
+    boost::optional<String> port;
+    boost::optional<String> path;
 };
 
 template <
@@ -31,14 +30,17 @@ template <
 struct uri_parts {
     String scheme;
     hierarchical_part<String> hier_part;
-    String query;
-    String fragment;
+    boost::optional<String> query;
+    boost::optional<String> fragment;
 
     void clear() {
         scheme.clear();
-        hier_part.clear();
-        query.clear();
-        fragment.clear();
+        hier_part.user_info = boost::optional<String>();
+        hier_part.host = boost::optional<String>();
+        hier_part.port = boost::optional<String>();
+        hier_part.path = boost::optional<String>();
+        query = boost::optional<String>();
+        fragment = boost::optional<String>();
     }
 };
 } // namespace detail
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -101,27 +101,39 @@ class uri
     }
 
     string_type user_info() const {
-        return uri_parts_.hier_part.user_info;
+        return uri_parts_.hier_part.user_info?
+            uri_parts_.hier_part.user_info.get() :
+            string_type();
     }
 
     string_type host() const {
-        return uri_parts_.hier_part.host;
+        return uri_parts_.hier_part.host?
+            uri_parts_.hier_part.host.get() :
+            string_type();
     }
 
     string_type port() const {
-        return uri_parts_.hier_part.port;
+        return uri_parts_.hier_part.port?
+            uri_parts_.hier_part.port.get() :
+            string_type();
     }
 
     string_type path() const {
-        return uri_parts_.hier_part.path;
+        return uri_parts_.hier_part.path?
+            uri_parts_.hier_part.path.get() :
+            string_type();
     }
 
     string_type query() const {
-        return uri_parts_.query;
+        return uri_parts_.query ?
+            uri_parts_.query.get() :
+            string_type();
     }
 
     string_type fragment() const {
-        return uri_parts_.fragment;
+        return uri_parts_.fragment?
+            uri_parts_.fragment.get() :
+            string_type();
     }
 
     string_type string() const {
diff --git a/libs/network/src/uri/parse.cpp b/libs/network/src/uri/parse.cpp
@@ -13,10 +13,10 @@ BOOST_FUSION_ADAPT_TPL_STRUCT
 (
     (String),
     (boost::network::uri::detail::hierarchical_part)(String),
-    (String, user_info)
-    (String, host)
-    (String, port)
-    (String, path)
+    (boost::optional<String>, user_info)
+    (boost::optional<String>, host)
+    (boost::optional<String>, port)
+    (boost::optional<String>, path)
     );
 
 BOOST_FUSION_ADAPT_TPL_STRUCT
@@ -25,8 +25,8 @@ BOOST_FUSION_ADAPT_TPL_STRUCT
     (boost::network::uri::detail::uri_parts)(String),
     (String, scheme)
     (boost::network::uri::detail::hierarchical_part<String>, hier_part)
-    (String, query)
-    (String, fragment)
+    (boost::optional<String>, query)
+    (boost::optional<String>, fragment)
     );
 
 namespace boost {
diff --git a/libs/network/test/uri/url_test.cpp b/libs/network/test/uri/url_test.cpp
@@ -44,8 +44,12 @@ BOOST_AUTO_TEST_CASE(basic_uri_test) {
     uri::uri instance("http://www.example.com/");
     BOOST_REQUIRE(uri::valid(instance));
     BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
+    BOOST_CHECK_EQUAL(uri::user_info(instance), "");
     BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
+    BOOST_CHECK_EQUAL(uri::port(instance), "");
     BOOST_CHECK_EQUAL(uri::path(instance), "/");
+    BOOST_CHECK_EQUAL(uri::query(instance), "");
+    BOOST_CHECK_EQUAL(uri::fragment(instance), "");
 }
 
 BOOST_AUTO_TEST_CASE(full_uri_test) {
@@ -164,7 +168,6 @@ BOOST_AUTO_TEST_CASE(username_test) {
 BOOST_AUTO_TEST_CASE(authority_test) {
     uri::uri instance("http://user:password@www.example.com:80/path?query#fragment");
     BOOST_REQUIRE(uri::valid(instance));
-	std::cout << uri::authority(instance) << std::endl;
     BOOST_CHECK_EQUAL(uri::authority(instance), "user:password@www.example.com:80");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,27 +101,39 @@ class uri`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`string_type user_info() const {`
`104`		`- return uri_parts_.hier_part.user_info;`
	`104`	`+ return uri_parts_.hier_part.user_info?`
	`105`	`+ uri_parts_.hier_part.user_info.get() :`
	`106`	`+ string_type();`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`string_type host() const {`
`108`		`- return uri_parts_.hier_part.host;`
	`110`	`+ return uri_parts_.hier_part.host?`
	`111`	`+ uri_parts_.hier_part.host.get() :`
	`112`	`+ string_type();`
`109`	`113`	`}`
`110`	`114`
`111`	`115`	`string_type port() const {`
`112`		`- return uri_parts_.hier_part.port;`
	`116`	`+ return uri_parts_.hier_part.port?`
	`117`	`+ uri_parts_.hier_part.port.get() :`
	`118`	`+ string_type();`
`113`	`119`	`}`
`114`	`120`
`115`	`121`	`string_type path() const {`
`116`		`- return uri_parts_.hier_part.path;`
	`122`	`+ return uri_parts_.hier_part.path?`
	`123`	`+ uri_parts_.hier_part.path.get() :`
	`124`	`+ string_type();`
`117`	`125`	`}`
`118`	`126`
`119`	`127`	`string_type query() const {`
`120`		`- return uri_parts_.query;`
	`128`	`+ return uri_parts_.query ?`
	`129`	`+ uri_parts_.query.get() :`
	`130`	`+ string_type();`
`121`	`131`	`}`
`122`	`132`
`123`	`133`	`string_type fragment() const {`
`124`		`- return uri_parts_.fragment;`
	`134`	`+ return uri_parts_.fragment?`
	`135`	`+ uri_parts_.fragment.get() :`
	`136`	`+ string_type();`
`125`	`137`	`}`
`126`	`138`
`127`	`139`	`string_type string() const {`