commit a642beb9f143130588dcf622f5f7020832b22707
author Steve Naroff <snaroff@apple.com> Mon Oct 15 20:55:58 2007 +0000
committer Steve Naroff <snaroff@apple.com> Mon Oct 15 20:55:58 2007 +0000
tree 917abdbd8a32f7c7b3a5313d638ea2e622fd590e
parent ec0550fa3653d46560bf4484a2e988329c228e39

Fix a parser bug with message expressions - need to call ParsePostfixExpressionSuffix(). 

Now were correctly allow the following...

    i = [str rangeOfString:@"]"].length;



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43012 91177308-0d34-0410-b5e6-96231b3b80d8

Parse/ParseExpr.cpp

diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp
index c69d4d2..2bc1d62 100644
--- a/Parse/ParseExpr.cpp
+++ b/Parse/ParseExpr.cpp
@@ -178,7 +178,7 @@
 /// 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 @@
     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);

Parse/ParseObjc.cpp

diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index 4236314..8555901 100644
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -1114,7 +1114,7 @@
   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

include/clang/Parse/Parser.h

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 5e4c529..66ca274 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -360,7 +360,7 @@
   
   //===--------------------------------------------------------------------===//
   // Objective-C Expressions
-  ExprResult ParseObjCExpression(SourceLocation AtLocation);
+  ExprResult ParseObjCAtExpression(SourceLocation AtLocation);
   ExprResult ParseObjCStringLiteral();
   ExprResult ParseObjCEncodeExpression();
   ExprResult ParseObjCProtocolExpression();