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

colorize_regex_factory: transform boost::regex_error in Kakoune::runtime_error

Browse Source
This commit is contained in:
Maxime Coste 2012-08-07 00:32:21 +02:00
parent c166bc92e3
commit 661c9db925
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/highlighters.cc
View File

@ -96,9 +96,8 @@ HighlighterAndId colorize_regex_factory(Window& window,
if (params.size() < 2) if (params.size() < 2)
throw runtime_error("wrong parameter count"); throw runtime_error("wrong parameter count");
Regex ex(params[0].begin(), params[0].end(), try
boost::regex::perl | boost::regex::optimize); {
static Regex color_spec_ex(LR"((\d+):(\w+)(,(\w+))?)"); static Regex color_spec_ex(LR"((\d+):(\w+)(,(\w+))?)");
ColorSpec colors; ColorSpec colors;
for (auto it = params.begin() + 1; it != params.end(); ++it) for (auto it = params.begin() + 1; it != params.end(); ++it)
@ -118,8 +117,16 @@ HighlighterAndId colorize_regex_factory(Window& window,
String id = "colre'" + params[0] + "'"; String id = "colre'" + params[0] + "'";
Regex ex(params[0].begin(), params[0].end(),
boost::regex::perl | boost::regex::optimize);
return HighlighterAndId(id, std::bind(colorize_regex, _1, ex, return HighlighterAndId(id, std::bind(colorize_regex, _1, ex,
std::move(colors))); std::move(colors)));
}
catch (boost::regex_error& err)
{
throw runtime_error(String("regex error: ") + err.what());
}
} }
void expand_tabulations(Window& window, DisplayBuffer& display_buffer) void expand_tabulations(Window& window, DisplayBuffer& display_buffer)