[cfe-commits] r46367 - in /cfe/trunk: Parse/ParseInit.cpp Parse/ParseObjc.cpp test/Parser/objc-init.m

[Chris Lattner]

Author: lattner
Date: Fri Jan 25 13:43:26 2008
New Revision: 46367

URL: http://llvm.org/viewvc/llvm-project?rev=46367&view=rev
Log:
Add support for dispatching an objc message to a variable 
in an initializer list.

Modified:
    cfe/trunk/Parse/ParseInit.cpp
    cfe/trunk/Parse/ParseObjc.cpp
    cfe/trunk/test/Parser/objc-init.m

Modified: cfe/trunk/Parse/ParseInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Parse/ParseInit.cpp?rev=46367&r1=46366&r2=46367&view=diff

==============================================================================
--- cfe/trunk/Parse/ParseInit.cpp (original)
+++ cfe/trunk/Parse/ParseInit.cpp Fri Jan 25 13:43:26 2008
@@ -94,6 +94,8 @@
       // If Objective-C is enabled and this is a typename or other identifier
       // receiver, parse this as a message send expression.
       if (getLang().ObjC1 && isTokObjCMessageIdentifierReceiver()) {
+        // FIXME: Emit ext_gnu_missing_equal_designator for inits like
+        // [4][foo bar].
         IdentifierInfo *Name = Tok.getIdentifierInfo();
         ConsumeToken();
         ExprResult R = ParseObjCMessageExpressionBody(StartLoc, Name, 0);
@@ -101,14 +103,25 @@
       }
       
       // Note that we parse this as an assignment expression, not a constant
-      // expression (allowing *=, =, etc).  Sema needs to validate that the
-      // expression is a constant.
+      // expression (allowing *=, =, etc) to handle the objc case.  Sema needs
+      // to validate that the expression is a constant.
       ExprResult Idx = ParseAssignmentExpression();
       if (Idx.isInvalid) {
         SkipUntil(tok::r_square);
         return Idx;
       }
       
+      // Given an expression, we could either have a designator (if the next
+      // tokens are '...' or ']' or an objc message send.  If this is an objc
+      // message send, handle it now.
+      if (getLang().ObjC1 && Tok.isNot(tok::ellipsis) && 
+          Tok.isNot(tok::r_square)) {
+        // FIXME: Emit ext_gnu_missing_equal_designator for inits like
+        // [4][foo bar].
+        ExprResult R = ParseObjCMessageExpressionBody(StartLoc, 0, Idx.Val);
+        return ParsePostfixExpressionSuffix(R);
+      }
+      
       // Handle the gnu array range extension.
       if (Tok.is(tok::ellipsis)) {
         Diag(Tok, diag::ext_gnu_array_range);

Modified: cfe/trunk/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Parse/ParseObjc.cpp?rev=46367&r1=46366&r2=46367&view=diff

==============================================================================
--- cfe/trunk/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/Parse/ParseObjc.cpp Fri Jan 25 13:43:26 2008
@@ -1276,7 +1276,7 @@
   ExprResult Res = ParseAssignmentExpression();
   if (Res.isInvalid) {
     Diag(Tok, diag::err_invalid_receiver_to_message);
-    SkipUntil(tok::identifier);
+    SkipUntil(tok::r_square);
     return Res;
   }
   return ParseObjCMessageExpressionBody(LBracLoc, 0, Res.Val);

Modified: cfe/trunk/test/Parser/objc-init.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objc-init.m?rev=46367&r1=46366&r2=46367&view=diff

==============================================================================
--- cfe/trunk/test/Parser/objc-init.m (original)
+++ cfe/trunk/test/Parser/objc-init.m Fri Jan 25 13:43:26 2008
@@ -3,11 +3,15 @@
 
 @interface NSNumber;
 - () METH;
-
 @end
 
-int main() {
+void test1() {
 	id objects[] = {[NSNumber METH]};
+}
+
+void test2(NSNumber x) {
+	id objects[] = {[x METH]};
 	return 0;
 }
 
+