Author: kastiglione Date: Thu Oct 26 08:53:37 2017 New Revision: 316670 URL: http://llvm.org/viewvc/llvm-project?rev=316670&view=rev Log: Add objcCategoryImplDecl matcher
Summary: Add `objcCategoryImplDecl` which matches ObjC category definitions (`@implementation`). This matcher complements `objcCategoryDecl` (`@interface`) which was added in D30854. Reviewers: aaron.ballman, malcolm.parsons, alexshap Reviewed By: aaron.ballman Subscribers: klimek, cfe-commits Differential Revision: https://reviews.llvm.org/D39293 Modified: cfe/trunk/docs/LibASTMatchersReference.html cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp cfe/trunk/unittests/ASTMatchers/ASTMatchersNodeTest.cpp Modified: cfe/trunk/docs/LibASTMatchersReference.html URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/LibASTMatchersReference.html?rev=316670&r1=316669&r2=316670&view=diff ============================================================================== --- cfe/trunk/docs/LibASTMatchersReference.html (original) +++ cfe/trunk/docs/LibASTMatchersReference.html Thu Oct 26 08:53:37 2017 @@ -346,6 +346,15 @@ Example matches Foo (Additions) </pre></td></tr> +<tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html";>Decl</a>></td><td class="name" onclick="toggle('objcCategoryImplDecl0')"><a name="objcCategoryImplDecl0Anchor">objcCategoryImplDecl</a></td><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1ObjCCategoryImplDecl.html";>ObjCCategoryImplDecl</a>>...</td></tr> +<tr><td colspan="4" class="doc" id="objcCategoryImplDecl0"><pre>Matches Objective-C category definitions. + +Example matches Foo (Additions) + @implementation Foo (Additions) + @end +</pre></td></tr> + + <tr><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1Decl.html";>Decl</a>></td><td class="name" onclick="toggle('objcImplementationDecl0')"><a name="objcImplementationDecl0Anchor">objcImplementationDecl</a></td><td>Matcher<<a href="http://clang.llvm.org/doxygen/classclang_1_1ObjCImplementationDecl.html";>ObjCImplementationDecl</a>>...</td></tr> <tr><td colspan="4" class="doc" id="objcImplementationDecl0"><pre>Matches Objective-C implementation declarations. Modified: cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h?rev=316670&r1=316669&r2=316670&view=diff ============================================================================== --- cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h (original) +++ cfe/trunk/include/clang/ASTMatchers/ASTMatchers.h Thu Oct 26 08:53:37 2017 @@ -1178,6 +1178,17 @@ const internal::VariadicDynCastAllOfMatc Decl, ObjCCategoryDecl> objcCategoryDecl; +/// \brief Matches Objective-C category definitions. +/// +/// Example matches Foo (Additions) +/// \code +/// @implementation Foo (Additions) +/// @end +/// \endcode +const internal::VariadicDynCastAllOfMatcher< + Decl, + ObjCCategoryImplDecl> objcCategoryImplDecl; + /// \brief Matches Objective-C method declarations. /// /// Example matches both declaration and definition of -[Foo method] Modified: cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp?rev=316670&r1=316669&r2=316670&view=diff ============================================================================== --- cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp (original) +++ cfe/trunk/lib/ASTMatchers/Dynamic/Registry.cpp Thu Oct 26 08:53:37 2017 @@ -375,6 +375,7 @@ RegistryMaps::RegistryMaps() { REGISTER_MATCHER(numSelectorArgs); REGISTER_MATCHER(ofClass); REGISTER_MATCHER(objcCategoryDecl); + REGISTER_MATCHER(objcCategoryImplDecl); REGISTER_MATCHER(objcImplementationDecl); REGISTER_MATCHER(objcInterfaceDecl); REGISTER_MATCHER(objcIvarDecl); Modified: cfe/trunk/unittests/ASTMatchers/ASTMatchersNodeTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersNodeTest.cpp?rev=316670&r1=316669&r2=316670&view=diff ============================================================================== --- cfe/trunk/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (original) +++ cfe/trunk/unittests/ASTMatchers/ASTMatchersNodeTest.cpp Thu Oct 26 08:53:37 2017 @@ -1590,7 +1590,7 @@ TEST(ObjCMessageExprMatcher, SimpleExprs ))); } -TEST(ObjCDeclMacher, CoreDecls) { +TEST(ObjCDeclMatcher, CoreDecls) { std::string ObjCString = "@protocol Proto " "- (void)protoDidThing; " @@ -1605,6 +1605,9 @@ TEST(ObjCDeclMacher, CoreDecls) { "{ id _ivar; } " "- (void)anything {} " "@end " + "@implementation Thing (ABC) " + "- (void)abc_doThing {} " + "@end " ; EXPECT_TRUE(matchesObjC( @@ -1618,6 +1621,9 @@ TEST(ObjCDeclMacher, CoreDecls) { objcCategoryDecl(hasName("ABC")))); EXPECT_TRUE(matchesObjC( ObjCString, + objcCategoryImplDecl(hasName("ABC")))); + EXPECT_TRUE(matchesObjC( + ObjCString, objcMethodDecl(hasName("protoDidThing")))); EXPECT_TRUE(matchesObjC( ObjCString, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
