diff options
Diffstat (limited to 'clang/Driver')
| -rw-r--r-- | clang/Driver/DiagChecker.cpp | 2 | ||||
| -rw-r--r-- | clang/Driver/Makefile | 2 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnosticBuffer.cpp | 41 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnosticBuffer.h | 53 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnosticPrinter.cpp | 212 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnosticPrinter.h | 52 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnostics.cpp | 53 | ||||
| -rw-r--r-- | clang/Driver/TextDiagnostics.h | 50 | ||||
| -rw-r--r-- | clang/Driver/clang.cpp | 19 |
9 files changed, 17 insertions, 467 deletions
diff --git a/clang/Driver/DiagChecker.cpp b/clang/Driver/DiagChecker.cpp index 643c17ee429..e11d2f0c6a1 100644 --- a/clang/Driver/DiagChecker.cpp +++ b/clang/Driver/DiagChecker.cpp @@ -13,7 +13,7 @@ #include "clang.h" #include "ASTConsumers.h" -#include "TextDiagnosticBuffer.h" +#include "clang/Driver/TextDiagnosticBuffer.h" #include "clang/Sema/ParseAST.h" #include "clang/AST/ASTConsumer.h" #include "clang/Basic/SourceManager.h" diff --git a/clang/Driver/Makefile b/clang/Driver/Makefile index 1e6d80be632..16a8c6308c1 100644 --- a/clang/Driver/Makefile +++ b/clang/Driver/Makefile @@ -4,7 +4,7 @@ CXXFLAGS = -fno-rtti TOOLNAME = clang USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSEMA.a \ - clangAST.a clangParse.a clangLex.a clangBasic.a \ + clangDriver.a clangAST.a clangParse.a clangLex.a clangBasic.a \ LLVMCore.a LLVMSupport.a LLVMSystem.a \ LLVMBitWriter.a LLVMBitReader.a LLVMCodeGen.a LLVMAnalysis.a \ LLVMTarget.a diff --git a/clang/Driver/TextDiagnosticBuffer.cpp b/clang/Driver/TextDiagnosticBuffer.cpp deleted file mode 100644 index aa6fbe9ab5e..00000000000 --- a/clang/Driver/TextDiagnosticBuffer.cpp +++ /dev/null @@ -1,41 +0,0 @@ -//===--- 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 "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/Driver/TextDiagnosticBuffer.h b/clang/Driver/TextDiagnosticBuffer.h deleted file mode 100644 index e0230cf7088..00000000000 --- a/clang/Driver/TextDiagnosticBuffer.h +++ /dev/null @@ -1,53 +0,0 @@ -//===--- TextDiagnosticBuffer.h - Buffer Text Diagnostics -------*- C++ -*-===// -// -// 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. -// -//===----------------------------------------------------------------------===// - -#ifndef DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_ -#define DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_ - -#include "TextDiagnostics.h" -#include <vector> - -namespace clang { - -class Preprocessor; -class SourceManager; - -class TextDiagnosticBuffer : public TextDiagnostics { -public: - typedef std::vector<std::pair<SourceLocation, std::string> > DiagList; - typedef DiagList::iterator iterator; - typedef DiagList::const_iterator const_iterator; -private: - DiagList Errors, Warnings; -public: - TextDiagnosticBuffer() {} - - const_iterator err_begin() const { return Errors.begin(); } - const_iterator err_end() const { return Errors.end(); } - - const_iterator warn_begin() const { return Warnings.begin(); } - const_iterator warn_end() const { return Warnings.end(); } - - virtual void HandleDiagnostic(Diagnostic &Diags, - Diagnostic::Level DiagLevel, - FullSourceLoc Pos, - diag::kind ID, - const std::string *Strs, - unsigned NumStrs, - const SourceRange *Ranges, - unsigned NumRanges); -}; - -} // end namspace clang - -#endif diff --git a/clang/Driver/TextDiagnosticPrinter.cpp b/clang/Driver/TextDiagnosticPrinter.cpp deleted file mode 100644 index 16c7645862d..00000000000 --- a/clang/Driver/TextDiagnosticPrinter.cpp +++ /dev/null @@ -1,212 +0,0 @@ -//===--- 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 "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/CommandLine.h" -#include "llvm/Support/MemoryBuffer.h" -#include <string> -using namespace clang; - -static llvm::cl::opt<bool> -NoShowColumn("fno-show-column", - llvm::cl::desc("Do not include column number on diagnostics")); -static llvm::cl::opt<bool> -NoCaretDiagnostics("fno-caret-diagnostics", - llvm::cl::desc("Do not include source line and caret with" - " diagnostics")); - -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 && !NoShowColumn) - 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 (!NoCaretDiagnostics && 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/Driver/TextDiagnosticPrinter.h b/clang/Driver/TextDiagnosticPrinter.h deleted file mode 100644 index 633f29edbef..00000000000 --- a/clang/Driver/TextDiagnosticPrinter.h +++ /dev/null @@ -1,52 +0,0 @@ -//===--- TextDiagnosticPrinter.h - Text Diagnostic Client -------*- C++ -*-===// -// -// 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 prints the diagnostics to -// standard error. -// -//===----------------------------------------------------------------------===// - -#ifndef TEXT_DIAGNOSTIC_PRINTER_H_ -#define TEXT_DIAGNOSTIC_PRINTER_H_ - -#include "TextDiagnostics.h" -#include "clang/Basic/SourceLocation.h" -#include "llvm/Support/Streams.h" - -namespace clang { -class SourceManager; - -class TextDiagnosticPrinter : public TextDiagnostics { - FullSourceLoc LastWarningLoc; - FullSourceLoc LastLoc; - llvm::OStream OS; -public: - TextDiagnosticPrinter(llvm::OStream &os = llvm::cerr) : OS(os) {} - - void PrintIncludeStack(FullSourceLoc Pos); - - void HighlightRange(const SourceRange &R, - SourceManager& SrcMgr, - unsigned LineNo, unsigned FileID, - std::string &CaratLine, - const std::string &SourceLine); - - virtual void HandleDiagnostic(Diagnostic &Diags, - Diagnostic::Level DiagLevel, - FullSourceLoc Pos, - diag::kind ID, - const std::string *Strs, - unsigned NumStrs, - const SourceRange *Ranges, - unsigned NumRanges); -}; - -} // end namspace clang - -#endif diff --git a/clang/Driver/TextDiagnostics.cpp b/clang/Driver/TextDiagnostics.cpp deleted file mode 100644 index 7a78e947833..00000000000 --- a/clang/Driver/TextDiagnostics.cpp +++ /dev/null @@ -1,53 +0,0 @@ -//===--- 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 "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/Driver/TextDiagnostics.h b/clang/Driver/TextDiagnostics.h deleted file mode 100644 index 9b8d9fb27db..00000000000 --- a/clang/Driver/TextDiagnostics.h +++ /dev/null @@ -1,50 +0,0 @@ -//===--- TextDiagnostics.h - Text Diagnostics Checkers ----------*- C++ -*-===// -// -// 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. -// -//===----------------------------------------------------------------------===// - -#ifndef TEXT_DIAGNOSTICS_H_ -#define TEXT_DIAGNOSTICS_H_ - -#include "clang/Basic/Diagnostic.h" - -namespace clang { -class SourceManager; -class HeaderSearch; -class Preprocessor; - -class TextDiagnostics : public DiagnosticClient { - HeaderSearch *TheHeaderSearch; -protected: - std::string FormatDiagnostic(Diagnostic &Diags, Diagnostic::Level Level, - diag::kind ID, - const std::string *Strs, - unsigned NumStrs); -public: - TextDiagnostics() {} - virtual ~TextDiagnostics(); - - void setHeaderSearch(HeaderSearch &HS) { TheHeaderSearch = &HS; } - - virtual bool isInSystemHeader(FullSourceLoc Pos) const; - - virtual void HandleDiagnostic(Diagnostic &Diags, Diagnostic::Level DiagLevel, - FullSourceLoc Pos, - diag::kind ID, - const std::string *Strs, - unsigned NumStrs, - const SourceRange *Ranges, - unsigned NumRanges) = 0; -}; - -} // end namspace clang - -#endif diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp index 56389dfb693..1aa7651aa6f 100644 --- a/clang/Driver/clang.cpp +++ b/clang/Driver/clang.cpp @@ -24,9 +24,9 @@ #include "clang.h" #include "ASTConsumers.h" -#include "TextDiagnosticBuffer.h" -#include "TextDiagnosticPrinter.h" #include "HTMLDiagnostics.h" +#include "clang/Driver/TextDiagnosticBuffer.h" +#include "clang/Driver/TextDiagnosticPrinter.h" #include "clang/Analysis/PathDiagnostic.h" #include "clang/AST/TranslationUnit.h" #include "clang/CodeGen/ModuleBuilder.h" @@ -143,6 +143,16 @@ HTMLDiag("html-diags", llvm::cl::desc("Generate HTML to report diagnostics"), llvm::cl::value_desc("HTML directory")); +static llvm::cl::opt<bool> +NoShowColumn("fno-show-column", + llvm::cl::desc("Do not include column number on diagnostics")); + +static llvm::cl::opt<bool> +NoCaretDiagnostics("fno-caret-diagnostics", + llvm::cl::desc("Do not include source line and caret with" + " diagnostics")); + + //===----------------------------------------------------------------------===// // Analyzer Options //===----------------------------------------------------------------------===// @@ -426,7 +436,7 @@ ObjCExclusiveGC("fobjc-gc-only", static llvm::cl::opt<bool> ObjCEnableGC("fobjc-gc", - llvm::cl::desc("Enable Objective-C garbage collection")); + llvm::cl::desc("Enable Objective-C garbage collection")); void InitializeGCMode(LangOptions &Options) { if (ObjCExclusiveGC) @@ -1392,7 +1402,8 @@ int main(int argc, char **argv) { else { // Use Text diagnostics. if (!VerifyDiagnostics) { // Print diagnostics to stderr by default. - TextDiagClient = new TextDiagnosticPrinter(); + TextDiagClient = new TextDiagnosticPrinter(!NoShowColumn, + !NoCaretDiagnostics); } else { // When checking diagnostics, just buffer them up. TextDiagClient = new TextDiagnosticBuffer(); |
