Move RefactoringCallbacks to Tooling to avoid dependency from

ASTMatchers (lower level abstraction) to Tooling (higher level
abstraction).

llvm-svn: 160351

clang/include/clang/Tooling/RefactoringCallbacks.h

@@ -26,8 +26,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
+#ifndef LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H
-#define LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
+#define LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H
 
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Tooling/Refactoring.h"
@@ -87,4 +87,4 @@ private:
 } // end namespace ast_matchers
 } // end namespace clang
 
-#endif // LLVM_CLANG_AST_MATCHERS_REFACTORING_CALLBACKS_H
+#endif // LLVM_CLANG_TOOLING_REFACTORING_CALLBACKS_H

clang/lib/ASTMatchers/CMakeLists.txt

@@ -4,7 +4,6 @@ set(LLVM_USED_LIBS clangBasic clangAST)
 add_clang_library(clangASTMatchers
   ASTMatchFinder.cpp
   ASTMatchersInternal.cpp
-  RefactoringCallbacks.cpp
   )
 
 add_dependencies(clangASTMatchers

clang/lib/Tooling/CMakeLists.txt

@@ -6,6 +6,7 @@ add_clang_library(clangTooling
   Refactoring.cpp
   Tooling.cpp
   ArgumentsAdjusters.cpp
+  RefactoringCallbacks.cpp
   )
 
 add_dependencies(clangTooling
@@ -16,5 +17,6 @@ target_link_libraries(clangTooling
   clangBasic
   clangFrontend
   clangAST
+  clangASTMatchers
   clangRewrite
   )

clang/lib/Tooling/RefactoringCallbacks.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/Lex/Lexer.h"
-#include "clang/ASTMatchers/RefactoringCallbacks.h"
+#include "clang/Tooling/RefactoringCallbacks.h"
 
 namespace clang {
 namespace ast_matchers {

clang/unittests/ASTMatchers/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_clang_unittest(ASTMatchersTests
-  ASTMatchersTest.cpp
+  ASTMatchersTest.cpp)
-  RefactoringCallbacksTest.cpp)
 
 target_link_libraries(ASTMatchersTests
   gtest gtest_main clangASTMatchers clangTooling)

clang/unittests/Tooling/CMakeLists.txt

@@ -5,6 +5,7 @@ add_clang_unittest(ToolingTests
   RecursiveASTVisitorTest.cpp
   RefactoringTest.cpp
   RewriterTest.cpp
+  RefactoringCallbacksTest.cpp
   )
 
 target_link_libraries(ToolingTests

clang/unittests/Tooling/RefactoringCallbacksTest.cpp

@@ -9,9 +9,9 @@
 
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/RefactoringCallbacks.h"
+#include "clang/Tooling/RefactoringCallbacks.h"
-#include "../Tooling/RewriterTestContext.h"
 #include "gtest/gtest.h"
+#include "RewriterTestContext.h"
 
 namespace clang {
 namespace ast_matchers {