This is an archive of the discontinued LLVM Phabricator instance.

Differential D54406

Add matchDynamic convenience functions
ClosedPublic

Authored by steveire on Nov 11 2018, 2:37 PM.

Details

Reviewers
aaron.ballman
Commits
rG2e8dc8590d8b: Add matchDynamic convenience functions
Summary

These correspond to the existing match() free functions.

Diff Detail

Event Timeline

steveire created this revision.Nov 11 2018, 2:37 PM
Herald added a subscriber: cfe-commits. · View Herald TranscriptNov 11 2018, 2:37 PM
Harbormaster completed remote builds in B24865: Diff 173590.Nov 11 2018, 2:37 PM
aaron.ballman added inline comments.Nov 11 2018, 3:50 PM
include/clang/ASTMatchers/ASTMatchFinder.h
314

80-col issue.

325–326

Same here; run the patch through clang-format?

steveire updated this revision to Diff 173768.Nov 12 2018, 2:42 PM

Update

Harbormaster completed remote builds in B24916: Diff 173768.Nov 12 2018, 2:42 PM
aaron.ballman accepted this revision.Nov 12 2018, 3:03 PM

LGTM!

This revision is now accepted and ready to land.Nov 12 2018, 3:03 PM
steveire closed this revision.Dec 6 2019, 4:02 PM

Committed in 2e8dc8590d8b412

Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2019, 4:02 PM

Revision Contents

PathSize
include/
clang/
ASTMatchers/
27 lines
unittests/
ASTMatchers/
24 lines

Diff 173768

include/clang/ASTMatchers/ASTMatchFinder.h

Show First 20 Lines • Show All 304 Lines • ▼ Show 20 Lines
match(MatcherT Matcher, ASTContext &Context) { match(MatcherT Matcher, ASTContext &Context) {
internal::CollectMatchesCallback Callback; internal::CollectMatchesCallback Callback;
MatchFinder Finder; MatchFinder Finder;
Finder.addMatcher(Matcher, &Callback); Finder.addMatcher(Matcher, &Callback);
Finder.matchAST(Context); Finder.matchAST(Context);
return std::move(Callback.Nodes); return std::move(Callback.Nodes);
} }
inline SmallVector<BoundNodes, 1>
matchDynamic(internal::DynTypedMatcher Matcher,
aaron.ballmanUnsubmitted
Not Done
ReplyInline Actions

80-col issue.

aaron.ballman: 80-col issue.
const ast_type_traits::DynTypedNode &Node, ASTContext &Context) {
internal::CollectMatchesCallback Callback;
MatchFinder Finder;
Finder.addDynamicMatcher(Matcher, &Callback);
Finder.match(Node, Context);
return std::move(Callback.Nodes);
}
template <typename NodeT>
SmallVector<BoundNodes, 1> matchDynamic(internal::DynTypedMatcher Matcher,
const NodeT &Node,
ASTContext &Context) {
aaron.ballmanUnsubmitted
Not Done
ReplyInline Actions

Same here; run the patch through clang-format?

aaron.ballman: Same here; run the patch through clang-format?
return matchDynamic(Matcher, ast_type_traits::DynTypedNode::create(Node),
Context);
}
inline SmallVector<BoundNodes, 1>
matchDynamic(internal::DynTypedMatcher Matcher, ASTContext &Context) {
internal::CollectMatchesCallback Callback;
MatchFinder Finder;
Finder.addDynamicMatcher(Matcher, &Callback);
Finder.matchAST(Context);
return std::move(Callback.Nodes);
}
} // end namespace ast_matchers } // end namespace ast_matchers
} // end namespace clang } // end namespace clang
#endif #endif

unittests/ASTMatchers/ASTMatchersNodeTest.cpp

Show First 20 Lines • Show All 1,713 Lines • ▼ Show 20 Lines std::string ObjCString =
" int x = 1;" " int x = 1;"
"}" "}"
"}"; "}";
EXPECT_TRUE(matchesObjC(ObjCString, autoreleasePoolStmt())); EXPECT_TRUE(matchesObjC(ObjCString, autoreleasePoolStmt()));
std::string ObjCStringNoPool = "void f() { int x = 1; }"; std::string ObjCStringNoPool = "void f() { int x = 1; }";
EXPECT_FALSE(matchesObjC(ObjCStringNoPool, autoreleasePoolStmt())); EXPECT_FALSE(matchesObjC(ObjCStringNoPool, autoreleasePoolStmt()));
} }
TEST(MatchFinderAPI, matchesDynamic) {
std::string SourceCode = "struct A { void f() {} };";
auto Matcher = functionDecl(isDefinition()).bind("method");
auto astUnit = tooling::buildASTFromCode(SourceCode);
auto GlobalBoundNodes = matchDynamic(Matcher, astUnit->getASTContext());
EXPECT_EQ(GlobalBoundNodes.size(), 1u);
EXPECT_EQ(GlobalBoundNodes[0].getMap().size(), 1u);
auto GlobalMethodNode = GlobalBoundNodes[0].getNodeAs<FunctionDecl>("method");
EXPECT_TRUE(GlobalMethodNode != nullptr);
auto MethodBoundNodes =
matchDynamic(Matcher, *GlobalMethodNode, astUnit->getASTContext());
EXPECT_EQ(MethodBoundNodes.size(), 1u);
EXPECT_EQ(MethodBoundNodes[0].getMap().size(), 1u);
auto MethodNode = MethodBoundNodes[0].getNodeAs<FunctionDecl>("method");
EXPECT_EQ(MethodNode, GlobalMethodNode);
}
} // namespace ast_matchers } // namespace ast_matchers
} // namespace clang } // namespace clang