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

Sink all of the include stack printing logic into its member function. 

llvm-svn: 138920
This commit is contained in:
Chandler Carruth 2011-08-31 23:59:19 +00:00
parent 5efad63f57
commit 153a7bb35e
1 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
clang/lib/Frontend/TextDiagnosticPrinter.cpp
View File

@ -53,27 +53,54 @@ TextDiagnosticPrinter::~TextDiagnosticPrinter() {
delete &OS;
}
void TextDiagnosticPrinter::PrintIncludeStack(Diagnostic::Level Level,
SourceLocation Loc,
const SourceManager &SM) {
if (!DiagOpts->ShowNoteIncludeStack && Level == Diagnostic::Note) return;
if (Loc.isInvalid()) return;
/// \brief Helper to recursivly walk up the include stack and print each layer
/// on the way back down.
static void PrintIncludeStackRecursively(raw_ostream &OS,
const SourceManager &SM,
SourceLocation Loc,
bool ShowLocation) {
if (Loc.isInvalid())
return;
PresumedLoc PLoc = SM.getPresumedLoc(Loc);
if (PLoc.isInvalid())
return;
// Print out the other include frames first.
PrintIncludeStack(Level, PLoc.getIncludeLoc(), SM);
if (DiagOpts->ShowLocation)
// Print out the other include frames first.
PrintIncludeStackRecursively(OS, SM, PLoc.getIncludeLoc(), ShowLocation);
if (ShowLocation)
OS << "In file included from " << PLoc.getFilename()
<< ':' << PLoc.getLine() << ":\n";
else
OS << "In included file:\n";
}
/// \brief Prints an include stack when appropriate for a particular diagnostic
/// level and location.
///
/// This routine handles all the logic of suppressing particular include stacks
/// (such as those for notes) and duplicate include stacks when repeated
/// warnings occur within the same file. It also handles the logic of
/// customizing the formatting and display of the include stack.
///
/// \param Level The diagnostic level of the message this stack pertains to.
/// \param Loc The include location of the current file (not the diagnostic
/// location).
void TextDiagnosticPrinter::PrintIncludeStack(Diagnostic::Level Level,
SourceLocation Loc,
const SourceManager &SM) {
// Skip redundant include stacks altogether.
if (LastWarningLoc == Loc)
return;
LastWarningLoc = Loc;
if (!DiagOpts->ShowNoteIncludeStack && Level == Diagnostic::Note)
return;
PrintIncludeStackRecursively(OS, SM, Loc, DiagOpts->ShowLocation);
}
/// HighlightRange - Given a SourceRange and a line number, highlight (with ~'s)
/// any characters in LineNo that intersect the SourceRange.
void TextDiagnosticPrinter::HighlightRange(const CharSourceRange &R,
@ -398,10 +425,7 @@ void TextDiagnosticPrinter::EmitCaretDiagnostic(SourceLocation Loc,
// If this diagnostic is not in the main file, print out the
// "included from" lines.
if (LastWarningLoc != PLoc.getIncludeLoc()) {
LastWarningLoc = PLoc.getIncludeLoc();
PrintIncludeStack(Diagnostic::Note, LastWarningLoc, SM);
}
PrintIncludeStack(Diagnostic::Note, PLoc.getIncludeLoc(), SM);
if (DiagOpts->ShowLocation) {
// Emit the file/line/column that this expansion came from.
@ -879,11 +903,8 @@ void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic::Level Level,
// First, if this diagnostic is not in the main file, print out the
// "included from" lines.
if (LastWarningLoc != PLoc.getIncludeLoc()) {
LastWarningLoc = PLoc.getIncludeLoc();
PrintIncludeStack(Level, LastWarningLoc, SM);
StartOfLocationInfo = OS.tell();
}
PrintIncludeStack(Level, PLoc.getIncludeLoc(), SM);
StartOfLocationInfo = OS.tell();
// Compute the column number.
if (DiagOpts->ShowLocation) {