microsoft
/
clang
зеркало из https://github.com/microsoft/clang.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename DiagnosticClient to DiagnosticConsumer as per issue 5397 

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140479 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2011-09-25 23:39:51 +00:00
Родитель d6471f7c19
Коммит 78ad0b9884
21 изменённых файлов: 80 добавлений и 80 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
include/clang/ARCMigrate/ARCMT.h
Просмотреть файл

@ -15,7 +15,7 @@
namespace clang {
class ASTContext;
class DiagnosticClient;
class DiagnosticConsumer;
namespace arcmt {
class MigrationPass;
@ -38,7 +38,7 @@ namespace arcmt {
/// \returns false if no error is produced, true otherwise.
bool checkForManualIssues(CompilerInvocation &CI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient,
DiagnosticConsumer *DiagClient,
bool emitPremigrationARCErrors = false,
StringRef plistOut = StringRef());
@ -48,7 +48,7 @@ bool checkForManualIssues(CompilerInvocation &CI,
/// \returns false if no error is produced, true otherwise.
bool applyTransformations(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient);
DiagnosticConsumer *DiagClient);
/// \brief Applies automatic modifications and produces temporary files
/// and metadata into the \arg outputDir path.
@ -63,7 +63,7 @@ bool applyTransformations(CompilerInvocation &origCI,
/// \returns false if no error is produced, true otherwise.
bool migrateWithTemporaryFiles(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient,
DiagnosticConsumer *DiagClient,
StringRef outputDir,
bool emitPremigrationARCErrors,
StringRef plistOut);
@ -74,7 +74,7 @@ bool migrateWithTemporaryFiles(CompilerInvocation &origCI,
/// \returns false if no error is produced, true otherwise.
bool getFileRemappings(std::vector<std::pair<std::string,std::string> > &remap,
StringRef outputDir,
DiagnosticClient *DiagClient);
DiagnosticConsumer *DiagClient);
typedef void (*TransformFn)(MigrationPass &pass);
@ -82,11 +82,11 @@ std::vector<TransformFn> getAllTransformations();
class MigrationProcess {
CompilerInvocation OrigCI;
DiagnosticClient *DiagClient;
DiagnosticConsumer *DiagClient;
FileRemapper Remapper;
public:
MigrationProcess(const CompilerInvocation &CI, DiagnosticClient *diagClient,
MigrationProcess(const CompilerInvocation &CI, DiagnosticConsumer *diagClient,
StringRef outputDir = StringRef());
class RewriteListener {

34
include/clang/Basic/Diagnostic.h
Просмотреть файл

@ -26,7 +26,7 @@
#include <list>
namespace clang {
class DiagnosticClient;
class DiagnosticConsumer;
class DiagnosticBuilder;
class IdentifierInfo;
class DeclContext;
@ -102,9 +102,9 @@ public:
/// DiagnosticsEngine - This concrete class is used by the front-end to report
/// problems and issues. It massages the diagnostics (e.g. handling things like
/// "report warnings as errors" and passes them off to the DiagnosticClient for
/// reporting to the user. DiagnosticsEngine is tied to one translation unit and
/// one SourceManager.
/// "report warnings as errors" and passes them off to the DiagnosticConsumer
/// for reporting to the user. DiagnosticsEngine is tied to one translation unit
/// and one SourceManager.
class DiagnosticsEngine : public llvm::RefCountedBase<DiagnosticsEngine> {
public:
/// Level - The level of the diagnostic, after it has been through mapping.
@ -160,7 +160,7 @@ private:
// 0 -> no limit.
ExtensionHandling ExtBehavior; // Map extensions onto warnings or errors?
llvm::IntrusiveRefCntPtr<DiagnosticIDs> Diags;
DiagnosticClient *Client;
DiagnosticConsumer *Client;
bool OwnsDiagClient;
SourceManager *SourceMgr;
@ -305,7 +305,7 @@ private:
public:
explicit DiagnosticsEngine(
const llvm::IntrusiveRefCntPtr<DiagnosticIDs> &Diags,
DiagnosticClient *client = 0,
DiagnosticConsumer *client = 0,
bool ShouldOwnClient = true);
~DiagnosticsEngine();
@ -313,15 +313,15 @@ public:
return Diags;
}
DiagnosticClient *getClient() { return Client; }
const DiagnosticClient *getClient() const { return Client; }
DiagnosticConsumer *getClient() { return Client; }
const DiagnosticConsumer *getClient() const { return Client; }
/// \brief Determine whether this \c DiagnosticsEngine object own its client.
bool ownsClient() const { return OwnsDiagClient; }
/// \brief Return the current diagnostic client along with ownership of that
/// client.
DiagnosticClient *takeClient() {
DiagnosticConsumer *takeClient() {
OwnsDiagClient = false;
return Client;
}
@ -352,7 +352,7 @@ public:
///
/// \param ShouldOwnClient true if the diagnostic object should take
/// ownership of \c client.
void setClient(DiagnosticClient *client, bool ShouldOwnClient = true);
void setClient(DiagnosticConsumer *client, bool ShouldOwnClient = true);
/// setErrorLimit - Specify a limit for the number of errors we should
/// emit before giving up. Zero disables the limit.
@ -501,7 +501,7 @@ public:
/// \brief Based on the way the client configured the DiagnosticsEngine
/// object, classify the specified diagnostic ID into a Level, consumable by
/// the DiagnosticClient.
/// the DiagnosticConsumer.
///
/// \param Loc The source location we are interested in finding out the
/// diagnostic state. Can be null in order to query the latest state.
@ -1025,20 +1025,20 @@ public:
unsigned fixit_size() const { return FixIts.size(); }
};
/// DiagnosticClient - This is an abstract interface implemented by clients of
/// DiagnosticConsumer - This is an abstract interface implemented by clients of
/// the front-end, which formats and prints fully processed diagnostics.
class DiagnosticClient {
class DiagnosticConsumer {
protected:
unsigned NumWarnings; // Number of warnings reported
unsigned NumErrors; // Number of errors reported
public:
DiagnosticClient() : NumWarnings(0), NumErrors(0) { }
DiagnosticConsumer() : NumWarnings(0), NumErrors(0) { }
unsigned getNumErrors() const { return NumErrors; }
unsigned getNumWarnings() const { return NumWarnings; }
virtual ~DiagnosticClient();
virtual ~DiagnosticConsumer();
/// BeginSourceFile - Callback to inform the diagnostic client that processing
/// of a source file is beginning.
@ -1061,8 +1061,8 @@ public:
/// IncludeInDiagnosticCounts - This method (whose default implementation
/// returns true) indicates whether the diagnostics handled by this
/// DiagnosticClient should be included in the number of diagnostics reported
/// by DiagnosticsEngine.
/// DiagnosticConsumer should be included in the number of diagnostics
/// reported by DiagnosticsEngine.
virtual bool IncludeInDiagnosticCounts() const;
/// HandleDiagnostic - Handle this diagnostic, reporting it to the user or

12
include/clang/Frontend/ChainedDiagnosticClient.h
Просмотреть файл

@ -20,13 +20,13 @@ class LangOptions;
/// go to the first client and then the second. The first diagnostic client
/// should be the "primary" client, and will be used for computing whether the
/// diagnostics should be included in counts.
class ChainedDiagnosticClient : public DiagnosticClient {
llvm::OwningPtr<DiagnosticClient> Primary;
llvm::OwningPtr<DiagnosticClient> Secondary;
class ChainedDiagnosticClient : public DiagnosticConsumer {
llvm::OwningPtr<DiagnosticConsumer> Primary;
llvm::OwningPtr<DiagnosticConsumer> Secondary;
public:
ChainedDiagnosticClient(DiagnosticClient *_Primary,
DiagnosticClient *_Secondary) {
ChainedDiagnosticClient(DiagnosticConsumer *_Primary,
DiagnosticConsumer *_Secondary) {
Primary.reset(_Primary);
Secondary.reset(_Secondary);
}
@ -49,7 +49,7 @@ public:
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(DiagLevel, Info);
DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
Primary->HandleDiagnostic(DiagLevel, Info);
Secondary->HandleDiagnostic(DiagLevel, Info);

10
include/clang/Frontend/CompilerInstance.h
Просмотреть файл

@ -30,7 +30,7 @@ class ASTConsumer;
class ASTReader;
class CodeCompleteConsumer;
class DiagnosticsEngine;
class DiagnosticClient;
class DiagnosticConsumer;
class ExternalASTSource;
class FileManager;
class FrontendAction;
@ -260,7 +260,7 @@ public:
/// setDiagnostics - Replace the current diagnostics engine.
void setDiagnostics(DiagnosticsEngine *Value);
DiagnosticClient &getDiagnosticClient() const {
DiagnosticConsumer &getDiagnosticClient() const {
assert(Diagnostics && Diagnostics->getClient() &&
"Compiler instance has no diagnostic client!");
return *Diagnostics->getClient();
@ -461,7 +461,7 @@ public:
/// \param ShouldOwnClient If Client is non-NULL, specifies whether
/// the diagnostic object should take ownership of the client.
void createDiagnostics(int Argc, const char* const *Argv,
DiagnosticClient *Client = 0,
DiagnosticConsumer *Client = 0,
bool ShouldOwnClient = true);
/// Create a DiagnosticsEngine object with a the TextDiagnosticPrinter.
@ -471,7 +471,7 @@ public:
/// logging information.
///
/// If no diagnostic client is provided, this creates a
/// DiagnosticClient that is owned by the returned diagnostic
/// DiagnosticConsumer that is owned by the returned diagnostic
/// object, if using directly the caller is responsible for
/// releasing the returned DiagnosticsEngine's client eventually.
///
@ -490,7 +490,7 @@ public:
static llvm::IntrusiveRefCntPtr<DiagnosticsEngine>
createDiagnostics(const DiagnosticOptions &Opts, int Argc,
const char* const *Argv,
DiagnosticClient *Client = 0,
DiagnosticConsumer *Client = 0,
bool ShouldOwnClient = true,
const CodeGenOptions *CodeGenOpts = 0);

2
include/clang/Frontend/LogDiagnosticPrinter.h
Просмотреть файл

@ -19,7 +19,7 @@ namespace clang {
class DiagnosticOptions;
class LangOptions;
class LogDiagnosticPrinter : public DiagnosticClient {
class LogDiagnosticPrinter : public DiagnosticConsumer {
struct DiagEntry {
/// The primary message line of the diagnostic.
std::string Message;

2
include/clang/Frontend/TextDiagnosticBuffer.h
Просмотреть файл

@ -22,7 +22,7 @@ namespace clang {
class Preprocessor;
class SourceManager;
class TextDiagnosticBuffer : public DiagnosticClient {
class TextDiagnosticBuffer : public DiagnosticConsumer {
public:
typedef std::vector<std::pair<SourceLocation, std::string> > DiagList;
typedef DiagList::iterator iterator;

2
include/clang/Frontend/TextDiagnosticPrinter.h
Просмотреть файл

@ -22,7 +22,7 @@ namespace clang {
class DiagnosticOptions;
class LangOptions;
class TextDiagnosticPrinter : public DiagnosticClient {
class TextDiagnosticPrinter : public DiagnosticConsumer {
raw_ostream &OS;
const LangOptions *LangOpts;
const DiagnosticOptions *DiagOpts;

4
include/clang/Frontend/VerifyDiagnosticsClient.h
Просмотреть файл

@ -62,10 +62,10 @@ class TextDiagnosticBuffer;
/// // expected-error-re {{variable has has type 'struct (.*)'}}
/// // expected-error-re {{variable has has type 'struct[[:space:]](.*)'}}
///
class VerifyDiagnosticsClient : public DiagnosticClient {
class VerifyDiagnosticsClient : public DiagnosticConsumer {
public:
DiagnosticsEngine &Diags;
DiagnosticClient *PrimaryClient;
DiagnosticConsumer *PrimaryClient;
bool OwnsPrimaryClient;
llvm::OwningPtr<TextDiagnosticBuffer> Buffer;
Preprocessor *CurrentPreprocessor;

6
include/clang/Rewrite/FixItRewriter.h
Просмотреть файл

@ -36,7 +36,7 @@ public:
bool FixWhatYouCan;
};
class FixItRewriter : public DiagnosticClient {
class FixItRewriter : public DiagnosticConsumer {
/// \brief The diagnostics machinery.
DiagnosticsEngine &Diags;
@ -46,7 +46,7 @@ class FixItRewriter : public DiagnosticClient {
/// \brief The diagnostic client that performs the actual formatting
/// of error messages.
DiagnosticClient *Client;
DiagnosticConsumer *Client;
/// \brief Turn an input path into an output path. NULL implies overwriting
/// the original.
@ -86,7 +86,7 @@ public:
/// IncludeInDiagnosticCounts - This method (whose default implementation
/// returns true) indicates whether the diagnostics handled by this
/// DiagnosticClient should be included in the number of diagnostics
/// DiagnosticConsumer should be included in the number of diagnostics
/// reported by DiagnosticsEngine.
virtual bool IncludeInDiagnosticCounts() const;

18
lib/ARCMigrate/ARCMT.cpp
Просмотреть файл

@ -88,7 +88,7 @@ bool CapturedDiagList::hasErrors() const {
namespace {
class CaptureDiagnosticClient : public DiagnosticClient {
class CaptureDiagnosticClient : public DiagnosticConsumer {
DiagnosticsEngine &Diags;
CapturedDiagList &CapturedDiags;
public:
@ -214,7 +214,7 @@ static void emitPremigrationErrors(const CapturedDiagList &arcDiags,
bool arcmt::checkForManualIssues(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient,
DiagnosticConsumer *DiagClient,
bool emitPremigrationARCErrors,
StringRef plistOut) {
if (!origCI.getLangOpts().ObjC1)
@ -271,7 +271,7 @@ bool arcmt::checkForManualIssues(CompilerInvocation &origCI,
// After parsing of source files ended, we want to reuse the
// diagnostics objects to emit further diagnostics.
// We call BeginSourceFile because DiagnosticClient requires that
// We call BeginSourceFile because DiagnosticConsumer requires that
// diagnostics with source range information are emitted only in between
// BeginSourceFile() and EndSourceFile().
DiagClient->BeginSourceFile(Ctx.getLangOptions(), &Unit->getPreprocessor());
@ -303,7 +303,7 @@ bool arcmt::checkForManualIssues(CompilerInvocation &origCI,
static bool applyTransforms(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient,
DiagnosticConsumer *DiagClient,
StringRef outputDir,
bool emitPremigrationARCErrors,
StringRef plistOut) {
@ -347,14 +347,14 @@ static bool applyTransforms(CompilerInvocation &origCI,
bool arcmt::applyTransformations(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient) {
DiagnosticConsumer *DiagClient) {
return applyTransforms(origCI, Filename, Kind, DiagClient,
StringRef(), false, StringRef());
}
bool arcmt::migrateWithTemporaryFiles(CompilerInvocation &origCI,
StringRef Filename, InputKind Kind,
DiagnosticClient *DiagClient,
DiagnosticConsumer *DiagClient,
StringRef outputDir,
bool emitPremigrationARCErrors,
StringRef plistOut) {
@ -366,7 +366,7 @@ bool arcmt::migrateWithTemporaryFiles(CompilerInvocation &origCI,
bool arcmt::getFileRemappings(std::vector<std::pair<std::string,std::string> > &
remap,
StringRef outputDir,
DiagnosticClient *DiagClient) {
DiagnosticConsumer *DiagClient) {
assert(!outputDir.empty());
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
@ -468,7 +468,7 @@ public:
MigrationProcess::RewriteListener::~RewriteListener() { }
MigrationProcess::MigrationProcess(const CompilerInvocation &CI,
DiagnosticClient *diagClient,
DiagnosticConsumer *diagClient,
StringRef outputDir)
: OrigCI(CI), DiagClient(diagClient) {
if (!outputDir.empty()) {
@ -524,7 +524,7 @@ bool MigrationProcess::applyTransform(TransformFn trans,
// After parsing of source files ended, we want to reuse the
// diagnostics objects to emit further diagnostics.
// We call BeginSourceFile because DiagnosticClient requires that
// We call BeginSourceFile because DiagnosticConsumer requires that
// diagnostics with source range information are emitted only in between
// BeginSourceFile() and EndSourceFile().
DiagClient->BeginSourceFile(Ctx.getLangOptions(), &Unit->getPreprocessor());

16
lib/Basic/Diagnostic.cpp
Просмотреть файл

@ -35,7 +35,7 @@ static void DummyArgToStringFn(DiagnosticsEngine::ArgumentKind AK, intptr_t QT,
DiagnosticsEngine::DiagnosticsEngine(
const llvm::IntrusiveRefCntPtr<DiagnosticIDs> &diags,
DiagnosticClient *client, bool ShouldOwnClient)
DiagnosticConsumer *client, bool ShouldOwnClient)
: Diags(diags), Client(client), OwnsDiagClient(ShouldOwnClient),
SourceMgr(0) {
ArgToStringFn = DummyArgToStringFn;
@ -62,7 +62,7 @@ DiagnosticsEngine::~DiagnosticsEngine() {
delete Client;
}
void DiagnosticsEngine::setClient(DiagnosticClient *client,
void DiagnosticsEngine::setClient(DiagnosticConsumer *client,
bool ShouldOwnClient) {
if (OwnsDiagClient && Client)
delete Client;
@ -245,7 +245,7 @@ void DiagnosticsEngine::Report(const StoredDiagnostic &storedDiag) {
FE = storedDiag.fixit_end(); FI != FE; ++FI)
FixItHints[i++] = *FI;
assert(Client && "DiagnosticClient not set!");
assert(Client && "DiagnosticConsumer not set!");
Level DiagLevel = storedDiag.getLevel();
DiagnosticInfo Info(this, storedDiag.getMessage());
Client->HandleDiagnostic(DiagLevel, Info);
@ -273,7 +273,7 @@ bool DiagnosticBuilder::Emit() {
FlushCounts();
// Process the diagnostic, sending the accumulated information to the
// DiagnosticClient.
// DiagnosticConsumer.
bool Emitted = DiagObj->ProcessDiag();
// Clear out the current diagnostic object.
@ -291,9 +291,9 @@ bool DiagnosticBuilder::Emit() {
}
DiagnosticClient::~DiagnosticClient() {}
DiagnosticConsumer::~DiagnosticConsumer() {}
void DiagnosticClient::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
void DiagnosticConsumer::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
const DiagnosticInfo &Info) {
if (!IncludeInDiagnosticCounts())
return;
@ -746,9 +746,9 @@ StoredDiagnostic::~StoredDiagnostic() { }
/// IncludeInDiagnosticCounts - This method (whose default implementation
/// returns true) indicates whether the diagnostics handled by this
/// DiagnosticClient should be included in the number of diagnostics
/// DiagnosticConsumer should be included in the number of diagnostics
/// reported by DiagnosticsEngine.
bool DiagnosticClient::IncludeInDiagnosticCounts() const { return true; }
bool DiagnosticConsumer::IncludeInDiagnosticCounts() const { return true; }
PartialDiagnostic::StorageAllocator::StorageAllocator() {
for (unsigned I = 0; I != NumCached; ++I)

8
lib/Frontend/ASTUnit.cpp
Просмотреть файл

@ -448,7 +448,7 @@ public:
}
};
class StoredDiagnosticClient : public DiagnosticClient {
class StoredDiagnosticClient : public DiagnosticConsumer {
SmallVectorImpl<StoredDiagnostic> &StoredDiags;
public:
@ -465,7 +465,7 @@ public:
class CaptureDroppedDiagnostics {
DiagnosticsEngine &Diags;
StoredDiagnosticClient Client;
DiagnosticClient *PreviousClient;
DiagnosticConsumer *PreviousClient;
public:
CaptureDroppedDiagnostics(bool RequestCapture, DiagnosticsEngine &Diags,
@ -491,7 +491,7 @@ public:
void StoredDiagnosticClient::HandleDiagnostic(DiagnosticsEngine::Level Level,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(Level, Info);
DiagnosticConsumer::HandleDiagnostic(Level, Info);
StoredDiags.push_back(StoredDiagnostic(Level, Info));
}
@ -514,7 +514,7 @@ void ASTUnit::ConfigureDiags(llvm::IntrusiveRefCntPtr<DiagnosticsEngine> &Diags,
// No diagnostics engine was provided, so create our own diagnostics object
// with the default options.
DiagnosticOptions DiagOpts;
DiagnosticClient *Client = 0;
DiagnosticConsumer *Client = 0;
if (CaptureDiagnostics)
Client = new StoredDiagnosticClient(AST.StoredDiagnostics);
Diags = CompilerInstance::createDiagnostics(DiagOpts, ArgEnd- ArgBegin,

6
lib/Frontend/CompilerInstance.cpp
Просмотреть файл

@ -104,7 +104,7 @@ static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts,
(*OS) << '\n';
// Chain in a diagnostic client which will log the diagnostics.
DiagnosticClient *Logger =
DiagnosticConsumer *Logger =
new TextDiagnosticPrinter(*OS.take(), DiagOpts, /*OwnsOutputStream=*/true);
Diags.setClient(new ChainedDiagnosticClient(Diags.takeClient(), Logger));
}
@ -140,7 +140,7 @@ static void SetUpDiagnosticLog(const DiagnosticOptions &DiagOpts,
}
void CompilerInstance::createDiagnostics(int Argc, const char* const *Argv,
DiagnosticClient *Client,
DiagnosticConsumer *Client,
bool ShouldOwnClient) {
Diagnostics = createDiagnostics(getDiagnosticOpts(), Argc, Argv, Client,
ShouldOwnClient, &getCodeGenOpts());
@ -149,7 +149,7 @@ void CompilerInstance::createDiagnostics(int Argc, const char* const *Argv,
llvm::IntrusiveRefCntPtr<DiagnosticsEngine>
CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts,
int Argc, const char* const *Argv,
DiagnosticClient *Client,
DiagnosticConsumer *Client,
bool ShouldOwnClient,
const CodeGenOptions *CodeGenOpts) {
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());

8
lib/Frontend/LogDiagnosticPrinter.cpp
Просмотреть файл

@ -42,9 +42,9 @@ void LogDiagnosticPrinter::EndSourceFile() {
// We emit all the diagnostics in EndSourceFile. However, we don't emit any
// entry if no diagnostics were present.
//
// Note that DiagnosticClient has no "end-of-compilation" callback, so we will
// miss any diagnostics which are emitted after and outside the translation
// unit processing.
// Note that DiagnosticConsumer has no "end-of-compilation" callback, so we
// will miss any diagnostics which are emitted after and outside the
// translation unit processing.
if (Entries.empty())
return;
@ -96,7 +96,7 @@ void LogDiagnosticPrinter::EndSourceFile() {
void LogDiagnosticPrinter::HandleDiagnostic(DiagnosticsEngine::Level Level,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(Level, Info);
DiagnosticConsumer::HandleDiagnostic(Level, Info);
// Initialize the main file name, if we haven't already fetched it.
if (MainFilename.empty() && Info.hasSourceManager()) {

2
lib/Frontend/TextDiagnosticBuffer.cpp
Просмотреть файл

@ -22,7 +22,7 @@ using namespace clang;
void TextDiagnosticBuffer::HandleDiagnostic(DiagnosticsEngine::Level Level,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(Level, Info);
DiagnosticConsumer::HandleDiagnostic(Level, Info);
llvm::SmallString<100> Buf;
Info.FormatDiagnostic(Buf);

2
lib/Frontend/TextDiagnosticPrinter.cpp
Просмотреть файл

@ -1062,7 +1062,7 @@ void TextDiagnosticPrinter::EmitDiagnosticLoc(DiagnosticsEngine::Level Level,
void TextDiagnosticPrinter::HandleDiagnostic(DiagnosticsEngine::Level Level,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(Level, Info);
DiagnosticConsumer::HandleDiagnostic(Level, Info);
// Keeps track of the the starting position of the location
// information (e.g., "foo.c:10:4:") that precedes the error

4
lib/Frontend/VerifyDiagnosticsClient.cpp
Просмотреть файл

@ -35,7 +35,7 @@ VerifyDiagnosticsClient::~VerifyDiagnosticsClient() {
delete PrimaryClient;
}
// DiagnosticClient interface.
// DiagnosticConsumer interface.
void VerifyDiagnosticsClient::BeginSourceFile(const LangOptions &LangOpts,
const Preprocessor *PP) {
@ -483,7 +483,7 @@ void VerifyDiagnosticsClient::CheckDiagnostics() {
// Ensure any diagnostics go to the primary client.
bool OwnsCurClient = Diags.ownsClient();
DiagnosticClient *CurClient = Diags.takeClient();
DiagnosticConsumer *CurClient = Diags.takeClient();
Diags.setClient(PrimaryClient, false);
// If we have a preprocessor, scan the source for expected diagnostic

2
lib/Rewrite/FixItRewriter.cpp
Просмотреть файл

@ -81,7 +81,7 @@ bool FixItRewriter::IncludeInDiagnosticCounts() const {
void FixItRewriter::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
const DiagnosticInfo &Info) {
// Default implementation (Warnings/errors count).
DiagnosticClient::HandleDiagnostic(DiagLevel, Info);
DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
Client->HandleDiagnostic(DiagLevel, Info);

2
lib/Rewrite/HTMLRewrite.cpp
Просмотреть файл

@ -443,7 +443,7 @@ void html::SyntaxHighlight(Rewriter &R, FileID FID, const Preprocessor &PP) {
namespace {
/// IgnoringDiagClient - This is a diagnostic client that just ignores all
/// diags.
class IgnoringDiagClient : public DiagnosticClient {
class IgnoringDiagClient : public DiagnosticConsumer {
void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
const DiagnosticInfo &Info) {
// Just ignore it.

4
tools/arcmt-test/arcmt-test.cpp
Просмотреть файл

@ -105,7 +105,7 @@ public:
static bool checkForMigration(StringRef resourcesPath,
ArrayRef<const char *> Args) {
DiagnosticClient *DiagClient =
DiagnosticConsumer *DiagClient =
new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions());
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
llvm::IntrusiveRefCntPtr<DiagnosticsEngine> Diags(
@ -152,7 +152,7 @@ static bool performTransformations(StringRef resourcesPath,
if (checkForMigration(resourcesPath, Args))
return true;
DiagnosticClient *DiagClient =
DiagnosticConsumer *DiagClient =
new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions());
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
llvm::IntrusiveRefCntPtr<DiagnosticsEngine> TopDiags(

2
unittests/AST/APValueTest.cpp
Просмотреть файл

@ -21,7 +21,7 @@ using namespace clang;
namespace {
class DiagnosticOutputGetter {
class LastDiagnosticString : public DiagnosticClient {
class LastDiagnosticString : public DiagnosticConsumer {
SmallString<64> LastDiagnostic;
public:
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,