diff options
54 files changed, 163 insertions, 100 deletions
diff --git a/clang/examples/clang-interpreter/CMakeLists.txt b/clang/examples/clang-interpreter/CMakeLists.txt index 9abefc274b1..06d3d03320c 100644 --- a/clang/examples/clang-interpreter/CMakeLists.txt +++ b/clang/examples/clang-interpreter/CMakeLists.txt @@ -29,7 +29,8 @@ target_link_libraries(clang-interpreter clangStaticAnalyzerCheckers clangStaticAnalyzerCore clangAnalysis - clangRewrite + clangRewriteCore + clangRewriteFrontend clangAST clangParse clangLex diff --git a/clang/examples/clang-interpreter/Makefile b/clang/examples/clang-interpreter/Makefile index 420a066caaa..0c4d35c8ebd 100644 --- a/clang/examples/clang-interpreter/Makefile +++ b/clang/examples/clang-interpreter/Makefile @@ -20,7 +20,7 @@ LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \ clangParse.a clangSema.a clangStaticAnalyzerFrontend.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangAnalysis.a clangRewrite.a \ + clangAnalysis.a clangRewriteCore.a clangRewriteFrontend.a \ clangEdit.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/include/clang/Rewrite/DeltaTree.h b/clang/include/clang/Rewrite/Core/DeltaTree.h index f32906a323e..f32906a323e 100644 --- a/clang/include/clang/Rewrite/DeltaTree.h +++ b/clang/include/clang/Rewrite/Core/DeltaTree.h diff --git a/clang/include/clang/Rewrite/HTMLRewrite.h b/clang/include/clang/Rewrite/Core/HTMLRewrite.h index 88caf85e601..88caf85e601 100644 --- a/clang/include/clang/Rewrite/HTMLRewrite.h +++ b/clang/include/clang/Rewrite/Core/HTMLRewrite.h diff --git a/clang/include/clang/Rewrite/RewriteRope.h b/clang/include/clang/Rewrite/Core/RewriteRope.h index bae8fb7a508..bae8fb7a508 100644 --- a/clang/include/clang/Rewrite/RewriteRope.h +++ b/clang/include/clang/Rewrite/Core/RewriteRope.h diff --git a/clang/include/clang/Rewrite/Rewriter.h b/clang/include/clang/Rewrite/Core/Rewriter.h index 5ffd88b05df..9498e174f34 100644 --- a/clang/include/clang/Rewrite/Rewriter.h +++ b/clang/include/clang/Rewrite/Core/Rewriter.h @@ -16,8 +16,8 @@ #define LLVM_CLANG_REWRITER_H #include "clang/Basic/SourceLocation.h" -#include "clang/Rewrite/DeltaTree.h" -#include "clang/Rewrite/RewriteRope.h" +#include "clang/Rewrite/Core/DeltaTree.h" +#include "clang/Rewrite/Core/RewriteRope.h" #include "llvm/ADT/StringRef.h" #include <cstring> #include <map> diff --git a/clang/include/clang/Rewrite/TokenRewriter.h b/clang/include/clang/Rewrite/Core/TokenRewriter.h index 894db0953f7..894db0953f7 100644 --- a/clang/include/clang/Rewrite/TokenRewriter.h +++ b/clang/include/clang/Rewrite/Core/TokenRewriter.h diff --git a/clang/include/clang/Rewrite/ASTConsumers.h b/clang/include/clang/Rewrite/Frontend/ASTConsumers.h index c9c92e3a018..c9c92e3a018 100644 --- a/clang/include/clang/Rewrite/ASTConsumers.h +++ b/clang/include/clang/Rewrite/Frontend/ASTConsumers.h diff --git a/clang/include/clang/Rewrite/FixItRewriter.h b/clang/include/clang/Rewrite/Frontend/FixItRewriter.h index 44f0611b17e..f12a034bd71 100644 --- a/clang/include/clang/Rewrite/FixItRewriter.h +++ b/clang/include/clang/Rewrite/Frontend/FixItRewriter.h @@ -17,7 +17,7 @@ #include "clang/Basic/Diagnostic.h" #include "clang/Basic/SourceLocation.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Edit/EditedSource.h" namespace clang { diff --git a/clang/include/clang/Rewrite/FrontendActions.h b/clang/include/clang/Rewrite/Frontend/FrontendActions.h index ea876d9980f..ea876d9980f 100644 --- a/clang/include/clang/Rewrite/FrontendActions.h +++ b/clang/include/clang/Rewrite/Frontend/FrontendActions.h diff --git a/clang/include/clang/Rewrite/Rewriters.h b/clang/include/clang/Rewrite/Frontend/Rewriters.h index f5ade5ad35d..f5ade5ad35d 100644 --- a/clang/include/clang/Rewrite/Rewriters.h +++ b/clang/include/clang/Rewrite/Frontend/Rewriters.h diff --git a/clang/lib/ARCMigrate/ARCMT.cpp b/clang/lib/ARCMigrate/ARCMT.cpp index 9c4c2f2df68..4b700dee2d1 100644 --- a/clang/lib/ARCMigrate/ARCMT.cpp +++ b/clang/lib/ARCMigrate/ARCMT.cpp @@ -14,7 +14,7 @@ #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Frontend/Utils.h" #include "clang/AST/ASTConsumer.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Sema/SemaDiagnostic.h" #include "clang/Basic/DiagnosticCategories.h" #include "clang/Lex/Preprocessor.h" diff --git a/clang/lib/ARCMigrate/CMakeLists.txt b/clang/lib/ARCMigrate/CMakeLists.txt index f602fc8e5f8..731bcb4fc7f 100644 --- a/clang/lib/ARCMigrate/CMakeLists.txt +++ b/clang/lib/ARCMigrate/CMakeLists.txt @@ -37,5 +37,6 @@ target_link_libraries(clangARCMigrate clangAST clangParse clangFrontend - clangRewrite + clangRewriteCore + clangRewriteFrontend ) diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp index 0098f973e63..dfe14e2b5dd 100644 --- a/clang/lib/ARCMigrate/ObjCMT.cpp +++ b/clang/lib/ARCMigrate/ObjCMT.cpp @@ -18,7 +18,7 @@ #include "clang/Edit/EditedSource.h" #include "clang/Edit/Commit.h" #include "clang/Edit/EditsReceiver.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/FileManager.h" #include "llvm/ADT/SmallString.h" diff --git a/clang/lib/FrontendTool/CMakeLists.txt b/clang/lib/FrontendTool/CMakeLists.txt index fe9d5896e72..176511b0e4c 100644 --- a/clang/lib/FrontendTool/CMakeLists.txt +++ b/clang/lib/FrontendTool/CMakeLists.txt @@ -11,7 +11,8 @@ add_dependencies(clangFrontendTool target_link_libraries(clangFrontendTool clangDriver clangFrontend - clangRewrite + clangRewriteCore + clangRewriteFrontend clangCodeGen clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 31eaccc5b4e..2433cf051e6 100644 --- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -23,7 +23,7 @@ #include "clang/Frontend/FrontendActions.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/FrontendPluginRegistry.h" -#include "clang/Rewrite/FrontendActions.h" +#include "clang/Rewrite/Frontend/FrontendActions.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/DynamicLibrary.h" using namespace clang; diff --git a/clang/lib/Rewrite/CMakeLists.txt b/clang/lib/Rewrite/CMakeLists.txt index af8f6d4f90d..d3d75430233 100644 --- a/clang/lib/Rewrite/CMakeLists.txt +++ b/clang/lib/Rewrite/CMakeLists.txt @@ -1,33 +1,2 @@ -add_clang_library(clangRewrite - DeltaTree.cpp - FixItRewriter.cpp - FrontendActions.cpp - HTMLPrint.cpp - HTMLRewrite.cpp - InclusionRewriter.cpp - RewriteMacros.cpp - RewriteModernObjC.cpp - RewriteObjC.cpp - RewriteRope.cpp - RewriteTest.cpp - Rewriter.cpp - TokenRewriter.cpp - ) - -add_dependencies(clangRewrite - ClangAttrClasses - ClangAttrList - ClangAttrParsedAttrList - ClangCommentNodes - ClangDeclNodes - ClangDiagnosticCommon - ClangDiagnosticFrontend - ClangStmtNodes - ) - -target_link_libraries(clangRewrite - clangBasic - clangAST - clangParse - clangFrontend - ) +add_subdirectory(Core) +add_subdirectory(Frontend) diff --git a/clang/lib/Rewrite/Core/CMakeLists.txt b/clang/lib/Rewrite/Core/CMakeLists.txt new file mode 100644 index 00000000000..07978187ff1 --- /dev/null +++ b/clang/lib/Rewrite/Core/CMakeLists.txt @@ -0,0 +1,24 @@ +add_clang_library(clangRewriteCore + DeltaTree.cpp + HTMLRewrite.cpp + RewriteRope.cpp + Rewriter.cpp + TokenRewriter.cpp + ) + +add_dependencies(clangRewriteCore + ClangAttrClasses + ClangAttrList + ClangAttrParsedAttrList + ClangCommentNodes + ClangDeclNodes + ClangDiagnosticCommon + ClangDiagnosticFrontend + ClangStmtNodes + ) + +target_link_libraries(clangRewriteCore + clangBasic + clangAST + clangParse + ) diff --git a/clang/lib/Rewrite/DeltaTree.cpp b/clang/lib/Rewrite/Core/DeltaTree.cpp index 4297dc8de62..dff621d206a 100644 --- a/clang/lib/Rewrite/DeltaTree.cpp +++ b/clang/lib/Rewrite/Core/DeltaTree.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/DeltaTree.h" +#include "clang/Rewrite/Core/DeltaTree.h" #include "clang/Basic/LLVM.h" #include <cstring> #include <cstdio> diff --git a/clang/lib/Rewrite/HTMLRewrite.cpp b/clang/lib/Rewrite/Core/HTMLRewrite.cpp index 236b98fc282..3deb90e632d 100644 --- a/clang/lib/Rewrite/HTMLRewrite.cpp +++ b/clang/lib/Rewrite/Core/HTMLRewrite.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "clang/Lex/Preprocessor.h" -#include "clang/Rewrite/Rewriter.h" -#include "clang/Rewrite/HTMLRewrite.h" +#include "clang/Rewrite/Core/Rewriter.h" +#include "clang/Rewrite/Core/HTMLRewrite.h" #include "clang/Lex/TokenConcatenation.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" diff --git a/clang/lib/Rewrite/Core/Makefile b/clang/lib/Rewrite/Core/Makefile new file mode 100644 index 00000000000..8c8d2e47813 --- /dev/null +++ b/clang/lib/Rewrite/Core/Makefile @@ -0,0 +1,18 @@ +##===- clang/lib/Rewrite/Makefile --------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +# +# This implements code transformation / rewriting facilities. +# +##===----------------------------------------------------------------------===## + +CLANG_LEVEL := ../../.. +LIBRARYNAME := clangRewriteCore + +include $(CLANG_LEVEL)/Makefile + diff --git a/clang/lib/Rewrite/RewriteRope.cpp b/clang/lib/Rewrite/Core/RewriteRope.cpp index cc8de1b11a1..3b085bbedc7 100644 --- a/clang/lib/Rewrite/RewriteRope.cpp +++ b/clang/lib/Rewrite/Core/RewriteRope.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/RewriteRope.h" +#include "clang/Rewrite/Core/RewriteRope.h" #include "clang/Basic/LLVM.h" #include <algorithm> using namespace clang; diff --git a/clang/lib/Rewrite/Rewriter.cpp b/clang/lib/Rewrite/Core/Rewriter.cpp index 7c27114f1cf..4df967f39bc 100644 --- a/clang/lib/Rewrite/Rewriter.cpp +++ b/clang/lib/Rewrite/Core/Rewriter.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/AST/Stmt.h" #include "clang/AST/Decl.h" #include "clang/Basic/DiagnosticIDs.h" diff --git a/clang/lib/Rewrite/TokenRewriter.cpp b/clang/lib/Rewrite/Core/TokenRewriter.cpp index 03ce63ea117..940ece2f9e0 100644 --- a/clang/lib/Rewrite/TokenRewriter.cpp +++ b/clang/lib/Rewrite/Core/TokenRewriter.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/TokenRewriter.h" +#include "clang/Rewrite/Core/TokenRewriter.h" #include "clang/Lex/Lexer.h" #include "clang/Lex/ScratchBuffer.h" #include "clang/Basic/SourceManager.h" diff --git a/clang/lib/Rewrite/Frontend/CMakeLists.txt b/clang/lib/Rewrite/Frontend/CMakeLists.txt new file mode 100644 index 00000000000..9017e479ab7 --- /dev/null +++ b/clang/lib/Rewrite/Frontend/CMakeLists.txt @@ -0,0 +1,28 @@ +add_clang_library(clangRewriteFrontend + FixItRewriter.cpp + FrontendActions.cpp + HTMLPrint.cpp + InclusionRewriter.cpp + RewriteMacros.cpp + RewriteModernObjC.cpp + RewriteObjC.cpp + RewriteTest.cpp + ) + +add_dependencies(clangRewriteFrontend + ClangAttrClasses + ClangAttrList + ClangAttrParsedAttrList + ClangCommentNodes + ClangDeclNodes + ClangDiagnosticCommon + ClangDiagnosticFrontend + ClangStmtNodes + ) + +target_link_libraries(clangRewriteFrontend + clangBasic + clangAST + clangParse + clangFrontend + ) diff --git a/clang/lib/Rewrite/FixItRewriter.cpp b/clang/lib/Rewrite/Frontend/FixItRewriter.cpp index 3863adb4f16..43a1ab1ac10 100644 --- a/clang/lib/Rewrite/FixItRewriter.cpp +++ b/clang/lib/Rewrite/Frontend/FixItRewriter.cpp @@ -13,7 +13,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/FixItRewriter.h" +#include "clang/Rewrite/Frontend/FixItRewriter.h" #include "clang/Edit/Commit.h" #include "clang/Edit/EditsReceiver.h" #include "clang/Basic/FileManager.h" diff --git a/clang/lib/Rewrite/FrontendActions.cpp b/clang/lib/Rewrite/Frontend/FrontendActions.cpp index 9bc218e994f..7d29b6d4219 100644 --- a/clang/lib/Rewrite/FrontendActions.cpp +++ b/clang/lib/Rewrite/Frontend/FrontendActions.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/FrontendActions.h" +#include "clang/Rewrite/Frontend/FrontendActions.h" #include "clang/AST/ASTConsumer.h" #include "clang/Lex/Preprocessor.h" #include "clang/Parse/Parser.h" @@ -16,9 +16,9 @@ #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/Utils.h" -#include "clang/Rewrite/ASTConsumers.h" -#include "clang/Rewrite/FixItRewriter.h" -#include "clang/Rewrite/Rewriters.h" +#include "clang/Rewrite/Frontend/ASTConsumers.h" +#include "clang/Rewrite/Frontend/FixItRewriter.h" +#include "clang/Rewrite/Frontend/Rewriters.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Rewrite/HTMLPrint.cpp b/clang/lib/Rewrite/Frontend/HTMLPrint.cpp index 3d190abffcf..79e44470ada 100644 --- a/clang/lib/Rewrite/HTMLPrint.cpp +++ b/clang/lib/Rewrite/Frontend/HTMLPrint.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/ASTConsumers.h" +#include "clang/Rewrite/Frontend/ASTConsumers.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" @@ -19,8 +19,8 @@ #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Rewrite/HTMLRewrite.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/HTMLRewrite.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" using namespace clang; diff --git a/clang/lib/Rewrite/InclusionRewriter.cpp b/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp index 3dfc3b00898..1929d721236 100644 --- a/clang/lib/Rewrite/InclusionRewriter.cpp +++ b/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/Rewriters.h" +#include "clang/Rewrite/Frontend/Rewriters.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" #include "clang/Frontend/PreprocessorOutputOptions.h" diff --git a/clang/lib/Rewrite/Frontend/Makefile b/clang/lib/Rewrite/Frontend/Makefile new file mode 100644 index 00000000000..ac97d4074ec --- /dev/null +++ b/clang/lib/Rewrite/Frontend/Makefile @@ -0,0 +1,18 @@ +##===- clang/lib/Rewrite/Makefile --------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +# +# This implements code transformation / rewriting facilities. +# +##===----------------------------------------------------------------------===## + +CLANG_LEVEL := ../../.. +LIBRARYNAME := clangRewriteFrontend + +include $(CLANG_LEVEL)/Makefile + diff --git a/clang/lib/Rewrite/RewriteMacros.cpp b/clang/lib/Rewrite/Frontend/RewriteMacros.cpp index 3fa0bdb7453..f399dd5d7ce 100644 --- a/clang/lib/Rewrite/RewriteMacros.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteMacros.cpp @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/Rewriters.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Frontend/Rewriters.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" #include "llvm/Support/raw_ostream.h" diff --git a/clang/lib/Rewrite/RewriteModernObjC.cpp b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp index 0f742045413..c735da03fd7 100644 --- a/clang/lib/Rewrite/RewriteModernObjC.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/ASTConsumers.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Frontend/ASTConsumers.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/AST/AST.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ParentMap.h" diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/Frontend/RewriteObjC.cpp index 37f58aa0e95..0b9e6564183 100644 --- a/clang/lib/Rewrite/RewriteObjC.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteObjC.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/ASTConsumers.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Frontend/ASTConsumers.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/AST/AST.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ParentMap.h" diff --git a/clang/lib/Rewrite/RewriteTest.cpp b/clang/lib/Rewrite/Frontend/RewriteTest.cpp index 019e5e73120..722c5e80b44 100644 --- a/clang/lib/Rewrite/RewriteTest.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteTest.cpp @@ -11,9 +11,9 @@ // //===----------------------------------------------------------------------===// -#include "clang/Rewrite/Rewriters.h" +#include "clang/Rewrite/Frontend/Rewriters.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Rewrite/TokenRewriter.h" +#include "clang/Rewrite/Core/TokenRewriter.h" #include "llvm/Support/raw_ostream.h" void clang::DoRewriteTest(Preprocessor &PP, raw_ostream* OS) { diff --git a/clang/lib/Rewrite/Makefile b/clang/lib/Rewrite/Makefile index 5fef9b2c0d3..0be84d40640 100644 --- a/clang/lib/Rewrite/Makefile +++ b/clang/lib/Rewrite/Makefile @@ -1,4 +1,4 @@ -##===- clang/lib/Rewrite/Makefile --------------------------*- Makefile -*-===## +##===- clang/lib/StaticAnalyzer/Makefile -------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -6,13 +6,9 @@ # License. See LICENSE.TXT for details. # ##===----------------------------------------------------------------------===## -# -# This implements code transformation / rewriting facilities. -# -##===----------------------------------------------------------------------===## CLANG_LEVEL := ../.. -LIBRARYNAME := clangRewrite +DIRS := Frontend +PARALLEL_DIRS := Core include $(CLANG_LEVEL)/Makefile - diff --git a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt index 43d42b3e0de..97cb977861a 100644 --- a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt @@ -54,5 +54,5 @@ target_link_libraries(clangStaticAnalyzerCore clangLex clangAST clangFrontend - clangRewrite + clangRewriteCore ) diff --git a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp index 211bcb91240..fd875f66d2d 100644 --- a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp +++ b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp @@ -17,8 +17,8 @@ #include "clang/AST/Decl.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/FileManager.h" -#include "clang/Rewrite/Rewriter.h" -#include "clang/Rewrite/HTMLRewrite.h" +#include "clang/Rewrite/Core/Rewriter.h" +#include "clang/Rewrite/Core/HTMLRewrite.h" #include "clang/Lex/Lexer.h" #include "clang/Lex/Preprocessor.h" #include "llvm/Support/FileSystem.h" diff --git a/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt index 06d14850787..aafb249c587 100644 --- a/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(clangStaticAnalyzerFrontend clangLex clangAST clangFrontend - clangRewrite + clangRewriteCore + clangRewriteFrontend clangStaticAnalyzerCheckers ) diff --git a/clang/lib/Tooling/CMakeLists.txt b/clang/lib/Tooling/CMakeLists.txt index c656c057910..01f24a666f0 100644 --- a/clang/lib/Tooling/CMakeLists.txt +++ b/clang/lib/Tooling/CMakeLists.txt @@ -24,5 +24,6 @@ target_link_libraries(clangTooling clangFrontend clangAST clangASTMatchers - clangRewrite + clangRewriteCore + clangRewriteFrontend ) diff --git a/clang/lib/Tooling/Refactoring.cpp b/clang/lib/Tooling/Refactoring.cpp index 628435307c0..97cf1c14489 100644 --- a/clang/lib/Tooling/Refactoring.cpp +++ b/clang/lib/Tooling/Refactoring.cpp @@ -16,7 +16,7 @@ #include "clang/Frontend/DiagnosticOptions.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Lex/Lexer.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Tooling/Refactoring.h" #include "llvm/Support/raw_os_ostream.h" diff --git a/clang/tools/arcmt-test/CMakeLists.txt b/clang/tools/arcmt-test/CMakeLists.txt index f36b14a679d..a7ce5868490 100644 --- a/clang/tools/arcmt-test/CMakeLists.txt +++ b/clang/tools/arcmt-test/CMakeLists.txt @@ -12,5 +12,5 @@ add_clang_executable(arcmt-test target_link_libraries(arcmt-test clangARCMigrate clangEdit - clangRewrite + clangRewriteCore ) diff --git a/clang/tools/arcmt-test/Makefile b/clang/tools/arcmt-test/Makefile index 719da75869e..06e20165d76 100644 --- a/clang/tools/arcmt-test/Makefile +++ b/clang/tools/arcmt-test/Makefile @@ -18,7 +18,7 @@ NO_INSTALL = 1 include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc -USEDLIBS = clangARCMigrate.a clangRewrite.a \ +USEDLIBS = clangARCMigrate.a clangRewriteCore.a \ clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \ clangSema.a clangEdit.a clangAnalysis.a clangAST.a clangLex.a \ clangBasic.a diff --git a/clang/tools/c-arcmt-test/Makefile b/clang/tools/c-arcmt-test/Makefile index b59afdac16d..6294eff5689 100644 --- a/clang/tools/c-arcmt-test/Makefile +++ b/clang/tools/c-arcmt-test/Makefile @@ -21,10 +21,7 @@ NO_INSTALL = 1 # LINK_COMPONENTS before including Makefile.rules include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc -USEDLIBS = clang.a clangARCMigrate.a clangRewrite.a \ - clangFrontend.a clangDriver.a \ - clangSerialization.a clangParse.a clangSema.a \ - clangAnalysis.a clangEdit.a clangAST.a clangLex.a clangBasic.a +LINK_COMPONENTS := $(TARGETS_TO_BUILD) support mc +USEDLIBS = clang.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index 71d77669cae..2545610477f 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/tools/driver/CMakeLists.txt @@ -29,7 +29,8 @@ target_link_libraries(clang clangParse clangEdit clangARCMigrate - clangRewrite + clangRewriteCore + clangRewriteFrontend clangSema clangSerialization clangStaticAnalyzerFrontend diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile index 270d4fdda86..7e4192c7235 100644 --- a/clang/tools/driver/Makefile +++ b/clang/tools/driver/Makefile @@ -35,7 +35,8 @@ USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \ clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerCore.a \ - clangAnalysis.a clangARCMigrate.a clangRewrite.a \ + clangAnalysis.a clangARCMigrate.a \ + clangRewriteCore.a clangRewriteFrontend.a \ clangEdit.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index 283276f801f..1426c42b462 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -43,7 +43,8 @@ set(SOURCES set(LIBRARIES clangARCMigrate - clangRewrite + clangRewriteCore + clangRewriteFrontend clangFrontend clangDriver clangSerialization diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile index 975d3812d10..cefd9ba6df3 100644 --- a/clang/tools/libclang/Makefile +++ b/clang/tools/libclang/Makefile @@ -17,10 +17,11 @@ SHARED_LIBRARY = 1 include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc -USEDLIBS = clangARCMigrate.a clangRewrite.a clangFrontend.a clangDriver.a \ - clangSerialization.a \ - clangParse.a clangSema.a clangEdit.a clangAnalysis.a \ - clangAST.a clangLex.a clangTooling.a clangBasic.a +USEDLIBS = clangARCMigrate.a clangRewriteCore.a clangRewriteFrontend.a \ + clangFrontend.a clangDriver.a \ + clangSerialization.a \ + clangParse.a clangSema.a clangEdit.a clangAnalysis.a \ + clangAST.a clangLex.a clangTooling.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/unittests/AST/Makefile b/clang/unittests/AST/Makefile index 74f17b25a7b..e07fc45467b 100644 --- a/clang/unittests/AST/Makefile +++ b/clang/unittests/AST/Makefile @@ -12,7 +12,8 @@ TESTNAME = AST include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ + clangRewriteCore.a clangRewriteFrontend.a \ + clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a clangEdit.a include $(CLANG_LEVEL)/unittests/Makefile diff --git a/clang/unittests/ASTMatchers/Makefile b/clang/unittests/ASTMatchers/Makefile index d3e4aa37ce7..9ca1006b141 100644 --- a/clang/unittests/ASTMatchers/Makefile +++ b/clang/unittests/ASTMatchers/Makefile @@ -13,7 +13,8 @@ TESTNAME = ASTMatchers include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ + clangRewriteCore.a clangRewriteFrontend.a \ + clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a clangEdit.a include $(CLANG_LEVEL)/unittests/Makefile diff --git a/clang/unittests/Frontend/Makefile b/clang/unittests/Frontend/Makefile index bfc3494320e..4b6f8753e90 100644 --- a/clang/unittests/Frontend/Makefile +++ b/clang/unittests/Frontend/Makefile @@ -14,7 +14,8 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \ clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangARCMigrate.a clangRewrite.a clangEdit.a \ + clangARCMigrate.a clangRewriteCore.a \ + clangRewriteFrontend.a clangEdit.a \ clangAnalysis.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/unittests/Makefile diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt index 4eaf33956f3..bd7317fe4ae 100644 --- a/clang/unittests/Tooling/CMakeLists.txt +++ b/clang/unittests/Tooling/CMakeLists.txt @@ -18,5 +18,5 @@ add_clang_unittest(ToolingTests target_link_libraries(ToolingTests clangAST clangTooling - clangRewrite + clangRewriteCore ) diff --git a/clang/unittests/Tooling/Makefile b/clang/unittests/Tooling/Makefile index 5d2224d40e1..5ed99fcc430 100644 --- a/clang/unittests/Tooling/Makefile +++ b/clang/unittests/Tooling/Makefile @@ -12,7 +12,8 @@ TESTNAME = Tooling include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangParse.a clangRewrite.a clangSema.a clangAnalysis.a clangEdit.a \ + clangParse.a clangRewriteCore.a clangRewriteFrontend.a \ + clangSema.a clangAnalysis.a clangEdit.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/unittests/Makefile diff --git a/clang/unittests/Tooling/RefactoringTest.cpp b/clang/unittests/Tooling/RefactoringTest.cpp index 8d9695590af..114f7240c03 100644 --- a/clang/unittests/Tooling/RefactoringTest.cpp +++ b/clang/unittests/Tooling/RefactoringTest.cpp @@ -22,7 +22,7 @@ #include "clang/Frontend/DiagnosticOptions.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/Path.h" diff --git a/clang/unittests/Tooling/RewriterTestContext.h b/clang/unittests/Tooling/RewriterTestContext.h index 73cedd01507..6d75836815f 100644 --- a/clang/unittests/Tooling/RewriterTestContext.h +++ b/clang/unittests/Tooling/RewriterTestContext.h @@ -20,7 +20,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Frontend/DiagnosticOptions.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Rewrite/Rewriter.h" +#include "clang/Rewrite/Core/Rewriter.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" |
