f00kat created this revision. f00kat added reviewers: aaron.ballman, alexfh, hokein, JonasToth. f00kat added a project: clang. Herald added a subscriber: cfe-commits.
In this case https://reviews.llvm.org/D73090#1840501 @aaron.ballman suggest to add new AST matcher for tagDecl to avoid using recordDecl and enumDecl together. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D73464 Files: clang/include/clang/ASTMatchers/ASTMatchers.h clang/lib/ASTMatchers/ASTMatchersInternal.cpp clang/lib/ASTMatchers/Dynamic/Registry.cpp clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
Index: clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp =================================================================== --- clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp @@ -184,6 +184,13 @@ EXPECT_TRUE(notMatches("enum X {};", Matcher)); } +TEST(TagDecl, MatchesTagDecls) { + EXPECT_TRUE(matches("struct X {};", tagDecl(hasName("X")))); + EXPECT_TRUE(matches("class C {};", tagDecl(hasName("C")))); + EXPECT_TRUE(matches("union U {};", tagDecl(hasName("U")))); + EXPECT_TRUE(matches("enum E {};", tagDecl(hasName("E")))); +} + TEST(Matcher, UnresolvedLookupExpr) { // FIXME: The test is known to be broken on Windows with delayed template // parsing. Index: clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp =================================================================== --- clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp +++ clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp @@ -2504,6 +2504,13 @@ EXPECT_TRUE(notMatches("enum X {};", enumDecl(isScoped()))); } +TEST(TagDeclKind, MatchesTagDeclKind) { + EXPECT_TRUE(matches("struct X {};", tagDecl(isStruct()))); + EXPECT_TRUE(matches("class C {};", tagDecl(isClass()))); + EXPECT_TRUE(matches("union U {};", tagDecl(isUnion()))); + EXPECT_TRUE(matches("enum E {};", tagDecl(isEnum()))); +} + TEST(HasTrailingReturn, MatchesTrailingReturn) { EXPECT_TRUE(matches("auto Y() -> int { return 0; }", functionDecl(hasTrailingReturn()))); Index: clang/lib/ASTMatchers/Dynamic/Registry.cpp =================================================================== --- clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -208,6 +208,8 @@ REGISTER_MATCHER(doStmt); REGISTER_MATCHER(eachOf); REGISTER_MATCHER(elaboratedType); + REGISTER_MATCHER(tagDecl); + REGISTER_MATCHER(tagType); REGISTER_MATCHER(enumConstantDecl); REGISTER_MATCHER(enumDecl); REGISTER_MATCHER(enumType); Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp =================================================================== --- clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -647,6 +647,7 @@ const internal::VariadicDynCastAllOfMatcher<Decl, EnumDecl> enumDecl; const internal::VariadicDynCastAllOfMatcher<Decl, EnumConstantDecl> enumConstantDecl; +const internal::VariadicDynCastAllOfMatcher<Decl, TagDecl> tagDecl; const internal::VariadicDynCastAllOfMatcher<Decl, CXXMethodDecl> cxxMethodDecl; const internal::VariadicDynCastAllOfMatcher<Decl, CXXConversionDecl> cxxConversionDecl; Index: clang/include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- clang/include/clang/ASTMatchers/ASTMatchers.h +++ clang/include/clang/ASTMatchers/ASTMatchers.h @@ -1194,6 +1194,20 @@ extern const internal::VariadicDynCastAllOfMatcher<Decl, EnumConstantDecl> enumConstantDecl; +/// Matches tag declarations. +/// +/// Example matches X, Z, U, S, E +/// \code +/// class X; +/// template<class T> class Z {}; +/// struct S {}; +/// union U {}; +/// enum E { +/// A, B, C +/// }; +/// \endcode +extern const internal::VariadicDynCastAllOfMatcher<Decl, TagDecl> tagDecl; + /// Matches method declarations. /// /// Example matches y @@ -4845,42 +4859,58 @@ return InnerMatcher.matches(Node.getType(), Finder, Builder); } -/// Matches RecordDecl object that are spelled with "struct." +/// Matches TagDecl object that are spelled with "struct." /// -/// Example matches S, but not C or U. +/// Example matches S, but not C, U or E. /// \code /// struct S {}; /// class C {}; /// union U {}; +/// enum E {}; /// \endcode -AST_MATCHER(RecordDecl, isStruct) { +AST_MATCHER(TagDecl, isStruct) { return Node.isStruct(); } -/// Matches RecordDecl object that are spelled with "union." +/// Matches TagDecl object that are spelled with "union." /// -/// Example matches U, but not C or S. +/// Example matches U, but not C, S or E. /// \code /// struct S {}; /// class C {}; /// union U {}; +/// enum E {}; /// \endcode -AST_MATCHER(RecordDecl, isUnion) { +AST_MATCHER(TagDecl, isUnion) { return Node.isUnion(); } -/// Matches RecordDecl object that are spelled with "class." +/// Matches TagDecl object that are spelled with "class." /// -/// Example matches C, but not S or U. +/// Example matches C, but not S, U or E. /// \code /// struct S {}; /// class C {}; /// union U {}; +/// enum E {}; /// \endcode -AST_MATCHER(RecordDecl, isClass) { +AST_MATCHER(TagDecl, isClass) { return Node.isClass(); } +/// Matches TagDecl object that are spelled with "enum." +/// +/// Example matches E, but not C, S or U. +/// \code +/// struct S {}; +/// class C {}; +/// union U {}; +/// enum E {}; +/// \endcode +AST_MATCHER(TagDecl, isEnum) { + return Node.isEnum(); +} + /// Matches the true branch expression of a conditional operator. /// /// Example 1 (conditional ternary operator): matches a
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits