Refactor traverse function with clearer function names

[796e43a5a8cdb73b92b]

The traverse function has been updated for better readability and maintainability. The function now has clearer function names.

[llvmbot]

@llvm/pr-subscribers-clang

Author: None (796e43a5a8cdb73b92b)

Changes

The traverse function has been updated for better readability and maintainability. The function now has clearer function names.

---

Full diff: https://github.com/llvm/llvm-project/pull/71441.diff

1 Files Affected:

• (modified) clang/lib/ASTMatchers/ASTMatchFinder.cpp (+9-8)

diff --git a/clang/lib/ASTMatchers/ASTMatchFinder.cpp b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
index 0bac2ed63a927ef..56bddce7d02ddfc 100644
--- a/clang/lib/ASTMatchers/ASTMatchFinder.cpp
+++ b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
@@ -395,14 +395,15 @@ class MatchChildASTVisitor
 
   // Traverses the subtree rooted at 'Node'; returns true if the
   // traversal should continue after this function returns.
-  template <typename T>
-  bool traverse(const T &Node) {
-    static_assert(IsBaseType<T>::value,
-                  "traverse can only be instantiated with base type");
-    if (!match(Node))
-      return false;
-    return baseTraverse(Node);
-  }
+template <typename NodeType>
+bool traverse(const NodeType &node) {
+    static_assert(IsBaseType<NodeType>::value,
+        "traverse can only be instantiated with base type");
+    if (!shouldContinue(node))
+        return false;
+    return continueTraversal(node);
+}
+
 
   const DynTypedMatcher *const Matcher;
   ASTMatchFinder *const Finder;

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff 74e0a26fd114cac39e251e4c2b6fbbadd6009887 1fc6f26966f0192bb1789b66778381d94cd6bbe5 -- clang/lib/ASTMatchers/ASTMatchFinder.cpp

View the diff from clang-format here.

diff --git a/clang/lib/ASTMatchers/ASTMatchFinder.cpp b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
index 56bddce7d..612bc3b5e 100644
--- a/clang/lib/ASTMatchers/ASTMatchFinder.cpp
+++ b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
@@ -395,15 +395,13 @@ private:
 
   // Traverses the subtree rooted at 'Node'; returns true if the
   // traversal should continue after this function returns.
-template <typename NodeType>
-bool traverse(const NodeType &node) {
+  template <typename NodeType> bool traverse(const NodeType &node) {
     static_assert(IsBaseType<NodeType>::value,
-        "traverse can only be instantiated with base type");
+                  "traverse can only be instantiated with base type");
     if (!shouldContinue(node))
-        return false;
+      return false;
     return continueTraversal(node);
-}
-
+  }
 
   const DynTypedMatcher *const Matcher;
   ASTMatchFinder *const Finder;