From 305c613af6cfc40e519c75d9d2c84c6fa9a841c0 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Sat, 1 Sep 2012 05:09:24 +0000 Subject: [PATCH] Split library clangRewrite into clangRewriteCore and clangRewriteFrontend. This is similar to how we divide up the StaticAnalyzer libraries to separate core functionality to what is clearly associated with Frontend actions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163050 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/clang-interpreter/CMakeLists.txt | 3 +- examples/clang-interpreter/Makefile | 2 +- include/clang/Rewrite/{ => Core}/DeltaTree.h | 0 .../clang/Rewrite/{ => Core}/HTMLRewrite.h | 0 .../clang/Rewrite/{ => Core}/RewriteRope.h | 0 include/clang/Rewrite/{ => Core}/Rewriter.h | 4 +-- .../clang/Rewrite/{ => Core}/TokenRewriter.h | 0 .../Rewrite/{ => Frontend}/ASTConsumers.h | 0 .../Rewrite/{ => Frontend}/FixItRewriter.h | 2 +- .../Rewrite/{ => Frontend}/FrontendActions.h | 0 .../clang/Rewrite/{ => Frontend}/Rewriters.h | 0 lib/ARCMigrate/ARCMT.cpp | 2 +- lib/ARCMigrate/CMakeLists.txt | 3 +- lib/ARCMigrate/ObjCMT.cpp | 2 +- lib/FrontendTool/CMakeLists.txt | 3 +- .../ExecuteCompilerInvocation.cpp | 2 +- lib/Rewrite/CMakeLists.txt | 35 ++----------------- lib/Rewrite/Core/CMakeLists.txt | 24 +++++++++++++ lib/Rewrite/{ => Core}/DeltaTree.cpp | 2 +- lib/Rewrite/{ => Core}/HTMLRewrite.cpp | 4 +-- lib/Rewrite/Core/Makefile | 18 ++++++++++ lib/Rewrite/{ => Core}/RewriteRope.cpp | 2 +- lib/Rewrite/{ => Core}/Rewriter.cpp | 2 +- lib/Rewrite/{ => Core}/TokenRewriter.cpp | 2 +- lib/Rewrite/Frontend/CMakeLists.txt | 28 +++++++++++++++ lib/Rewrite/{ => Frontend}/FixItRewriter.cpp | 2 +- .../{ => Frontend}/FrontendActions.cpp | 8 ++--- lib/Rewrite/{ => Frontend}/HTMLPrint.cpp | 6 ++-- .../{ => Frontend}/InclusionRewriter.cpp | 2 +- lib/Rewrite/Frontend/Makefile | 18 ++++++++++ lib/Rewrite/{ => Frontend}/RewriteMacros.cpp | 4 +-- .../{ => Frontend}/RewriteModernObjC.cpp | 4 +-- lib/Rewrite/{ => Frontend}/RewriteObjC.cpp | 4 +-- lib/Rewrite/{ => Frontend}/RewriteTest.cpp | 4 +-- lib/Rewrite/Makefile | 10 ++---- lib/StaticAnalyzer/Core/CMakeLists.txt | 2 +- lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp | 4 +-- lib/StaticAnalyzer/Frontend/CMakeLists.txt | 3 +- lib/Tooling/CMakeLists.txt | 3 +- lib/Tooling/Refactoring.cpp | 2 +- tools/arcmt-test/CMakeLists.txt | 2 +- tools/arcmt-test/Makefile | 2 +- tools/c-arcmt-test/Makefile | 7 ++-- tools/driver/CMakeLists.txt | 3 +- tools/driver/Makefile | 3 +- tools/libclang/CMakeLists.txt | 3 +- tools/libclang/Makefile | 9 ++--- unittests/AST/Makefile | 3 +- unittests/ASTMatchers/Makefile | 3 +- unittests/Frontend/Makefile | 3 +- unittests/Tooling/CMakeLists.txt | 2 +- unittests/Tooling/Makefile | 3 +- unittests/Tooling/RefactoringTest.cpp | 2 +- unittests/Tooling/RewriterTestContext.h | 2 +- 54 files changed, 163 insertions(+), 100 deletions(-) rename include/clang/Rewrite/{ => Core}/DeltaTree.h (100%) rename include/clang/Rewrite/{ => Core}/HTMLRewrite.h (100%) rename include/clang/Rewrite/{ => Core}/RewriteRope.h (100%) rename include/clang/Rewrite/{ => Core}/Rewriter.h (99%) rename include/clang/Rewrite/{ => Core}/TokenRewriter.h (100%) rename include/clang/Rewrite/{ => Frontend}/ASTConsumers.h (100%) rename include/clang/Rewrite/{ => Frontend}/FixItRewriter.h (99%) rename include/clang/Rewrite/{ => Frontend}/FrontendActions.h (100%) rename include/clang/Rewrite/{ => Frontend}/Rewriters.h (100%) create mode 100644 lib/Rewrite/Core/CMakeLists.txt rename lib/Rewrite/{ => Core}/DeltaTree.cpp (99%) rename lib/Rewrite/{ => Core}/HTMLRewrite.cpp (99%) create mode 100644 lib/Rewrite/Core/Makefile rename lib/Rewrite/{ => Core}/RewriteRope.cpp (99%) rename lib/Rewrite/{ => Core}/Rewriter.cpp (99%) rename lib/Rewrite/{ => Core}/TokenRewriter.cpp (98%) create mode 100644 lib/Rewrite/Frontend/CMakeLists.txt rename lib/Rewrite/{ => Frontend}/FixItRewriter.cpp (99%) rename lib/Rewrite/{ => Frontend}/FrontendActions.cpp (97%) rename lib/Rewrite/{ => Frontend}/HTMLPrint.cpp (95%) rename lib/Rewrite/{ => Frontend}/InclusionRewriter.cpp (99%) create mode 100644 lib/Rewrite/Frontend/Makefile rename lib/Rewrite/{ => Frontend}/RewriteMacros.cpp (98%) rename lib/Rewrite/{ => Frontend}/RewriteModernObjC.cpp (99%) rename lib/Rewrite/{ => Frontend}/RewriteObjC.cpp (99%) rename lib/Rewrite/{ => Frontend}/RewriteTest.cpp (92%) diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt index 9abefc274b..06d3d03320 100644 --- a/examples/clang-interpreter/CMakeLists.txt +++ b/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/examples/clang-interpreter/Makefile b/examples/clang-interpreter/Makefile index 420a066caa..0c4d35c8eb 100644 --- a/examples/clang-interpreter/Makefile +++ b/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/include/clang/Rewrite/DeltaTree.h b/include/clang/Rewrite/Core/DeltaTree.h similarity index 100% rename from include/clang/Rewrite/DeltaTree.h rename to include/clang/Rewrite/Core/DeltaTree.h diff --git a/include/clang/Rewrite/HTMLRewrite.h b/include/clang/Rewrite/Core/HTMLRewrite.h similarity index 100% rename from include/clang/Rewrite/HTMLRewrite.h rename to include/clang/Rewrite/Core/HTMLRewrite.h diff --git a/include/clang/Rewrite/RewriteRope.h b/include/clang/Rewrite/Core/RewriteRope.h similarity index 100% rename from include/clang/Rewrite/RewriteRope.h rename to include/clang/Rewrite/Core/RewriteRope.h diff --git a/include/clang/Rewrite/Rewriter.h b/include/clang/Rewrite/Core/Rewriter.h similarity index 99% rename from include/clang/Rewrite/Rewriter.h rename to include/clang/Rewrite/Core/Rewriter.h index 5ffd88b05d..9498e174f3 100644 --- a/include/clang/Rewrite/Rewriter.h +++ b/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 #include diff --git a/include/clang/Rewrite/TokenRewriter.h b/include/clang/Rewrite/Core/TokenRewriter.h similarity index 100% rename from include/clang/Rewrite/TokenRewriter.h rename to include/clang/Rewrite/Core/TokenRewriter.h diff --git a/include/clang/Rewrite/ASTConsumers.h b/include/clang/Rewrite/Frontend/ASTConsumers.h similarity index 100% rename from include/clang/Rewrite/ASTConsumers.h rename to include/clang/Rewrite/Frontend/ASTConsumers.h diff --git a/include/clang/Rewrite/FixItRewriter.h b/include/clang/Rewrite/Frontend/FixItRewriter.h similarity index 99% rename from include/clang/Rewrite/FixItRewriter.h rename to include/clang/Rewrite/Frontend/FixItRewriter.h index 44f0611b17..f12a034bd7 100644 --- a/include/clang/Rewrite/FixItRewriter.h +++ b/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/include/clang/Rewrite/FrontendActions.h b/include/clang/Rewrite/Frontend/FrontendActions.h similarity index 100% rename from include/clang/Rewrite/FrontendActions.h rename to include/clang/Rewrite/Frontend/FrontendActions.h diff --git a/include/clang/Rewrite/Rewriters.h b/include/clang/Rewrite/Frontend/Rewriters.h similarity index 100% rename from include/clang/Rewrite/Rewriters.h rename to include/clang/Rewrite/Frontend/Rewriters.h diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp index 9c4c2f2df6..4b700dee2d 100644 --- a/lib/ARCMigrate/ARCMT.cpp +++ b/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/lib/ARCMigrate/CMakeLists.txt b/lib/ARCMigrate/CMakeLists.txt index f602fc8e5f..731bcb4fc7 100644 --- a/lib/ARCMigrate/CMakeLists.txt +++ b/lib/ARCMigrate/CMakeLists.txt @@ -37,5 +37,6 @@ target_link_libraries(clangARCMigrate clangAST clangParse clangFrontend - clangRewrite + clangRewriteCore + clangRewriteFrontend ) diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp index 0098f973e6..dfe14e2b5d 100644 --- a/lib/ARCMigrate/ObjCMT.cpp +++ b/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/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt index fe9d5896e7..176511b0e4 100644 --- a/lib/FrontendTool/CMakeLists.txt +++ b/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/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 31eaccc5b4..2433cf051e 100644 --- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/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/lib/Rewrite/CMakeLists.txt b/lib/Rewrite/CMakeLists.txt index af8f6d4f90..d3d7543023 100644 --- a/lib/Rewrite/CMakeLists.txt +++ b/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/lib/Rewrite/Core/CMakeLists.txt b/lib/Rewrite/Core/CMakeLists.txt new file mode 100644 index 0000000000..07978187ff --- /dev/null +++ b/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/lib/Rewrite/DeltaTree.cpp b/lib/Rewrite/Core/DeltaTree.cpp similarity index 99% rename from lib/Rewrite/DeltaTree.cpp rename to lib/Rewrite/Core/DeltaTree.cpp index 4297dc8de6..dff621d206 100644 --- a/lib/Rewrite/DeltaTree.cpp +++ b/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 #include diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/Core/HTMLRewrite.cpp similarity index 99% rename from lib/Rewrite/HTMLRewrite.cpp rename to lib/Rewrite/Core/HTMLRewrite.cpp index 236b98fc28..3deb90e632 100644 --- a/lib/Rewrite/HTMLRewrite.cpp +++ b/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/lib/Rewrite/Core/Makefile b/lib/Rewrite/Core/Makefile new file mode 100644 index 0000000000..8c8d2e4781 --- /dev/null +++ b/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/lib/Rewrite/RewriteRope.cpp b/lib/Rewrite/Core/RewriteRope.cpp similarity index 99% rename from lib/Rewrite/RewriteRope.cpp rename to lib/Rewrite/Core/RewriteRope.cpp index cc8de1b11a..3b085bbedc 100644 --- a/lib/Rewrite/RewriteRope.cpp +++ b/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 using namespace clang; diff --git a/lib/Rewrite/Rewriter.cpp b/lib/Rewrite/Core/Rewriter.cpp similarity index 99% rename from lib/Rewrite/Rewriter.cpp rename to lib/Rewrite/Core/Rewriter.cpp index 7c27114f1c..4df967f39b 100644 --- a/lib/Rewrite/Rewriter.cpp +++ b/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/lib/Rewrite/TokenRewriter.cpp b/lib/Rewrite/Core/TokenRewriter.cpp similarity index 98% rename from lib/Rewrite/TokenRewriter.cpp rename to lib/Rewrite/Core/TokenRewriter.cpp index 03ce63ea11..940ece2f9e 100644 --- a/lib/Rewrite/TokenRewriter.cpp +++ b/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/lib/Rewrite/Frontend/CMakeLists.txt b/lib/Rewrite/Frontend/CMakeLists.txt new file mode 100644 index 0000000000..9017e479ab --- /dev/null +++ b/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/lib/Rewrite/FixItRewriter.cpp b/lib/Rewrite/Frontend/FixItRewriter.cpp similarity index 99% rename from lib/Rewrite/FixItRewriter.cpp rename to lib/Rewrite/Frontend/FixItRewriter.cpp index 3863adb4f1..43a1ab1ac1 100644 --- a/lib/Rewrite/FixItRewriter.cpp +++ b/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/lib/Rewrite/FrontendActions.cpp b/lib/Rewrite/Frontend/FrontendActions.cpp similarity index 97% rename from lib/Rewrite/FrontendActions.cpp rename to lib/Rewrite/Frontend/FrontendActions.cpp index 9bc218e994..7d29b6d421 100644 --- a/lib/Rewrite/FrontendActions.cpp +++ b/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/lib/Rewrite/HTMLPrint.cpp b/lib/Rewrite/Frontend/HTMLPrint.cpp similarity index 95% rename from lib/Rewrite/HTMLPrint.cpp rename to lib/Rewrite/Frontend/HTMLPrint.cpp index 3d190abffc..79e44470ad 100644 --- a/lib/Rewrite/HTMLPrint.cpp +++ b/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/lib/Rewrite/InclusionRewriter.cpp b/lib/Rewrite/Frontend/InclusionRewriter.cpp similarity index 99% rename from lib/Rewrite/InclusionRewriter.cpp rename to lib/Rewrite/Frontend/InclusionRewriter.cpp index 3dfc3b0089..1929d72123 100644 --- a/lib/Rewrite/InclusionRewriter.cpp +++ b/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/lib/Rewrite/Frontend/Makefile b/lib/Rewrite/Frontend/Makefile new file mode 100644 index 0000000000..ac97d4074e --- /dev/null +++ b/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/lib/Rewrite/RewriteMacros.cpp b/lib/Rewrite/Frontend/RewriteMacros.cpp similarity index 98% rename from lib/Rewrite/RewriteMacros.cpp rename to lib/Rewrite/Frontend/RewriteMacros.cpp index 3fa0bdb745..f399dd5d7c 100644 --- a/lib/Rewrite/RewriteMacros.cpp +++ b/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/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/Frontend/RewriteModernObjC.cpp similarity index 99% rename from lib/Rewrite/RewriteModernObjC.cpp rename to lib/Rewrite/Frontend/RewriteModernObjC.cpp index 0f74204541..c735da03fd 100644 --- a/lib/Rewrite/RewriteModernObjC.cpp +++ b/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/lib/Rewrite/RewriteObjC.cpp b/lib/Rewrite/Frontend/RewriteObjC.cpp similarity index 99% rename from lib/Rewrite/RewriteObjC.cpp rename to lib/Rewrite/Frontend/RewriteObjC.cpp index 37f58aa0e9..0b9e656418 100644 --- a/lib/Rewrite/RewriteObjC.cpp +++ b/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/lib/Rewrite/RewriteTest.cpp b/lib/Rewrite/Frontend/RewriteTest.cpp similarity index 92% rename from lib/Rewrite/RewriteTest.cpp rename to lib/Rewrite/Frontend/RewriteTest.cpp index 019e5e7312..722c5e80b4 100644 --- a/lib/Rewrite/RewriteTest.cpp +++ b/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/lib/Rewrite/Makefile b/lib/Rewrite/Makefile index 5fef9b2c0d..0be84d4064 100644 --- a/lib/Rewrite/Makefile +++ b/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/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt index 43d42b3e0d..97cb977861 100644 --- a/lib/StaticAnalyzer/Core/CMakeLists.txt +++ b/lib/StaticAnalyzer/Core/CMakeLists.txt @@ -54,5 +54,5 @@ target_link_libraries(clangStaticAnalyzerCore clangLex clangAST clangFrontend - clangRewrite + clangRewriteCore ) diff --git a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp index 211bcb9124..fd875f66d2 100644 --- a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp +++ b/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/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/lib/StaticAnalyzer/Frontend/CMakeLists.txt index 06d1485078..aafb249c58 100644 --- a/lib/StaticAnalyzer/Frontend/CMakeLists.txt +++ b/lib/StaticAnalyzer/Frontend/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(clangStaticAnalyzerFrontend clangLex clangAST clangFrontend - clangRewrite + clangRewriteCore + clangRewriteFrontend clangStaticAnalyzerCheckers ) diff --git a/lib/Tooling/CMakeLists.txt b/lib/Tooling/CMakeLists.txt index c656c05791..01f24a666f 100644 --- a/lib/Tooling/CMakeLists.txt +++ b/lib/Tooling/CMakeLists.txt @@ -24,5 +24,6 @@ target_link_libraries(clangTooling clangFrontend clangAST clangASTMatchers - clangRewrite + clangRewriteCore + clangRewriteFrontend ) diff --git a/lib/Tooling/Refactoring.cpp b/lib/Tooling/Refactoring.cpp index 628435307c..97cf1c1448 100644 --- a/lib/Tooling/Refactoring.cpp +++ b/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/tools/arcmt-test/CMakeLists.txt b/tools/arcmt-test/CMakeLists.txt index f36b14a679..a7ce586849 100644 --- a/tools/arcmt-test/CMakeLists.txt +++ b/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/tools/arcmt-test/Makefile b/tools/arcmt-test/Makefile index 719da75869..06e20165d7 100644 --- a/tools/arcmt-test/Makefile +++ b/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/tools/c-arcmt-test/Makefile b/tools/c-arcmt-test/Makefile index b59afdac16..6294eff568 100644 --- a/tools/c-arcmt-test/Makefile +++ b/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/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt index 71d77669ca..2545610477 100644 --- a/tools/driver/CMakeLists.txt +++ b/tools/driver/CMakeLists.txt @@ -29,7 +29,8 @@ target_link_libraries(clang clangParse clangEdit clangARCMigrate - clangRewrite + clangRewriteCore + clangRewriteFrontend clangSema clangSerialization clangStaticAnalyzerFrontend diff --git a/tools/driver/Makefile b/tools/driver/Makefile index 270d4fdda8..7e4192c723 100644 --- a/tools/driver/Makefile +++ b/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/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index 283276f801..1426c42b46 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -43,7 +43,8 @@ set(SOURCES set(LIBRARIES clangARCMigrate - clangRewrite + clangRewriteCore + clangRewriteFrontend clangFrontend clangDriver clangSerialization diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile index 975d3812d1..cefd9ba6df 100644 --- a/tools/libclang/Makefile +++ b/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/unittests/AST/Makefile b/unittests/AST/Makefile index 74f17b25a7..e07fc45467 100644 --- a/unittests/AST/Makefile +++ b/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/unittests/ASTMatchers/Makefile b/unittests/ASTMatchers/Makefile index d3e4aa37ce..9ca1006b14 100644 --- a/unittests/ASTMatchers/Makefile +++ b/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/unittests/Frontend/Makefile b/unittests/Frontend/Makefile index bfc3494320..4b6f8753e9 100644 --- a/unittests/Frontend/Makefile +++ b/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/unittests/Tooling/CMakeLists.txt b/unittests/Tooling/CMakeLists.txt index 4eaf33956f..bd7317fe4a 100644 --- a/unittests/Tooling/CMakeLists.txt +++ b/unittests/Tooling/CMakeLists.txt @@ -18,5 +18,5 @@ add_clang_unittest(ToolingTests target_link_libraries(ToolingTests clangAST clangTooling - clangRewrite + clangRewriteCore ) diff --git a/unittests/Tooling/Makefile b/unittests/Tooling/Makefile index 5d2224d40e..5ed99fcc43 100644 --- a/unittests/Tooling/Makefile +++ b/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/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp index 8d9695590a..114f7240c0 100644 --- a/unittests/Tooling/RefactoringTest.cpp +++ b/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/unittests/Tooling/RewriterTestContext.h b/unittests/Tooling/RewriterTestContext.h index 73cedd0150..6d75836815 100644 --- a/unittests/Tooling/RewriterTestContext.h +++ b/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" -- 2.50.1