summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
diff options
context:
space:
mode:
authorEdwin Vane <edwin.vane@intel.com>2013-09-03 13:16:02 +0000
committerEdwin Vane <edwin.vane@intel.com>2013-09-03 13:16:02 +0000
commit147984a8adf15183de3f3a25f74b7b3620e2a1a6 (patch)
treebf419f9698f16461fb7d4160a9a6175c5d5d6383 /clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
parent249c7fb10eb837cc78a6e6d26aef9ad802111440 (diff)
downloadbcm5719-llvm-147984a8adf15183de3f3a25f74b7b3620e2a1a6.tar.gz
bcm5719-llvm-147984a8adf15183de3f3a25f74b7b3620e2a1a6.zip
cpp11-migrate: Refactor for driver model of operation
Re-commit of r189691 and r189689 now with a proper autoconf fix. Massive simplification of how replacements and file overrides are handled by the migrator: * Sources and headers are all treated the same. * All replacements for a given translation unit are stored in the same TranslationUnitReplacements structure. * Change tracking is updated only from main file; no need for propagating "is tracking" flag around. * Transform base class no longer responsible for applying replacements. They are simply stored and main() looks after deduplication and application. * Renamed -yaml-only to -serialize-replacements. Same restrictions apply: Can only request one transform. New restriction: formatting cannot also be turned on since it's basically a transform. * If -serialize-replacements is requested, changes to files will not be applied on disk. * Changed behaviour of function generating names for serialized replacements: Only the main source file goes into the name of the file since a file may contain changes for multiple different files. * Updated HeaderReplacements LIT test for new serialization behaviour. * Replaced old test that ensures replacements are not serialized if -serialize-replacements is not provided. New version ensures changes are made directly to all files in the translation unit. * Updated unit tests. * Due to major simplification of structures in FileOverrides.h, the FileOverridesTest is quite a bit simpler now. llvm-svn: 189798
Diffstat (limited to 'clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp')
-rw-r--r--clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp b/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
index afeec4a10af..e07ee6682ee 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
+++ b/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
@@ -24,7 +24,7 @@ using clang::ast_matchers::MatchFinder;
using namespace clang::tooling;
using namespace clang;
-int UseNullptrTransform::apply(FileOverrides &InputStates,
+int UseNullptrTransform::apply(const FileOverrides &InputStates,
const CompilationDatabase &Database,
const std::vector<std::string> &SourcePaths) {
ClangTool UseNullptrTool(Database, SourcePaths);
@@ -32,8 +32,7 @@ int UseNullptrTransform::apply(FileOverrides &InputStates,
unsigned AcceptedChanges = 0;
MatchFinder Finder;
- NullptrFixer Fixer(getReplacements(), AcceptedChanges, Options().MaxRiskLevel,
- /*Owner=*/ *this);
+ NullptrFixer Fixer(AcceptedChanges, Options().MaxRiskLevel, /*Owner=*/ *this);
Finder.addMatcher(makeCastSequenceMatcher(), &Fixer);
OpenPOWER on IntegriCloud