Add '@' conversion specifier.

llvm-svn: 94713
This commit is contained in:
Ted Kremenek 2010-01-28 00:55:28 +00:00
parent abb4413728
commit c06ead62f0
2 changed files with 14 additions and 5 deletions

View File

@ -24,6 +24,7 @@ class ConversionSpecifier {
public:
enum Kind {
InvalidSpecifier = 0,
// C99 conversion specifiers.
dArg, // 'd'
iArg, // 'i',
oArg, // 'o',
@ -43,12 +44,19 @@ public:
VoidPtrArg, // 'p'
OutIntPtrArg, // 'n'
PercentArg, // '%'
// Objective-C specific specifiers.
ObjCObjArg, // '@'
// Specifier ranges.
IntArgBeg = dArg,
IntArgEnd = iArg,
UIntArgBeg = oArg,
UIntArgEnd = XArg,
DoubleArgBeg = fArg,
DoubleArgEnd = AArg
DoubleArgEnd = AArg,
C99Beg = IntArgBeg,
C99End = DoubleArgEnd,
ObjCBeg = ObjCObjArg,
ObjCEnd = ObjCObjArg
};
ConversionSpecifier(Kind k) : kind(k) {}

View File

@ -193,9 +193,8 @@ static FormatSpecifierResult ParseFormatSpecifier(printf::FormatStringHandler &H
switch (*I) {
default:
H.HandleInvalidConversionSpecifier(I);
return true;
// Handle the cases we know about.
return true;
// C99: 7.19.6.1 (section 8).
case 'd': cs = ConversionSpecifier::dArg; break;
case 'i': cs = ConversionSpecifier::iArg; break;
case 'o': cs = ConversionSpecifier::oArg; break;
@ -214,7 +213,9 @@ static FormatSpecifierResult ParseFormatSpecifier(printf::FormatStringHandler &H
case 's': cs = ConversionSpecifier::CStrArg; break;
case 'p': cs = ConversionSpecifier::VoidPtrArg; break;
case 'n': cs = ConversionSpecifier::OutIntPtrArg; break;
case '%': cs = ConversionSpecifier::PercentArg; break;
case '%': cs = ConversionSpecifier::PercentArg; break;
// Objective-C.
case '@': cs = ConversionSpecifier::ObjCObjArg; break;
}
FS.setConversionSpecifier(cs);
return FormatSpecifierResult(Start, FS);