diff options
-rw-r--r-- | clang/lib/AST/ASTTypeTraits.cpp | 4 | ||||
-rw-r--r-- | clang/unittests/AST/ASTTypeTraitsTest.cpp | 17 | ||||
-rw-r--r-- | clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp | 2 | ||||
-rw-r--r-- | clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp | 17 |
4 files changed, 25 insertions, 15 deletions
diff --git a/clang/lib/AST/ASTTypeTraits.cpp b/clang/lib/AST/ASTTypeTraits.cpp index 5019be45b59..2336c98fe04 100644 --- a/clang/lib/AST/ASTTypeTraits.cpp +++ b/clang/lib/AST/ASTTypeTraits.cpp @@ -22,12 +22,12 @@ namespace ast_type_traits { const ASTNodeKind::KindInfo ASTNodeKind::AllKindInfo[] = { { NKI_None, "<None>" }, - { NKI_None, "CXXCtorInitializer" }, { NKI_None, "TemplateArgument" }, - { NKI_None, "NestedNameSpecifier" }, { NKI_None, "NestedNameSpecifierLoc" }, { NKI_None, "QualType" }, { NKI_None, "TypeLoc" }, + { NKI_None, "CXXCtorInitializer" }, + { NKI_None, "NestedNameSpecifier" }, { NKI_None, "Decl" }, #define DECL(DERIVED, BASE) { NKI_##BASE, #DERIVED "Decl" }, #include "clang/AST/DeclNodes.inc" diff --git a/clang/unittests/AST/ASTTypeTraitsTest.cpp b/clang/unittests/AST/ASTTypeTraitsTest.cpp index b6356538a12..436cd775141 100644 --- a/clang/unittests/AST/ASTTypeTraitsTest.cpp +++ b/clang/unittests/AST/ASTTypeTraitsTest.cpp @@ -107,10 +107,21 @@ TEST(ASTNodeKind, UnknownKind) { } TEST(ASTNodeKind, Name) { - EXPECT_EQ("Decl", DNT<Decl>().asStringRef()); - EXPECT_EQ("CallExpr", DNT<CallExpr>().asStringRef()); - EXPECT_EQ("ConstantArrayType", DNT<ConstantArrayType>().asStringRef()); EXPECT_EQ("<None>", ASTNodeKind().asStringRef()); +#define VERIFY_NAME(Node) EXPECT_EQ(#Node, DNT<Node>().asStringRef()); + VERIFY_NAME(TemplateArgument); + VERIFY_NAME(NestedNameSpecifierLoc); + VERIFY_NAME(QualType); + VERIFY_NAME(TypeLoc); + VERIFY_NAME(CXXCtorInitializer); + VERIFY_NAME(NestedNameSpecifier); + VERIFY_NAME(Decl); + VERIFY_NAME(CXXRecordDecl); + VERIFY_NAME(Stmt); + VERIFY_NAME(CallExpr); + VERIFY_NAME(Type); + VERIFY_NAME(ConstantArrayType); +#undef VERIFY_NAME } TEST(DynTypedNode, DeclSourceRange) { diff --git a/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp b/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp index 81373dab96a..553427c9a40 100644 --- a/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp +++ b/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp @@ -320,7 +320,7 @@ TEST(ParserTest, CompletionNamedValues) { EXPECT_EQ("arent(", Comps[2].TypedText); EXPECT_EQ( "Matcher<Decl> " - "hasParent(Matcher<TemplateArgument|NestedNameSpecifierLoc|Decl|...>)", + "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)", Comps[2].MatcherDecl); } diff --git a/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp b/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp index 3b0bd51ec91..6bbbc2bd356 100644 --- a/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp +++ b/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp @@ -449,26 +449,25 @@ TEST_F(RegistryTest, Completion) { // Overloaded EXPECT_TRUE(hasCompletion( Comps, "hasParent(", - "Matcher<TemplateArgument|NestedNameSpecifierLoc|Decl|...> " - "hasParent(Matcher<TemplateArgument|NestedNameSpecifierLoc|Decl|...>)")); + "Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...> " + "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)")); // Variadic. EXPECT_TRUE(hasCompletion(Comps, "whileStmt(", "Matcher<Stmt> whileStmt(Matcher<WhileStmt>...)")); // Polymorphic. EXPECT_TRUE(hasCompletion( Comps, "hasDescendant(", - "Matcher<TemplateArgument|NestedNameSpecifier|NestedNameSpecifierLoc|...>" - " hasDescendant(Matcher<TemplateArgument|NestedNameSpecifier|" - "NestedNameSpecifierLoc|...>)")); + "Matcher<NestedNameSpecifierLoc|QualType|TypeLoc|...> " + "hasDescendant(Matcher<NestedNameSpecifierLoc|QualType|TypeLoc|...>)")); CompVector WhileComps = getCompletions("whileStmt", 0); EXPECT_TRUE(hasCompletion(WhileComps, "hasBody(", "Matcher<WhileStmt> hasBody(Matcher<Stmt>)")); - EXPECT_TRUE(hasCompletion(WhileComps, "hasParent(", - "Matcher<Stmt> " - "hasParent(Matcher<TemplateArgument|" - "NestedNameSpecifierLoc|Decl|...>)")); + EXPECT_TRUE(hasCompletion( + WhileComps, "hasParent(", + "Matcher<Stmt> " + "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)")); EXPECT_TRUE( hasCompletion(WhileComps, "allOf(", "Matcher<T> allOf(Matcher<T>...)")); |