diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2011-10-18 23:13:50 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-10-18 23:13:50 +0000 |
commit | b224343723f514123dc7181ba9543ac361b35416 (patch) | |
tree | 864c4869f009e78d6567533a209e6d14daef4740 /lib/Parse/ParseDecl.cpp | |
parent | c9003c89c7aead1686aba89c8e3ddcea1f2bec54 (diff) |
objc: allow class name qualified with protocols in
iboutletcollection attribute. But ignore protocol
list. // rdar://10296078
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142459 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDecl.cpp')
-rw-r--r-- | lib/Parse/ParseDecl.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 0c60e28741..8cf25b619d 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -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 ')' } } |