ioeric created this revision. ioeric added a reviewer: ilya-biryukov. Herald added subscribers: cfe-commits, mgorny, klimek.
clangToolingCore is linked into almost everything (incl. clang), but not few tools need #include manipulation at this point. So pull this into a separate library in Tooling. Repository: rC Clang https://reviews.llvm.org/D47068 Files: include/clang/Format/Format.h include/clang/Tooling/Core/HeaderIncludes.h include/clang/Tooling/Core/IncludeStyle.h include/clang/Tooling/Inclusions/HeaderIncludes.h include/clang/Tooling/Inclusions/IncludeStyle.h lib/Format/CMakeLists.txt lib/Format/Format.cpp lib/Tooling/CMakeLists.txt lib/Tooling/Core/CMakeLists.txt lib/Tooling/Core/HeaderIncludes.cpp lib/Tooling/Core/IncludeStyle.cpp lib/Tooling/Inclusions/CMakeLists.txt lib/Tooling/Inclusions/HeaderIncludes.cpp lib/Tooling/Inclusions/IncludeStyle.cpp unittests/Tooling/HeaderIncludesTest.cpp
Index: unittests/Tooling/HeaderIncludesTest.cpp =================================================================== --- unittests/Tooling/HeaderIncludesTest.cpp +++ unittests/Tooling/HeaderIncludesTest.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Core/HeaderIncludes.h" +#include "clang/Tooling/Inclusions/HeaderIncludes.h" #include "../Tooling/ReplacementTest.h" #include "../Tooling/RewriterTestContext.h" #include "clang/Format/Format.h" Index: lib/Tooling/Inclusions/IncludeStyle.cpp =================================================================== --- lib/Tooling/Inclusions/IncludeStyle.cpp +++ lib/Tooling/Inclusions/IncludeStyle.cpp @@ -7,8 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Core/IncludeStyle.h" - +#include "clang/Tooling/Inclusions/IncludeStyle.h" using clang::tooling::IncludeStyle; Index: lib/Tooling/Inclusions/HeaderIncludes.cpp =================================================================== --- lib/Tooling/Inclusions/HeaderIncludes.cpp +++ lib/Tooling/Inclusions/HeaderIncludes.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Tooling/Core/HeaderIncludes.h" +#include "clang/Tooling/Inclusions/HeaderIncludes.h" #include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" Index: lib/Tooling/Inclusions/CMakeLists.txt =================================================================== --- lib/Tooling/Inclusions/CMakeLists.txt +++ lib/Tooling/Inclusions/CMakeLists.txt @@ -1,15 +1,12 @@ set(LLVM_LINK_COMPONENTS support) -add_clang_library(clangToolingCore - Diagnostic.cpp +add_clang_library(clangToolingInclusions HeaderIncludes.cpp IncludeStyle.cpp - Lookup.cpp - Replacement.cpp LINK_LIBS - clangAST clangBasic clangLex clangRewrite + clangToolingCore ) Index: lib/Tooling/Core/CMakeLists.txt =================================================================== --- lib/Tooling/Core/CMakeLists.txt +++ lib/Tooling/Core/CMakeLists.txt @@ -2,8 +2,6 @@ add_clang_library(clangToolingCore Diagnostic.cpp - HeaderIncludes.cpp - IncludeStyle.cpp Lookup.cpp Replacement.cpp Index: lib/Tooling/CMakeLists.txt =================================================================== --- lib/Tooling/CMakeLists.txt +++ lib/Tooling/CMakeLists.txt @@ -4,6 +4,7 @@ ) add_subdirectory(Core) +add_subdirectory(Inclusions) add_subdirectory(Refactoring) add_subdirectory(ASTDiff) Index: lib/Format/Format.cpp =================================================================== --- lib/Format/Format.cpp +++ lib/Format/Format.cpp @@ -31,7 +31,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Basic/VirtualFileSystem.h" #include "clang/Lex/Lexer.h" -#include "clang/Tooling/Core/HeaderIncludes.h" +#include "clang/Tooling/Inclusions/HeaderIncludes.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Allocator.h" Index: lib/Format/CMakeLists.txt =================================================================== --- lib/Format/CMakeLists.txt +++ lib/Format/CMakeLists.txt @@ -20,4 +20,5 @@ clangBasic clangLex clangToolingCore + clangToolingInclusions ) Index: include/clang/Tooling/Inclusions/IncludeStyle.h =================================================================== --- include/clang/Tooling/Inclusions/IncludeStyle.h +++ include/clang/Tooling/Inclusions/IncludeStyle.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H -#define LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H +#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H +#define LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H #include "llvm/Support/YAMLTraits.h" #include <string> @@ -130,4 +130,4 @@ } // namespace yaml } // namespace llvm -#endif // LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H +#endif // LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H Index: include/clang/Tooling/Inclusions/HeaderIncludes.h =================================================================== --- include/clang/Tooling/Inclusions/HeaderIncludes.h +++ include/clang/Tooling/Inclusions/HeaderIncludes.h @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H -#define LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H +#ifndef LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H +#define LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H #include "clang/Basic/SourceManager.h" #include "clang/Tooling/Core/Replacement.h" -#include "clang/Tooling/Core/IncludeStyle.h" +#include "clang/Tooling/Inclusions/IncludeStyle.h" #include "llvm/Support/Path.h" #include "llvm/Support/Regex.h" #include <unordered_map> @@ -134,4 +134,4 @@ } // namespace tooling } // namespace clang -#endif // LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H +#endif // LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H Index: include/clang/Format/Format.h =================================================================== --- include/clang/Format/Format.h +++ include/clang/Format/Format.h @@ -16,8 +16,8 @@ #define LLVM_CLANG_FORMAT_FORMAT_H #include "clang/Basic/LangOptions.h" -#include "clang/Tooling/Core/IncludeStyle.h" #include "clang/Tooling/Core/Replacement.h" +#include "clang/Tooling/Inclusions/IncludeStyle.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/Support/Regex.h" #include <system_error>
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
