RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 19:05:08 +00:00
Code Issues Activity Actions

expr: Make Match expressions comply with POSIX

Browse source 
They should print the contents of capture group 1, if it exists.
This commit is contained in:
Ali Mohammad Pur 2021-07-10 23:08:17 +04:30 • committed by Ali Mohammad Pur
parent 11a8476cf4
commit a5bc366d9a
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Utilities/expr.cpp
View file

@ -359,7 +359,12 @@ public:
} }
private: private:
virtual bool truth() const override { return integer() != 0; } virtual bool truth() const override
{
if (type() == Expression::Type::String)
return !string().is_empty();
return integer() != 0;
}
virtual int integer() const override virtual int integer() const override
{ {
if (m_op == StringOperation::Substring || m_op == StringOperation::Match) { if (m_op == StringOperation::Substring || m_op == StringOperation::Match) {
@ -411,10 +416,8 @@ private:
return ""; return "";
StringBuilder result; StringBuilder result;
for (auto& m : match.capture_group_matches) { for (auto& e : match.capture_group_matches[0])
for (auto& e : m) result.append(e.view.u8view());
result.append(e.view.to_string());
}
return result.build(); return result.build();
} }