mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Add an overload for SourceMgr::PrintMessage that takes an existing diagnostic.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211087 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ecb1c3aa8c
commit
4e23baa945
@ -157,6 +157,13 @@ public:
|
||||
ArrayRef<SMFixIt> FixIts = None,
|
||||
bool ShowColors = true) const;
|
||||
|
||||
/// Emits a manually-constructed diagnostic to the given output stream.
|
||||
///
|
||||
/// \param ShowColors Display colored messages if output is a terminal and
|
||||
/// the default error handler is used.
|
||||
void PrintMessage(raw_ostream &OS, const SMDiagnostic &Diagnostic,
|
||||
bool ShowColors = true) const;
|
||||
|
||||
/// Return an SMDiagnostic at the specified location with the specified
|
||||
/// string.
|
||||
///
|
||||
|
@ -199,20 +199,16 @@ SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, SourceMgr::DiagKind Kind,
|
||||
LineStr, ColRanges, FixIts);
|
||||
}
|
||||
|
||||
void SourceMgr::PrintMessage(raw_ostream &OS, SMLoc Loc,
|
||||
SourceMgr::DiagKind Kind,
|
||||
const Twine &Msg, ArrayRef<SMRange> Ranges,
|
||||
ArrayRef<SMFixIt> FixIts, bool ShowColors) const {
|
||||
SMDiagnostic Diagnostic = GetMessage(Loc, Kind, Msg, Ranges, FixIts);
|
||||
|
||||
void SourceMgr::PrintMessage(raw_ostream &OS, const SMDiagnostic &Diagnostic,
|
||||
bool ShowColors) const {
|
||||
// Report the message with the diagnostic handler if present.
|
||||
if (DiagHandler) {
|
||||
DiagHandler(Diagnostic, DiagContext);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Loc != SMLoc()) {
|
||||
int CurBuf = FindBufferContainingLoc(Loc);
|
||||
if (Diagnostic.getLoc().isValid()) {
|
||||
int CurBuf = FindBufferContainingLoc(Diagnostic.getLoc());
|
||||
assert(CurBuf != -1 && "Invalid or unspecified location!");
|
||||
PrintIncludeStack(getBufferInfo(CurBuf).IncludeLoc, OS);
|
||||
}
|
||||
@ -220,6 +216,13 @@ void SourceMgr::PrintMessage(raw_ostream &OS, SMLoc Loc,
|
||||
Diagnostic.print(nullptr, OS, ShowColors);
|
||||
}
|
||||
|
||||
void SourceMgr::PrintMessage(raw_ostream &OS, SMLoc Loc,
|
||||
SourceMgr::DiagKind Kind,
|
||||
const Twine &Msg, ArrayRef<SMRange> Ranges,
|
||||
ArrayRef<SMFixIt> FixIts, bool ShowColors) const {
|
||||
PrintMessage(OS, GetMessage(Loc, Kind, Msg, Ranges, FixIts), ShowColors);
|
||||
}
|
||||
|
||||
void SourceMgr::PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind,
|
||||
const Twine &Msg, ArrayRef<SMRange> Ranges,
|
||||
ArrayRef<SMFixIt> FixIts, bool ShowColors) const {
|
||||
|
Loading…
Reference in New Issue
Block a user