Skip to content

Optimized regexes in Whiskers #16549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
msooseth wants to merge 1 commit into from
+8 −4
Closed

Optimized regexes in Whiskers #16549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions libsolutil/Whiskers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ std::string Whiskers::render() const

void Whiskers::checkTemplateValid() const
{
std::regex validTemplate("<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)");
static std::regex const validTemplate(
"<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)",
std::regex::optimize
);
std::smatch match;
assertThrow(
!regex_search(m_template, match, validTemplate),
Expand All @@ -87,7 +90,7 @@ void Whiskers::checkTemplateValid() const

void Whiskers::checkParameterValid(std::string const& _parameter) const
{
static std::regex validParam("^" + paramRegex() + "$");
static std::regex const validParam("^" + paramRegex() + "$", std::regex::optimize);
assertThrow(
regex_match(_parameter, validParam),
WhiskersError,
Expand Down Expand Up @@ -160,10 +163,11 @@ std::string Whiskers::replace(
std::map<std::string, std::vector<StringMap>> const& _listParameters
)
{
static std::regex listOrTag(
static std::regex const listOrTag(
"<(" + paramRegex() + ")>|"
"<#(" + paramRegex() + ")>((?:.|\\r|\\n)*?)</\\2>|"
"<\\?(\\+?" + paramRegex() + ")>((?:.|\\r|\\n)*?)(<!\\4>((?:.|\\r|\\n)*?))?</\\4>"
"<\\?(\\+?" + paramRegex() + ")>((?:.|\\r|\\n)*?)(<!\\4>((?:.|\\r|\\n)*?))?</\\4>",
std::regex::optimize
);
return regex_replace(_template, listOrTag, [&](std::match_results<std::string::const_iterator> _match) -> std::string
{
Expand Down