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

Regex: minor cleanup of the regex parsing code

Browse Source
This commit is contained in:
Maxime Coste 2017-10-23 11:22:07 +08:00
parent 6e0275e550
commit aea2de885d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/regex_impl.cc
View File

@ -151,7 +151,7 @@ private:
return nullptr;
}
bool peek(StringView expected) const
bool accept(StringView expected)
{
auto it = m_pos;
for (Iterator expected_it{expected.begin(), expected}; expected_it != expected.end(); ++expected_it)
@ -159,21 +159,20 @@ private:
if (it == m_regex.end() or *it++ != *expected_it)
return false;
}
m_pos = it;
return true;
}
bool modifiers()
{
if (peek("(?i)"))
if (accept("(?i)"))
{
m_ignore_case = true;
m_pos += 4;
return true;
}
if (peek("(?I)"))
if (accept("(?I)"))
{
m_ignore_case = false;
m_pos += 4;
return true;
}
return false;
@ -211,10 +210,9 @@ private:
};
for (auto& lookaround : lookarounds)
{
if (peek(lookaround.prefix))
if (accept(lookaround.prefix))
{
lookaround_op = lookaround.op;
m_pos += (int)lookaround.prefix.char_length();
break;
}
}
@ -244,13 +242,7 @@ private:
case '(':
{
++m_pos;
bool capture = true;
if (peek("?:"))
{
capture = false;
m_pos += 2;
}
const bool capture = not accept("?:");
AstNodePtr content = disjunction(capture ? m_parsed_regex.capture_count++ : -1);
if (at_end() or *m_pos++ != ')')
parse_error("unclosed parenthesis");