[libTooling] Move Transformer files to their own directory/library.

Summary:
The Transformer library has been growing inside of
lib/Tooling/Refactoring. However, it's not really related to anything else in
that directory. This revision moves all Transformer-related files into their own
include & lib directories.  A followup revision will (temporarily) add
forwarding headers to help any users migrate their code to the new location.

Reviewers: gribozavr

Subscribers: mgorny, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D68637

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@374271 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Tooling/Refactoring/MatchConsumer.h b/include/clang/Tooling/Transformer/MatchConsumer.h
similarity index 92%
rename from include/clang/Tooling/Refactoring/MatchConsumer.h
rename to include/clang/Tooling/Transformer/MatchConsumer.h
index d516550d0f02b99b5904d8d534193f781f415a8c..51eb6af25a40e84010caa88756e96bcbf65f5bca 100644 (file)
--- a/include/clang/Tooling/Refactoring/MatchConsumer.h
+++ b/include/clang/Tooling/Transformer/MatchConsumer.h
@@ -12,8 +12,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_REFACTOR_MATCH_CONSUMER_H_
-#define LLVM_CLANG_TOOLING_REFACTOR_MATCH_CONSUMER_H_
+#ifndef LLVM_CLANG_TOOLING_TRANSFORMER_MATCH_CONSUMER_H_
+#define LLVM_CLANG_TOOLING_TRANSFORMER_MATCH_CONSUMER_H_
 
 #include "clang/AST/ASTTypeTraits.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
@@ -55,4 +55,4 @@ MatchConsumer<T> ifBound(std::string ID, MatchConsumer<T> TrueC,
 
 } // namespace tooling
 } // namespace clang
-#endif // LLVM_CLANG_TOOLING_REFACTOR_MATCH_CONSUMER_H_
+#endif // LLVM_CLANG_TOOLING_TRANSFORMER_MATCH_CONSUMER_H_

diff --git a/include/clang/Tooling/Refactoring/RangeSelector.h b/include/clang/Tooling/Transformer/RangeSelector.h
similarity index 98%
rename from include/clang/Tooling/Refactoring/RangeSelector.h
rename to include/clang/Tooling/Transformer/RangeSelector.h
index d5b5c8fbd8a5bceeb82799c6779c5d507df94fc5..e178fb36a8e368b057a93a0cc4ae29aa4737a415 100644 (file)
--- a/include/clang/Tooling/Refactoring/RangeSelector.h
+++ b/include/clang/Tooling/Transformer/RangeSelector.h
@@ -17,7 +17,7 @@
 
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Basic/SourceLocation.h"
-#include "clang/Tooling/Refactoring/MatchConsumer.h"
+#include "clang/Tooling/Transformer/MatchConsumer.h"
 #include "llvm/Support/Error.h"
 #include <functional>
 #include <string>

diff --git a/include/clang/Tooling/Refactoring/SourceCode.h b/include/clang/Tooling/Transformer/SourceCode.h
similarity index 95%
rename from include/clang/Tooling/Refactoring/SourceCode.h
rename to include/clang/Tooling/Transformer/SourceCode.h
index 72dbee4a4317059a185d42626e9d16f4ca1de4d5..bc9cc3d2a258098e5a2f4863dbd53b0d5a5c234e 100644 (file)
--- a/include/clang/Tooling/Refactoring/SourceCode.h
+++ b/include/clang/Tooling/Transformer/SourceCode.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_H
-#define LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_H
+#ifndef LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_H
+#define LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_H
 
 #include "clang/AST/ASTContext.h"
 #include "clang/Basic/SourceLocation.h"
@@ -87,4 +87,4 @@ getRangeForEdit(const CharSourceRange &EditRange, const ASTContext &Context) {
 }
 } // namespace tooling
 } // namespace clang
-#endif // LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_H
+#endif // LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_H

diff --git a/include/clang/Tooling/Refactoring/SourceCodeBuilders.h b/include/clang/Tooling/Transformer/SourceCodeBuilders.h
similarity index 94%
rename from include/clang/Tooling/Refactoring/SourceCodeBuilders.h
rename to include/clang/Tooling/Transformer/SourceCodeBuilders.h
index 797046f3ecffb4843a79135db0b0ec1f5dc9522a..6c79a7588f28d73bf8a15b43fbe581b51e1d3238 100644 (file)
--- a/include/clang/Tooling/Refactoring/SourceCodeBuilders.h
+++ b/include/clang/Tooling/Transformer/SourceCodeBuilders.h
@@ -11,8 +11,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_BUILDERS_H_
-#define LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_BUILDERS_H_
+#ifndef LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_BUILDERS_H_
+#define LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_BUILDERS_H_
 
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Expr.h"
@@ -83,4 +83,4 @@ llvm::Optional<std::string> buildArrow(const Expr &E,
 
 } // namespace tooling
 } // namespace clang
