diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/Makefile | 22 | ||||
| -rw-r--r-- | clang/lib/Driver/TextDiagnosticBuffer.cpp | 41 | ||||
| -rw-r--r-- | clang/lib/Driver/TextDiagnosticPrinter.cpp | 203 | ||||
| -rw-r--r-- | clang/lib/Driver/TextDiagnostics.cpp | 53 | ||||
| -rwxr-xr-x | clang/lib/Makefile | 2 |
5 files changed, 320 insertions, 1 deletions
diff --git a/clang/lib/Driver/Makefile b/clang/lib/Driver/Makefile new file mode 100644 index 00000000000..01902fd88af --- /dev/null +++ b/clang/lib/Driver/Makefile @@ -0,0 +1,22 @@ +##===- clang/lib/Analysis/Makefile -------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +# +# This implements analyses built on top of source-level CFGs. +# +##===----------------------------------------------------------------------===## + +LEVEL = ../../../.. +LIBRARYNAME := clangDriver +BUILD_ARCHIVE = 1 +CXXFLAGS = -fno-rtti + +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include + +include $(LEVEL)/Makefile.common + diff --git a/clang/lib/Driver/TextDiagnosticBuffer.cpp b/clang/lib/Driver/TextDiagnosticBuffer.cpp new file mode 100644 index 00000000000..35aba58aad9 --- /dev/null +++ b/clang/lib/Driver/TextDiagnosticBuffer.cpp @@ -0,0 +1,41 @@ +//===--- TextDiagnosticBuffer.cpp - Buffer Text Diagnostics ---------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This is a concrete diagnostic client, which buffers the diagnostic messages. +// +//===----------------------------------------------------------------------===// + +#include "clang/Driver/TextDiagnosticBuffer.h" +#include "clang/Basic/SourceManager.h" +using namespace clang; + +/// HandleDiagnostic - Store the errors & warnings that are reported. +/// +void TextDiagnosticBuffer::HandleDiagnostic(Diagnostic &Diags, + Diagnostic::Level Level, + FullSourceLoc Pos, + diag::kind ID, + const std::string *Strs, + unsigned NumStrs, + const SourceRange *, + unsigned) { + switch (Level) { + default: assert(0 && "Diagnostic not handled during diagnostic buffering!"); + case Diagnostic::Warning: + Warnings.push_back(std::make_pair(Pos.getLocation(), + FormatDiagnostic(Diags, Level, ID, + Strs, NumStrs))); + break; + case Diagnostic::Error: + Errors.push_back(std::make_pair(Pos.getLocation(), + FormatDiagnostic(Diags, Level, ID, + Strs, NumStrs))); + break; + } +} diff --git a/clang/lib/Driver/TextDiagnosticPrinter.cpp b/clang/lib/Driver/TextDiagnosticPrinter.cpp new file mode 100644 index 00000000000..5188f4dfa11 --- /dev/null +++ b/clang/lib/Driver/TextDiagnosticPrinter.cpp @@ -0,0 +1,203 @@ +//===--- TextDiagnosticPrinter.cpp - Diagnostic Printer -------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This diagnostic client prints out their diagnostic messages. +// +//===----------------------------------------------------------------------===// + +#include "clang/Driver/TextDiagnosticPrinter.h" +#include "clang/Basic/FileManager.h" +#include "clang/Basic/SourceManager.h" +#include "clang/Lex/HeaderSearch.h" +#include "clang/Lex/Lexer.h" +#include "llvm/Support/MemoryBuffer.h" +#include <string> +using namespace clang; + +void TextDiagnosticPrinter:: +PrintIncludeStack(FullSourceLoc Pos) { + if (Pos.isInvalid()) return; + + Pos = Pos.getLogicalLoc(); + + // Print out the other include frames first. + PrintIncludeStack(Pos.getIncludeLoc()); + unsigned LineNo = Pos.getLineNumber(); + + OS << "In file included from " << Pos.getSourceName() + << ":" << LineNo << ":\n"; +} + +/// HighlightRange - Given a SourceRange and a line number, highlight (with ~'s) +/// any characters in LineNo that intersect the SourceRange. +void TextDiagnosticPrinter::HighlightRange(const SourceRange &R, + SourceManager& SourceMgr, + unsigned LineNo, unsigned FileID, + std::string &CaratLine, + const std::string &SourceLine) { + assert(CaratLine.size() == SourceLine.size() && + "Expect a correspondence between source and carat line!"); + if (!R.isValid()) return; + + SourceLocation LogicalStart = SourceMgr.getLogicalLoc(R.getBegin()); + unsigned StartLineNo = SourceMgr.getLineNumber(LogicalStart); + if (StartLineNo > LineNo || LogicalStart.getFileID() != FileID) + return; // No intersection. + + SourceLocation LogicalEnd = SourceMgr.getLogicalLoc(R.getEnd()); + unsigned EndLineNo = SourceMgr.getLineNumber(LogicalEnd); + if (EndLineNo < LineNo || LogicalEnd.getFileID() != FileID) + return; // No intersection. + + // Compute the column number of the start. + unsigned StartColNo = 0; + if (StartLineNo == LineNo) { + StartColNo = SourceMgr.getLogicalColumnNumber(R.getBegin()); + if (StartColNo) --StartColNo; // Zero base the col #. + } + + // Pick the first non-whitespace column. + while (StartColNo < SourceLine.size() && + (SourceLine[StartColNo] == ' ' || SourceLine[StartColNo] == '\t')) + ++StartColNo; + + // Compute the column number of the end. + unsigned EndColNo = CaratLine.size(); + if (EndLineNo == LineNo) { + EndColNo = SourceMgr.getLogicalColumnNumber(R.getEnd()); + if (EndColNo) { + --EndColNo; // Zero base the col #. + + // Add in the length of the token, so that we cover multi-char tokens. + EndColNo += Lexer::MeasureTokenLength(R.getEnd(), SourceMgr); + } else { + EndColNo = CaratLine.size(); + } + } + + // Pick the last non-whitespace column. + if (EndColNo <= SourceLine.size()) + while (EndColNo-1 && + (SourceLine[EndColNo-1] == ' ' || SourceLine[EndColNo-1] == '\t')) + --EndColNo; + else + EndColNo = SourceLine.size(); + + // Fill the range with ~'s. + assert(StartColNo <= EndColNo && "Invalid range!"); + for (unsigned i = StartColNo; i < EndColNo; ++i) + CaratLine[i] = '~'; +} + +void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic &Diags, + Diagnostic::Level Level, + FullSourceLoc Pos, + diag::kind ID, + const std::string *Strs, + unsigned NumStrs, + const SourceRange *Ranges, + unsigned NumRanges) { + unsigned LineNo = 0, ColNo = 0; + unsigned FileID = 0; + const char *LineStart = 0, *LineEnd = 0; + + if (Pos.isValid()) { + FullSourceLoc LPos = Pos.getLogicalLoc(); + LineNo = LPos.getLineNumber(); + FileID = LPos.getLocation().getFileID(); + + // First, if this diagnostic is not in the main file, print out the + // "included from" lines. + if (LastWarningLoc != LPos.getIncludeLoc()) { + LastWarningLoc = LPos.getIncludeLoc(); + PrintIncludeStack(LastWarningLoc); + } + + // Compute the column number. Rewind from the current position to the start + // of the line. + ColNo = LPos.getColumnNumber(); + const char *TokLogicalPtr = LPos.getCharacterData(); + LineStart = TokLogicalPtr-ColNo+1; // Column # is 1-based + + // Compute the line end. Scan forward from the error position to the end of + // the line. + const llvm::MemoryBuffer *Buffer = LPos.getBuffer(); + const char *BufEnd = Buffer->getBufferEnd(); + LineEnd = TokLogicalPtr; + while (LineEnd != BufEnd && + *LineEnd != '\n' && *LineEnd != '\r') + ++LineEnd; + + OS << Buffer->getBufferIdentifier() << ":" << LineNo << ":"; + if (ColNo && ShowColumn) + OS << ColNo << ":"; + OS << " "; + } + + switch (Level) { + default: assert(0 && "Unknown diagnostic type!"); + case Diagnostic::Note: OS << "note: "; break; + case Diagnostic::Warning: OS << "warning: "; break; + case Diagnostic::Error: OS << "error: "; break; + case Diagnostic::Fatal: OS << "fatal error: "; break; + break; + } + + OS << FormatDiagnostic(Diags, Level, ID, Strs, NumStrs) << "\n"; + + if (CaretDiagnostics && Pos.isValid() && ((LastLoc != Pos) || Ranges)) { + // Cache the LastLoc, it allows us to omit duplicate source/caret spewage. + LastLoc = Pos; + + // Get the line of the source file. + std::string SourceLine(LineStart, LineEnd); + + // Create a line for the carat that is filled with spaces that is the same + // length as the line of source code. + std::string CaratLine(LineEnd-LineStart, ' '); + + // Highlight all of the characters covered by Ranges with ~ characters. + for (unsigned i = 0; i != NumRanges; ++i) + HighlightRange(Ranges[i], Pos.getManager(), LineNo, FileID, + CaratLine, SourceLine); + + // Next, insert the carat itself. + if (ColNo-1 < CaratLine.size()) + CaratLine[ColNo-1] = '^'; + else + CaratLine.push_back('^'); + + // Scan the source line, looking for tabs. If we find any, manually expand + // them to 8 characters and update the CaratLine to match. + for (unsigned i = 0; i != SourceLine.size(); ++i) { + if (SourceLine[i] != '\t') continue; + + // Replace this tab with at least one space. + SourceLine[i] = ' '; + + // Compute the number of spaces we need to insert. + unsigned NumSpaces = ((i+8)&~7) - (i+1); + assert(NumSpaces < 8 && "Invalid computation of space amt"); + + // Insert spaces into the SourceLine. + SourceLine.insert(i+1, NumSpaces, ' '); + + // Insert spaces or ~'s into CaratLine. + CaratLine.insert(i+1, NumSpaces, CaratLine[i] == '~' ? '~' : ' '); + } + + // Finally, remove any blank spaces from the end of CaratLine. + while (CaratLine[CaratLine.size()-1] == ' ') + CaratLine.erase(CaratLine.end()-1); + + // Emit what we have computed. + OS << SourceLine << "\n"; + OS << CaratLine << "\n"; + } +} diff --git a/clang/lib/Driver/TextDiagnostics.cpp b/clang/lib/Driver/TextDiagnostics.cpp new file mode 100644 index 00000000000..ae7b57dc2c1 --- /dev/null +++ b/clang/lib/Driver/TextDiagnostics.cpp @@ -0,0 +1,53 @@ +//===--- TextDiagnostics.cpp - Text Diagnostics Parent Class --------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This is the parent class for all text diagnostics. +// +//===----------------------------------------------------------------------===// + +#include "clang/Driver/TextDiagnostics.h" +#include "clang/Basic/SourceLocation.h" +#include "clang/Basic/SourceManager.h" +#include "clang/Lex/HeaderSearch.h" +using namespace clang; + +TextDiagnostics:: ~TextDiagnostics() {} + +std::string TextDiagnostics::FormatDiagnostic(Diagnostic &Diags, + Diagnostic::Level Level, + diag::kind ID, + const std::string *Strs, + unsigned NumStrs) { + std::string Msg = Diags.getDescription(ID); + + // Replace all instances of %0 in Msg with 'Extra'. + for (unsigned i = 0; i < Msg.size() - 1; ++i) { + if (Msg[i] == '%' && isdigit(Msg[i + 1])) { + unsigned StrNo = Msg[i + 1] - '0'; + Msg = std::string(Msg.begin(), Msg.begin() + i) + + (StrNo < NumStrs ? Strs[StrNo] : "<<<INTERNAL ERROR>>>") + + std::string(Msg.begin() + i + 2, Msg.end()); + } + } + + return Msg; +} + +bool TextDiagnostics::isInSystemHeader(FullSourceLoc Pos) const { + if (!Pos.isValid()) return false; + + if (const FileEntry *F = Pos.getFileEntryForLoc()) { + DirectoryLookup::DirType DirInfo = TheHeaderSearch->getFileDirFlavor(F); + if (DirInfo == DirectoryLookup::SystemHeaderDir || + DirInfo == DirectoryLookup::ExternCSystemHeaderDir) + return true; + } + + return false; +} diff --git a/clang/lib/Makefile b/clang/lib/Makefile index f6514d57c77..c72c353f8b5 100755 --- a/clang/lib/Makefile +++ b/clang/lib/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../../.. -PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite +PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver include $(LEVEL)/Makefile.common |
