sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use sequencial catch blocks

Browse source
This commit is contained in:
artemp 2015-03-09 16:30:10 +01:00
parent 317e9c497f
commit 54f87b40d2
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/expression.cpp
View file

@ -45,18 +45,15 @@ expression_ptr parse_expression(std::string const& str)
{
r = boost::spirit::qi::phrase_parse(itr, end, g, space, *node);
}
catch (boost::spirit::qi::expectation_failure<std::string::const_iterator> const& ex)
{
// no need to show "boost::spirit::qi::expectation_failure" which is a std::runtime_error
throw config_error("Failed to parse expression: \"" + str + "\"");
}
catch (std::exception const& ex)
{
if (std::string("boost::spirit::qi::expectation_failure") == std::string(ex.what()))
{
// no need to show "boost::spirit::qi::expectation_failure" which is a std::runtime_error
throw config_error("Failed to parse expression: \"" + str + "\"");
}
else
{
// show "Could not initialize ICU resources" from boost::regex which is a std::runtime_error
throw config_error(std::string(ex.what()) + " for expression: \"" + str + "\"");
}
// show "Could not initialize ICU resources" from boost::regex which is a std::runtime_error
throw config_error(std::string(ex.what()) + " for expression: \"" + str + "\"");
}
if (r && itr == end)
{