From 44564ac7eb4d864ef15fa28281d15060f75b5f07 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Mon, 4 Jun 2018 09:04:12 +0000 Subject: [PATCH] Reland "Move #include manipulation code to new lib/Tooling/Inclusions." This reverts commit r333534 (i.e. reland r332720) after fixing module build. Differential Revision: https://reviews.llvm.org/D47068 llvm-svn: 333874 --- clang/include/clang/Format/Format.h | 2 +- .../Tooling/{Core => Inclusions}/HeaderIncludes.h | 8 ++++---- .../Tooling/{Core => Inclusions}/IncludeStyle.h | 6 +++--- clang/include/clang/module.modulemap | 5 +++++ clang/lib/Format/CMakeLists.txt | 1 + clang/lib/Format/Format.cpp | 2 +- clang/lib/Tooling/CMakeLists.txt | 1 + clang/lib/Tooling/Core/CMakeLists.txt | 2 -- clang/lib/Tooling/Inclusions/CMakeLists.txt | 12 ++++++++++++ .../Tooling/{Core => Inclusions}/HeaderIncludes.cpp | 2 +- .../Tooling/{Core => Inclusions}/IncludeStyle.cpp | 3 +-- clang/unittests/Tooling/HeaderIncludesTest.cpp | 2 +- 12 files changed, 31 insertions(+), 15 deletions(-) rename clang/include/clang/Tooling/{Core => Inclusions}/HeaderIncludes.h (96%) rename clang/include/clang/Tooling/{Core => Inclusions}/IncludeStyle.h (96%) create mode 100644 clang/lib/Tooling/Inclusions/CMakeLists.txt rename clang/lib/Tooling/{Core => Inclusions}/HeaderIncludes.cpp (99%) rename clang/lib/Tooling/{Core => Inclusions}/IncludeStyle.cpp (95%) diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index b4d99f07545a..75654875414f 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/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 diff --git a/clang/include/clang/Tooling/Core/HeaderIncludes.h b/clang/include/clang/Tooling/Inclusions/HeaderIncludes.h similarity index 96% rename from clang/include/clang/Tooling/Core/HeaderIncludes.h rename to clang/include/clang/Tooling/Inclusions/HeaderIncludes.h index 1aaa3de441f6..d99a3283168c 100644 --- a/clang/include/clang/Tooling/Core/HeaderIncludes.h +++ b/clang/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 @@ -134,4 +134,4 @@ private: } // namespace tooling } // namespace clang -#endif // LLVM_CLANG_TOOLING_CORE_HEADERINCLUDES_H +#endif // LLVM_CLANG_TOOLING_INCLUSIONS_HEADERINCLUDES_H diff --git a/clang/include/clang/Tooling/Core/IncludeStyle.h b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h similarity index 96% rename from clang/include/clang/Tooling/Core/IncludeStyle.h rename to clang/include/clang/Tooling/Inclusions/IncludeStyle.h index ed7bd08ce0c5..42d6e1a5cf16 100644 --- a/clang/include/clang/Tooling/Core/IncludeStyle.h +++ b/clang/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 @@ -130,4 +130,4 @@ struct ScalarEnumerationTraits< } // namespace yaml } // namespace llvm -#endif // LLVM_CLANG_TOOLING_CORE_INCLUDESTYLE_H +#endif // LLVM_CLANG_TOOLING_INCLUSIONS_INCLUDESTYLE_H diff --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap index 6993943c1c52..8d525c5ffbac 100644 --- a/clang/include/clang/module.modulemap +++ b/clang/include/clang/module.modulemap @@ -154,3 +154,8 @@ module Clang_ToolingCore { requires cplusplus umbrella "Tooling/Core" module * { export * } } + +module Clang_ToolingInclusions { + requires cplusplus + umbrella "Tooling/Inclusions" module * { export * } +} diff --git a/clang/lib/Format/CMakeLists.txt b/clang/lib/Format/CMakeLists.txt index 42e6d53d9fe6..0019d045cd06 100644 --- a/clang/lib/Format/CMakeLists.txt +++ b/clang/lib/Format/CMakeLists.txt @@ -20,4 +20,5 @@ add_clang_library(clangFormat clangBasic clangLex clangToolingCore + clangToolingInclusions ) diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index c6de92b3cafe..d1a5dc8e6c69 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/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" diff --git a/clang/lib/Tooling/CMakeLists.txt b/clang/lib/Tooling/CMakeLists.txt index eaae49b431fb..031d8b51dec4 100644 --- a/clang/lib/Tooling/CMakeLists.txt +++ b/clang/lib/Tooling/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS ) add_subdirectory(Core) +add_subdirectory(Inclusions) add_subdirectory(Refactoring) add_subdirectory(ASTDiff) diff --git a/clang/lib/Tooling/Core/CMakeLists.txt b/clang/lib/Tooling/Core/CMakeLists.txt index 84d17984b429..f7f423c52228 100644 --- a/clang/lib/Tooling/Core/CMakeLists.txt +++ b/clang/lib/Tooling/Core/CMakeLists.txt @@ -2,8 +2,6 @@ set(LLVM_LINK_COMPONENTS support) add_clang_library(clangToolingCore Diagnostic.cpp - HeaderIncludes.cpp - IncludeStyle.cpp Lookup.cpp Replacement.cpp diff --git a/clang/lib/Tooling/Inclusions/CMakeLists.txt b/clang/lib/Tooling/Inclusions/CMakeLists.txt new file mode 100644 index 000000000000..00afb50f3a69 --- /dev/null +++ b/clang/lib/Tooling/Inclusions/CMakeLists.txt @@ -0,0 +1,12 @@ +set(LLVM_LINK_COMPONENTS support) + +add_clang_library(clangToolingInclusions + HeaderIncludes.cpp + IncludeStyle.cpp + + LINK_LIBS + clangBasic + clangLex + clangRewrite + clangToolingCore + ) diff --git a/clang/lib/Tooling/Core/HeaderIncludes.cpp b/clang/lib/Tooling/Inclusions/HeaderIncludes.cpp similarity index 99% rename from clang/lib/Tooling/Core/HeaderIncludes.cpp rename to clang/lib/Tooling/Inclusions/HeaderIncludes.cpp index d974d16f01c0..99c0866a6855 100644 --- a/clang/lib/Tooling/Core/HeaderIncludes.cpp +++ b/clang/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" diff --git a/clang/lib/Tooling/Core/IncludeStyle.cpp b/clang/lib/Tooling/Inclusions/IncludeStyle.cpp similarity index 95% rename from clang/lib/Tooling/Core/IncludeStyle.cpp rename to clang/lib/Tooling/Inclusions/IncludeStyle.cpp index 74eec481c288..3597710f1f6e 100644 --- a/clang/lib/Tooling/Core/IncludeStyle.cpp +++ b/clang/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; diff --git a/clang/unittests/Tooling/HeaderIncludesTest.cpp b/clang/unittests/Tooling/HeaderIncludesTest.cpp index 4407221f8ad7..ff68f75a6e82 100644 --- a/clang/unittests/Tooling/HeaderIncludesTest.cpp +++ b/clang/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"