QRegularExpression: add support for non-filepath wildcards/globbing

A glob pattern has different semantics depending on whether
it's used in "filepath mode" (FNM_PATHNAME) or not.
QRegularExpression only implemented the former, but the latter
is also useful, and possibly more "intuitive" for certain use
cases (e.g. offering users a simplified version of regexps that
however still need "*" to match a "/").

Add this support. The problems highlighted by QTBUG-111234 have
not been addressed, I've just amended a bit of documentation
relating backslashes.

[ChangeLog][QtCore][QRegularExpression] Support for non-filepath
wildcards has been added to wildcardToRegularExpression().

Fixes: QTBUG-110901
Task-number: QTBUG-104585
Task-number: QTBUG-111234
Change-Id: If9850616267980fa843bda996fcb4552b5375938
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 67 insertions, 48 deletions

diff --git a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
index 6d7e15de6b..212e315a34 100644
--- a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
@@ -2446,54 +2446,68 @@ void tst_QRegularExpression::wildcard_data()
 {
     QTest::addColumn<QString>("pattern");
     QTest::addColumn<QString>("string");
-    QTest::addColumn<qsizetype>("foundIndex");
+    QTest::addColumn<bool>("matchesPathGlob");
+    QTest::addColumn<bool>("matchesNonPathGlob");
 
-    auto addRow = [](const char *pattern, const char *string, qsizetype foundIndex) {
-        QTest::addRow("%s@%s", pattern, string) << pattern << string << foundIndex;
+    auto addRow = [](const char *pattern, const char *string, bool matchesPathGlob, bool matchesNonPathGlob) {
+        QTest::addRow("%s@%s", pattern, string) << pattern << string << matchesPathGlob << matchesNonPathGlob;
     };
 
-    addRow("*.html", "test.html", 0);
-    addRow("*.html", "test.htm", -1);
-    addRow("*bar*", "foobarbaz", 0);
-    addRow("*", "Qt Rocks!", 0);
-    addRow("*.h", "test.cpp", -1);
-    addRow("*.???l", "test.html", 0);
-    addRow("*?", "test.html", 0);
-    addRow("*?ml", "test.html", 0);
-    addRow("*[*]", "test.html", -1);
-    addRow("*[?]","test.html", -1);
-    addRow("*[?]ml","test.h?ml", 0);
-    addRow("*[[]ml","test.h[ml", 0);
-    addRow("*[]]ml","test.h]ml", 0);
-    addRow("*.h[a-z]ml", "test.html", 0);
-    addRow("*.h[A-Z]ml", "test.html", -1);
-    addRow("*.h[A-Z]ml", "test.hTml", 0);
-    addRow("*.h[!A-Z]ml", "test.hTml", -1);
-    addRow("*.h[!A-Z]ml", "test.html", 0);
-    addRow("*.h[!T]ml", "test.hTml", -1);
-    addRow("*.h[!T]ml", "test.html", 0);
-    addRow("*.h[!T]m[!L]", "test.htmL", -1);
-    addRow("*.h[!T]m[!L]", "test.html", 0);
-    addRow("*.h[][!]ml", "test.h]ml", 0);
-    addRow("*.h[][!]ml", "test.h[ml", 0);
-    addRow("*.h[][!]ml", "test.h!ml", 0);
-
-    addRow("foo/*/bar", "foo/baz/bar", 0);
-    addRow("foo/(*)/bar", "foo/baz/bar", -1);
-    addRow("foo/(*)/bar", "foo/(baz)/bar", 0);
-    addRow("foo/?/bar", "foo/Q/bar", 0);
-    addRow("foo/?/bar", "foo/Qt/bar", -1);
-    addRow("foo/(?)/bar", "foo/Q/bar", -1);
-    addRow("foo/(?)/bar", "foo/(Q)/bar", 0);
+    addRow("*.html", "test.html", true, true);
+    addRow("*.html", "test.htm", false, false);
+    addRow("*bar*", "foobarbaz", true, true);
+    addRow("*", "Qt Rocks!", true, true);
+    addRow("*.h", "test.cpp", false, false);
+    addRow("*.???l", "test.html", true, true);
+    addRow("*?", "test.html", true, true);
+    addRow("*?ml", "test.html", true, true);
+    addRow("*[*]", "test.html", false, false);
+    addRow("*[?]","test.html", false, false);
+    addRow("*[?]ml","test.h?ml", true, true);
+    addRow("*[[]ml","test.h[ml", true, true);
+    addRow("*[]]ml","test.h]ml", true, true);
+    addRow("*.h[a-z]ml", "test.html", true, true);
+    addRow("*.h[A-Z]ml", "test.html", false, false);
+    addRow("*.h[A-Z]ml", "test.hTml", true, true);
+    addRow("*.h[!A-Z]ml", "test.hTml", false, false);
+    addRow("*.h[!A-Z]ml", "test.html", true, true);
+    addRow("*.h[!T]ml", "test.hTml", false, false);
+    addRow("*.h[!T]ml", "test.html", true, true);
+    addRow("*.h[!T]m[!L]", "test.htmL", false, false);
+    addRow("*.h[!T]m[!L]", "test.html", true, true);
+    addRow("*.h[][!]ml", "test.h]ml", true, true);
+    addRow("*.h[][!]ml", "test.h[ml", true, true);
+    addRow("*.h[][!]ml", "test.h!ml", true, true);
+
+    addRow("foo/*/bar", "foo/baz/bar", true, true);
+    addRow("foo/*/bar", "foo/fie/baz/bar", false, true);
+    addRow("foo?bar", "foo/bar", false, true);
+    addRow("foo/(*)/bar", "foo/baz/bar", false, false);
+    addRow("foo/(*)/bar", "foo/(baz)/bar", true, true);
+    addRow("foo/?/bar", "foo/Q/bar", true, true);
+    addRow("foo/?/bar", "foo/Qt/bar", false, false);
+    addRow("foo/(?)/bar", "foo/Q/bar", false, false);
+    addRow("foo/(?)/bar", "foo/(Q)/bar", true, true);
+
+    addRow("foo*bar", "foo/fie/baz/bar", false, true);
+    addRow("fie*bar", "foo/fie/baz/bar", false, false); // regexp is anchored
 
 #ifdef Q_OS_WIN
-    addRow("foo\\*\\bar", "foo\\baz\\bar", 0);
-    addRow("foo\\(*)\\bar", "foo\\baz\\bar", -1);
-    addRow("foo\\(*)\\bar", "foo\\(baz)\\bar", 0);
-    addRow("foo\\?\\bar", "foo\\Q\\bar", 0);
-    addRow("foo\\?\\bar", "foo\\Qt\\bar", -1);
-    addRow("foo\\(?)\\bar", "foo\\Q\\bar", -1);
-    addRow("foo\\(?)\\bar", "foo\\(Q)\\bar", 0);
+    addRow("foo\\*\\bar", "foo\\baz\\bar", true, true);
+    addRow("foo\\*\\bar", "foo/baz/bar", true, false);
+    addRow("foo\\*\\bar", "foo/baz\\bar", true, false);
+    addRow("foo\\*\\bar", "foo\\fie\\baz\\bar", false, true);
+    addRow("foo\\*\\bar", "foo/fie/baz/bar", false, false);
+    addRow("foo/*/bar", "foo\\baz\\bar", true, false);
+    addRow("foo/*/bar", "foo/baz/bar", true, true);
+    addRow("foo/*/bar", "foo\\fie\\baz\\bar", false, false);
+    addRow("foo/*/bar", "foo/fie/baz/bar", false, true);
+    addRow("foo\\(*)\\bar", "foo\\baz\\bar", false, false);
+    addRow("foo\\(*)\\bar", "foo\\(baz)\\bar", true, true);
+    addRow("foo\\?\\bar", "foo\\Q\\bar", true, true);
+    addRow("foo\\?\\bar", "foo\\Qt\\bar", false, false);
+    addRow("foo\\(?)\\bar", "foo\\Q\\bar", false, false);
+    addRow("foo\\(?)\\bar", "foo\\(Q)\\bar", true, true);
 #endif
 }
 
@@ -2501,12 +2515,17 @@ void tst_QRegularExpression::wildcard()
 {
     QFETCH(QString, pattern);
     QFETCH(QString, string);
-    QFETCH(qsizetype, foundIndex);
+    QFETCH(bool, matchesPathGlob);
+    QFETCH(bool, matchesNonPathGlob);
 
-    QRegularExpression re(QRegularExpression::wildcardToRegularExpression(pattern));
-    QRegularExpressionMatch match = re.match(string);
-
-    QCOMPARE(match.capturedStart(), foundIndex);
+    {
+        QRegularExpression re(QRegularExpression::wildcardToRegularExpression(pattern));
+        QCOMPARE(string.contains(re), matchesPathGlob);
+    }
+    {
+        QRegularExpression re(QRegularExpression::wildcardToRegularExpression(pattern, QRegularExpression::NonPathWildcardConversion));
+        QCOMPARE(string.contains(re), matchesNonPathGlob);
+    }
 }
 
 void tst_QRegularExpression::testInvalidWildcard_data()