From 40847cfb58acc3cac7d68727df9455ac45f2e118 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Mon, 26 Sep 2011 01:18:08 +0000
Subject: [PATCH] Rename DiagnosticInfo to Diagnostic as per issue 5397
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140493 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/Diagnostic.h | 16 ++++++++--------
include/clang/Basic/IdentifierTable.h | 2 +-
include/clang/Basic/PartialDiagnostic.h | 2 +-
.../clang/Frontend/ChainedDiagnosticConsumer.h | 2 +-
include/clang/Frontend/LogDiagnosticPrinter.h | 2 +-
include/clang/Frontend/TextDiagnosticBuffer.h | 2 +-
include/clang/Frontend/TextDiagnosticPrinter.h | 4 ++--
.../clang/Frontend/VerifyDiagnosticConsumer.h | 2 +-
include/clang/Rewrite/FixItRewriter.h | 2 +-
lib/ARCMigrate/ARCMT.cpp | 2 +-
lib/Basic/Diagnostic.cpp | 14 +++++++-------
lib/Basic/DiagnosticIDs.cpp | 2 +-
lib/Frontend/ASTUnit.cpp | 4 ++--
lib/Frontend/LogDiagnosticPrinter.cpp | 2 +-
lib/Frontend/TextDiagnosticBuffer.cpp | 2 +-
lib/Frontend/TextDiagnosticPrinter.cpp | 8 ++++----
lib/Frontend/VerifyDiagnosticConsumer.cpp | 2 +-
lib/Rewrite/FixItRewriter.cpp | 2 +-
lib/Rewrite/HTMLRewrite.cpp | 2 +-
lib/Sema/Sema.cpp | 2 +-
unittests/AST/APValueTest.cpp | 2 +-
21 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h
index a83427df89c..a1a3d44d44a 100644
--- a/include/clang/Basic/Diagnostic.h
+++ b/include/clang/Basic/Diagnostic.h
@@ -579,7 +579,7 @@ private:
// diagnostic is in flight at a time.
friend class DiagnosticIDs;
friend class DiagnosticBuilder;
- friend class DiagnosticInfo;
+ friend class Diagnostic;
friend class PartialDiagnostic;
friend class DiagnosticErrorTrap;
@@ -874,18 +874,18 @@ inline DiagnosticBuilder DiagnosticsEngine::Report(unsigned DiagID) {
}
//===----------------------------------------------------------------------===//
-// DiagnosticInfo
+// Diagnostic
//===----------------------------------------------------------------------===//
-/// DiagnosticInfo - This is a little helper class (which is basically a smart
+/// Diagnostic - This is a little helper class (which is basically a smart
/// pointer that forward info from DiagnosticsEngine) that allows clients to
/// enquire about the currently in-flight diagnostic.
-class DiagnosticInfo {
+class Diagnostic {
const DiagnosticsEngine *DiagObj;
StringRef StoredDiagMessage;
public:
- explicit DiagnosticInfo(const DiagnosticsEngine *DO) : DiagObj(DO) {}
- DiagnosticInfo(const DiagnosticsEngine *DO, StringRef storedDiagMessage)
+ explicit Diagnostic(const DiagnosticsEngine *DO) : DiagObj(DO) {}
+ Diagnostic(const DiagnosticsEngine *DO, StringRef storedDiagMessage)
: DiagObj(DO), StoredDiagMessage(storedDiagMessage) {}
const DiagnosticsEngine *getDiags() const { return DiagObj; }
@@ -995,7 +995,7 @@ class StoredDiagnostic {
public:
StoredDiagnostic();
- StoredDiagnostic(DiagnosticsEngine::Level Level, const DiagnosticInfo &Info);
+ StoredDiagnostic(DiagnosticsEngine::Level Level, const Diagnostic &Info);
StoredDiagnostic(DiagnosticsEngine::Level Level, unsigned ID,
StringRef Message);
StoredDiagnostic(DiagnosticsEngine::Level Level, unsigned ID,
@@ -1071,7 +1071,7 @@ public:
/// Default implementation just keeps track of the total number of warnings
/// and errors.
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
};
} // end namespace clang
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 97cd68ee551..45b098b0880 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -510,7 +510,7 @@ enum { InvalidObjCMethodFamily = (1 << ObjCMethodFamilyBitWidth) - 1 };
/// selectors that take no arguments and selectors that take 1 argument, which
/// accounts for 78% of all selectors in Cocoa.h.
class Selector {
- friend class DiagnosticInfo;
+ friend class Diagnostic;
enum IdentifierInfoFlag {
// MultiKeywordSelector = 0.
diff --git a/include/clang/Basic/PartialDiagnostic.h b/include/clang/Basic/PartialDiagnostic.h
index fac5580f85c..4eff3a188e0 100644
--- a/include/clang/Basic/PartialDiagnostic.h
+++ b/include/clang/Basic/PartialDiagnostic.h
@@ -190,7 +190,7 @@ public:
*this->DiagStorage = *Other.DiagStorage;
}
- PartialDiagnostic(const DiagnosticInfo &Other, StorageAllocator &Allocator)
+ PartialDiagnostic(const Diagnostic &Other, StorageAllocator &Allocator)
: DiagID(Other.getID()), DiagStorage(0), Allocator(&Allocator)
{
// Copy arguments.
diff --git a/include/clang/Frontend/ChainedDiagnosticConsumer.h b/include/clang/Frontend/ChainedDiagnosticConsumer.h
index 5def0d85c81..125a9b2bf74 100644
--- a/include/clang/Frontend/ChainedDiagnosticConsumer.h
+++ b/include/clang/Frontend/ChainedDiagnosticConsumer.h
@@ -47,7 +47,7 @@ public:
}
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
diff --git a/include/clang/Frontend/LogDiagnosticPrinter.h b/include/clang/Frontend/LogDiagnosticPrinter.h
index 002eb741324..e12752b4f82 100644
--- a/include/clang/Frontend/LogDiagnosticPrinter.h
+++ b/include/clang/Frontend/LogDiagnosticPrinter.h
@@ -69,7 +69,7 @@ public:
void EndSourceFile();
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
};
} // end namespace clang
diff --git a/include/clang/Frontend/TextDiagnosticBuffer.h b/include/clang/Frontend/TextDiagnosticBuffer.h
index 4f133e60ede..93ac299da30 100644
--- a/include/clang/Frontend/TextDiagnosticBuffer.h
+++ b/include/clang/Frontend/TextDiagnosticBuffer.h
@@ -40,7 +40,7 @@ public:
const_iterator note_end() const { return Notes.end(); }
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
/// FlushDiagnostics - Flush the buffered diagnostics to an given
/// diagnostic engine.
diff --git a/include/clang/Frontend/TextDiagnosticPrinter.h b/include/clang/Frontend/TextDiagnosticPrinter.h
index 64c95c520c6..f3dec55f107 100644
--- a/include/clang/Frontend/TextDiagnosticPrinter.h
+++ b/include/clang/Frontend/TextDiagnosticPrinter.h
@@ -57,11 +57,11 @@ public:
const SourceManager &SM);
virtual void HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
private:
void EmitDiagnosticLoc(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info,
+ const Diagnostic &Info,
const SourceManager &SM,
PresumedLoc PLoc);
};
diff --git a/include/clang/Frontend/VerifyDiagnosticConsumer.h b/include/clang/Frontend/VerifyDiagnosticConsumer.h
index 1ef59ccb781..a74c8091095 100644
--- a/include/clang/Frontend/VerifyDiagnosticConsumer.h
+++ b/include/clang/Frontend/VerifyDiagnosticConsumer.h
@@ -87,7 +87,7 @@ public:
virtual void EndSourceFile();
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
};
} // end namspace clang
diff --git a/include/clang/Rewrite/FixItRewriter.h b/include/clang/Rewrite/FixItRewriter.h
index 42356dbfd47..d98058134c9 100644
--- a/include/clang/Rewrite/FixItRewriter.h
+++ b/include/clang/Rewrite/FixItRewriter.h
@@ -93,7 +93,7 @@ public:
/// HandleDiagnostic - Handle this diagnostic, reporting it to the user or
/// capturing it to a log as needed.
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
/// \brief Emit a diagnostic via the adapted diagnostic client.
void Diag(SourceLocation Loc, unsigned DiagID);
diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp
index d0c9f19bbc8..05bc150487f 100644
--- a/lib/ARCMigrate/ARCMT.cpp
+++ b/lib/ARCMigrate/ARCMT.cpp
@@ -97,7 +97,7 @@ public:
: Diags(diags), CapturedDiags(capturedDiags) { }
virtual void HandleDiagnostic(DiagnosticsEngine::Level level,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
if (arcmt::isARCDiagnostic(Info.getID(), Diags) ||
level >= DiagnosticsEngine::Error || level == DiagnosticsEngine::Note) {
CapturedDiags.push_back(StoredDiagnostic(level, Info));
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index b7f130acd59..126f2e24f2d 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -247,7 +247,7 @@ void DiagnosticsEngine::Report(const StoredDiagnostic &storedDiag) {
assert(Client && "DiagnosticConsumer not set!");
Level DiagLevel = storedDiag.getLevel();
- DiagnosticInfo Info(this, storedDiag.getMessage());
+ Diagnostic Info(this, storedDiag.getMessage());
Client->HandleDiagnostic(DiagLevel, Info);
if (Client->IncludeInDiagnosticCounts()) {
if (DiagLevel == DiagnosticsEngine::Warning)
@@ -294,7 +294,7 @@ bool DiagnosticBuilder::Emit() {
DiagnosticConsumer::~DiagnosticConsumer() {}
void DiagnosticConsumer::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
if (!IncludeInDiagnosticCounts())
return;
@@ -343,7 +343,7 @@ static const char *ScanFormat(const char *I, const char *E, char Target) {
/// "%2" has a value from 0-2. If the value is 0, the diagnostic prints 'foo'.
/// If the value is 1, it prints 'bar'. If it has the value 2, it prints 'baz'.
/// This is very useful for certain classes of variant diagnostics.
-static void HandleSelectModifier(const DiagnosticInfo &DInfo, unsigned ValNo,
+static void HandleSelectModifier(const Diagnostic &DInfo, unsigned ValNo,
const char *Argument, unsigned ArgumentLen,
SmallVectorImpl<char> &OutStr) {
const char *ArgumentEnd = Argument+ArgumentLen;
@@ -501,7 +501,7 @@ static bool EvalPluralExpr(unsigned ValNo, const char *Start, const char *End) {
/// {1:form0|[2,4]:form1|:form2}
/// Polish (requires repeated form):
/// {1:form0|%100=[10,20]:form2|%10=[2,4]:form1|:form2}
-static void HandlePluralModifier(const DiagnosticInfo &DInfo, unsigned ValNo,
+static void HandlePluralModifier(const Diagnostic &DInfo, unsigned ValNo,
const char *Argument, unsigned ArgumentLen,
SmallVectorImpl<char> &OutStr) {
const char *ArgumentEnd = Argument + ArgumentLen;
@@ -529,7 +529,7 @@ static void HandlePluralModifier(const DiagnosticInfo &DInfo, unsigned ValNo,
/// FormatDiagnostic - Format this diagnostic into a string, substituting the
/// formal arguments into the %0 slots. The result is appended onto the Str
/// array.
-void DiagnosticInfo::
+void Diagnostic::
FormatDiagnostic(SmallVectorImpl<char> &OutStr) const {
if (!StoredDiagMessage.empty()) {
OutStr.append(StoredDiagMessage.begin(), StoredDiagMessage.end());
@@ -542,7 +542,7 @@ FormatDiagnostic(SmallVectorImpl<char> &OutStr) const {
FormatDiagnostic(Diag.begin(), Diag.end(), OutStr);
}
-void DiagnosticInfo::
+void Diagnostic::
FormatDiagnostic(const char *DiagStr, const char *DiagEnd,
SmallVectorImpl<char> &OutStr) const {
@@ -712,7 +712,7 @@ StoredDiagnostic::StoredDiagnostic(DiagnosticsEngine::Level Level, unsigned ID,
: ID(ID), Level(Level), Loc(), Message(Message) { }
StoredDiagnostic::StoredDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info)
+ const Diagnostic &Info)
: ID(Info.getID()), Level(Level)
{
assert((Info.getLocation().isInvalid() || Info.hasSourceManager()) &&
diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp
index eda2f8e19fc..4b88c60ead9 100644
--- a/lib/Basic/DiagnosticIDs.cpp
+++ b/lib/Basic/DiagnosticIDs.cpp
@@ -674,7 +674,7 @@ bool DiagnosticIDs::setDiagnosticGroupMapping(StringRef Group,
/// ProcessDiag - This is the method used to report a diagnostic that is
/// finally fully formed.
bool DiagnosticIDs::ProcessDiag(DiagnosticsEngine &Diag) const {
- DiagnosticInfo Info(&Diag);
+ Diagnostic Info(&Diag);
if (Diag.SuppressAllDiagnostics)
return false;
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index d843101ee4f..4cc936a2b68 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -457,7 +457,7 @@ public:
: StoredDiags(StoredDiags) { }
virtual void HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info);
+ const Diagnostic &Info);
};
/// \brief RAII object that optionally captures diagnostics, if
@@ -489,7 +489,7 @@ public:
} // anonymous namespace
void StoredDiagnosticConsumer::HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(Level, Info);
diff --git a/lib/Frontend/LogDiagnosticPrinter.cpp b/lib/Frontend/LogDiagnosticPrinter.cpp
index 1f64134d3a0..7089049ed59 100644
--- a/lib/Frontend/LogDiagnosticPrinter.cpp
+++ b/lib/Frontend/LogDiagnosticPrinter.cpp
@@ -94,7 +94,7 @@ void LogDiagnosticPrinter::EndSourceFile() {
}
void LogDiagnosticPrinter::HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(Level, Info);
diff --git a/lib/Frontend/TextDiagnosticBuffer.cpp b/lib/Frontend/TextDiagnosticBuffer.cpp
index 75ecaaf29b9..cef46a27e8a 100644
--- a/lib/Frontend/TextDiagnosticBuffer.cpp
+++ b/lib/Frontend/TextDiagnosticBuffer.cpp
@@ -20,7 +20,7 @@ using namespace clang;
/// reported.
///
void TextDiagnosticBuffer::HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(Level, Info);
diff --git a/lib/Frontend/TextDiagnosticPrinter.cpp b/lib/Frontend/TextDiagnosticPrinter.cpp
index 3651480ae96..153c08eb754 100644
--- a/lib/Frontend/TextDiagnosticPrinter.cpp
+++ b/lib/Frontend/TextDiagnosticPrinter.cpp
@@ -958,7 +958,7 @@ static PresumedLoc getDiagnosticPresumedLoc(const SourceManager &SM,
/// diagnostic and printing it, as well as any include stack or source ranges
/// necessary.
void TextDiagnosticPrinter::EmitDiagnosticLoc(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info,
+ const Diagnostic &Info,
const SourceManager &SM,
PresumedLoc PLoc) {
if (PLoc.isInvalid()) {
@@ -1086,14 +1086,14 @@ static void PrintDiagnosticLevel(raw_ostream &OS,
OS.resetColor();
}
-static void PrintDiagnosticName(raw_ostream &OS, const DiagnosticInfo &Info) {
+static void PrintDiagnosticName(raw_ostream &OS, const Diagnostic &Info) {
if (!DiagnosticIDs::isBuiltinNote(Info.getID()))
OS << " [" << DiagnosticIDs::getName(Info.getID()) << "]";
}
static void PrintDiagnosticOptions(raw_ostream &OS,
DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info,
+ const Diagnostic &Info,
const DiagnosticOptions &DiagOpts) {
std::string OptionName;
if (DiagOpts.ShowOptionNames) {
@@ -1156,7 +1156,7 @@ static void PrintDiagnosticOptions(raw_ostream &OS,
}
void TextDiagnosticPrinter::HandleDiagnostic(DiagnosticsEngine::Level Level,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(Level, Info);
diff --git a/lib/Frontend/VerifyDiagnosticConsumer.cpp b/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 34f3c220992..983dc8eebb4 100644
--- a/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -56,7 +56,7 @@ void VerifyDiagnosticConsumer::EndSourceFile() {
}
void VerifyDiagnosticConsumer::HandleDiagnostic(
- DiagnosticsEngine::Level DiagLevel, const DiagnosticInfo &Info) {
+ DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) {
if (FirstErrorFID.isInvalid() && Info.hasSourceManager()) {
const SourceManager &SM = Info.getSourceManager();
FirstErrorFID = SM.getFileID(Info.getLocation());
diff --git a/lib/Rewrite/FixItRewriter.cpp b/lib/Rewrite/FixItRewriter.cpp
index 2d336a59998..d38179dabfc 100644
--- a/lib/Rewrite/FixItRewriter.cpp
+++ b/lib/Rewrite/FixItRewriter.cpp
@@ -79,7 +79,7 @@ bool FixItRewriter::IncludeInDiagnosticCounts() const {
}
void FixItRewriter::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Default implementation (Warnings/errors count).
DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index 1bdcddab534..dcf52f9e3cb 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -445,7 +445,7 @@ namespace {
/// diags.
class IgnoringDiagConsumer : public DiagnosticConsumer {
void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
// Just ignore it.
}
};
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 39933fde5f5..d0c122a51c3 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -669,7 +669,7 @@ Sema::SemaDiagnosticBuilder::~SemaDiagnosticBuilder() {
// Make a copy of this suppressed diagnostic and store it with the
// template-deduction information;
FlushCounts();
- DiagnosticInfo DiagInfo(&SemaRef.Diags);
+ Diagnostic DiagInfo(&SemaRef.Diags);
if (*Info)
(*Info)->addSuppressedDiagnostic(DiagInfo.getLocation(),
diff --git a/unittests/AST/APValueTest.cpp b/unittests/AST/APValueTest.cpp
index 44ad8cc3880..98cb086931e 100644
--- a/unittests/AST/APValueTest.cpp
+++ b/unittests/AST/APValueTest.cpp
@@ -25,7 +25,7 @@ class DiagnosticOutputGetter {
SmallString<64> LastDiagnostic;
public:
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
- const DiagnosticInfo &Info) {
+ const Diagnostic &Info) {
LastDiagnostic.clear();
Info.FormatDiagnostic(LastDiagnostic);
}
--
GitLab