[clang-tools-extra] r370039 - Refactor GlobList from an ad-hoc linked list to a vector

[Dmitri Gribenko via cfe-commits]

Author: gribozavr
Date: Tue Aug 27 03:56:13 2019
New Revision: 370039

URL: http://llvm.org/viewvc/llvm-project?rev=370039&view=rev
Log:
Refactor GlobList from an ad-hoc linked list to a vector

Summary: I think it makes method implementations more obvious.

Subscribers: cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D66788

Modified:
    clang-tools-extra/trunk/clang-tidy/GlobList.cpp
    clang-tools-extra/trunk/clang-tidy/GlobList.h

Modified: clang-tools-extra/trunk/clang-tidy/GlobList.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/GlobList.cpp?rev=370039&r1=370038&r2=370039&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/GlobList.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/GlobList.cpp Tue Aug 27 03:56:13 2019
@@ -42,15 +42,20 @@ static llvm::Regex ConsumeGlob(StringRef
   return llvm::Regex(RegexText);
 }
 
-GlobList::GlobList(StringRef Globs)
-    : Positive(!ConsumeNegativeIndicator(Globs)), Regex(ConsumeGlob(Globs)),
-      NextGlob(Globs.empty() ? nullptr : new GlobList(Globs)) {}
-
-bool GlobList::contains(StringRef S, bool Contains) {
-  if (Regex.match(S))
-    Contains = Positive;
+GlobList::GlobList(StringRef Globs) {
+  do {
+    GlobListItem Item;
+    Item.IsPositive = !ConsumeNegativeIndicator(Globs);
+    Item.Regex = ConsumeGlob(Globs);
+    Items.push_back(std::move(Item));
+  } while (!Globs.empty());
+}
 
-  if (NextGlob)
-    Contains = NextGlob->contains(S, Contains);
+bool GlobList::contains(StringRef S) {
+  bool Contains = false;
+  for (const GlobListItem &Item : Items) {
+    if (Item.Regex.match(S))
+      Contains = Item.IsPositive;
+  }
   return Contains;
 }

Modified: clang-tools-extra/trunk/clang-tidy/GlobList.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/GlobList.h?rev=370039&r1=370038&r2=370039&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/GlobList.h (original)
+++ clang-tools-extra/trunk/clang-tidy/GlobList.h Tue Aug 27 03:56:13 2019
@@ -12,30 +12,36 @@
 #include "clang/Basic/LLVM.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Regex.h"
-#include <memory>
+#include <vector>
 
 namespace clang {
 namespace tidy {
 
-/// Read-only set of strings represented as a list of positive and
-/// negative globs. Positive globs add all matched strings to the set, negative
-/// globs remove them in the order of appearance in the list.
+/// Read-only set of strings represented as a list of positive and negative
+/// globs.
+///
+/// Positive globs add all matched strings to the set, negative globs remove
+/// them in the order of appearance in the list.
 class GlobList {
 public:
-  /// \p GlobList is a comma-separated list of globs (only '*'
-  /// metacharacter is supported) with optional '-' prefix to denote exclusion.
+  /// \p Globs is a comma-separated list of globs (only the '*' metacharacter is
+  /// supported) with an optional '-' prefix to denote exclusion.
+  ///
+  /// An empty \p Globs string is interpreted as one glob that matches an empty
+  /// string.
   GlobList(StringRef Globs);
 
   /// Returns \c true if the pattern matches \p S. The result is the last
   /// matching glob's Positive flag.
-  bool contains(StringRef S) { return contains(S, false); }
+  bool contains(StringRef S);
 
 private:
-  bool contains(StringRef S, bool Contains);
 
-  bool Positive;
-  llvm::Regex Regex;
-  std::unique_ptr<GlobList> NextGlob;
+  struct GlobListItem {
+    bool IsPositive;
+    mutable llvm::Regex Regex;
+  };
+  std::vector<GlobListItem> Items;
 };
 
 } // end namespace tidy