-#endif // LLVM_CLANG_TOOLING_REFACTOR_SOURCE_CODE_BUILDERS_H_
+#endif // LLVM_CLANG_TOOLING_TRANSFORMER_SOURCE_CODE_BUILDERS_H_

diff --git a/include/clang/Tooling/Refactoring/Stencil.h b/include/clang/Tooling/Transformer/Stencil.h
similarity index 96%
rename from include/clang/Tooling/Refactoring/Stencil.h
rename to include/clang/Tooling/Transformer/Stencil.h
index b80320d409b334c36648f1a19a72ff58694c700b..617585cacdbfb5ac62ad499fa261deb180b3ff26 100644 (file)
--- a/include/clang/Tooling/Refactoring/Stencil.h
+++ b/include/clang/Tooling/Transformer/Stencil.h
@@ -17,14 +17,14 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_REFACTOR_STENCIL_H_
-#define LLVM_CLANG_TOOLING_REFACTOR_STENCIL_H_
+#ifndef LLVM_CLANG_TOOLING_TRANSFORMER_STENCIL_H_
+#define LLVM_CLANG_TOOLING_TRANSFORMER_STENCIL_H_
 
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTTypeTraits.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Refactoring/MatchConsumer.h"
-#include "clang/Tooling/Refactoring/RangeSelector.h"
+#include "clang/Tooling/Transformer/MatchConsumer.h"
+#include "clang/Tooling/Transformer/RangeSelector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include <string>
@@ -223,4 +223,4 @@ StencilPart dPrint(llvm::StringRef Id);
 } // namespace stencil
 } // namespace tooling
 } // namespace clang
-#endif // LLVM_CLANG_TOOLING_REFACTOR_STENCIL_H_
+#endif // LLVM_CLANG_TOOLING_TRANSFORMER_STENCIL_H_

diff --git a/include/clang/Tooling/Refactoring/Transformer.h b/include/clang/Tooling/Transformer/Transformer.h
similarity index 98%
rename from include/clang/Tooling/Refactoring/Transformer.h
rename to include/clang/Tooling/Transformer/Transformer.h
index 0971cc3e667932c041c5d805c92bf38b57c65aad..0dc1e820e21bf7e4ea8a12f37c7b92958fb810b4 100644 (file)
--- a/include/clang/Tooling/Refactoring/Transformer.h
+++ b/include/clang/Tooling/Transformer/Transformer.h
@@ -12,15 +12,15 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_REFACTOR_TRANSFORMER_H_
-#define LLVM_CLANG_TOOLING_REFACTOR_TRANSFORMER_H_
+#ifndef LLVM_CLANG_TOOLING_TRANSFORMER_TRANSFORMER_H_
+#define LLVM_CLANG_TOOLING_TRANSFORMER_TRANSFORMER_H_
 
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchersInternal.h"
 #include "clang/Tooling/Refactoring/AtomicChange.h"
-#include "clang/Tooling/Refactoring/MatchConsumer.h"
-#include "clang/Tooling/Refactoring/RangeSelector.h"
+#include "clang/Tooling/Transformer/MatchConsumer.h"
+#include "clang/Tooling/Transformer/RangeSelector.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Error.h"
@@ -317,4 +317,4 @@ private:
 } // namespace tooling
 } // namespace clang
 
-#endif // LLVM_CLANG_TOOLING_REFACTOR_TRANSFORMER_H_
+#endif // LLVM_CLANG_TOOLING_TRANSFORMER_TRANSFORMER_H_

diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt
index 81185d7417d79b33b950d5f5d8695dcd33c6bbd1..05061f0a10a804d098f4e796110c766ba35b6d40 100644 (file)
--- a/lib/Tooling/CMakeLists.txt
+++ b/lib/Tooling/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(Refactoring)
 add_subdirectory(ASTDiff)
 add_subdirectory(Syntax)
 add_subdirectory(DependencyScanning)
