Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Report position where parsing failed; resolves #2168

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-04-07 13:22:28 +02:00 committed by Patrick Niklaus
parent 58ebadd7b3
commit 996a27dbd1
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/api/url_parser.cpp
View File

@ -15,7 +15,6 @@ namespace qi = boost::spirit::qi;
template <typename Iterator, typename Into> // template <typename Iterator, typename Into> //
struct URLParser final : qi::grammar<Iterator, Into> struct URLParser final : qi::grammar<Iterator, Into>
{ {
URLParser() : URLParser::base_type(start) URLParser() : URLParser::base_type(start)
{ {
alpha_numeral = qi::char_("a-zA-Z0-9"); alpha_numeral = qi::char_("a-zA-Z0-9");
@ -29,10 +28,10 @@ struct URLParser final : qi::grammar<Iterator, Into>
// Example input: /route/v1/driving/7.416351,43.731205;7.420363,43.736189 // Example input: /route/v1/driving/7.416351,43.731205;7.420363,43.736189
start = qi::lit('/') >> service // start = qi::lit('/') > service //
>> qi::lit('/') >> qi::lit('v') >> version // > qi::lit('/') > qi::lit('v') > version //
>> qi::lit('/') >> profile // > qi::lit('/') > profile //
>> qi::lit('/') >> query; // > qi::lit('/') > query; //
BOOST_SPIRIT_DEBUG_NODES((start)(service)(version)(profile)(query)) BOOST_SPIRIT_DEBUG_NODES((start)(service)(version)(profile)(query))
} }
@ -65,10 +64,19 @@ boost::optional<ParsedURL> parseURL(std::string::iterator &iter, const std::stri
static URLParser<It, ParsedURL()> const parser; static URLParser<It, ParsedURL()> const parser;
ParsedURL out; ParsedURL out;
const auto ok = boost::spirit::qi::parse(iter, end, parser, out); try
{
const auto ok = boost::spirit::qi::parse(iter, end, parser, out);
if (ok && iter == end) if (ok && iter == end)
return boost::make_optional(out); return boost::make_optional(out);
}
catch (const qi::expectation_failure<It> &failure)
{
// The grammar above using expectation parsers ">" does not automatically increment the
// iterator to the failing position. Extract the position from the exception ourselves.
iter = failure.first;
}
return boost::none; return boost::none;
} }