xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not let boost regex errors propagate, convert them to Kakoune errors.

Browse Source
This commit is contained in:
Maxime Coste 2016-09-06 13:55:14 +01:00
parent 9a19f18bc0
commit c1d7f79a52
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/regex.hh
View File

@ -104,14 +104,28 @@ template<typename It>
bool regex_match(It begin, It end, const Regex& re) bool regex_match(It begin, It end, const Regex& re)
{ {
using Utf8It = RegexUtf8It<It>; using Utf8It = RegexUtf8It<It>;
try
{
return boost::regex_match(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, re); return boost::regex_match(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, re);
}
catch (std::runtime_error& err)
{
throw runtime_error{format("Regex matching error: {}", err.what())};
}
} }
template<typename It> template<typename It>
bool regex_match(It begin, It end, MatchResults<It>& res, const Regex& re) bool regex_match(It begin, It end, MatchResults<It>& res, const Regex& re)
{ {
using Utf8It = RegexUtf8It<It>; using Utf8It = RegexUtf8It<It>;
try
{
return boost::regex_match(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, res, re); return boost::regex_match(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, res, re);
}
catch (std::runtime_error& err)
{
throw runtime_error{format("Regex matching error: {}", err.what())};
}
} }
template<typename It> template<typename It>
@ -119,7 +133,14 @@ bool regex_search(It begin, It end, const Regex& re,
RegexConstant::match_flag_type flags = RegexConstant::match_default) RegexConstant::match_flag_type flags = RegexConstant::match_default)
{ {
using Utf8It = RegexUtf8It<It>; using Utf8It = RegexUtf8It<It>;
try
{
return boost::regex_search(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, re); return boost::regex_search(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, re);
}
catch (std::runtime_error& err)
{
throw runtime_error{format("Regex searching error: {}", err.what())};
}
} }
template<typename It> template<typename It>
@ -127,7 +148,14 @@ bool regex_search(It begin, It end, MatchResults<It>& res, const Regex& re,
RegexConstant::match_flag_type flags = RegexConstant::match_default) RegexConstant::match_flag_type flags = RegexConstant::match_default)
{ {
using Utf8It = RegexUtf8It<It>; using Utf8It = RegexUtf8It<It>;
try
{
return boost::regex_search(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, res, re); return boost::regex_search(Utf8It{begin, begin, end}, Utf8It{end, begin, end}, res, re);
}
catch (std::runtime_error& err)
{
throw runtime_error{format("Regex searching error: {}", err.what())};
}
} }
String option_to_string(const Regex& re); String option_to_string(const Regex& re);