+add_subdirectory(Transformer)
 
 add_clang_library(clangTooling
   AllTUsExecution.cpp

diff --git a/lib/Tooling/Refactoring/CMakeLists.txt b/lib/Tooling/Refactoring/CMakeLists.txt
index e3961db2841ec9b8ddd1cf02329e722c87aa34d5..db889d2a06b5b2360db8b7a1a4527c8e3ed98190 100644 (file)
--- a/lib/Tooling/Refactoring/CMakeLists.txt
+++ b/lib/Tooling/Refactoring/CMakeLists.txt
@@ -6,17 +6,12 @@ add_clang_library(clangToolingRefactoring
   AtomicChange.cpp
   Extract/Extract.cpp
   Extract/SourceExtraction.cpp
-  RangeSelector.cpp
   RefactoringActions.cpp
   Rename/RenamingAction.cpp
   Rename/SymbolOccurrences.cpp
   Rename/USRFinder.cpp
   Rename/USRFindingAction.cpp
   Rename/USRLocFinder.cpp
-  SourceCode.cpp
-  SourceCodeBuilders.cpp
-  Stencil.cpp
-  Transformer.cpp
 
   LINK_LIBS
   clangAST

diff --git a/lib/Tooling/Transformer/CMakeLists.txt b/lib/Tooling/Transformer/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2e9ba58
--- /dev/null
+++ b/lib/Tooling/Transformer/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(LLVM_LINK_COMPONENTS Support)
+
+add_clang_library(clangTransformer
+  RangeSelector.cpp
+  SourceCode.cpp
+  SourceCodeBuilders.cpp
+  Stencil.cpp
+  Transformer.cpp
+
+  LINK_LIBS
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangLex
+  clangToolingCore
+  clangToolingRefactoring
+  )

diff --git a/lib/Tooling/Refactoring/RangeSelector.cpp b/lib/Tooling/Transformer/RangeSelector.cpp
similarity index 99%
rename from lib/Tooling/Refactoring/RangeSelector.cpp
rename to lib/Tooling/Transformer/RangeSelector.cpp
index 972c7e65540a9100b90de0189683506d62a80e2e..496c2d987c40f2f3a52d95e9f9a349d05d598aac 100644 (file)
--- a/lib/Tooling/Refactoring/RangeSelector.cpp
+++ b/lib/Tooling/Transformer/RangeSelector.cpp
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/RangeSelector.h"
+#include "clang/Tooling/Transformer/RangeSelector.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Lex/Lexer.h"
-#include "clang/Tooling/Refactoring/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"

diff --git a/lib/Tooling/Refactoring/SourceCode.cpp b/lib/Tooling/Transformer/SourceCode.cpp
similarity index 98%
rename from lib/Tooling/Refactoring/SourceCode.cpp
rename to lib/Tooling/Transformer/SourceCode.cpp
index cee8f43f3e60953c8816aeab870741eb07fcf267..836401d1e605c2f720e169e8bde1c770f2e428b0 100644 (file)
--- a/lib/Tooling/Refactoring/SourceCode.cpp
+++ b/lib/Tooling/Transformer/SourceCode.cpp
@@ -9,7 +9,7 @@
 //  This file provides functions that simplify extraction of source code.
 //
 //===----------------------------------------------------------------------===//
-#include "clang/Tooling/Refactoring/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
 #include "clang/Lex/Lexer.h"
 
 using namespace clang;

diff --git a/lib/Tooling/Refactoring/SourceCodeBuilders.cpp b/lib/Tooling/Transformer/SourceCodeBuilders.cpp
similarity index 98%
rename from lib/Tooling/Refactoring/SourceCodeBuilders.cpp
rename to lib/Tooling/Transformer/SourceCodeBuilders.cpp
index 2499c0f1eb398f5e596e8d9d08407f6b05c9321f..56ec45e8fd1dc3da8e676db7a3aeb3e40c001dc1 100644 (file)
--- a/lib/Tooling/Refactoring/SourceCodeBuilders.cpp
+++ b/lib/Tooling/Transformer/SourceCodeBuilders.cpp
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/SourceCodeBuilders.h"
+#include "clang/Tooling/Transformer/SourceCodeBuilders.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/Tooling/Refactoring/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
 #include "llvm/ADT/Twine.h"
 #include <string>
 

diff --git a/lib/Tooling/Refactoring/Stencil.cpp b/lib/Tooling/Transformer/Stencil.cpp
similarity index 98%
rename from lib/Tooling/Refactoring/Stencil.cpp
rename to lib/Tooling/Transformer/Stencil.cpp
index ebfe78099db21472795d96996583f3140dd678a6..82fde2bc4db02df6efec20787619574c175a053c 100644 (file)
--- a/lib/Tooling/Refactoring/Stencil.cpp
+++ b/lib/Tooling/Transformer/Stencil.cpp
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/Stencil.h"
+#include "clang/Tooling/Transformer/Stencil.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTTypeTraits.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Lex/Lexer.h"
-#include "clang/Tooling/Refactoring/SourceCode.h"
-#include "clang/Tooling/Refactoring/SourceCodeBuilders.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCodeBuilders.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Errc.h"
 #include <atomic>

diff --git a/lib/Tooling/Refactoring/Transformer.cpp b/lib/Tooling/Transformer/Transformer.cpp
similarity index 98%
rename from lib/Tooling/Refactoring/Transformer.cpp
rename to lib/Tooling/Transformer/Transformer.cpp
index 905d5944449c93b7cb423ad9e37eb3534b83b9ed..1aecf6ab8e140e54da2e9264d2551f45f015d3c5 100644 (file)
--- a/lib/Tooling/Refactoring/Transformer.cpp
+++ b/lib/Tooling/Transformer/Transformer.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/Transformer.h"
+#include "clang/Tooling/Transformer/Transformer.h"
 #include "clang/AST/Expr.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
@@ -14,15 +14,15 @@
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Rewrite/Core/Rewriter.h"
 #include "clang/Tooling/Refactoring/AtomicChange.h"
-#include "clang/Tooling/Refactoring/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
+#include <map>
 #include <string>
 #include <utility>
 #include <vector>
-#include <map>
 
 using namespace clang;
 using namespace tooling;

diff --git a/unittests/Tooling/CMakeLists.txt b/unittests/Tooling/CMakeLists.txt
index 2b35302c7b1faa58fc3d45306157da6960c87ebe..5cef154926aeba13a9f4a90a9b94b2d15636a1c2 100644 (file)
--- a/unittests/Tooling/CMakeLists.txt
+++ b/unittests/Tooling/CMakeLists.txt
@@ -75,6 +75,7 @@ clang_target_link_libraries(ToolingTests
   clangToolingCore
   clangToolingInclusions
   clangToolingRefactoring
+  clangTransformer
   )
 
 target_link_libraries(ToolingTests

diff --git a/unittests/Tooling/RangeSelectorTest.cpp b/unittests/Tooling/RangeSelectorTest.cpp
index 58ce63cbd750fc7cd3ae1e4a60d5c0d1d4a1771e..29a20a9f18d799dbd9b77e474782a7bf4e6b3f31 100644 (file)
--- a/unittests/Tooling/RangeSelectorTest.cpp
+++ b/unittests/Tooling/RangeSelectorTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/RangeSelector.h"
+#include "clang/Tooling/Transformer/RangeSelector.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Tooling/FixIt.h"

diff --git a/unittests/Tooling/SourceCodeBuildersTest.cpp b/unittests/Tooling/SourceCodeBuildersTest.cpp
index 2bf50ffad58503401508cc831cdd2dd7e977ffb2..9b5e7bf3ba8da69300ffcf36e9354ea630d814f9 100644 (file)
--- a/unittests/Tooling/SourceCodeBuildersTest.cpp
+++ b/unittests/Tooling/SourceCodeBuildersTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/SourceCodeBuilders.h"
+#include "clang/Tooling/Transformer/SourceCodeBuilders.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/Tooling.h"

diff --git a/unittests/Tooling/SourceCodeTest.cpp b/unittests/Tooling/SourceCodeTest.cpp
index e3da9bf14b62ede73eb89dbedf52e4472b2ff61b..eb28d7cf27d607490b60c345f7b20cc386e4c21b 100644 (file)
--- a/unittests/Tooling/SourceCodeTest.cpp
+++ b/unittests/Tooling/SourceCodeTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/SourceCode.h"
+#include "clang/Tooling/Transformer/SourceCode.h"
 #include "TestVisitor.h"
 #include "clang/Basic/Diagnostic.h"
 #include "llvm/Testing/Support/Annotations.h"

diff --git a/unittests/Tooling/StencilTest.cpp b/unittests/Tooling/StencilTest.cpp
index 0bd3d90f83fe6373bbcb16fc5fb97f490cbf9feb..2b9aa68e34c97eb3d089bcd30ab1b516bf5d76e3 100644 (file)
--- a/unittests/Tooling/StencilTest.cpp
+++ b/unittests/Tooling/StencilTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/Stencil.h"
+#include "clang/Tooling/Transformer/Stencil.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/FixIt.h"
 #include "clang/Tooling/Tooling.h"

diff --git a/unittests/Tooling/TransformerTest.cpp b/unittests/Tooling/TransformerTest.cpp
index 5d55182f8273ba3f18b863ee8bbc15d6847e8107..feae0c649aae5c41ff3778f3f95cada1329cba0a 100644 (file)
--- a/unittests/Tooling/TransformerTest.cpp
+++ b/unittests/Tooling/TransformerTest.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Tooling/Refactoring/Transformer.h"
+#include "clang/Tooling/Transformer/Transformer.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Refactoring/RangeSelector.h"
+#include "clang/Tooling/Transformer/RangeSelector.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"