Skip to content

XCode crash fix #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deanberris merged 1 commit into from
Jan 2, 2016
+87 −35
Merged

XCode crash fix #578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 87 additions & 35 deletions boost/network/uri/uri.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,42 +84,92 @@ struct uri_grammar
ipvfuture %=
qi::lit('v') >> +qi::xdigit >> '.' >> +(unreserved | sub_delims | ':');

ipv6addresses[0] %= qi::repeat(6)[h16 >> ':'] >> ls32;
ipv6addresses[1] %= "::" >> qi::repeat(5)[h16 >> ':'] >> ls32;
ipv6addresses[2] %= -qi::raw[h16] >> "::" >> qi::repeat(4)[h16 >> ':']
>> ls32;
ipv6addresses[3] %= -qi::raw[h16] >> "::" >> qi::repeat(3)[h16 >> ':']
>> ls32;
ipv6addresses[4] %= -qi::raw[h16] >> "::" >> qi::repeat(2)[h16 >> ':']
>> ls32;
ipv6addresses[5] %= -qi::raw[h16] >> "::" >> h16 >> ':' >> ls32;
ipv6addresses[6] %= -qi::raw[h16] >> "::" >> ls32;
ipv6addresses[7] %= -qi::raw[h16] >> "::" >> h16;
ipv6addresses[8] %= -qi::raw[h16] >> "::";
ipv6addresses[9] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::" >> qi::repeat(3)[h16 >> ':'] >> ls32;
ipv6addresses[10] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::" >> qi::repeat(2)[h16 >> ':'] >> ls32;
ipv6addresses[11] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::" >> h16 >> ':' >> ls32;
ipv6addresses[12] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::" >> ls32;
ipv6addresses[13] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::" >> h16;
ipv6addresses[14] %= -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >>
"::";
ipv6addresses[15] %= -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >>
"::" >> qi::repeat(2)[h16 >> ':'] >> ls32;
ipv6addresses[16] %= -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >>
"::" >> h16 >> ':' >> ls32;
ipv6addresses[17] %= -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >>
"::" >> ls32;
ipv6addresses[18] %= -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >>
"::" >> h16;
ipv6addresses[19] %= -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >>
"::";
ipv6addresses[20] %= -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >>
"::" >> h16 >> ':' >> ls32;
ipv6addresses[21] %= -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >>
"::" >> ls32;
ipv6addresses[22] %= -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >>
"::" >> h16;
ipv6addresses[23] %= -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >>
"::";
ipv6addresses[24] %= -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >>
"::" >> ls32;
ipv6addresses[25] %= -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >>
"::" >> h16;
ipv6addresses[26] %= -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >>
"::";
ipv6addresses[27] %= -qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >>
"::" >> h16;
ipv6addresses[28] %= -qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >>
"::";
ipv6addresses[29] %= -qi::raw[qi::repeat(6)[(h16 >> ':')] >> h16] >>
"::";

ipv6address %= qi::raw
[qi::repeat(6)[h16 >> ':'] >> ls32 |
"::" >> qi::repeat(5)[h16 >> ':'] >> ls32 |
-qi::raw[h16] >> "::" >> qi::repeat(4)[h16 >> ':'] >> ls32 |
-qi::raw[h16] >> "::" >> qi::repeat(3)[h16 >> ':'] >> ls32 |
-qi::raw[h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32 |
-qi::raw[h16] >> "::" >> h16 >> ':' >> ls32 |
-qi::raw[h16] >> "::" >> ls32 | -qi::raw[h16] >> "::" >> h16 |
-qi::raw[h16] >> "::" |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >>
qi::repeat(3)[h16 >> ':'] >> ls32 |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >>
qi::repeat(2)[h16 >> ':'] >> ls32 |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
':' >> ls32 |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16 |
-qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" |
-qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >>
qi::repeat(2)[h16 >> ':'] >> ls32 |
-qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
':' >> ls32 |
-qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
-qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16 |
-qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" |
-qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
':' >> ls32 |
-qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
-qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16 |
-qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" |
-qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
-qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> h16 |
-qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" |
-qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::" >> h16 |
-qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::" |
-qi::raw[qi::repeat(6)[(h16 >> ':')] >> h16] >> "::"];
[ipv6addresses[0] |
ipv6addresses[1] |
ipv6addresses[2] |
ipv6addresses[3] |
ipv6addresses[4] |
ipv6addresses[5] |
ipv6addresses[6] |
ipv6addresses[7] |
ipv6addresses[8] |
ipv6addresses[9] |
ipv6addresses[10] |
ipv6addresses[11] |
ipv6addresses[12] |
ipv6addresses[13] |
ipv6addresses[14] |
ipv6addresses[15] |
ipv6addresses[16] |
ipv6addresses[17] |
ipv6addresses[18] |
ipv6addresses[19] |
ipv6addresses[20] |
ipv6addresses[21] |
ipv6addresses[22] |
ipv6addresses[23] |
ipv6addresses[24] |
ipv6addresses[25] |
ipv6addresses[26] |
ipv6addresses[27] |
ipv6addresses[28] |
ipv6addresses[29]];

// ls32 = ( h16 ":" h16 ) / IPv4address
ls32 %= (h16 >> ':' >> h16) | ipv4address;
Expand Down Expand Up @@ -178,6 +228,8 @@ struct uri_grammar
ipv6address, ipvfuture, ip_literal;

qi::rule<const_iterator, string_type()> h16, ls32;
qi::rule<const_iterator, string_type()> ipv6addresses[30];


qi::rule<const_iterator, iterator_range<const_iterator>()> host, port;

Expand Down