Skip to content

Make isValidGlobPattern recognize ** #7682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 5 commits into from
Jul 19, 2025
Merged

Make isValidGlobPattern recognize ** #7682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b632294
Make isValidGlobPattern recognize '**'
Jul 18, 2025
3554f12
Update bad suppression glob pattern example
Jul 18, 2025
811479e
Add suppression glob tests for '**'
Jul 18, 2025
9960288
Update lib/utils.cpp
danmar Jul 19, 2025
943a313
Add contributor to AUTHORS
Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ Jesse Boswell
Jim Kuhn
Jim Zhou
jlguardi
Joel Johnson
Johan Bertrand
Johan Samuelson
John Marshall
Expand Down
13 changes: 10 additions & 3 deletions lib/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,19 @@ int caseInsensitiveStringCompare(const std::string &lhs, const std::string &rhs)

bool isValidGlobPattern(const std::string& pattern)
{
int consecutiveAsterisks = 0;
for (auto i = pattern.cbegin(); i != pattern.cend(); ++i) {
if (*i == '*' || *i == '?') {
const auto j = i + 1;
if (j != pattern.cend() && (*j == '*' || *j == '?')) {
if (*i == '*') {
++consecutiveAsterisks;
if (consecutiveAsterisks > 2) {
return false;
}
} else if (*i == '?') {
if (consecutiveAsterisks > 0) {
return false;
}
} else {
consecutiveAsterisks = 0;
}
}
return true;
Expand Down
15 changes: 12 additions & 3 deletions test/testsuppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,18 @@ class TestSuppressions : public TestFixture {
// Check for syntax errors in glob
{
SuppressionList suppressions;
std::istringstream s("errorid:**.cpp\n");
ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '**.cpp'.", suppressions.parseFile(s));
std::istringstream s("errorid:*?.cpp\n");
ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '*?.cpp'.", suppressions.parseFile(s));
}

// Check that globbing works
{
SuppressionList suppressions;
std::istringstream s("errorid:x*.cpp\n"
"errorid:y?.cpp\n"
"errorid:test.c*");
"errorid:test.c*\n"
"errorid:dir/**\n"
"errorid:**/abc**/xyz-??*.?pp\n");
ASSERT_EQUALS("", suppressions.parseFile(s));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "xyz.cpp", 1)));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "xyz.cpp.cpp", 1)));
Expand All @@ -181,6 +183,13 @@ class TestSuppressions : public TestFixture {
ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "y.cpp", 1)));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "test.c", 1)));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "test.cpp", 1)));

ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "dir/test.cpp", 1)));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "dir/deep/nested/test.cpp", 1)));
ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "yellow.cpp", 1)));
ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "foo/sub/abc/sub/xyz-22aaa.cpp", 1)));
ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "foo/sub/abc-xyz-22.cpp", 1)));
ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "x/abcxyz-11.cpp", 1)));
}

// Check that both a filename match and a glob match apply
Expand Down
41 changes: 35 additions & 6 deletions test/testutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,32 @@ class TestUtils : public TestFixture {
ASSERT_EQUALS(true, ::isValidGlobPattern("x*"));
ASSERT_EQUALS(true, ::isValidGlobPattern("*/x/*"));
ASSERT_EQUALS(true, ::isValidGlobPattern("x/*/z"));
ASSERT_EQUALS(false, ::isValidGlobPattern("**"));
ASSERT_EQUALS(false, ::isValidGlobPattern("**x"));
ASSERT_EQUALS(false, ::isValidGlobPattern("x**"));
ASSERT_EQUALS(true, ::isValidGlobPattern("**"));
ASSERT_EQUALS(true, ::isValidGlobPattern("**x"));
ASSERT_EQUALS(true, ::isValidGlobPattern("x**"));

ASSERT_EQUALS(true, ::isValidGlobPattern("?"));
ASSERT_EQUALS(true, ::isValidGlobPattern("?x"));
ASSERT_EQUALS(true, ::isValidGlobPattern("x?"));
ASSERT_EQUALS(true, ::isValidGlobPattern("?/x/?"));
ASSERT_EQUALS(true, ::isValidGlobPattern("x/?/z"));
ASSERT_EQUALS(false, ::isValidGlobPattern("??"));
ASSERT_EQUALS(false, ::isValidGlobPattern("??x"));
ASSERT_EQUALS(false, ::isValidGlobPattern("x??"));
ASSERT_EQUALS(true, ::isValidGlobPattern("??"));
ASSERT_EQUALS(true, ::isValidGlobPattern("????"));
ASSERT_EQUALS(true, ::isValidGlobPattern("??x"));
ASSERT_EQUALS(true, ::isValidGlobPattern("x??"));

ASSERT_EQUALS(true, ::isValidGlobPattern("?*"));
ASSERT_EQUALS(true, ::isValidGlobPattern("?**"));
ASSERT_EQUALS(false, ::isValidGlobPattern("?***"));
ASSERT_EQUALS(true, ::isValidGlobPattern("???*"));
ASSERT_EQUALS(true, ::isValidGlobPattern("???**"));
ASSERT_EQUALS(false, ::isValidGlobPattern("???***"));

ASSERT_EQUALS(false, ::isValidGlobPattern("*?"));
ASSERT_EQUALS(true, ::isValidGlobPattern("*x?"));
ASSERT_EQUALS(false, ::isValidGlobPattern("**?"));
ASSERT_EQUALS(false, ::isValidGlobPattern("***"));
ASSERT_EQUALS(true, ::isValidGlobPattern("**x*"));
}

void matchglob() const {
Expand All @@ -76,11 +90,26 @@ class TestUtils : public TestFixture {
ASSERT_EQUALS(true, ::matchglob("*", "x/y/z"));
ASSERT_EQUALS(true, ::matchglob("*/y/z", "x/y/z"));

ASSERT_EQUALS(true, ::matchglob("**", ""));
ASSERT_EQUALS(true, ::matchglob("**", "abcdefg"));
ASSERT_EQUALS(true, ::matchglob("**", "abcde/foo/bar"));
ASSERT_EQUALS(false, ::matchglob("*/**", "abcde"));
ASSERT_EQUALS(true, ::matchglob("*/**", "abcde/foo"));
ASSERT_EQUALS(true, ::matchglob("*/**", "abcde/foo/bar"));

ASSERT_EQUALS(false, ::matchglob("?", "xyz"));
ASSERT_EQUALS(false, ::matchglob("x?", "xyz"));
ASSERT_EQUALS(false, ::matchglob("?z", "xyz"));
ASSERT_EQUALS(true, ::matchglob("?y?", "xyz"));
ASSERT_EQUALS(true, ::matchglob("?/?/?", "x/y/z"));

ASSERT_EQUALS(true, ::matchglob("??", "xy"));
ASSERT_EQUALS(false, ::matchglob("??", "x"));
ASSERT_EQUALS(false, ::matchglob("??", "xyz"));

ASSERT_EQUALS(true, ::matchglob("????", "wxyz"));
ASSERT_EQUALS(false, ::matchglob("????", "xyz"));
ASSERT_EQUALS(false, ::matchglob("????", "vwxyz"));
}

void isStringLiteral() const {
Expand Down