From 5add7541726348b9d1c8e96ac5031b87c41acff0 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 27 Aug 2010 22:32:41 +0000 Subject: [PATCH] handle :: in selectors in objc++ mode, rdar://8366474 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112307 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Parse/ParseObjc.cpp | 10 +++++++--- test/SemaObjCXX/expr-objcxx.mm | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 test/SemaObjCXX/expr-objcxx.mm diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 914d52ea38..c36f09c881 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -2204,17 +2204,21 @@ ExprResult Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) { } 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; diff --git a/test/SemaObjCXX/expr-objcxx.mm b/test/SemaObjCXX/expr-objcxx.mm new file mode 100644 index 0000000000..e70a001b70 --- /dev/null +++ b/test/SemaObjCXX/expr-objcxx.mm @@ -0,0 +1,4 @@ +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only + +// rdar://8366474 +void *P = @selector(foo::bar::); -- 2.40.0