MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd::rfc3986: Add expectations for host and port parsers.

Browse source
This commit is contained in:
Jason Volk 2020-05-14 10:33:54 -07:00
parent a2f6acd73f
commit f4fe10ba38
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ircd/rfc3986.cc
View file

@ -635,13 +635,19 @@ try
static const parser::rule<string_view> rule static const parser::rule<string_view> rule
{ {
(lit('[') >> raw[literal]) | raw[non_literal] (&lit('[') > raw[literal]) | raw[non_literal]
,"host"
};
static const parser::rule<string_view> grammar
{
expect[rule >> omit[&lit(':') | eoi]]
,"host" ,"host"
}; };
string_view ret; string_view ret;
const char *start(str.data()), *const stop(start + str.size()); const char *start(str.data()), *const stop(start + str.size());
qi::parse(start, stop, eps > rule, ret); qi::parse(start, stop, grammar, ret);
return ret; return ret;
} }
catch(const qi::expectation_failure<const char *> &e) catch(const qi::expectation_failure<const char *> &e)
@ -665,7 +671,7 @@ try
static const parser::rule<uint16_t> rule static const parser::rule<uint16_t> rule
{ {
non_literal | (literal >> -(lit(':') >> parser::port) >> eoi) non_literal | (literal >> -(lit(':') >> parser::port)) >> eoi
,"port" ,"port"
}; };