As suggested by Chris, use MatchRHSPunctuation instead of manually looking for a right parenthesis when parsing @encode() and @protocol().
llvm-svn: 41321
This commit is contained in:
@@ -677,13 +677,10 @@ Parser::ExprResult Parser::ParseObjCEncodeExpression() {
|
|||||||
|
|
||||||
TypeTy *Ty = ParseTypeName();
|
TypeTy *Ty = ParseTypeName();
|
||||||
|
|
||||||
if (Tok.getKind() != tok::r_paren) {
|
SourceLocation RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
|
||||||
Diag(Tok, diag::err_expected_rparen);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Actions.ParseObjCEncodeExpression(EncLoc, LParenLoc, Ty,
|
return Actions.ParseObjCEncodeExpression(EncLoc, LParenLoc, Ty,
|
||||||
ConsumeParen());
|
RParenLoc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// objc-protocol-expression
|
/// objc-protocol-expression
|
||||||
@@ -708,12 +705,7 @@ Parser::ExprResult Parser::ParseObjCProtocolExpression()
|
|||||||
// FIXME: Do something with the protocol name
|
// FIXME: Do something with the protocol name
|
||||||
ConsumeToken();
|
ConsumeToken();
|
||||||
|
|
||||||
if (Tok.getKind() != tok::r_paren) {
|
SourceLocation RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
|
||||||
Diag(Tok, diag::err_expected_rparen);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
ConsumeParen();
|
|
||||||
|
|
||||||
// FIXME
|
// FIXME
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user