objc: allow class name qualified with protocols in

iboutletcollection attribute. But ignore protocol
list. // rdar://10296078

llvm-svn: 142459
This commit is contained in:
Fariborz Jahanian 2011-10-18 23:13:50 +00:00
parent 64e6bfc16c
commit 7f73302b4f
2 changed files with 12 additions and 2 deletions

View File

@ -248,7 +248,17 @@ void Parser::ParseGNUAttributeArgs(IdentifierInfo *AttrName,
else if (Tok.is(tok::less) && AttrName->isStr("iboutletcollection")) {
if (!ExpectAndConsume(tok::less, diag::err_expected_less_after, "<",
tok::greater)) {
Diag(Tok, diag::err_iboutletcollection_with_protocol);
while (Tok.is(tok::identifier)) {
ConsumeToken();
if (Tok.is(tok::greater))
break;
if (Tok.is(tok::comma)) {
ConsumeToken();
continue;
}
}
if (Tok.isNot(tok::greater))
Diag(Tok, diag::err_iboutletcollection_with_protocol);
SkipUntil(tok::r_paren, false, true); // skip until ')'
}
}

View File

@ -39,5 +39,5 @@ typedef void *PV;
@interface RDar10296078 : ParentRDar10296078
@property (nonatomic, strong)
__attribute__((iboutletcollection(RDar10296078_OtherClass<RDar10296078_Protocol>))) NSArray *stuff; // expected-error {{invalid argument of iboutletcollection attribute}}
__attribute__((iboutletcollection(RDar10296078_OtherClass<RDar10296078_Protocol>))) NSArray *stuff;
@end