From 621bc69624599da62abd9bc9e5edd8a63ac99fe6 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 26 Sep 2011 00:38:03 +0000 Subject: [PATCH] Rename VerifyDiagnosticsClient to VerifyDiagnosticConsumer as per issue 5397 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140489 91177308-0d34-0410-b5e6-96231b3b80d8 --- ...osticsClient.h => VerifyDiagnosticConsumer.h} | 14 +++++++------- lib/Frontend/CMakeLists.txt | 2 +- lib/Frontend/CompilerInstance.cpp | 4 ++-- ...csClient.cpp => VerifyDiagnosticConsumer.cpp} | 16 ++++++++-------- tools/arcmt-test/arcmt-test.cpp | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) rename include/clang/Frontend/{VerifyDiagnosticsClient.h => VerifyDiagnosticConsumer.h} (88%) rename lib/Frontend/{VerifyDiagnosticsClient.cpp => VerifyDiagnosticConsumer.cpp} (97%) diff --git a/include/clang/Frontend/VerifyDiagnosticsClient.h b/include/clang/Frontend/VerifyDiagnosticConsumer.h similarity index 88% rename from include/clang/Frontend/VerifyDiagnosticsClient.h rename to include/clang/Frontend/VerifyDiagnosticConsumer.h index cce33d64bc..1ef59ccb78 100644 --- a/include/clang/Frontend/VerifyDiagnosticsClient.h +++ b/include/clang/Frontend/VerifyDiagnosticConsumer.h @@ -1,4 +1,4 @@ -//===-- VerifyDiagnosticsClient.h - Verifying Diagnostic Client -*- C++ -*-===// +//===- VerifyDiagnosticConsumer.h - Verifying Diagnostic Client -*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -18,9 +18,9 @@ namespace clang { class DiagnosticsEngine; class TextDiagnosticBuffer; -/// VerifyDiagnosticsClient - Create a diagnostic client which will use markers -/// in the input source to check that all the emitted diagnostics match those -/// expected. +/// VerifyDiagnosticConsumer - Create a diagnostic client which will use +/// markers in the input source to check that all the emitted diagnostics match +/// those expected. /// /// USING THE DIAGNOSTIC CHECKER: /// @@ -62,7 +62,7 @@ class TextDiagnosticBuffer; /// // expected-error-re {{variable has has type 'struct (.*)'}} /// // expected-error-re {{variable has has type 'struct[[:space:]](.*)'}} /// -class VerifyDiagnosticsClient : public DiagnosticConsumer { +class VerifyDiagnosticConsumer: public DiagnosticConsumer { public: DiagnosticsEngine &Diags; DiagnosticConsumer *PrimaryClient; @@ -78,8 +78,8 @@ public: /// Create a new verifying diagnostic client, which will issue errors to \arg /// the currently-attached diagnostic client when a diagnostic does not match /// what is expected (as indicated in the source file). - VerifyDiagnosticsClient(DiagnosticsEngine &Diags); - ~VerifyDiagnosticsClient(); + VerifyDiagnosticConsumer(DiagnosticsEngine &Diags); + ~VerifyDiagnosticConsumer(); virtual void BeginSourceFile(const LangOptions &LangOpts, const Preprocessor *PP); diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt index 28072961ee..39128fba38 100644 --- a/lib/Frontend/CMakeLists.txt +++ b/lib/Frontend/CMakeLists.txt @@ -29,7 +29,7 @@ add_clang_library(clangFrontend PrintPreprocessedOutput.cpp TextDiagnosticBuffer.cpp TextDiagnosticPrinter.cpp - VerifyDiagnosticsClient.cpp + VerifyDiagnosticConsumer.cpp Warnings.cpp ) diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index c4dd651458..ce5496562b 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -25,7 +25,7 @@ #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/LogDiagnosticPrinter.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Frontend/VerifyDiagnosticsClient.h" +#include "clang/Frontend/VerifyDiagnosticConsumer.h" #include "clang/Frontend/Utils.h" #include "clang/Serialization/ASTReader.h" #include "clang/Sema/CodeCompleteConsumer.h" @@ -165,7 +165,7 @@ CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts, // Chain in -verify checker, if requested. if (Opts.VerifyDiagnostics) - Diags->setClient(new VerifyDiagnosticsClient(*Diags)); + Diags->setClient(new VerifyDiagnosticConsumer(*Diags)); // Chain in -diagnostic-log-file dumper, if requested. if (!Opts.DiagnosticLogFile.empty()) diff --git a/lib/Frontend/VerifyDiagnosticsClient.cpp b/lib/Frontend/VerifyDiagnosticConsumer.cpp similarity index 97% rename from lib/Frontend/VerifyDiagnosticsClient.cpp rename to lib/Frontend/VerifyDiagnosticConsumer.cpp index c3a236fad4..34f3c22099 100644 --- a/lib/Frontend/VerifyDiagnosticsClient.cpp +++ b/lib/Frontend/VerifyDiagnosticConsumer.cpp @@ -1,4 +1,4 @@ -//===--- VerifyDiagnosticsClient.cpp - Verifying Diagnostic Client --------===// +//===---- VerifyDiagnosticConsumer.cpp - Verifying Diagnostic Client ------===// // // The LLVM Compiler Infrastructure // @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/Frontend/VerifyDiagnosticsClient.h" +#include "clang/Frontend/VerifyDiagnosticConsumer.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/TextDiagnosticBuffer.h" #include "clang/Lex/Preprocessor.h" @@ -20,7 +20,7 @@ #include "llvm/Support/raw_ostream.h" using namespace clang; -VerifyDiagnosticsClient::VerifyDiagnosticsClient(DiagnosticsEngine &_Diags) +VerifyDiagnosticConsumer::VerifyDiagnosticConsumer(DiagnosticsEngine &_Diags) : Diags(_Diags), PrimaryClient(Diags.getClient()), OwnsPrimaryClient(Diags.ownsClient()), Buffer(new TextDiagnosticBuffer()), CurrentPreprocessor(0) @@ -28,7 +28,7 @@ VerifyDiagnosticsClient::VerifyDiagnosticsClient(DiagnosticsEngine &_Diags) Diags.takeClient(); } -VerifyDiagnosticsClient::~VerifyDiagnosticsClient() { +VerifyDiagnosticConsumer::~VerifyDiagnosticConsumer() { CheckDiagnostics(); Diags.takeClient(); if (OwnsPrimaryClient) @@ -37,7 +37,7 @@ VerifyDiagnosticsClient::~VerifyDiagnosticsClient() { // DiagnosticConsumer interface. -void VerifyDiagnosticsClient::BeginSourceFile(const LangOptions &LangOpts, +void VerifyDiagnosticConsumer::BeginSourceFile(const LangOptions &LangOpts, const Preprocessor *PP) { // FIXME: Const hack, we screw up the preprocessor but in practice its ok // because it doesn't get reused. It would be better if we could make a copy @@ -47,7 +47,7 @@ void VerifyDiagnosticsClient::BeginSourceFile(const LangOptions &LangOpts, PrimaryClient->BeginSourceFile(LangOpts, PP); } -void VerifyDiagnosticsClient::EndSourceFile() { +void VerifyDiagnosticConsumer::EndSourceFile() { CheckDiagnostics(); PrimaryClient->EndSourceFile(); @@ -55,7 +55,7 @@ void VerifyDiagnosticsClient::EndSourceFile() { CurrentPreprocessor = 0; } -void VerifyDiagnosticsClient::HandleDiagnostic( +void VerifyDiagnosticConsumer::HandleDiagnostic( DiagnosticsEngine::Level DiagLevel, const DiagnosticInfo &Info) { if (FirstErrorFID.isInvalid() && Info.hasSourceManager()) { const SourceManager &SM = Info.getSourceManager(); @@ -478,7 +478,7 @@ static unsigned CheckResults(DiagnosticsEngine &Diags, SourceManager &SourceMgr, return NumProblems; } -void VerifyDiagnosticsClient::CheckDiagnostics() { +void VerifyDiagnosticConsumer::CheckDiagnostics() { ExpectedData ED; // Ensure any diagnostics go to the primary client. diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp index 8c17737b6f..d27483f291 100644 --- a/tools/arcmt-test/arcmt-test.cpp +++ b/tools/arcmt-test/arcmt-test.cpp @@ -10,7 +10,7 @@ #include "clang/ARCMigrate/ARCMT.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/TextDiagnosticPrinter.h" -#include "clang/Frontend/VerifyDiagnosticsClient.h" +#include "clang/Frontend/VerifyDiagnosticConsumer.h" #include "clang/Frontend/Utils.h" #include "clang/Lex/Preprocessor.h" #include "llvm/Support/MemoryBuffer.h" @@ -111,9 +111,9 @@ static bool checkForMigration(StringRef resourcesPath, llvm::IntrusiveRefCntPtr Diags( new DiagnosticsEngine(DiagID, DiagClient)); // Chain in -verify checker, if requested. - VerifyDiagnosticsClient *verifyDiag = 0; + VerifyDiagnosticConsumer *verifyDiag = 0; if (VerifyDiags) { - verifyDiag = new VerifyDiagnosticsClient(*Diags); + verifyDiag = new VerifyDiagnosticConsumer(*Diags); Diags->setClient(verifyDiag); } -- 2.40.0