diff options
| -rw-r--r-- | Parse/ParseExpr.cpp | 7 | ||||
| -rw-r--r-- | Parse/ParseObjc.cpp | 2 | ||||
| -rw-r--r-- | include/clang/Parse/Parser.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp index c69d4d2d95..2bc1d62fcf 100644 --- a/Parse/ParseExpr.cpp +++ b/Parse/ParseExpr.cpp @@ -178,7 +178,7 @@ Parser::ExprResult Parser::ParseExpression() { /// for example, @encode-expression. /// Parser::ExprResult Parser::ParseExpressionWithLeadingAt(SourceLocation AtLoc) { - ExprResult LHS = ParseObjCExpression(AtLoc); + ExprResult LHS = ParseObjCAtExpression(AtLoc); if (LHS.isInvalid) return LHS; return ParseRHSOfBinaryExpression(LHS, prec::Comma); @@ -601,10 +601,11 @@ Parser::ExprResult Parser::ParseCastExpression(bool isUnaryExpression) { return ParseCXXCasts(); case tok::at: { SourceLocation AtLoc = ConsumeToken(); - return ParseObjCExpression(AtLoc); + return ParseObjCAtExpression(AtLoc); } case tok::l_square: - return ParseObjCMessageExpression(); + // These can be followed by postfix-expr pieces. + return ParsePostfixExpressionSuffix(ParseObjCMessageExpression()); default: Diag(Tok, diag::err_expected_expression); return ExprResult(true); diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp index 4236314fdf..85559019e0 100644 --- a/Parse/ParseObjc.cpp +++ b/Parse/ParseObjc.cpp @@ -1114,7 +1114,7 @@ void Parser::ParseObjCClassMethodDefinition() { StmtResult FnBody = ParseCompoundStatementBody(); } -Parser::ExprResult Parser::ParseObjCExpression(SourceLocation AtLoc) { +Parser::ExprResult Parser::ParseObjCAtExpression(SourceLocation AtLoc) { switch (Tok.getKind()) { case tok::string_literal: // primary-expression: string-literal diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index 5e4c5290e8..66ca274915 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -360,7 +360,7 @@ private: //===--------------------------------------------------------------------===// // Objective-C Expressions - ExprResult ParseObjCExpression(SourceLocation AtLocation); + ExprResult ParseObjCAtExpression(SourceLocation AtLocation); ExprResult ParseObjCStringLiteral(); ExprResult ParseObjCEncodeExpression(); ExprResult ParseObjCProtocolExpression(); |