diff options
54 files changed, 163 insertions, 100 deletions
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 index f32906a323..f32906a323 100644 --- a/include/clang/Rewrite/DeltaTree.h +++ b/include/clang/Rewrite/Core/DeltaTree.h diff --git a/include/clang/Rewrite/HTMLRewrite.h b/include/clang/Rewrite/Core/HTMLRewrite.h index 88caf85e60..88caf85e60 100644 --- a/include/clang/Rewrite/HTMLRewrite.h +++ b/include/clang/Rewrite/Core/HTMLRewrite.h diff --git a/include/clang/Rewrite/RewriteRope.h b/include/clang/Rewrite/Core/RewriteRope.h index bae8fb7a50..bae8fb7a50 100644 --- a/include/clang/Rewrite/RewriteRope.h +++ b/include/clang/Rewrite/Core/RewriteRope.h diff --git a/include/clang/Rewrite/Rewriter.h b/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 <cstring> #include <map> diff --git a/include/clang/Rewrite/TokenRewriter.h b/include/clang/Rewrite/Core/TokenRewriter.h index 894db0953f..894db0953f 100644 --- a/include/clang/Rewrite/TokenRewriter.h +++ b/include/clang/Rewrite/Core/TokenRewriter.h diff --git a/include/clang/Rewrite/ASTConsumers.h b/include/clang/Rewrite/Frontend/ASTConsumers.h index c9c92e3a01..c9c92e3a01 100644 --- a/include/clang/Rewrite/ASTConsumers.h +++ b/include/clang/Rewrite/Frontend/ASTConsumers.h diff --git a/include/clang/Rewrite/FixItRewriter.h b/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 index ea876d9980..ea876d9980 100644 --- a/include/clang/Rewrite/FrontendActions.h +++ b/include/clang/Rewrite/Frontend/FrontendActions.h diff --git a/include/clang/Rewrite/Rewriters.h b/include/clang/Rewrite/Frontend/Rewriters.h index f5ade5ad35..f5ade5ad35 100644 --- a/include/clang/Rewrite/Rewriters.h +++ b/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 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 <cstring> #include <cstdio> diff --git a/lib/Rewrite/HTMLRewrite.cpp b/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 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 <algorithm> using namespace clang; diff --git a/lib/Rewrite/Rewriter.cpp b/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 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 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 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 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 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 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 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 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 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 |