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

Enforce parameter and grammar type to catch subtle bugs

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-02-17 15:10:49 -08:00 committed by Patrick Niklaus
parent 6fecce23fc
commit 7e1c164937
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/server/api/parameters_parser.hpp
View File

@ -21,6 +21,7 @@ namespace api
namespace detail namespace detail
{ {
template <typename T> using is_parameter_t = std::is_base_of<engine::api::BaseParameters, T>; template <typename T> using is_parameter_t = std::is_base_of<engine::api::BaseParameters, T>;
template <typename T> using is_grammar_t = std::is_base_of<BaseParametersGrammar, T>;
} // ns detail } // ns detail
// Starts parsing and iter and modifies it until iter == end or parsing failed // Starts parsing and iter and modifies it until iter == end or parsing failed

16
src/server/api/parameters_parser.cpp
View File

@ -18,7 +18,10 @@ namespace api
namespace detail namespace detail
{ {
template <typename ParameterT, typename GrammarT> template <typename ParameterT,
typename GrammarT,
typename std::enable_if<detail::is_parameter_t<ParameterT>::value, int>::type = 0,
typename std::enable_if<detail::is_grammar_t<ParameterT>::value, int>::type = 0>
boost::optional<ParameterT> parseParameters(std::string::iterator &iter, std::string::iterator end) boost::optional<ParameterT> parseParameters(std::string::iterator &iter, std::string::iterator end)
{ {
GrammarT grammar; GrammarT grammar;
@ -54,18 +57,19 @@ boost::optional<engine::api::NearestParameters> parseParameters(std::string::ite
end); end);
} }
//template <> // template <>
//boost::optional<engine::api::TripParameters> parseParameters(std::string::iterator &iter, // boost::optional<engine::api::TripParameters> parseParameters(std::string::iterator &iter,
// std::string::iterator end) // std::string::iterator end)
//{ //{
// return detail::parseParameters<engine::api::TripParameters, TripParametersGrammar>(iter, end); // return detail::parseParameters<engine::api::TripParameters, TripParametersGrammar>(iter, end);
//} //}
// //
//template <> // template <>
//boost::optional<engine::api::MatchParameters> parseParameters(std::string::iterator &iter, // boost::optional<engine::api::MatchParameters> parseParameters(std::string::iterator &iter,
// std::string::iterator end) // std::string::iterator end)
//{ //{
// return detail::parseParameters<engine::api::MatchParameters, MatchParametersGrammar>(iter, end); // return detail::parseParameters<engine::api::MatchParameters, MatchParametersGrammar>(iter,
// end);
//} //}
} // ns api } // ns api