2006-06-18 13:43:12 +08:00
|
|
|
//===--- Diagnostic.cpp - C Language Family Diagnostic Handling -----------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
2007-12-30 03:59:25 +08:00
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
2006-06-18 13:43:12 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This file implements the Diagnostic-related interfaces.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "clang/Basic/Diagnostic.h"
|
2008-11-19 15:32:16 +08:00
|
|
|
#include "clang/Basic/IdentifierTable.h"
|
2006-06-18 13:43:12 +08:00
|
|
|
#include "clang/Basic/SourceLocation.h"
|
2008-11-19 14:51:40 +08:00
|
|
|
#include "llvm/ADT/SmallVector.h"
|
2008-11-19 15:22:31 +08:00
|
|
|
#include "llvm/ADT/StringExtras.h"
|
2007-12-02 09:09:57 +08:00
|
|
|
#include <vector>
|
|
|
|
#include <map>
|
2008-03-11 01:04:53 +08:00
|
|
|
#include <cstring>
|
2006-06-18 13:43:12 +08:00
|
|
|
using namespace clang;
|
|
|
|
|
2007-12-02 09:09:57 +08:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Builtin Diagnostic information
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2006-06-18 13:43:12 +08:00
|
|
|
/// Flag values for diagnostics.
|
|
|
|
enum {
|
|
|
|
// Diagnostic classes.
|
|
|
|
NOTE = 0x01,
|
|
|
|
WARNING = 0x02,
|
|
|
|
EXTENSION = 0x03,
|
2008-08-05 08:07:51 +08:00
|
|
|
EXTWARN = 0x04,
|
|
|
|
ERROR = 0x05,
|
2009-02-06 06:47:05 +08:00
|
|
|
FATAL = 0x06,
|
2006-06-18 13:43:12 +08:00
|
|
|
class_mask = 0x07
|
|
|
|
};
|
|
|
|
|
|
|
|
/// DiagnosticFlags - A set of flags, or'd together, that describe the
|
|
|
|
/// diagnostic.
|
|
|
|
#define DIAG(ENUM,FLAGS,DESC) FLAGS,
|
2009-01-28 02:30:58 +08:00
|
|
|
static unsigned char DiagnosticFlagsCommon[] = {
|
|
|
|
#include "clang/Basic/DiagnosticCommonKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static unsigned char DiagnosticFlagsLex[] = {
|
|
|
|
#include "clang/Basic/DiagnosticLexKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static unsigned char DiagnosticFlagsParse[] = {
|
|
|
|
#include "clang/Basic/DiagnosticParseKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static unsigned char DiagnosticFlagsAST[] = {
|
|
|
|
#include "clang/Basic/DiagnosticASTKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static unsigned char DiagnosticFlagsSema[] = {
|
|
|
|
#include "clang/Basic/DiagnosticSemaKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static unsigned char DiagnosticFlagsAnalysis[] = {
|
|
|
|
#include "clang/Basic/DiagnosticAnalysisKinds.def"
|
2006-06-18 13:43:12 +08:00
|
|
|
0
|
|
|
|
};
|
2009-01-28 02:30:58 +08:00
|
|
|
#undef DIAG
|
2006-06-18 13:43:12 +08:00
|
|
|
|
|
|
|
/// getDiagClass - Return the class field of the diagnostic.
|
|
|
|
///
|
2007-12-01 06:53:43 +08:00
|
|
|
static unsigned getBuiltinDiagClass(unsigned DiagID) {
|
2009-01-30 01:46:13 +08:00
|
|
|
assert(DiagID < diag::DIAG_UPPER_LIMIT &&
|
2007-12-01 06:53:43 +08:00
|
|
|
"Diagnostic ID out of range!");
|
2009-01-28 02:30:58 +08:00
|
|
|
unsigned res;
|
2009-01-30 01:46:13 +08:00
|
|
|
if (DiagID < diag::DIAG_START_LEX)
|
2009-01-28 02:30:58 +08:00
|
|
|
res = DiagnosticFlagsCommon[DiagID];
|
2009-01-30 01:46:13 +08:00
|
|
|
else if (DiagID < diag::DIAG_START_PARSE)
|
|
|
|
res = DiagnosticFlagsLex[DiagID - diag::DIAG_START_LEX - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_AST)
|
|
|
|
res = DiagnosticFlagsParse[DiagID - diag::DIAG_START_PARSE - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_SEMA)
|
|
|
|
res = DiagnosticFlagsAST[DiagID - diag::DIAG_START_AST - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_ANALYSIS)
|
|
|
|
res = DiagnosticFlagsSema[DiagID - diag::DIAG_START_SEMA - 1];
|
2009-01-28 02:30:58 +08:00
|
|
|
else
|
2009-01-30 01:46:13 +08:00
|
|
|
res = DiagnosticFlagsAnalysis[DiagID - diag::DIAG_START_ANALYSIS - 1];
|
2009-01-28 02:30:58 +08:00
|
|
|
return res & class_mask;
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// DiagnosticText - An english message to print for the diagnostic. These
|
|
|
|
/// should be localized.
|
|
|
|
#define DIAG(ENUM,FLAGS,DESC) DESC,
|
2009-01-28 02:30:58 +08:00
|
|
|
static const char * const DiagnosticTextCommon[] = {
|
|
|
|
#include "clang/Basic/DiagnosticCommonKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static const char * const DiagnosticTextLex[] = {
|
|
|
|
#include "clang/Basic/DiagnosticLexKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static const char * const DiagnosticTextParse[] = {
|
|
|
|
#include "clang/Basic/DiagnosticParseKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static const char * const DiagnosticTextAST[] = {
|
|
|
|
#include "clang/Basic/DiagnosticASTKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static const char * const DiagnosticTextSema[] = {
|
|
|
|
#include "clang/Basic/DiagnosticSemaKinds.def"
|
|
|
|
0
|
|
|
|
};
|
|
|
|
static const char * const DiagnosticTextAnalysis[] = {
|
|
|
|
#include "clang/Basic/DiagnosticAnalysisKinds.def"
|
2006-06-18 13:43:12 +08:00
|
|
|
0
|
|
|
|
};
|
2009-01-28 02:30:58 +08:00
|
|
|
#undef DIAG
|
2006-06-18 13:43:12 +08:00
|
|
|
|
2007-12-02 09:09:57 +08:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Custom Diagnostic information
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace diag {
|
|
|
|
class CustomDiagInfo {
|
|
|
|
typedef std::pair<Diagnostic::Level, std::string> DiagDesc;
|
|
|
|
std::vector<DiagDesc> DiagInfo;
|
|
|
|
std::map<DiagDesc, unsigned> DiagIDs;
|
|
|
|
public:
|
|
|
|
|
|
|
|
/// getDescription - Return the description of the specified custom
|
|
|
|
/// diagnostic.
|
|
|
|
const char *getDescription(unsigned DiagID) const {
|
2009-01-29 14:55:46 +08:00
|
|
|
assert(this && DiagID-DIAG_UPPER_LIMIT < DiagInfo.size() &&
|
2007-12-02 09:09:57 +08:00
|
|
|
"Invalid diagnosic ID");
|
2009-01-29 14:55:46 +08:00
|
|
|
return DiagInfo[DiagID-DIAG_UPPER_LIMIT].second.c_str();
|
2007-12-02 09:09:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// getLevel - Return the level of the specified custom diagnostic.
|
|
|
|
Diagnostic::Level getLevel(unsigned DiagID) const {
|
2009-01-29 14:55:46 +08:00
|
|
|
assert(this && DiagID-DIAG_UPPER_LIMIT < DiagInfo.size() &&
|
2007-12-02 09:09:57 +08:00
|
|
|
"Invalid diagnosic ID");
|
2009-01-29 14:55:46 +08:00
|
|
|
return DiagInfo[DiagID-DIAG_UPPER_LIMIT].first;
|
2007-12-02 09:09:57 +08:00
|
|
|
}
|
|
|
|
|
2008-10-18 05:24:47 +08:00
|
|
|
unsigned getOrCreateDiagID(Diagnostic::Level L, const char *Message,
|
|
|
|
Diagnostic &Diags) {
|
2007-12-02 09:09:57 +08:00
|
|
|
DiagDesc D(L, Message);
|
|
|
|
// Check to see if it already exists.
|
|
|
|
std::map<DiagDesc, unsigned>::iterator I = DiagIDs.lower_bound(D);
|
|
|
|
if (I != DiagIDs.end() && I->first == D)
|
|
|
|
return I->second;
|
|
|
|
|
|
|
|
// If not, assign a new ID.
|
2009-01-29 14:55:46 +08:00
|
|
|
unsigned ID = DiagInfo.size()+DIAG_UPPER_LIMIT;
|
2007-12-02 09:09:57 +08:00
|
|
|
DiagIDs.insert(std::make_pair(D, ID));
|
|
|
|
DiagInfo.push_back(D);
|
2008-10-18 05:24:47 +08:00
|
|
|
|
|
|
|
// If this is a warning, and all warnings are supposed to map to errors,
|
|
|
|
// insert the mapping now.
|
|
|
|
if (L == Diagnostic::Warning && Diags.getWarningsAsErrors())
|
|
|
|
Diags.setDiagnosticMapping((diag::kind)ID, diag::MAP_ERROR);
|
2007-12-02 09:09:57 +08:00
|
|
|
return ID;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
} // end diag namespace
|
|
|
|
} // end clang namespace
|
|
|
|
|
|
|
|
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Common Diagnostic implementation
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2008-11-23 17:21:17 +08:00
|
|
|
static void DummyArgToStringFn(Diagnostic::ArgumentKind AK, intptr_t QT,
|
|
|
|
const char *Modifier, unsigned ML,
|
|
|
|
const char *Argument, unsigned ArgLen,
|
2009-02-20 07:53:20 +08:00
|
|
|
llvm::SmallVectorImpl<char> &Output,
|
|
|
|
void *Cookie) {
|
2008-11-23 17:21:17 +08:00
|
|
|
const char *Str = "<can't format argument>";
|
2008-11-23 17:13:29 +08:00
|
|
|
Output.append(Str, Str+strlen(Str));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-08-08 01:49:57 +08:00
|
|
|
Diagnostic::Diagnostic(DiagnosticClient *client) : Client(client) {
|
2008-05-29 23:36:45 +08:00
|
|
|
IgnoreAllWarnings = false;
|
2006-07-05 08:55:08 +08:00
|
|
|
WarningsAsErrors = false;
|
|
|
|
WarnOnExtensions = false;
|
|
|
|
ErrorOnExtensions = false;
|
2008-09-13 02:10:20 +08:00
|
|
|
SuppressSystemWarnings = false;
|
2006-07-05 08:55:08 +08:00
|
|
|
// Clear all mappings, setting them to MAP_DEFAULT.
|
|
|
|
memset(DiagMappings, 0, sizeof(DiagMappings));
|
2007-05-28 08:46:44 +08:00
|
|
|
|
|
|
|
ErrorOccurred = false;
|
2009-02-06 12:16:02 +08:00
|
|
|
FatalErrorOccurred = false;
|
2007-06-09 03:17:38 +08:00
|
|
|
NumDiagnostics = 0;
|
|
|
|
NumErrors = 0;
|
2007-12-02 09:09:57 +08:00
|
|
|
CustomDiagInfo = 0;
|
2008-11-22 08:59:29 +08:00
|
|
|
CurDiagID = ~0U;
|
2009-02-17 14:49:55 +08:00
|
|
|
LastDiagLevel = Fatal;
|
2008-11-23 17:13:29 +08:00
|
|
|
|
2008-11-23 17:21:17 +08:00
|
|
|
ArgToStringFn = DummyArgToStringFn;
|
2009-02-20 07:53:20 +08:00
|
|
|
ArgToStringCookie = 0;
|
2007-12-02 09:09:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
Diagnostic::~Diagnostic() {
|
|
|
|
delete CustomDiagInfo;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// getCustomDiagID - Return an ID for a diagnostic with the specified message
|
|
|
|
/// and level. If this is the first request for this diagnosic, it is
|
|
|
|
/// registered and created, otherwise the existing ID is returned.
|
|
|
|
unsigned Diagnostic::getCustomDiagID(Level L, const char *Message) {
|
|
|
|
if (CustomDiagInfo == 0)
|
|
|
|
CustomDiagInfo = new diag::CustomDiagInfo();
|
2008-10-18 05:24:47 +08:00
|
|
|
return CustomDiagInfo->getOrCreateDiagID(L, Message, *this);
|
2006-07-05 08:55:08 +08:00
|
|
|
}
|
|
|
|
|
2007-12-02 09:09:57 +08:00
|
|
|
|
2009-02-17 14:49:55 +08:00
|
|
|
/// isBuiltinWarningOrExtension - Return true if the unmapped diagnostic
|
|
|
|
/// level of the specified diagnostic ID is a Warning or Extension.
|
|
|
|
/// This only works on builtin diagnostics, not custom ones, and is not legal to
|
|
|
|
/// call on NOTEs.
|
|
|
|
bool Diagnostic::isBuiltinWarningOrExtension(unsigned DiagID) {
|
2009-01-30 01:46:13 +08:00
|
|
|
return DiagID < diag::DIAG_UPPER_LIMIT && getBuiltinDiagClass(DiagID) < ERROR;
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// getDescription - Given a diagnostic ID, return a description of the
|
|
|
|
/// issue.
|
This reworks some of the Diagnostic interfaces a bit to change how diagnostics
are formed. In particular, a diagnostic with all its strings and ranges is now
packaged up and sent to DiagnosticClients as a DiagnosticInfo instead of as a
ton of random stuff. This has the benefit of simplifying the interface, making
it more extensible, and allowing us to do more checking for things like access
past the end of the various arrays passed in.
In addition to introducing DiagnosticInfo, this also substantially changes how
Diagnostic::Report works. Instead of being passed in all of the info required
to issue a diagnostic, Report now takes only the required info (a location and
ID) and returns a fresh DiagnosticInfo *by value*. The caller is then free to
stuff strings and ranges into the DiagnosticInfo with the << operator. When
the dtor runs on the DiagnosticInfo object (which should happen at the end of
the statement), the diagnostic is actually emitted with all of the accumulated
information. This is a somewhat tricky dance, but it means that the
accumulated DiagnosticInfo is allowed to keep pointers to other expression
temporaries without those pointers getting invalidated.
This is just the minimal change to get this stuff working, but this will allow
us to eliminate the zillions of variant "Diag" methods scattered throughout
(e.g.) sema. For example, instead of calling:
Diag(BuiltinLoc, diag::err_overload_no_match, typeNames,
SourceRange(BuiltinLoc, RParenLoc));
We will soon be able to just do:
Diag(BuiltinLoc, diag::err_overload_no_match)
<< typeNames << SourceRange(BuiltinLoc, RParenLoc));
This scales better to support arbitrary types being passed in (not just
strings) in a type-safe way. Go operator overloading?!
llvm-svn: 59502
2008-11-18 15:04:44 +08:00
|
|
|
const char *Diagnostic::getDescription(unsigned DiagID) const {
|
2009-02-17 14:49:55 +08:00
|
|
|
if (DiagID < diag::DIAG_START_LEX)
|
|
|
|
return DiagnosticTextCommon[DiagID];
|
|
|
|
else if (DiagID < diag::DIAG_START_PARSE)
|
|
|
|
return DiagnosticTextLex[DiagID - diag::DIAG_START_LEX - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_AST)
|
|
|
|
return DiagnosticTextParse[DiagID - diag::DIAG_START_PARSE - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_SEMA)
|
|
|
|
return DiagnosticTextAST[DiagID - diag::DIAG_START_AST - 1];
|
|
|
|
else if (DiagID < diag::DIAG_START_ANALYSIS)
|
|
|
|
return DiagnosticTextSema[DiagID - diag::DIAG_START_SEMA - 1];
|
|
|
|
else if (DiagID < diag::DIAG_UPPER_LIMIT)
|
|
|
|
return DiagnosticTextAnalysis[DiagID - diag::DIAG_START_ANALYSIS - 1];
|
2009-01-28 02:30:58 +08:00
|
|
|
return CustomDiagInfo->getDescription(DiagID);
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// getDiagnosticLevel - Based on the way the client configured the Diagnostic
|
|
|
|
/// object, classify the specified diagnostic ID into a Level, consumable by
|
|
|
|
/// the DiagnosticClient.
|
|
|
|
Diagnostic::Level Diagnostic::getDiagnosticLevel(unsigned DiagID) const {
|
2007-12-02 09:09:57 +08:00
|
|
|
// Handle custom diagnostics, which cannot be mapped.
|
2009-01-30 01:46:13 +08:00
|
|
|
if (DiagID >= diag::DIAG_UPPER_LIMIT)
|
2007-12-02 09:09:57 +08:00
|
|
|
return CustomDiagInfo->getLevel(DiagID);
|
2007-12-01 06:53:43 +08:00
|
|
|
|
|
|
|
unsigned DiagClass = getBuiltinDiagClass(DiagID);
|
2009-02-17 14:49:55 +08:00
|
|
|
assert(DiagClass != NOTE && "Cannot get the diagnostic level of a note!");
|
|
|
|
return getDiagnosticLevel(DiagID, DiagClass);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// getDiagnosticLevel - Based on the way the client configured the Diagnostic
|
|
|
|
/// object, classify the specified diagnostic ID into a Level, consumable by
|
|
|
|
/// the DiagnosticClient.
|
|
|
|
Diagnostic::Level
|
|
|
|
Diagnostic::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass) const {
|
2006-07-05 08:55:08 +08:00
|
|
|
// Specific non-error diagnostics may be mapped to various levels from ignored
|
2009-02-17 14:49:55 +08:00
|
|
|
// to error. Errors can only be mapped to fatal.
|
|
|
|
switch (getDiagnosticMapping((diag::kind)DiagID)) {
|
|
|
|
case diag::MAP_DEFAULT: break;
|
|
|
|
case diag::MAP_IGNORE: return Diagnostic::Ignored;
|
|
|
|
case diag::MAP_WARNING: DiagClass = WARNING; break;
|
|
|
|
case diag::MAP_ERROR: DiagClass = ERROR; break;
|
|
|
|
case diag::MAP_FATAL: DiagClass = FATAL; break;
|
2006-07-05 08:55:08 +08:00
|
|
|
}
|
2006-06-18 13:43:12 +08:00
|
|
|
|
|
|
|
// Map diagnostic classes based on command line argument settings.
|
|
|
|
if (DiagClass == EXTENSION) {
|
|
|
|
if (ErrorOnExtensions)
|
|
|
|
DiagClass = ERROR;
|
|
|
|
else if (WarnOnExtensions)
|
|
|
|
DiagClass = WARNING;
|
|
|
|
else
|
|
|
|
return Ignored;
|
2008-08-05 08:07:51 +08:00
|
|
|
} else if (DiagClass == EXTWARN) {
|
|
|
|
DiagClass = ErrorOnExtensions ? ERROR : WARNING;
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
|
2008-05-29 23:36:45 +08:00
|
|
|
// If warnings are globally mapped to ignore or error, do it.
|
|
|
|
if (DiagClass == WARNING) {
|
|
|
|
if (IgnoreAllWarnings)
|
|
|
|
return Diagnostic::Ignored;
|
|
|
|
if (WarningsAsErrors)
|
|
|
|
DiagClass = ERROR;
|
|
|
|
}
|
2006-06-18 13:43:12 +08:00
|
|
|
|
|
|
|
switch (DiagClass) {
|
|
|
|
default: assert(0 && "Unknown diagnostic class!");
|
|
|
|
case WARNING: return Diagnostic::Warning;
|
|
|
|
case ERROR: return Diagnostic::Error;
|
2009-02-06 06:47:05 +08:00
|
|
|
case FATAL: return Diagnostic::Fatal;
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
This reworks some of the Diagnostic interfaces a bit to change how diagnostics
are formed. In particular, a diagnostic with all its strings and ranges is now
packaged up and sent to DiagnosticClients as a DiagnosticInfo instead of as a
ton of random stuff. This has the benefit of simplifying the interface, making
it more extensible, and allowing us to do more checking for things like access
past the end of the various arrays passed in.
In addition to introducing DiagnosticInfo, this also substantially changes how
Diagnostic::Report works. Instead of being passed in all of the info required
to issue a diagnostic, Report now takes only the required info (a location and
ID) and returns a fresh DiagnosticInfo *by value*. The caller is then free to
stuff strings and ranges into the DiagnosticInfo with the << operator. When
the dtor runs on the DiagnosticInfo object (which should happen at the end of
the statement), the diagnostic is actually emitted with all of the accumulated
information. This is a somewhat tricky dance, but it means that the
accumulated DiagnosticInfo is allowed to keep pointers to other expression
temporaries without those pointers getting invalidated.
This is just the minimal change to get this stuff working, but this will allow
us to eliminate the zillions of variant "Diag" methods scattered throughout
(e.g.) sema. For example, instead of calling:
Diag(BuiltinLoc, diag::err_overload_no_match, typeNames,
SourceRange(BuiltinLoc, RParenLoc));
We will soon be able to just do:
Diag(BuiltinLoc, diag::err_overload_no_match)
<< typeNames << SourceRange(BuiltinLoc, RParenLoc));
This scales better to support arbitrary types being passed in (not just
strings) in a type-safe way. Go operator overloading?!
llvm-svn: 59502
2008-11-18 15:04:44 +08:00
|
|
|
/// ProcessDiag - This is the method used to report a diagnostic that is
|
|
|
|
/// finally fully formed.
|
2008-11-22 08:59:29 +08:00
|
|
|
void Diagnostic::ProcessDiag() {
|
|
|
|
DiagnosticInfo Info(this);
|
|
|
|
|
2009-02-06 12:16:02 +08:00
|
|
|
// If a fatal error has already been emitted, silence all subsequent
|
|
|
|
// diagnostics.
|
|
|
|
if (FatalErrorOccurred)
|
|
|
|
return;
|
|
|
|
|
2006-06-18 13:43:12 +08:00
|
|
|
// Figure out the diagnostic level of this message.
|
2009-02-17 14:49:55 +08:00
|
|
|
Diagnostic::Level DiagLevel;
|
|
|
|
unsigned DiagID = Info.getID();
|
|
|
|
|
|
|
|
// ShouldEmitInSystemHeader - True if this diagnostic should be produced even
|
|
|
|
// in a system header.
|
|
|
|
bool ShouldEmitInSystemHeader;
|
|
|
|
|
|
|
|
if (DiagID >= diag::DIAG_UPPER_LIMIT) {
|
|
|
|
// Handle custom diagnostics, which cannot be mapped.
|
|
|
|
DiagLevel = CustomDiagInfo->getLevel(DiagID);
|
|
|
|
|
|
|
|
// Custom diagnostics always are emitted in system headers.
|
|
|
|
ShouldEmitInSystemHeader = true;
|
|
|
|
} else {
|
|
|
|
// Get the class of the diagnostic. If this is a NOTE, map it onto whatever
|
|
|
|
// the diagnostic level was for the previous diagnostic so that it is
|
|
|
|
// filtered the same as the previous diagnostic.
|
|
|
|
unsigned DiagClass = getBuiltinDiagClass(DiagID);
|
|
|
|
if (DiagClass == NOTE) {
|
|
|
|
DiagLevel = Diagnostic::Note;
|
|
|
|
ShouldEmitInSystemHeader = false; // extra consideration is needed
|
|
|
|
} else {
|
|
|
|
// If this is not an error and we are in a system header, we ignore it.
|
|
|
|
// Check the original Diag ID here, because we also want to ignore
|
|
|
|
// extensions and warnings in -Werror and -pedantic-errors modes, which
|
|
|
|
// *map* warnings/extensions to errors.
|
|
|
|
ShouldEmitInSystemHeader = DiagClass == ERROR;
|
|
|
|
|
|
|
|
DiagLevel = getDiagnosticLevel(DiagID, DiagClass);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (DiagLevel != Diagnostic::Note)
|
|
|
|
LastDiagLevel = DiagLevel;
|
2006-06-18 13:43:12 +08:00
|
|
|
|
2009-02-17 14:49:55 +08:00
|
|
|
// If the client doesn't care about this message, don't issue it. If this is
|
|
|
|
// a note and the last real diagnostic was ignored, ignore it too.
|
|
|
|
if (DiagLevel == Diagnostic::Ignored ||
|
|
|
|
(DiagLevel == Diagnostic::Note && LastDiagLevel == Diagnostic::Ignored))
|
2006-06-18 14:48:37 +08:00
|
|
|
return;
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2009-02-17 14:49:55 +08:00
|
|
|
// If this diagnostic is in a system header and is not a clang error, suppress
|
|
|
|
// it.
|
|
|
|
if (SuppressSystemWarnings && !ShouldEmitInSystemHeader &&
|
This reworks some of the Diagnostic interfaces a bit to change how diagnostics
are formed. In particular, a diagnostic with all its strings and ranges is now
packaged up and sent to DiagnosticClients as a DiagnosticInfo instead of as a
ton of random stuff. This has the benefit of simplifying the interface, making
it more extensible, and allowing us to do more checking for things like access
past the end of the various arrays passed in.
In addition to introducing DiagnosticInfo, this also substantially changes how
Diagnostic::Report works. Instead of being passed in all of the info required
to issue a diagnostic, Report now takes only the required info (a location and
ID) and returns a fresh DiagnosticInfo *by value*. The caller is then free to
stuff strings and ranges into the DiagnosticInfo with the << operator. When
the dtor runs on the DiagnosticInfo object (which should happen at the end of
the statement), the diagnostic is actually emitted with all of the accumulated
information. This is a somewhat tricky dance, but it means that the
accumulated DiagnosticInfo is allowed to keep pointers to other expression
temporaries without those pointers getting invalidated.
This is just the minimal change to get this stuff working, but this will allow
us to eliminate the zillions of variant "Diag" methods scattered throughout
(e.g.) sema. For example, instead of calling:
Diag(BuiltinLoc, diag::err_overload_no_match, typeNames,
SourceRange(BuiltinLoc, RParenLoc));
We will soon be able to just do:
Diag(BuiltinLoc, diag::err_overload_no_match)
<< typeNames << SourceRange(BuiltinLoc, RParenLoc));
This scales better to support arbitrary types being passed in (not just
strings) in a type-safe way. Go operator overloading?!
llvm-svn: 59502
2008-11-18 15:04:44 +08:00
|
|
|
Info.getLocation().isValid() &&
|
2009-02-17 14:49:55 +08:00
|
|
|
Info.getLocation().getSpellingLoc().isInSystemHeader() &&
|
2009-02-17 14:52:20 +08:00
|
|
|
(DiagLevel != Diagnostic::Note || LastDiagLevel == Diagnostic::Ignored)) {
|
|
|
|
LastDiagLevel = Diagnostic::Ignored;
|
2008-02-03 17:00:04 +08:00
|
|
|
return;
|
2009-02-17 14:52:20 +08:00
|
|
|
}
|
2009-02-17 14:49:55 +08:00
|
|
|
|
2007-06-09 03:17:38 +08:00
|
|
|
if (DiagLevel >= Diagnostic::Error) {
|
2007-05-28 08:46:44 +08:00
|
|
|
ErrorOccurred = true;
|
This reworks some of the Diagnostic interfaces a bit to change how diagnostics
are formed. In particular, a diagnostic with all its strings and ranges is now
packaged up and sent to DiagnosticClients as a DiagnosticInfo instead of as a
ton of random stuff. This has the benefit of simplifying the interface, making
it more extensible, and allowing us to do more checking for things like access
past the end of the various arrays passed in.
In addition to introducing DiagnosticInfo, this also substantially changes how
Diagnostic::Report works. Instead of being passed in all of the info required
to issue a diagnostic, Report now takes only the required info (a location and
ID) and returns a fresh DiagnosticInfo *by value*. The caller is then free to
stuff strings and ranges into the DiagnosticInfo with the << operator. When
the dtor runs on the DiagnosticInfo object (which should happen at the end of
the statement), the diagnostic is actually emitted with all of the accumulated
information. This is a somewhat tricky dance, but it means that the
accumulated DiagnosticInfo is allowed to keep pointers to other expression
temporaries without those pointers getting invalidated.
This is just the minimal change to get this stuff working, but this will allow
us to eliminate the zillions of variant "Diag" methods scattered throughout
(e.g.) sema. For example, instead of calling:
Diag(BuiltinLoc, diag::err_overload_no_match, typeNames,
SourceRange(BuiltinLoc, RParenLoc));
We will soon be able to just do:
Diag(BuiltinLoc, diag::err_overload_no_match)
<< typeNames << SourceRange(BuiltinLoc, RParenLoc));
This scales better to support arbitrary types being passed in (not just
strings) in a type-safe way. Go operator overloading?!
llvm-svn: 59502
2008-11-18 15:04:44 +08:00
|
|
|
++NumErrors;
|
2009-02-06 12:16:02 +08:00
|
|
|
|
|
|
|
if (DiagLevel == Diagnostic::Fatal)
|
|
|
|
FatalErrorOccurred = true;
|
2007-06-09 03:17:38 +08:00
|
|
|
}
|
2009-02-17 14:49:55 +08:00
|
|
|
|
2006-06-18 13:43:12 +08:00
|
|
|
// Finally, report it.
|
This reworks some of the Diagnostic interfaces a bit to change how diagnostics
are formed. In particular, a diagnostic with all its strings and ranges is now
packaged up and sent to DiagnosticClients as a DiagnosticInfo instead of as a
ton of random stuff. This has the benefit of simplifying the interface, making
it more extensible, and allowing us to do more checking for things like access
past the end of the various arrays passed in.
In addition to introducing DiagnosticInfo, this also substantially changes how
Diagnostic::Report works. Instead of being passed in all of the info required
to issue a diagnostic, Report now takes only the required info (a location and
ID) and returns a fresh DiagnosticInfo *by value*. The caller is then free to
stuff strings and ranges into the DiagnosticInfo with the << operator. When
the dtor runs on the DiagnosticInfo object (which should happen at the end of
the statement), the diagnostic is actually emitted with all of the accumulated
information. This is a somewhat tricky dance, but it means that the
accumulated DiagnosticInfo is allowed to keep pointers to other expression
temporaries without those pointers getting invalidated.
This is just the minimal change to get this stuff working, but this will allow
us to eliminate the zillions of variant "Diag" methods scattered throughout
(e.g.) sema. For example, instead of calling:
Diag(BuiltinLoc, diag::err_overload_no_match, typeNames,
SourceRange(BuiltinLoc, RParenLoc));
We will soon be able to just do:
Diag(BuiltinLoc, diag::err_overload_no_match)
<< typeNames << SourceRange(BuiltinLoc, RParenLoc));
This scales better to support arbitrary types being passed in (not just
strings) in a type-safe way. Go operator overloading?!
llvm-svn: 59502
2008-11-18 15:04:44 +08:00
|
|
|
Client->HandleDiagnostic(DiagLevel, Info);
|
2009-01-24 04:28:53 +08:00
|
|
|
if (Client->IncludeInDiagnosticCounts()) ++NumDiagnostics;
|
2006-06-18 13:43:12 +08:00
|
|
|
}
|
|
|
|
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2006-06-18 13:43:12 +08:00
|
|
|
DiagnosticClient::~DiagnosticClient() {}
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2008-11-19 14:51:40 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
/// ModifierIs - Return true if the specified modifier matches specified string.
|
|
|
|
template <std::size_t StrLen>
|
|
|
|
static bool ModifierIs(const char *Modifier, unsigned ModifierLen,
|
|
|
|
const char (&Str)[StrLen]) {
|
|
|
|
return StrLen-1 == ModifierLen && !memcmp(Modifier, Str, StrLen-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// HandleSelectModifier - Handle the integer 'select' modifier. This is used
|
|
|
|
/// like this: %select{foo|bar|baz}2. This means that the integer argument
|
|
|
|
/// "%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(unsigned ValNo,
|
|
|
|
const char *Argument, unsigned ArgumentLen,
|
|
|
|
llvm::SmallVectorImpl<char> &OutStr) {
|
|
|
|
const char *ArgumentEnd = Argument+ArgumentLen;
|
|
|
|
|
|
|
|
// Skip over 'ValNo' |'s.
|
|
|
|
while (ValNo) {
|
|
|
|
const char *NextVal = std::find(Argument, ArgumentEnd, '|');
|
|
|
|
assert(NextVal != ArgumentEnd && "Value for integer select modifier was"
|
|
|
|
" larger than the number of options in the diagnostic string!");
|
|
|
|
Argument = NextVal+1; // Skip this string.
|
|
|
|
--ValNo;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the end of the value. This is either the } or the |.
|
|
|
|
const char *EndPtr = std::find(Argument, ArgumentEnd, '|');
|
|
|
|
// Add the value to the output string.
|
|
|
|
OutStr.append(Argument, EndPtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// HandleIntegerSModifier - Handle the integer 's' modifier. This adds the
|
|
|
|
/// letter 's' to the string if the value is not 1. This is used in cases like
|
|
|
|
/// this: "you idiot, you have %4 parameter%s4!".
|
|
|
|
static void HandleIntegerSModifier(unsigned ValNo,
|
|
|
|
llvm::SmallVectorImpl<char> &OutStr) {
|
|
|
|
if (ValNo != 1)
|
|
|
|
OutStr.push_back('s');
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-11-22 21:44:36 +08:00
|
|
|
/// PluralNumber - Parse an unsigned integer and advance Start.
|
|
|
|
static unsigned PluralNumber(const char *&Start, const char *End)
|
|
|
|
{
|
|
|
|
// Programming 101: Parse a decimal number :-)
|
|
|
|
unsigned Val = 0;
|
|
|
|
while (Start != End && *Start >= '0' && *Start <= '9') {
|
|
|
|
Val *= 10;
|
|
|
|
Val += *Start - '0';
|
|
|
|
++Start;
|
|
|
|
}
|
|
|
|
return Val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// TestPluralRange - Test if Val is in the parsed range. Modifies Start.
|
|
|
|
static bool TestPluralRange(unsigned Val, const char *&Start, const char *End)
|
|
|
|
{
|
|
|
|
if (*Start != '[') {
|
|
|
|
unsigned Ref = PluralNumber(Start, End);
|
|
|
|
return Ref == Val;
|
|
|
|
}
|
|
|
|
|
|
|
|
++Start;
|
|
|
|
unsigned Low = PluralNumber(Start, End);
|
|
|
|
assert(*Start == ',' && "Bad plural expression syntax: expected ,");
|
|
|
|
++Start;
|
|
|
|
unsigned High = PluralNumber(Start, End);
|
|
|
|
assert(*Start == ']' && "Bad plural expression syntax: expected )");
|
|
|
|
++Start;
|
|
|
|
return Low <= Val && Val <= High;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// EvalPluralExpr - Actual expression evaluator for HandlePluralModifier.
|
|
|
|
static bool EvalPluralExpr(unsigned ValNo, const char *Start, const char *End)
|
|
|
|
{
|
|
|
|
// Empty condition?
|
|
|
|
if (*Start == ':')
|
|
|
|
return true;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
char C = *Start;
|
|
|
|
if (C == '%') {
|
|
|
|
// Modulo expression
|
|
|
|
++Start;
|
|
|
|
unsigned Arg = PluralNumber(Start, End);
|
|
|
|
assert(*Start == '=' && "Bad plural expression syntax: expected =");
|
|
|
|
++Start;
|
|
|
|
unsigned ValMod = ValNo % Arg;
|
|
|
|
if (TestPluralRange(ValMod, Start, End))
|
|
|
|
return true;
|
|
|
|
} else {
|
2008-11-27 15:28:14 +08:00
|
|
|
assert((C == '[' || (C >= '0' && C <= '9')) &&
|
2008-11-22 21:44:36 +08:00
|
|
|
"Bad plural expression syntax: unexpected character");
|
|
|
|
// Range expression
|
|
|
|
if (TestPluralRange(ValNo, Start, End))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan for next or-expr part.
|
|
|
|
Start = std::find(Start, End, ',');
|
|
|
|
if(Start == End)
|
|
|
|
break;
|
|
|
|
++Start;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// HandlePluralModifier - Handle the integer 'plural' modifier. This is used
|
|
|
|
/// for complex plural forms, or in languages where all plurals are complex.
|
|
|
|
/// The syntax is: %plural{cond1:form1|cond2:form2|:form3}, where condn are
|
|
|
|
/// conditions that are tested in order, the form corresponding to the first
|
|
|
|
/// that applies being emitted. The empty condition is always true, making the
|
|
|
|
/// last form a default case.
|
|
|
|
/// Conditions are simple boolean expressions, where n is the number argument.
|
|
|
|
/// Here are the rules.
|
|
|
|
/// condition := expression | empty
|
|
|
|
/// empty := -> always true
|
|
|
|
/// expression := numeric [',' expression] -> logical or
|
|
|
|
/// numeric := range -> true if n in range
|
|
|
|
/// | '%' number '=' range -> true if n % number in range
|
|
|
|
/// range := number
|
|
|
|
/// | '[' number ',' number ']' -> ranges are inclusive both ends
|
|
|
|
///
|
|
|
|
/// Here are some examples from the GNU gettext manual written in this form:
|
|
|
|
/// English:
|
|
|
|
/// {1:form0|:form1}
|
|
|
|
/// Latvian:
|
|
|
|
/// {0:form2|%100=11,%10=0,%10=[2,9]:form1|:form0}
|
|
|
|
/// Gaeilge:
|
|
|
|
/// {1:form0|2:form1|:form2}
|
|
|
|
/// Romanian:
|
|
|
|
/// {1:form0|0,%100=[1,19]:form1|:form2}
|
|
|
|
/// Lithuanian:
|
|
|
|
/// {%10=0,%100=[10,19]:form2|%10=1:form0|:form1}
|
|
|
|
/// Russian (requires repeated form):
|
|
|
|
/// {%100=[11,14]:form2|%10=1:form0|%10=[2,4]:form1|:form2}
|
|
|
|
/// Slovak
|
|
|
|
/// {1:form0|[2,4]:form1|:form2}
|
|
|
|
/// Polish (requires repeated form):
|
|
|
|
/// {1:form0|%100=[10,20]:form2|%10=[2,4]:form1|:form2}
|
|
|
|
static void HandlePluralModifier(unsigned ValNo,
|
|
|
|
const char *Argument, unsigned ArgumentLen,
|
|
|
|
llvm::SmallVectorImpl<char> &OutStr)
|
|
|
|
{
|
|
|
|
const char *ArgumentEnd = Argument + ArgumentLen;
|
|
|
|
while (1) {
|
|
|
|
assert(Argument < ArgumentEnd && "Plural expression didn't match.");
|
|
|
|
const char *ExprEnd = Argument;
|
|
|
|
while (*ExprEnd != ':') {
|
|
|
|
assert(ExprEnd != ArgumentEnd && "Plural missing expression end");
|
|
|
|
++ExprEnd;
|
|
|
|
}
|
|
|
|
if (EvalPluralExpr(ValNo, Argument, ExprEnd)) {
|
|
|
|
Argument = ExprEnd + 1;
|
|
|
|
ExprEnd = std::find(Argument, ArgumentEnd, '|');
|
|
|
|
OutStr.append(Argument, ExprEnd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
Argument = std::find(Argument, ArgumentEnd - 1, '|') + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-11-19 14:51:40 +08:00
|
|
|
/// 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::
|
|
|
|
FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const {
|
|
|
|
const char *DiagStr = getDiags()->getDescription(getID());
|
|
|
|
const char *DiagEnd = DiagStr+strlen(DiagStr);
|
2008-08-11 03:59:06 +08:00
|
|
|
|
2008-11-19 14:51:40 +08:00
|
|
|
while (DiagStr != DiagEnd) {
|
|
|
|
if (DiagStr[0] != '%') {
|
|
|
|
// Append non-%0 substrings to Str if we have one.
|
|
|
|
const char *StrEnd = std::find(DiagStr, DiagEnd, '%');
|
|
|
|
OutStr.append(DiagStr, StrEnd);
|
|
|
|
DiagStr = StrEnd;
|
2008-11-21 15:50:02 +08:00
|
|
|
continue;
|
2008-11-19 14:51:40 +08:00
|
|
|
} else if (DiagStr[1] == '%') {
|
|
|
|
OutStr.push_back('%'); // %% -> %.
|
|
|
|
DiagStr += 2;
|
2008-11-21 15:50:02 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Skip the %.
|
|
|
|
++DiagStr;
|
|
|
|
|
|
|
|
// This must be a placeholder for a diagnostic argument. The format for a
|
|
|
|
// placeholder is one of "%0", "%modifier0", or "%modifier{arguments}0".
|
|
|
|
// The digit is a number from 0-9 indicating which argument this comes from.
|
|
|
|
// The modifier is a string of digits from the set [-a-z]+, arguments is a
|
|
|
|
// brace enclosed string.
|
|
|
|
const char *Modifier = 0, *Argument = 0;
|
|
|
|
unsigned ModifierLen = 0, ArgumentLen = 0;
|
|
|
|
|
|
|
|
// Check to see if we have a modifier. If so eat it.
|
|
|
|
if (!isdigit(DiagStr[0])) {
|
|
|
|
Modifier = DiagStr;
|
|
|
|
while (DiagStr[0] == '-' ||
|
|
|
|
(DiagStr[0] >= 'a' && DiagStr[0] <= 'z'))
|
|
|
|
++DiagStr;
|
|
|
|
ModifierLen = DiagStr-Modifier;
|
2008-11-19 14:51:40 +08:00
|
|
|
|
2008-11-21 15:50:02 +08:00
|
|
|
// If we have an argument, get it next.
|
|
|
|
if (DiagStr[0] == '{') {
|
|
|
|
++DiagStr; // Skip {.
|
|
|
|
Argument = DiagStr;
|
|
|
|
|
|
|
|
for (; DiagStr[0] != '}'; ++DiagStr)
|
|
|
|
assert(DiagStr[0] && "Mismatched {}'s in diagnostic string!");
|
|
|
|
ArgumentLen = DiagStr-Argument;
|
|
|
|
++DiagStr; // Skip }.
|
2008-11-19 14:51:40 +08:00
|
|
|
}
|
2008-11-21 15:50:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
assert(isdigit(*DiagStr) && "Invalid format for argument in diagnostic");
|
2008-11-23 17:13:29 +08:00
|
|
|
unsigned ArgNo = *DiagStr++ - '0';
|
2008-11-21 15:50:02 +08:00
|
|
|
|
2008-11-23 17:13:29 +08:00
|
|
|
switch (getArgKind(ArgNo)) {
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- STRINGS ----
|
2008-11-22 08:59:29 +08:00
|
|
|
case Diagnostic::ak_std_string: {
|
2008-11-23 17:13:29 +08:00
|
|
|
const std::string &S = getArgStdStr(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
|
|
|
OutStr.append(S.begin(), S.end());
|
|
|
|
break;
|
|
|
|
}
|
2008-11-22 08:59:29 +08:00
|
|
|
case Diagnostic::ak_c_string: {
|
2008-11-23 17:13:29 +08:00
|
|
|
const char *S = getArgCStr(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
|
|
|
OutStr.append(S, S + strlen(S));
|
|
|
|
break;
|
|
|
|
}
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- INTEGERS ----
|
2008-11-22 08:59:29 +08:00
|
|
|
case Diagnostic::ak_sint: {
|
2008-11-23 17:13:29 +08:00
|
|
|
int Val = getArgSInt(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
|
|
|
|
if (ModifierIs(Modifier, ModifierLen, "select")) {
|
|
|
|
HandleSelectModifier((unsigned)Val, Argument, ArgumentLen, OutStr);
|
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "s")) {
|
|
|
|
HandleIntegerSModifier(Val, OutStr);
|
2008-11-22 21:44:36 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "plural")) {
|
|
|
|
HandlePluralModifier((unsigned)Val, Argument, ArgumentLen, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else {
|
|
|
|
assert(ModifierLen == 0 && "Unknown integer modifier");
|
2008-11-19 15:22:31 +08:00
|
|
|
// FIXME: Optimize
|
2008-11-21 15:50:02 +08:00
|
|
|
std::string S = llvm::itostr(Val);
|
2008-11-19 15:22:31 +08:00
|
|
|
OutStr.append(S.begin(), S.end());
|
|
|
|
}
|
2008-11-21 15:50:02 +08:00
|
|
|
break;
|
|
|
|
}
|
2008-11-22 08:59:29 +08:00
|
|
|
case Diagnostic::ak_uint: {
|
2008-11-23 17:13:29 +08:00
|
|
|
unsigned Val = getArgUInt(ArgNo);
|
2008-11-21 15:50:02 +08:00
|
|
|
|
|
|
|
if (ModifierIs(Modifier, ModifierLen, "select")) {
|
|
|
|
HandleSelectModifier(Val, Argument, ArgumentLen, OutStr);
|
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "s")) {
|
|
|
|
HandleIntegerSModifier(Val, OutStr);
|
2008-11-22 21:44:36 +08:00
|
|
|
} else if (ModifierIs(Modifier, ModifierLen, "plural")) {
|
|
|
|
HandlePluralModifier((unsigned)Val, Argument, ArgumentLen, OutStr);
|
2008-11-21 15:50:02 +08:00
|
|
|
} else {
|
|
|
|
assert(ModifierLen == 0 && "Unknown integer modifier");
|
|
|
|
|
2008-11-19 15:22:31 +08:00
|
|
|
// FIXME: Optimize
|
2008-11-21 15:50:02 +08:00
|
|
|
std::string S = llvm::utostr_32(Val);
|
2008-11-19 15:22:31 +08:00
|
|
|
OutStr.append(S.begin(), S.end());
|
|
|
|
}
|
2008-11-23 17:13:29 +08:00
|
|
|
break;
|
2008-11-21 15:50:02 +08:00
|
|
|
}
|
2008-11-24 05:45:46 +08:00
|
|
|
// ---- NAMES and TYPES ----
|
|
|
|
case Diagnostic::ak_identifierinfo: {
|
|
|
|
const IdentifierInfo *II = getArgIdentifier(ArgNo);
|
|
|
|
assert(ModifierLen == 0 && "No modifiers for strings yet");
|
2009-02-20 07:45:49 +08:00
|
|
|
OutStr.push_back('\'');
|
2008-11-24 05:45:46 +08:00
|
|
|
OutStr.append(II->getName(), II->getName() + II->getLength());
|
|
|
|
OutStr.push_back('\'');
|
|
|
|
break;
|
|
|
|
}
|
2008-11-23 17:13:29 +08:00
|
|
|
case Diagnostic::ak_qualtype:
|
2008-11-24 04:28:15 +08:00
|
|
|
case Diagnostic::ak_declarationname:
|
2009-02-05 01:27:36 +08:00
|
|
|
case Diagnostic::ak_nameddecl:
|
2008-11-23 17:21:17 +08:00
|
|
|
getDiags()->ConvertArgToString(getArgKind(ArgNo), getRawArg(ArgNo),
|
|
|
|
Modifier, ModifierLen,
|
|
|
|
Argument, ArgumentLen, OutStr);
|
2008-11-23 17:13:29 +08:00
|
|
|
break;
|
2008-08-11 03:59:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-01-24 04:28:53 +08:00
|
|
|
|
|
|
|
/// 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 Diagnostic.
|
|
|
|
bool DiagnosticClient::IncludeInDiagnosticCounts() const { return true; }
|