[cfe-commits] r112307 - in /cfe/trunk: lib/Parse/ParseObjc.cpp test/SemaObjCXX/expr-objcxx.mm

[Chris Lattner]

Author: lattner
Date: Fri Aug 27 17:32:41 2010
New Revision: 112307

URL: http://llvm.org/viewvc/llvm-project?rev=112307&view=rev
Log:
handle :: in selectors in objc++ mode, rdar://8366474

Added:
    cfe/trunk/test/SemaObjCXX/expr-objcxx.mm
Modified:
    cfe/trunk/lib/Parse/ParseObjc.cpp

Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=112307&r1=112306&r2=112307&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Fri Aug 27 17:32:41 2010
@@ -2204,17 +2204,21 @@
   }
   
   IdentifierInfo *SelIdent = ParseObjCSelectorPiece(sLoc);
-  if (!SelIdent && Tok.isNot(tok::colon)) // missing selector name.
+  if (!SelIdent &&  // missing selector name.
+      Tok.isNot(tok::colon) && Tok.isNot(tok::coloncolon))
     return ExprError(Diag(Tok, diag::err_expected_ident));
 
   KeyIdents.push_back(SelIdent);
   unsigned nColons = 0;
   if (Tok.isNot(tok::r_paren)) {
     while (1) {
-      if (Tok.isNot(tok::colon))
+      if (Tok.is(tok::coloncolon)) { // Handle :: in C++.
+        ++nColons;
+        KeyIdents.push_back(0);
+      } else if (Tok.isNot(tok::colon))
         return ExprError(Diag(Tok, diag::err_expected_colon));
 
-      nColons++;
+      ++nColons;
       ConsumeToken(); // Eat the ':'.
       if (Tok.is(tok::r_paren))
         break;

Added: cfe/trunk/test/SemaObjCXX/expr-objcxx.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/expr-objcxx.mm?rev=112307&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjCXX/expr-objcxx.mm (added)
+++ cfe/trunk/test/SemaObjCXX/expr-objcxx.mm Fri Aug 27 17:32:41 2010
@@ -0,0 +1,4 @@
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
+
+// rdar://8366474
+void *P =  @selector(foo::bar::);