expr: Make Match expressions comply with POSIX

They should print the contents of capture group 1, if it exists.
Author: https://github.com/alimpfard Commit: https://github.com/SerenityOS/serenity/commit/a5bc366d9a0 Pull-request: https://github.com/SerenityOS/serenity/pull/8617 Reviewed-by: https://github.com/linusg ✅
2021-07-10 23:08:17 +04:30 · 2021-07-10 23:08:17 +04:30 · a5bc366d9a · 2024-07-18 09:24:37 +09:00
commit a5bc366d9a
parent 11a8476cf4
1 changed files with 8 additions and 5 deletions
--- a/Userland/Utilities/expr.cpp
+++ b/Userland/Utilities/expr.cpp
@ -359,7 +359,12 @@ public:
    }

 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
    {
        if (m_op == StringOperation::Substring || m_op == StringOperation::Match) {
@ -411,10 +416,8 @@ private:
                    return "";

                StringBuilder result;
-                for (auto& m : match.capture_group_matches) {
-                    for (auto& e : m)
-                        result.append(e.view.to_string());
-                }
+                for (auto& e : match.capture_group_matches[0])
+                    result.append(e.view.u8view());

                return result.build();
            }