Add a new cc1 option -fix-what-you-can which when combined with the fix-it mode
will apply all fixes even when there were other errors in the file.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111020 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Rewrite/FixItRewriter.cpp b/lib/Rewrite/FixItRewriter.cpp
index 29ac7e3..875af7a 100644
--- a/lib/Rewrite/FixItRewriter.cpp
+++ b/lib/Rewrite/FixItRewriter.cpp
@@ -27,10 +27,10 @@
FixItRewriter::FixItRewriter(Diagnostic &Diags, SourceManager &SourceMgr,
const LangOptions &LangOpts,
- FixItPathRewriter *PathRewriter)
+ FixItOptions *FixItOpts)
: Diags(Diags),
Rewrite(SourceMgr, LangOpts),
- PathRewriter(PathRewriter),
+ FixItOpts(FixItOpts),
NumFailures(0) {
Client = Diags.getClient();
Diags.setClient(this);
@@ -49,7 +49,7 @@
}
bool FixItRewriter::WriteFixedFiles() {
- if (NumFailures > 0) {
+ if (NumFailures > 0 && !FixItOpts->FixWhatYouCan) {
Diag(FullSourceLoc(), diag::warn_fixit_no_changes);
return true;
}
@@ -57,8 +57,8 @@
for (iterator I = buffer_begin(), E = buffer_end(); I != E; ++I) {
const FileEntry *Entry = Rewrite.getSourceMgr().getFileEntryForID(I->first);
std::string Filename = Entry->getName();
- if (PathRewriter)
- Filename = PathRewriter->RewriteFilename(Filename);
+ if (FixItOpts)
+ Filename = FixItOpts->RewriteFilename(Filename);
std::string Err;
llvm::raw_fd_ostream OS(Filename.c_str(), Err,
llvm::raw_fd_ostream::F_Binary);
@@ -164,4 +164,4 @@
Diags.setClient(this);
}
-FixItPathRewriter::~FixItPathRewriter() {}
+FixItOptions::~FixItOptions() {}
diff --git a/lib/Rewrite/FrontendActions.cpp b/lib/Rewrite/FrontendActions.cpp
index 6da3b4b..6d98987 100644
--- a/lib/Rewrite/FrontendActions.cpp
+++ b/lib/Rewrite/FrontendActions.cpp
@@ -42,12 +42,14 @@
return new ASTConsumer();
}
-class FixItActionSuffixInserter : public FixItPathRewriter {
+class FixItActionSuffixInserter : public FixItOptions {
std::string NewSuffix;
public:
- explicit FixItActionSuffixInserter(std::string NewSuffix)
- : NewSuffix(NewSuffix) {}
+ FixItActionSuffixInserter(std::string NewSuffix, bool FixWhatYouCan)
+ : NewSuffix(NewSuffix) {
+ this->FixWhatYouCan = FixWhatYouCan;
+ }
std::string RewriteFilename(const std::string &Filename) {
llvm::sys::Path Path(Filename);
@@ -62,12 +64,13 @@
llvm::StringRef Filename) {
const FrontendOptions &FEOpts = getCompilerInstance().getFrontendOpts();
if (!FEOpts.FixItSuffix.empty()) {
- PathRewriter.reset(new FixItActionSuffixInserter(FEOpts.FixItSuffix));
+ FixItOpts.reset(new FixItActionSuffixInserter(FEOpts.FixItSuffix,
+ FEOpts.FixWhatYouCan));
} else {
- PathRewriter.reset();
+ FixItOpts.reset();
}
Rewriter.reset(new FixItRewriter(CI.getDiagnostics(), CI.getSourceManager(),
- CI.getLangOpts(), PathRewriter.get()));
+ CI.getLangOpts(), FixItOpts.get()));
return true;
}