[PATCH] D80623: WIP: Add an API to simplify setting TraversalKind in clang-tidy matchers
Stephen Kelly via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Oct 29 09:58:14 PDT 2020
steveire updated this revision to Diff 301667.
steveire added a comment.
Update
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D80623/new/
https://reviews.llvm.org/D80623
Files:
clang/include/clang/ASTMatchers/ASTMatchFinder.h
clang/lib/ASTMatchers/ASTMatchFinder.cpp
Index: clang/lib/ASTMatchers/ASTMatchFinder.cpp
===================================================================
--- clang/lib/ASTMatchers/ASTMatchFinder.cpp
+++ clang/lib/ASTMatchers/ASTMatchFinder.cpp
@@ -877,6 +877,7 @@
Callback(Callback) {}
void visitMatch(const BoundNodes& BoundNodesView) override {
+ TraversalKindScope RAII(*Context, Callback->getCheckTraversalKind());
Callback->run(MatchFinder::MatchResult(BoundNodesView, Context));
}
@@ -1142,7 +1143,11 @@
void MatchFinder::addMatcher(const DeclarationMatcher &NodeMatch,
MatchCallback *Action) {
- Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);
+ if (auto TK = Action->getCheckTraversalKind()) {
+ Matchers.DeclOrStmt.emplace_back(traverse(*TK, NodeMatch), Action);
+ } else {
+ Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);
+ }
Matchers.AllCallbacks.insert(Action);
}
@@ -1154,7 +1159,11 @@
void MatchFinder::addMatcher(const StatementMatcher &NodeMatch,
MatchCallback *Action) {
- Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);
+ if (auto TK = Action->getCheckTraversalKind()) {
+ Matchers.DeclOrStmt.emplace_back(traverse(*TK, NodeMatch), Action);
+ } else {
+ Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);
+ }
Matchers.AllCallbacks.insert(Action);
}
@@ -1243,5 +1252,10 @@
StringRef MatchFinder::MatchCallback::getID() const { return "<unknown>"; }
+llvm::Optional<ast_type_traits::TraversalKind>
+MatchFinder::MatchCallback::getCheckTraversalKind() const {
+ return llvm::None;
+}
+
} // end namespace ast_matchers
} // end namespace clang
Index: clang/include/clang/ASTMatchers/ASTMatchFinder.h
===================================================================
--- clang/include/clang/ASTMatchers/ASTMatchFinder.h
+++ clang/include/clang/ASTMatchers/ASTMatchFinder.h
@@ -110,6 +110,13 @@
/// This id is used, for example, for the profiling output.
/// It defaults to "<unknown>".
virtual StringRef getID() const;
+
+ /// TraversalKind to use while matching and processing
+ /// the result nodes. This API is temporary to facilitate
+ /// third parties porting existing code to the default
+ /// behavior of clang-tidy.
+ virtual llvm::Optional<ast_type_traits::TraversalKind>
+ getCheckTraversalKind() const;
};
/// Called when parsing is finished. Intended for testing only.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80623.301667.patch
Type: text/x-patch
Size: 2459 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20201029/b830b0e7/attachment.bin>
More information about the cfe-commits
mailing list