ymandel created this revision.
ymandel added reviewers: gribozavr, steveire.
Herald added a project: clang.
This patch exposes `TraversalKind` support in the `DynTypedMatcher` API. While
previously, the `match` method supported traversal logic, it was not possible to
set or get the traversal kind.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D80685
Files:
clang/include/clang/ASTMatchers/ASTMatchersInternal.h
clang/lib/ASTMatchers/ASTMatchersInternal.cpp
clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
Index: clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
===================================================================
--- clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
+++ clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
@@ -17,6 +17,7 @@
namespace clang {
namespace ast_matchers {
+using internal::DynTypedMatcher;
#if GTEST_HAS_DEATH_TEST
TEST(HasNameDeathTest, DiesOnEmptyName) {
@@ -171,6 +172,34 @@
EXPECT_NE(nullptr, PT);
}
+TEST(DynTypedMatcherTest, TraversalKindForwardsToImpl) {
+ auto M = DynTypedMatcher(decl());
+ EXPECT_FALSE(M.getTraversalKind().hasValue());
+
+ M = DynTypedMatcher(traverse(TK_AsIs, decl()));
+ llvm::Optional<clang::TraversalKind> TK = M.getTraversalKind();
+ EXPECT_TRUE(TK.hasValue());
+ EXPECT_EQ(*TK, TK_AsIs);
+}
+
+TEST(DynTypedMatcherTest, ConstructWithTraversalKindSetsTK) {
+ auto M = DynTypedMatcher::constructWithTraversalKind(DynTypedMatcher(decl()),
+ TK_AsIs);
+ llvm::Optional<clang::TraversalKind> TK = M.getTraversalKind();
+ EXPECT_TRUE(TK.hasValue());
+ EXPECT_EQ(*TK, TK_AsIs);
+}
+
+TEST(DynTypedMatcherTest, ConstructWithTraversalKindOverridesNestedTK) {
+ auto M = DynTypedMatcher::constructWithTraversalKind(DynTypedMatcher(decl()),
+ TK_AsIs);
+ auto M2 = DynTypedMatcher::constructWithTraversalKind(
+ M, TK_IgnoreUnlessSpelledInSource);
+ llvm::Optional<clang::TraversalKind> TK = M2.getTraversalKind();
+ EXPECT_TRUE(TK.hasValue());
+ EXPECT_EQ(*TK, TK_IgnoreUnlessSpelledInSource);
+}
+
TEST(IsInlineMatcher, IsInline) {
EXPECT_TRUE(matches("void g(); inline void f();",
functionDecl(isInline(), hasName("f"))));
Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp
===================================================================
--- clang/lib/ASTMatchers/ASTMatchersInternal.cpp
+++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp
@@ -136,6 +136,31 @@
}
};
+/// A matcher that specifies a particular \c TraversalKind.
+///
+/// The kind provided to the constructor overrides any kind that may be
+/// specified by the `InnerMatcher`.
+class DynTraversalMatcherImpl : public DynMatcherInterface {
+public:
+ explicit DynTraversalMatcherImpl(
+ clang::TraversalKind TK,
+ IntrusiveRefCntPtr<DynMatcherInterface> InnerMatcher)
+ : TK(TK), InnerMatcher(std::move(InnerMatcher)) {}
+
+ bool dynMatches(const DynTypedNode &DynNode, ASTMatchFinder *Finder,
+ BoundNodesTreeBuilder *Builder) const override {
+ return this->InnerMatcher->dynMatches(DynNode, Finder, Builder);
+ }
+
+ llvm::Optional<clang::TraversalKind> TraversalKind() const override {
+ return TK;
+ }
+
+private:
+ clang::TraversalKind TK;
+ IntrusiveRefCntPtr<DynMatcherInterface> InnerMatcher;
+};
+
} // namespace
static llvm::ManagedStatic<TrueMatcherImpl> TrueMatcherInstance;
@@ -204,6 +229,14 @@
return Copy;
}
+DynTypedMatcher
+DynTypedMatcher::constructWithTraversalKind(DynTypedMatcher InnerMatcher,
+ ast_type_traits::TraversalKind TK) {
+ InnerMatcher.Implementation =
+ new DynTraversalMatcherImpl(TK, std::move(InnerMatcher.Implementation));
+ return InnerMatcher;
+}
+
DynTypedMatcher DynTypedMatcher::trueMatcher(ASTNodeKind NodeKind) {
return DynTypedMatcher(NodeKind, NodeKind, &*TrueMatcherInstance);
}
Index: clang/include/clang/ASTMatchers/ASTMatchersInternal.h
===================================================================
--- clang/include/clang/ASTMatchers/ASTMatchersInternal.h
+++ clang/include/clang/ASTMatchers/ASTMatchersInternal.h
@@ -379,6 +379,12 @@
constructRestrictedWrapper(const DynTypedMatcher &InnerMatcher,
ASTNodeKind RestrictKind);
+ /// Creates a new matcher that is identical to the old one, but sets the
+ /// traversal kind. If `InnerMatcher` had already set a traversal kind, then
+ /// the new one overrides it.
+ static DynTypedMatcher
+ constructWithTraversalKind(DynTypedMatcher InnerMatcher, TraversalKind TK);
+
/// Get a "true" matcher for \p NodeKind.
///
/// It only checks that the node is of the right kind.
@@ -458,6 +464,14 @@
/// If it is not compatible, then this matcher will never match anything.
template <typename T> Matcher<T> unconditionalConvertTo() const;
+ /// Returns the \c TraversalKind respected by calls to `match()`, if any.
+ ///
+ /// Most matchers will not have a traversal kind set, instead relying on the
+ /// surrounding context. For those, \c llvm::None is returned.
+ llvm::Optional<clang::TraversalKind> getTraversalKind() const {
+ return Implementation->TraversalKind();
+ }
+
private:
DynTypedMatcher(ASTNodeKind SupportedKind, ASTNodeKind RestrictKind,
IntrusiveRefCntPtr<DynMatcherInterface> Implementation)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
