rebase

Created using spr 1.3.6

Author: vitalybuka

llvm/include/llvm/Support/GlobPattern.h

@@ -65,19 +65,13 @@ class GlobPattern {
   bool isTrivialMatchAll() const {
     if (!Prefix.empty())
       return false;
-    if (!Suffix.empty())
-      return false;
     if (SubGlobs.size() != 1)
       return false;
     return SubGlobs[0].getPat() == "*";
   }
 
-  StringRef prefix() const { return Prefix; }
-  StringRef suffix() const { return Suffix; }
-
 private:
   StringRef Prefix;
-  StringRef Suffix;
 
   struct SubGlobPattern {
     /// \param Pat the pattern to match against

llvm/lib/Support/GlobPattern.cpp

@@ -143,15 +143,6 @@ GlobPattern::create(StringRef S, std::optional<size_t> MaxSubPatterns) {
     return Pat;
   S = S.substr(PrefixSize);
 
-  // Just in case we stop on unmatched opening brackets.
-  size_t SuffixStart = S.find_last_of("?*[]{}\\");
-  assert(SuffixStart != std::string::npos);
-  if (S[SuffixStart] == '\\')
-    ++SuffixStart;
-  ++SuffixStart;
-  Pat.Suffix = S.substr(SuffixStart);
-  S = S.substr(0, SuffixStart);
-
   SmallVector<std::string, 1> SubPats;
   if (auto Err = parseBraceExpansions(S, MaxSubPatterns).moveInto(SubPats))
     return std::move(Err);
@@ -202,8 +193,6 @@ GlobPattern::SubGlobPattern::create(StringRef S) {
 bool GlobPattern::match(StringRef S) const {
   if (!S.consume_front(Prefix))
     return false;
-  if (!S.consume_back(Suffix))
-    return false;
   if (SubGlobs.empty() && S.empty())
     return true;
   for (auto &Glob : SubGlobs)

llvm/unittests/Support/GlobPatternTest.cpp

@@ -257,78 +257,6 @@ TEST_F(GlobPatternTest, NUL) {
   }
 }
 
-TEST_F(GlobPatternTest, PrefixSuffix) {
-  auto Pat = GlobPattern::create("");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("", Pat->prefix());
-  EXPECT_EQ("", Pat->suffix());
-
-  Pat = GlobPattern::create("abcd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("abcd", Pat->prefix());
-  EXPECT_EQ("", Pat->suffix());
-
-  Pat = GlobPattern::create("*abcd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("", Pat->prefix());
-  EXPECT_EQ("abcd", Pat->suffix());
-
-  Pat = GlobPattern::create("abcd*");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("abcd", Pat->prefix());
-  EXPECT_EQ("", Pat->suffix());
-
-  Pat = GlobPattern::create("ab*cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-
-  Pat = GlobPattern::create("ab?cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-
-  Pat = GlobPattern::create("ab[n]cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-
-  Pat = GlobPattern::create("ab{}cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-
-  Pat = GlobPattern::create("ab{cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-
-  Pat = GlobPattern::create("ab]cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab]cd", Pat->prefix());
-  EXPECT_EQ("", Pat->suffix());
-
-  Pat = GlobPattern::create("ab\\cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("d", Pat->suffix());
-
-  Pat = GlobPattern::create("ab\\\\cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("d", Pat->suffix());
-
-  Pat = GlobPattern::create("ab?cd?");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("ab", Pat->prefix());
-  EXPECT_EQ("", Pat->suffix());
-
-  Pat = GlobPattern::create("?ab?cd");
-  ASSERT_TRUE((bool)Pat);
-  EXPECT_EQ("", Pat->prefix());
-  EXPECT_EQ("cd", Pat->suffix());
-}
-
 TEST_F(GlobPatternTest, Pathological) {
   std::string P, S(40, 'a');
   StringRef Pieces[] = {"a*", "[ba]*", "{b*,a*}*"};