forked from OSchip/llvm-project
add a libDriver, for now only move the text diangostics stuff from Driver to there
llvm-svn: 54383
This commit is contained in:
parent
829e988899
commit
b5fc3c300a
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include "clang.h"
|
#include "clang.h"
|
||||||
#include "ASTConsumers.h"
|
#include "ASTConsumers.h"
|
||||||
#include "TextDiagnosticBuffer.h"
|
#include "clang/Driver/TextDiagnosticBuffer.h"
|
||||||
#include "clang/Sema/ParseAST.h"
|
#include "clang/Sema/ParseAST.h"
|
||||||
#include "clang/AST/ASTConsumer.h"
|
#include "clang/AST/ASTConsumer.h"
|
||||||
#include "clang/Basic/SourceManager.h"
|
#include "clang/Basic/SourceManager.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@ CXXFLAGS = -fno-rtti
|
||||||
|
|
||||||
TOOLNAME = clang
|
TOOLNAME = clang
|
||||||
USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSEMA.a \
|
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 \
|
LLVMCore.a LLVMSupport.a LLVMSystem.a \
|
||||||
LLVMBitWriter.a LLVMBitReader.a LLVMCodeGen.a LLVMAnalysis.a \
|
LLVMBitWriter.a LLVMBitReader.a LLVMCodeGen.a LLVMAnalysis.a \
|
||||||
LLVMTarget.a
|
LLVMTarget.a
|
||||||
|
|
|
@ -24,9 +24,9 @@
|
||||||
|
|
||||||
#include "clang.h"
|
#include "clang.h"
|
||||||
#include "ASTConsumers.h"
|
#include "ASTConsumers.h"
|
||||||
#include "TextDiagnosticBuffer.h"
|
|
||||||
#include "TextDiagnosticPrinter.h"
|
|
||||||
#include "HTMLDiagnostics.h"
|
#include "HTMLDiagnostics.h"
|
||||||
|
#include "clang/Driver/TextDiagnosticBuffer.h"
|
||||||
|
#include "clang/Driver/TextDiagnosticPrinter.h"
|
||||||
#include "clang/Analysis/PathDiagnostic.h"
|
#include "clang/Analysis/PathDiagnostic.h"
|
||||||
#include "clang/AST/TranslationUnit.h"
|
#include "clang/AST/TranslationUnit.h"
|
||||||
#include "clang/CodeGen/ModuleBuilder.h"
|
#include "clang/CodeGen/ModuleBuilder.h"
|
||||||
|
@ -143,6 +143,16 @@ HTMLDiag("html-diags",
|
||||||
llvm::cl::desc("Generate HTML to report diagnostics"),
|
llvm::cl::desc("Generate HTML to report diagnostics"),
|
||||||
llvm::cl::value_desc("HTML directory"));
|
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
|
// Analyzer Options
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
@ -426,7 +436,7 @@ ObjCExclusiveGC("fobjc-gc-only",
|
||||||
|
|
||||||
static llvm::cl::opt<bool>
|
static llvm::cl::opt<bool>
|
||||||
ObjCEnableGC("fobjc-gc",
|
ObjCEnableGC("fobjc-gc",
|
||||||
llvm::cl::desc("Enable Objective-C garbage collection"));
|
llvm::cl::desc("Enable Objective-C garbage collection"));
|
||||||
|
|
||||||
void InitializeGCMode(LangOptions &Options) {
|
void InitializeGCMode(LangOptions &Options) {
|
||||||
if (ObjCExclusiveGC)
|
if (ObjCExclusiveGC)
|
||||||
|
@ -1392,7 +1402,8 @@ int main(int argc, char **argv) {
|
||||||
else { // Use Text diagnostics.
|
else { // Use Text diagnostics.
|
||||||
if (!VerifyDiagnostics) {
|
if (!VerifyDiagnostics) {
|
||||||
// Print diagnostics to stderr by default.
|
// Print diagnostics to stderr by default.
|
||||||
TextDiagClient = new TextDiagnosticPrinter();
|
TextDiagClient = new TextDiagnosticPrinter(!NoShowColumn,
|
||||||
|
!NoCaretDiagnostics);
|
||||||
} else {
|
} else {
|
||||||
// When checking diagnostics, just buffer them up.
|
// When checking diagnostics, just buffer them up.
|
||||||
TextDiagClient = new TextDiagnosticBuffer();
|
TextDiagClient = new TextDiagnosticBuffer();
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#ifndef DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_
|
#ifndef DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_
|
||||||
#define DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_
|
#define DRIVER_TEXT_DIAGNOSTIC_BUFFER_H_
|
||||||
|
|
||||||
#include "TextDiagnostics.h"
|
#include "clang/Driver/TextDiagnostics.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace clang {
|
namespace clang {
|
|
@ -15,7 +15,7 @@
|
||||||
#ifndef TEXT_DIAGNOSTIC_PRINTER_H_
|
#ifndef TEXT_DIAGNOSTIC_PRINTER_H_
|
||||||
#define TEXT_DIAGNOSTIC_PRINTER_H_
|
#define TEXT_DIAGNOSTIC_PRINTER_H_
|
||||||
|
|
||||||
#include "TextDiagnostics.h"
|
#include "clang/Driver/TextDiagnostics.h"
|
||||||
#include "clang/Basic/SourceLocation.h"
|
#include "clang/Basic/SourceLocation.h"
|
||||||
#include "llvm/Support/Streams.h"
|
#include "llvm/Support/Streams.h"
|
||||||
|
|
||||||
|
@ -26,8 +26,12 @@ class TextDiagnosticPrinter : public TextDiagnostics {
|
||||||
FullSourceLoc LastWarningLoc;
|
FullSourceLoc LastWarningLoc;
|
||||||
FullSourceLoc LastLoc;
|
FullSourceLoc LastLoc;
|
||||||
llvm::OStream OS;
|
llvm::OStream OS;
|
||||||
|
bool ShowColumn;
|
||||||
|
bool CaretDiagnostics;
|
||||||
public:
|
public:
|
||||||
TextDiagnosticPrinter(llvm::OStream &os = llvm::cerr) : OS(os) {}
|
TextDiagnosticPrinter(bool showColumn = true, bool caretDiagnistics = true,
|
||||||
|
llvm::OStream &os = llvm::cerr)
|
||||||
|
: OS(os), ShowColumn(showColumn), CaretDiagnostics(caretDiagnistics) {}
|
||||||
|
|
||||||
void PrintIncludeStack(FullSourceLoc Pos);
|
void PrintIncludeStack(FullSourceLoc Pos);
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
//
|
//
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "TextDiagnosticBuffer.h"
|
#include "clang/Driver/TextDiagnosticBuffer.h"
|
||||||
#include "clang/Basic/SourceManager.h"
|
#include "clang/Basic/SourceManager.h"
|
||||||
using namespace clang;
|
using namespace clang;
|
||||||
|
|
|
@ -11,24 +11,15 @@
|
||||||
//
|
//
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "TextDiagnosticPrinter.h"
|
#include "clang/Driver/TextDiagnosticPrinter.h"
|
||||||
#include "clang/Basic/FileManager.h"
|
#include "clang/Basic/FileManager.h"
|
||||||
#include "clang/Basic/SourceManager.h"
|
#include "clang/Basic/SourceManager.h"
|
||||||
#include "clang/Lex/HeaderSearch.h"
|
#include "clang/Lex/HeaderSearch.h"
|
||||||
#include "clang/Lex/Lexer.h"
|
#include "clang/Lex/Lexer.h"
|
||||||
#include "llvm/Support/CommandLine.h"
|
|
||||||
#include "llvm/Support/MemoryBuffer.h"
|
#include "llvm/Support/MemoryBuffer.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
using namespace clang;
|
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::
|
void TextDiagnosticPrinter::
|
||||||
PrintIncludeStack(FullSourceLoc Pos) {
|
PrintIncludeStack(FullSourceLoc Pos) {
|
||||||
if (Pos.isInvalid()) return;
|
if (Pos.isInvalid()) return;
|
||||||
|
@ -144,7 +135,7 @@ void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic &Diags,
|
||||||
++LineEnd;
|
++LineEnd;
|
||||||
|
|
||||||
OS << Buffer->getBufferIdentifier() << ":" << LineNo << ":";
|
OS << Buffer->getBufferIdentifier() << ":" << LineNo << ":";
|
||||||
if (ColNo && !NoShowColumn)
|
if (ColNo && ShowColumn)
|
||||||
OS << ColNo << ":";
|
OS << ColNo << ":";
|
||||||
OS << " ";
|
OS << " ";
|
||||||
}
|
}
|
||||||
|
@ -160,7 +151,7 @@ void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic &Diags,
|
||||||
|
|
||||||
OS << FormatDiagnostic(Diags, Level, ID, Strs, NumStrs) << "\n";
|
OS << FormatDiagnostic(Diags, Level, ID, Strs, NumStrs) << "\n";
|
||||||
|
|
||||||
if (!NoCaretDiagnostics && Pos.isValid() && ((LastLoc != Pos) || Ranges)) {
|
if (CaretDiagnostics && Pos.isValid() && ((LastLoc != Pos) || Ranges)) {
|
||||||
// Cache the LastLoc, it allows us to omit duplicate source/caret spewage.
|
// Cache the LastLoc, it allows us to omit duplicate source/caret spewage.
|
||||||
LastLoc = Pos;
|
LastLoc = Pos;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
//
|
//
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "TextDiagnostics.h"
|
#include "clang/Driver/TextDiagnostics.h"
|
||||||
#include "clang/Basic/SourceLocation.h"
|
#include "clang/Basic/SourceLocation.h"
|
||||||
#include "clang/Basic/SourceManager.h"
|
#include "clang/Basic/SourceManager.h"
|
||||||
#include "clang/Lex/HeaderSearch.h"
|
#include "clang/Lex/HeaderSearch.h"
|
|
@ -8,7 +8,7 @@
|
||||||
##===----------------------------------------------------------------------===##
|
##===----------------------------------------------------------------------===##
|
||||||
LEVEL = ../../..
|
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
|
include $(LEVEL)/Makefile.common
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue