From 8bb47cd8c30c29d064cefe2b69510160535727ae Mon Sep 17 00:00:00 2001 From: Yitzhak Mandelbaum Date: Wed, 16 Oct 2019 01:06:46 +0000 Subject: [libTooling] Put all Transformer declarations in a single namespace. Summary: This revision introduces a new namespace, `clang::transformer`, to hold the declarations for the Transformer library. Reviewers: gribozavr Subscribers: cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D68876 llvm-svn: 374962 --- clang/unittests/Tooling/TransformerTest.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'clang/unittests/Tooling/TransformerTest.cpp') diff --git a/clang/unittests/Tooling/TransformerTest.cpp b/clang/unittests/Tooling/TransformerTest.cpp index feae0c6..c42976a 100644 --- a/clang/unittests/Tooling/TransformerTest.cpp +++ b/clang/unittests/Tooling/TransformerTest.cpp @@ -18,9 +18,10 @@ using namespace clang; using namespace tooling; using namespace ast_matchers; - namespace { using ::testing::IsEmpty; +using transformer::RewriteRule; +using transformer::text; constexpr char KHeaderContents[] = R"cc( struct string { @@ -208,7 +209,7 @@ TEST_F(TransformerTest, AddIncludeQuoted) { TEST_F(TransformerTest, AddIncludeAngled) { RewriteRule Rule = makeRule(callExpr(callee(functionDecl(hasName("f")))), change(text("other()"))); - addInclude(Rule, "clang/OtherLib.h", IncludeFormat::Angled); + addInclude(Rule, "clang/OtherLib.h", transformer::IncludeFormat::Angled); std::string Input = R"cc( int f(int x); @@ -559,7 +560,7 @@ TEST_F(TransformerTest, OrderedRuleMultipleKinds) { change(name("fun"), text("DECL_RULE"))); RewriteRule Rule = applyFirst({ReplaceF1, DeclRule, ReplaceF1OrF2}); - EXPECT_EQ(tooling::detail::buildMatchers(Rule).size(), 2UL); + EXPECT_EQ(transformer::detail::buildMatchers(Rule).size(), 2UL); testRule(Rule, Input, Expected); } @@ -795,11 +796,11 @@ TEST_F(TransformerTest, NoPartialRewriteOfMacroExpansionForMacroArgs) { // rules. TEST(TransformerDeathTest, OrderedRuleTypes) { RewriteRule QualTypeRule = makeRule(qualType(), change(text("Q"))); - EXPECT_DEATH(tooling::detail::buildMatchers(QualTypeRule), + EXPECT_DEATH(transformer::detail::buildMatchers(QualTypeRule), "Matcher must be.*node matcher"); RewriteRule TypeRule = makeRule(arrayType(), change(text("T"))); - EXPECT_DEATH(tooling::detail::buildMatchers(TypeRule), + EXPECT_DEATH(transformer::detail::buildMatchers(TypeRule), "Matcher must be.*node matcher"); } #endif -- cgit v1.1