replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some cleanups to the fix-it rewriter. Thanks, Chris 

llvm-svn: 68322
This commit is contained in:
Douglas Gregor 2009-04-02 16:34:42 +00:00
parent 4eca109941
commit 068913eb7a
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/Frontend/CMakeLists.txt
View File

@ -1,6 +1,7 @@
set(LLVM_NO_RTTI 1)
add_clang_library(clangFrontend
FixItRewriter.cpp
HTMLDiagnostics.cpp
InitHeaderSearch.cpp
TextDiagnosticBuffer.cpp

72
clang/lib/Frontend/FixItRewriter.cpp
View File

@ -12,8 +12,9 @@
// then forwards any diagnostics to the adapted diagnostic client.
//
//===----------------------------------------------------------------------===//
#include "clang/Basic/SourceManager.h"
#include "clang/Frontend/FixItRewriter.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Rewrite/Rewriter.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/Streams.h"
@ -37,16 +38,14 @@ bool FixItRewriter::WriteFixedFile(const std::string &InFileName,
if (NumFailures > 0) {
// FIXME: Use diagnostic machinery!
std::fprintf(stderr,
"%d fix-it failures detected; code will not be modified",
"%d fix-it failures detected; code will not be modified\n",
NumFailures);
return true;
}
llvm::OwningPtr<llvm::raw_ostream> OwnedStream;
llvm::raw_ostream *OutFile;
if (OutFileName == "-") {
OutFile = &llvm::outs();
} else if (!OutFileName.empty()) {
if (!OutFileName.empty()) {
std::string Err;
OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(),
// set binary mode (critical for Windoze)
@ -81,7 +80,7 @@ bool FixItRewriter::WriteFixedFile(const std::string &InFileName,
}
bool FixItRewriter::IncludeInDiagnosticCounts() const {
return Client? Client->IncludeInDiagnosticCounts() : false;
return Client? Client->IncludeInDiagnosticCounts() : true;
}
void FixItRewriter::HandleDiagnostic(Diagnostic::Level DiagLevel,
@ -91,13 +90,12 @@ void FixItRewriter::HandleDiagnostic(Diagnostic::Level DiagLevel,
// Make sure that we can perform all of the modifications we
// in this diagnostic.
bool CanRewrite = true;
for (unsigned Idx = 0; Idx < Info.getNumCodeModificationHints(); ++Idx) {
bool CanRewrite = Info.getNumCodeModificationHints() > 0;
for (unsigned Idx = 0, Last = Info.getNumCodeModificationHints();
Idx < Last; ++Idx) {
const CodeModificationHint &Hint = Info.getCodeModificationHint(Idx);
if (Hint.RemoveRange.isValid() &&
(!Rewrite->isRewritable(Hint.RemoveRange.getBegin()) ||
!Rewrite->isRewritable(Hint.RemoveRange.getEnd()) ||
Rewrite->getRangeSize(Hint.RemoveRange) == -1)) {
Rewrite->getRangeSize(Hint.RemoveRange) == -1) {
CanRewrite = false;
break;
}
@ -109,33 +107,49 @@ void FixItRewriter::HandleDiagnostic(Diagnostic::Level DiagLevel,
}
}
if (!CanRewrite) // FIXME: warn the user that this rewrite couldn't be done
if (!CanRewrite) {
if (Info.getNumCodeModificationHints() > 0) {
// FIXME: warn the user that this rewrite couldn't be done
}
// If this was an error, refuse to perform any rewriting.
if (DiagLevel == Diagnostic::Error || DiagLevel == Diagnostic::Fatal) {
if (++NumFailures == 1) {
// FIXME: use diagnostic machinery to print this.
std::fprintf(stderr, "error without fix-it advice detected; "
"fix-it will produce no output\n");
}
}
return;
}
bool Failed = false;
for (unsigned Idx = 0; Idx < Info.getNumCodeModificationHints(); ++Idx) {
for (unsigned Idx = 0, Last = Info.getNumCodeModificationHints();
Idx < Last; ++Idx) {
const CodeModificationHint &Hint = Info.getCodeModificationHint(Idx);
if (Hint.RemoveRange.isValid()) {
if (Hint.CodeToInsert.empty()) {
// We're removing code.
if (Rewrite->RemoveText(Hint.RemoveRange.getBegin(),
Rewrite->getRangeSize(Hint.RemoveRange)))
Failed = true;
} else {
// We're replacing code.
if (Rewrite->ReplaceText(Hint.RemoveRange.getBegin(),
Rewrite->getRangeSize(Hint.RemoveRange),
Hint.CodeToInsert.c_str(),
Hint.CodeToInsert.size()))
Failed = true;
}
} else {
if (!Hint.RemoveRange.isValid()) {
// We're adding code.
if (Rewrite->InsertStrBefore(Hint.InsertionLoc, Hint.CodeToInsert))
Failed = true;
continue;
}
if (Hint.CodeToInsert.empty()) {
// We're removing code.
if (Rewrite->RemoveText(Hint.RemoveRange.getBegin(),
Rewrite->getRangeSize(Hint.RemoveRange)))
Failed = true;
continue;
}
// We're replacing code.
if (Rewrite->ReplaceText(Hint.RemoveRange.getBegin(),
Rewrite->getRangeSize(Hint.RemoveRange),
Hint.CodeToInsert.c_str(),
Hint.CodeToInsert.size()))
Failed = true;
}
if (Failed)
if (Failed) // FIXME: notify the user that the rewrite failed.
++NumFailures;
}