This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG08b289867b5a: [clang] Respect PrintingPolicy::FullyQualifiedName when printing a template-id (authored by nridge).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D104619/new/ https://reviews.llvm.org/D104619 Files: clang/lib/AST/TypePrinter.cpp clang/unittests/AST/CMakeLists.txt clang/unittests/AST/TypePrinterTest.cpp Index: clang/unittests/AST/TypePrinterTest.cpp =================================================================== --- /dev/null +++ clang/unittests/AST/TypePrinterTest.cpp @@ -0,0 +1,65 @@ +//===- unittests/AST/TypePrinterTest.cpp --- Type printer tests -----------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file contains tests for QualType::print() and related methods. +// +//===----------------------------------------------------------------------===// + +#include "ASTPrint.h" +#include "clang/AST/ASTContext.h" +#include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Tooling/Tooling.h" +#include "llvm/ADT/SmallString.h" +#include "gtest/gtest.h" + +using namespace clang; +using namespace ast_matchers; +using namespace tooling; + +namespace { + +static void PrintType(raw_ostream &Out, const ASTContext *Context, + const QualType *T, + PrintingPolicyAdjuster PolicyAdjuster) { + assert(T && !T->isNull() && "Expected non-null Type"); + PrintingPolicy Policy = Context->getPrintingPolicy(); + if (PolicyAdjuster) + PolicyAdjuster(Policy); + T->print(Out, Policy); +} + +::testing::AssertionResult +PrintedTypeMatches(StringRef Code, const std::vector<std::string> &Args, + const DeclarationMatcher &NodeMatch, + StringRef ExpectedPrinted, + PrintingPolicyAdjuster PolicyAdjuster) { + return PrintedNodeMatches<QualType>(Code, Args, NodeMatch, ExpectedPrinted, + "", PrintType, PolicyAdjuster); +} + +} // unnamed namespace + +TEST(TypePrinter, TemplateId) { + std::string Code = R"cpp( + namespace N { + template <typename> struct Type {}; + + template <typename T> + void Foo(const Type<T> &Param); + } + )cpp"; + auto Matcher = parmVarDecl(hasType(qualType().bind("id"))); + + ASSERT_TRUE(PrintedTypeMatches( + Code, {}, Matcher, "const Type<T> &", + [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = false; })); + + ASSERT_TRUE(PrintedTypeMatches( + Code, {}, Matcher, "const N::Type<T> &", + [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = true; })); +} \ No newline at end of file Index: clang/unittests/AST/CMakeLists.txt =================================================================== --- clang/unittests/AST/CMakeLists.txt +++ clang/unittests/AST/CMakeLists.txt @@ -29,6 +29,7 @@ SourceLocationTest.cpp StmtPrinterTest.cpp StructuralEquivalenceTest.cpp + TypePrinterTest.cpp ) clang_target_link_libraries(ASTTests Index: clang/lib/AST/TypePrinter.cpp =================================================================== --- clang/lib/AST/TypePrinter.cpp +++ clang/lib/AST/TypePrinter.cpp @@ -1459,7 +1459,7 @@ void TypePrinter::printTemplateSpecializationBefore( const TemplateSpecializationType *T, raw_ostream &OS) { - printTemplateId(T, OS, false); + printTemplateId(T, OS, Policy.FullyQualifiedName); } void TypePrinter::printTemplateSpecializationAfter(
Index: clang/unittests/AST/TypePrinterTest.cpp =================================================================== --- /dev/null +++ clang/unittests/AST/TypePrinterTest.cpp @@ -0,0 +1,65 @@ +//===- unittests/AST/TypePrinterTest.cpp --- Type printer tests -----------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file contains tests for QualType::print() and related methods. +// +//===----------------------------------------------------------------------===// + +#include "ASTPrint.h" +#include "clang/AST/ASTContext.h" +#include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Tooling/Tooling.h" +#include "llvm/ADT/SmallString.h" +#include "gtest/gtest.h" + +using namespace clang; +using namespace ast_matchers; +using namespace tooling; + +namespace { + +static void PrintType(raw_ostream &Out, const ASTContext *Context, + const QualType *T, + PrintingPolicyAdjuster PolicyAdjuster) { + assert(T && !T->isNull() && "Expected non-null Type"); + PrintingPolicy Policy = Context->getPrintingPolicy(); + if (PolicyAdjuster) + PolicyAdjuster(Policy); + T->print(Out, Policy); +} + +::testing::AssertionResult +PrintedTypeMatches(StringRef Code, const std::vector<std::string> &Args, + const DeclarationMatcher &NodeMatch, + StringRef ExpectedPrinted, + PrintingPolicyAdjuster PolicyAdjuster) { + return PrintedNodeMatches<QualType>(Code, Args, NodeMatch, ExpectedPrinted, + "", PrintType, PolicyAdjuster); +} + +} // unnamed namespace + +TEST(TypePrinter, TemplateId) { + std::string Code = R"cpp( + namespace N { + template <typename> struct Type {}; + + template <typename T> + void Foo(const Type<T> &Param); + } + )cpp"; + auto Matcher = parmVarDecl(hasType(qualType().bind("id"))); + + ASSERT_TRUE(PrintedTypeMatches( + Code, {}, Matcher, "const Type<T> &", + [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = false; })); + + ASSERT_TRUE(PrintedTypeMatches( + Code, {}, Matcher, "const N::Type<T> &", + [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = true; })); +} \ No newline at end of file Index: clang/unittests/AST/CMakeLists.txt =================================================================== --- clang/unittests/AST/CMakeLists.txt +++ clang/unittests/AST/CMakeLists.txt @@ -29,6 +29,7 @@ SourceLocationTest.cpp StmtPrinterTest.cpp StructuralEquivalenceTest.cpp + TypePrinterTest.cpp ) clang_target_link_libraries(ASTTests Index: clang/lib/AST/TypePrinter.cpp =================================================================== --- clang/lib/AST/TypePrinter.cpp +++ clang/lib/AST/TypePrinter.cpp @@ -1459,7 +1459,7 @@ void TypePrinter::printTemplateSpecializationBefore( const TemplateSpecializationType *T, raw_ostream &OS) { - printTemplateId(T, OS, false); + printTemplateId(T, OS, Policy.FullyQualifiedName); } void TypePrinter::printTemplateSpecializationAfter(
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
