diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cpp11-migrate/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | cpp11-migrate/Cpp11Migrate.cpp | 57 | ||||
| -rw-r--r-- | cpp11-migrate/Makefile | 26 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/cpp11-migrate/syntax_only.cpp | 7 | ||||
| -rw-r--r-- | test/cpp11-migrate/syntax_xfail.cpp | 8 |
7 files changed, 112 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a3ee684..4755f295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(remove-cstr-calls) add_subdirectory(tool-template) add_subdirectory(loop-convert) add_subdirectory(clang-format) +add_subdirectory(cpp11-migrate) # Add the common testsuite after all the tools. add_subdirectory(test) diff --git a/cpp11-migrate/CMakeLists.txt b/cpp11-migrate/CMakeLists.txt new file mode 100644 index 00000000..49c624d4 --- /dev/null +++ b/cpp11-migrate/CMakeLists.txt @@ -0,0 +1,12 @@ +set(LLVM_LINK_COMPONENTS support) +set(LLVM_USED_LIBS clangTooling clangBasic clangAST) + +add_clang_executable(cpp11-migrate + Cpp11Migrate.cpp + ) + +target_link_libraries(cpp11-migrate + clangTooling + clangBasic + clangASTMatchers + ) diff --git a/cpp11-migrate/Cpp11Migrate.cpp b/cpp11-migrate/Cpp11Migrate.cpp new file mode 100644 index 00000000..0e720462 --- /dev/null +++ b/cpp11-migrate/Cpp11Migrate.cpp @@ -0,0 +1,57 @@ +//===-- cpp11-migrate/Cpp11Migrate.cpp - Main file C++11 migration tool ---===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +/// +/// \file +/// \brief This file implements the C++11 feature migration tool main function +/// and transformation framework. +/// +/// Usage: +/// cpp11-migrate [-p <build-path>] <file1> <file2> ... [-- [compiler-options]] +/// +/// Where <build-path> is a CMake build directory containing a file named +/// compile_commands.json which provides compiler options for building each +/// sourc file. If <build-path> is not provided the compile_commands.json file +/// is searched for through all parent directories. +/// +/// Alternatively, one can provide compile options to be applied to every source +/// file after the optional '--'. +/// +/// <file1>... specify the paths of files in the CMake source tree, with the +/// same requirements as other tools built on LibTooling. +/// +//===----------------------------------------------------------------------===// + +#include "clang/Basic/FileManager.h" +#include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/FrontendActions.h" +#include "clang/Tooling/Refactoring.h" +#include "clang/Tooling/Tooling.h" +#include "clang/Tooling/CommonOptionsParser.h" + +namespace cl = llvm::cl; +using namespace clang::tooling; + + +int main(int argc, const char **argv) { + CommonOptionsParser OptionsParser(argc, argv); + + // TODO: Create transforms requested by command-line. + ClangTool SyntaxTool(OptionsParser.GetCompilations(), + OptionsParser.GetSourcePathList()); + + // First, let's check to make sure there were no errors. + if (SyntaxTool.run(newFrontendActionFactory<clang::SyntaxOnlyAction>()) != + 0) { + return 1; + } + + // TODO: Apply transforms + + return 0; +} diff --git a/cpp11-migrate/Makefile b/cpp11-migrate/Makefile new file mode 100644 index 00000000..98d9b1e7 --- /dev/null +++ b/cpp11-migrate/Makefile @@ -0,0 +1,26 @@ +##===- tools/extra/loop-convert/Makefile ----sssss----------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## + +CLANG_LEVEL := ../../.. + +TOOLNAME = cpp11-migrate +NO_INSTALL = 1 + +# No plugins, optimize startup time. +TOOL_NO_EXPORTS = 1 + +include $(CLANG_LEVEL)/../../Makefile.config +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc +USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ + clangRewriteFrontend.a clangRewriteCore.a clangParse.a \ + clangSema.a clangAnalysis.a \ + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a + +include $(CLANG_LEVEL)/Makefile + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9c0d1824..be12d199 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,7 +22,7 @@ set(CLANG_TOOLS_TEST_DEPS clang clang-headers FileCheck count not # Individual tools we test. - remove-cstr-calls loop-convert + remove-cstr-calls loop-convert cpp11-migrate ) add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests" diff --git a/test/cpp11-migrate/syntax_only.cpp b/test/cpp11-migrate/syntax_only.cpp new file mode 100644 index 00000000..eaceb357 --- /dev/null +++ b/test/cpp11-migrate/syntax_only.cpp @@ -0,0 +1,7 @@ +// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp +// RUN: cpp11-migrate %t.cpp -- +// REQUIRES: shell + +int main(int argc, char** argv) { + return 0; +} diff --git a/test/cpp11-migrate/syntax_xfail.cpp b/test/cpp11-migrate/syntax_xfail.cpp new file mode 100644 index 00000000..0c5c652a --- /dev/null +++ b/test/cpp11-migrate/syntax_xfail.cpp @@ -0,0 +1,8 @@ +// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp +// RUN: cpp11-migrate %t.cpp -- +// XFAIL: * +// REQUIRES: shell + +int main(int argc, char** argv) { +i return 0; +} |