RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:18:11 +00:00
Code Issues Activity Actions

expr: Use Basic Posix regular expressions

Browse source 
Dr.POSIX requires expr to use BREs, so let's use BREs.
Fixes #8506.
This commit is contained in:
Ali Mohammad Pur 2021-07-10 13:19:47 +04:30 • committed by Andreas Kling
parent daa6d99e6e
commit 97f7132b82
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Utilities/expr.cpp
View file

@ -441,14 +441,17 @@ private:
void ensure_regex() const void ensure_regex() const
{ {
if (!m_compiled_regex) if (!m_compiled_regex) {
m_compiled_regex = make<regex::Regex<PosixExtended>>(m_pos_or_chars->string()); m_compiled_regex = make<regex::Regex<PosixBasic>>(m_pos_or_chars->string());
if (m_compiled_regex->parser_result.error != regex::Error::NoError)
fail("Regex error: {}", regex::get_error_string(m_compiled_regex->parser_result.error));
}
} }
StringOperation m_op { StringOperation::Substring }; StringOperation m_op { StringOperation::Substring };
NonnullOwnPtr<Expression> m_str; NonnullOwnPtr<Expression> m_str;
OwnPtr<Expression> m_pos_or_chars, m_length; OwnPtr<Expression> m_pos_or_chars, m_length;
mutable OwnPtr<regex::Regex<PosixExtended>> m_compiled_regex; mutable OwnPtr<regex::Regex<PosixBasic>> m_compiled_regex;
}; };
NonnullOwnPtr<Expression> Expression::parse(Queue<StringView>& args, Precedence prec) NonnullOwnPtr<Expression> Expression::parse(Queue<StringView>& args, Precedence prec)