[llvm] r375052 - Revert [support] GlobPattern: add support for `\` and `[!...]`, and allow `]` in more places
Jordan Rupprecht via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 16 15:59:02 PDT 2019
Author: rupprecht
Date: Wed Oct 16 15:59:02 2019
New Revision: 375052
URL: http://llvm.org/viewvc/llvm-project?rev=375052&view=rev
Log:
Revert [support] GlobPattern: add support for `\` and `[!...]`, and allow `]` in more places
This reverts r375051 (git commit a409afaad64ce83ea44cc30ee5f96b6e613a6e98)
The patch does not work on Windows due to `\` in filenames being interpreted as escaping rather than literal path separators when used by lld linker scripts.
Modified:
llvm/trunk/include/llvm/Support/GlobPattern.h
llvm/trunk/lib/Support/GlobPattern.cpp
llvm/trunk/unittests/Support/GlobPatternTest.cpp
Modified: llvm/trunk/include/llvm/Support/GlobPattern.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GlobPattern.h?rev=375052&r1=375051&r2=375052&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/GlobPattern.h (original)
+++ llvm/trunk/include/llvm/Support/GlobPattern.h Wed Oct 16 15:59:02 2019
@@ -21,7 +21,7 @@
#include <vector>
// This class represents a glob pattern. Supported metacharacters
-// are "*", "?", "\", "[<chars>]", "[^<chars>]", and "[!<chars>]".
+// are "*", "?", "[<chars>]" and "[^<chars>]".
namespace llvm {
class BitVector;
template <typename T> class ArrayRef;
Modified: llvm/trunk/lib/Support/GlobPattern.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/GlobPattern.cpp?rev=375052&r1=375051&r2=375052&view=diff
==============================================================================
--- llvm/trunk/lib/Support/GlobPattern.cpp (original)
+++ llvm/trunk/lib/Support/GlobPattern.cpp Wed Oct 16 15:59:02 2019
@@ -19,7 +19,7 @@
using namespace llvm;
static bool hasWildcard(StringRef S) {
- return S.find_first_of("?*[\\") != StringRef::npos;
+ return S.find_first_of("?*[") != StringRef::npos;
}
// Expands character ranges and returns a bitmap.
@@ -60,9 +60,8 @@ static Expected<BitVector> expand(String
}
// This is a scanner for the glob pattern.
-// A glob pattern token is one of "*", "?", "\", "[<chars>]", "[^<chars>]"
-// (which is a negative form of "[<chars>]"), "[!<chars>]" (which is
-// equivalent to "[^<chars>]"), or a non-meta character.
+// A glob pattern token is one of "*", "?", "[<chars>]", "[^<chars>]"
+// (which is a negative form of "[<chars>]"), or a non-meta character.
// This function returns the first token in S.
static Expected<BitVector> scan(StringRef &S, StringRef Original) {
switch (S[0]) {
@@ -75,16 +74,14 @@ static Expected<BitVector> scan(StringRe
S = S.substr(1);
return BitVector(256, true);
case '[': {
- // ']' is allowed as the first character of a character class. '[]' is
- // invalid. So, just skip the first character.
- size_t End = S.find(']', 2);
+ size_t End = S.find(']', 1);
if (End == StringRef::npos)
return make_error<StringError>("invalid glob pattern: " + Original,
errc::invalid_argument);
StringRef Chars = S.substr(1, End - 1);
S = S.substr(End + 1);
- if (Chars.startswith("^") || Chars.startswith("!")) {
+ if (Chars.startswith("^")) {
Expected<BitVector> BV = expand(Chars.substr(1), Original);
if (!BV)
return BV.takeError();
@@ -92,11 +89,6 @@ static Expected<BitVector> scan(StringRe
}
return expand(Chars, Original);
}
- case '\\':
- // Eat this character and fall through below to treat it like a non-meta
- // character.
- S = S.substr(1);
- LLVM_FALLTHROUGH;
default:
BitVector BV(256, false);
BV[(uint8_t)S[0]] = true;
@@ -115,9 +107,8 @@ Expected<GlobPattern> GlobPattern::creat
return Pat;
}
- // S is something like "foo*", and the "* is not escaped. We can use
- // startswith().
- if (S.endswith("*") && !S.endswith("\\*") && !hasWildcard(S.drop_back())) {
+ // S is something like "foo*". We can use startswith().
+ if (S.endswith("*") && !hasWildcard(S.drop_back())) {
Pat.Prefix = S.drop_back();
return Pat;
}
Modified: llvm/trunk/unittests/Support/GlobPatternTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/GlobPatternTest.cpp?rev=375052&r1=375051&r2=375052&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/GlobPatternTest.cpp (original)
+++ llvm/trunk/unittests/Support/GlobPatternTest.cpp Wed Oct 16 15:59:02 2019
@@ -14,115 +14,57 @@ namespace {
class GlobPatternTest : public ::testing::Test {};
-TEST_F(GlobPatternTest, Empty) {
+TEST_F(GlobPatternTest, Basics) {
Expected<GlobPattern> Pat1 = GlobPattern::create("");
EXPECT_TRUE((bool)Pat1);
EXPECT_TRUE(Pat1->match(""));
EXPECT_FALSE(Pat1->match("a"));
-}
-
-TEST_F(GlobPatternTest, Glob) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("ab*c*def");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("abcdef"));
- EXPECT_TRUE(Pat1->match("abxcxdef"));
- EXPECT_FALSE(Pat1->match(""));
- EXPECT_FALSE(Pat1->match("xabcdef"));
- EXPECT_FALSE(Pat1->match("abcdefx"));
-}
-
-TEST_F(GlobPatternTest, Wildcard) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("a??c");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("axxc"));
- EXPECT_FALSE(Pat1->match("axxx"));
- EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, Escape) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("\\*");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("*"));
- EXPECT_FALSE(Pat1->match("\\*"));
- EXPECT_FALSE(Pat1->match("a"));
-
- Expected<GlobPattern> Pat2 = GlobPattern::create("a?\\?c");
- EXPECT_TRUE((bool)Pat2);
- EXPECT_TRUE(Pat2->match("ax?c"));
- EXPECT_FALSE(Pat2->match("axxc"));
- EXPECT_FALSE(Pat2->match(""));
-}
-
-TEST_F(GlobPatternTest, BasicCharacterClass) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("[abc-fy-z]");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("a"));
- EXPECT_TRUE(Pat1->match("b"));
- EXPECT_TRUE(Pat1->match("c"));
- EXPECT_TRUE(Pat1->match("d"));
- EXPECT_TRUE(Pat1->match("e"));
- EXPECT_TRUE(Pat1->match("f"));
- EXPECT_TRUE(Pat1->match("y"));
- EXPECT_TRUE(Pat1->match("z"));
- EXPECT_FALSE(Pat1->match("g"));
- EXPECT_FALSE(Pat1->match(""));
-}
-
-TEST_F(GlobPatternTest, NegatedCharacterClass) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("[^abc-fy-z]");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("g"));
- EXPECT_FALSE(Pat1->match("a"));
- EXPECT_FALSE(Pat1->match("b"));
- EXPECT_FALSE(Pat1->match("c"));
- EXPECT_FALSE(Pat1->match("d"));
- EXPECT_FALSE(Pat1->match("e"));
- EXPECT_FALSE(Pat1->match("f"));
- EXPECT_FALSE(Pat1->match("y"));
- EXPECT_FALSE(Pat1->match("z"));
- EXPECT_FALSE(Pat1->match(""));
- Expected<GlobPattern> Pat2 = GlobPattern::create("[!abc-fy-z]");
+ Expected<GlobPattern> Pat2 = GlobPattern::create("ab*c*def");
EXPECT_TRUE((bool)Pat2);
- EXPECT_TRUE(Pat2->match("g"));
- EXPECT_FALSE(Pat2->match("a"));
- EXPECT_FALSE(Pat2->match("b"));
- EXPECT_FALSE(Pat2->match("c"));
- EXPECT_FALSE(Pat2->match("d"));
- EXPECT_FALSE(Pat2->match("e"));
- EXPECT_FALSE(Pat2->match("f"));
- EXPECT_FALSE(Pat2->match("y"));
- EXPECT_FALSE(Pat2->match("z"));
+ EXPECT_TRUE(Pat2->match("abcdef"));
+ EXPECT_TRUE(Pat2->match("abxcxdef"));
EXPECT_FALSE(Pat2->match(""));
-}
-
-TEST_F(GlobPatternTest, BracketFrontOfCharacterClass) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("[]a]x");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("]x"));
- EXPECT_TRUE(Pat1->match("ax"));
- EXPECT_FALSE(Pat1->match("a]x"));
- EXPECT_FALSE(Pat1->match(""));
-}
+ EXPECT_FALSE(Pat2->match("xabcdef"));
+ EXPECT_FALSE(Pat2->match("abcdefx"));
-TEST_F(GlobPatternTest, SpecialCharsInCharacterClass) {
- Expected<GlobPattern> Pat1 = GlobPattern::create("[*?^]");
- EXPECT_TRUE((bool)Pat1);
- EXPECT_TRUE(Pat1->match("*"));
- EXPECT_TRUE(Pat1->match("?"));
- EXPECT_TRUE(Pat1->match("^"));
- EXPECT_FALSE(Pat1->match("*?^"));
- EXPECT_FALSE(Pat1->match(""));
+ Expected<GlobPattern> Pat3 = GlobPattern::create("a??c");
+ EXPECT_TRUE((bool)Pat3);
+ EXPECT_TRUE(Pat3->match("axxc"));
+ EXPECT_FALSE(Pat3->match("axxx"));
+ EXPECT_FALSE(Pat3->match(""));
+
+ Expected<GlobPattern> Pat4 = GlobPattern::create("[abc-fy-z]");
+ EXPECT_TRUE((bool)Pat4);
+ EXPECT_TRUE(Pat4->match("a"));
+ EXPECT_TRUE(Pat4->match("b"));
+ EXPECT_TRUE(Pat4->match("c"));
+ EXPECT_TRUE(Pat4->match("d"));
+ EXPECT_TRUE(Pat4->match("e"));
+ EXPECT_TRUE(Pat4->match("f"));
+ EXPECT_TRUE(Pat4->match("y"));
+ EXPECT_TRUE(Pat4->match("z"));
+ EXPECT_FALSE(Pat4->match("g"));
+ EXPECT_FALSE(Pat4->match(""));
+
+ Expected<GlobPattern> Pat5 = GlobPattern::create("[^abc-fy-z]");
+ EXPECT_TRUE((bool)Pat5);
+ EXPECT_TRUE(Pat5->match("g"));
+ EXPECT_FALSE(Pat5->match("a"));
+ EXPECT_FALSE(Pat5->match("b"));
+ EXPECT_FALSE(Pat5->match("c"));
+ EXPECT_FALSE(Pat5->match("d"));
+ EXPECT_FALSE(Pat5->match("e"));
+ EXPECT_FALSE(Pat5->match("f"));
+ EXPECT_FALSE(Pat5->match("y"));
+ EXPECT_FALSE(Pat5->match("z"));
+ EXPECT_FALSE(Pat5->match(""));
}
TEST_F(GlobPatternTest, Invalid) {
Expected<GlobPattern> Pat1 = GlobPattern::create("[");
EXPECT_FALSE((bool)Pat1);
handleAllErrors(Pat1.takeError(), [&](ErrorInfoBase &EIB) {});
-
- Expected<GlobPattern> Pat2 = GlobPattern::create("[]");
- EXPECT_FALSE((bool)Pat2);
- handleAllErrors(Pat2.takeError(), [&](ErrorInfoBase &EIB) {});
}
TEST_F(GlobPatternTest, ExtSym) {
More information about the llvm-commits
mailing list