Commitb86fa8c

committed

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

1 parent7af0122 commitb86fa8cCopy full SHA for b86fa8c

File tree

+43

-26

lines changed

+43

-26

lines changed

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`#defineBOOST_NETWORK_URL_DETAIL_URL_PARTS_HPP_`
`8`	`8`
`9`	`9`
	`10`	`+#include<boost/optional.hpp>`
	`11`	`+`
	`12`	`+`
`10`	`13`	`namespaceboost {`
`11`	`14`	`namespacenetwork {`
`12`	`15`	`namespaceuri {`
`@@ -15,14 +18,10 @@ template <`
`15`	`18`	`classString`
`16`	`19`	`>`
`17`	`20`	`structhierarchical_part {`
`18`		`- String user_info, host, port, path;`
`19`		`-`
`20`		`-voidclear() {`
`21`		`- user_info.clear();`
`22`		`- host.clear();`
`23`		`- port.clear();`
`24`		`- path.clear();`
`25`		`- }`
	`21`	`+ boost::optional<String> user_info;`
	`22`	`+ boost::optional<String> host;`
	`23`	`+ boost::optional<String> port;`
	`24`	`+ boost::optional<String> path;`
`26`	`25`	`};`
`27`	`26`
`28`	`27`	`template<`
`@@ -31,14 +30,17 @@ template <`
`31`	`30`	`structuri_parts {`
`32`	`31`	`String scheme;`
`33`	`32`	`hierarchical_part<String> hier_part;`
`34`		`- String query;`
`35`		`- String fragment;`
	`33`	`+boost::optional<String> query;`
	`34`	`+boost::optional<String> fragment;`
`36`	`35`
`37`	`36`	`voidclear() {`
`38`	`37`	`scheme.clear();`
`39`		`- hier_part.clear();`
`40`		`- query.clear();`
`41`		`- fragment.clear();`
	`38`	`+ hier_part.user_info = boost::optional<String>();`
	`39`	`+ hier_part.host = boost::optional<String>();`
	`40`	`+ hier_part.port = boost::optional<String>();`
	`41`	`+ hier_part.path = boost::optional<String>();`
	`42`	`+ query = boost::optional<String>();`
	`43`	`+ fragment = boost::optional<String>();`
`42`	`44`	`}`
`43`	`45`	`};`
`44`	`46`	`}// namespace detail`

Lines changed: 18 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,27 +101,39 @@ class uri`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`string_typeuser_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_typehost()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_typeport()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_typepath()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_typequery()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_typefragment()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_typestring()const {`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ BOOST_FUSION_ADAPT_TPL_STRUCT`
`13`	`13`	`(`
`14`	`14`	`(String),`
`15`	`15`	`(boost::network::uri::detail::hierarchical_part)(String),`
`16`		`- (String, user_info)`
`17`		`- (String, host)`
`18`		`- (String, port)`
`19`		`- (String, path)`
	`16`	`+ (boost::optional<String>, user_info)`
	`17`	`+ (boost::optional<String>, host)`
	`18`	`+ (boost::optional<String>, port)`
	`19`	`+ (boost::optional<String>, path)`
`20`	`20`	`);`
`21`	`21`
`22`	`22`	`BOOST_FUSION_ADAPT_TPL_STRUCT`
`@@ -25,8 +25,8 @@ BOOST_FUSION_ADAPT_TPL_STRUCT`
`25`	`25`	`(boost::network::uri::detail::uri_parts)(String),`
`26`	`26`	`(String, scheme)`
`27`	`27`	`(boost::network::uri::detail::hierarchical_part<String>, hier_part)`
`28`		`- (String, query)`
`29`		`- (String, fragment)`
	`28`	`+ (boost::optional<String>, query)`
	`29`	`+ (boost::optional<String>, fragment)`
`30`	`30`	`);`
`31`	`31`
`32`	`32`	`namespaceboost {`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,12 @@ BOOST_AUTO_TEST_CASE(basic_uri_test) {`
`44`	`44`	`uri::uriinstance("http://www.example.com/");`
`45`	`45`	`BOOST_REQUIRE(uri::valid(instance));`
`46`	`46`	`BOOST_CHECK_EQUAL(uri::scheme(instance),"http");`
	`47`	`+BOOST_CHECK_EQUAL(uri::user_info(instance),"");`
`47`	`48`	`BOOST_CHECK_EQUAL(uri::host(instance),"www.example.com");`
	`49`	`+BOOST_CHECK_EQUAL(uri::port(instance),"");`
`48`	`50`	`BOOST_CHECK_EQUAL(uri::path(instance),"/");`
	`51`	`+BOOST_CHECK_EQUAL(uri::query(instance),"");`
	`52`	`+BOOST_CHECK_EQUAL(uri::fragment(instance),"");`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`BOOST_AUTO_TEST_CASE(full_uri_test) {`
`@@ -164,7 +168,6 @@ BOOST_AUTO_TEST_CASE(username_test) {`
`164`	`168`	`BOOST_AUTO_TEST_CASE(authority_test) {`
`165`	`169`	`uri::uriinstance("http://user:password@www.example.com:80/path?query#fragment");`
`166`	`170`	`BOOST_REQUIRE(uri::valid(instance));`
`167`		`-std::cout <<uri::authority(instance) << std::endl;`
`168`	`171`	`BOOST_CHECK_EQUAL(uri::authority(instance),"user:password@www.example.com:80");`
`169`	`172`	`}`
`170`	`173`

Comments

(0)