aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-04-11 18:13:45 +0000
committerChris Lattner <sabre@nondot.org>2009-04-11 18:13:45 +0000
commit2fc5c2428ecb450a3256c8316b93b8655cb76a0f (patch)
tree3b5058f3c5d99f5dbd298ddd67648ad6f9404346
parent5272b7f6ac343bbfc1638ed414fe474d763b3f88 (diff)
rename Parser::ParseObjCSelector -> Parser::ParseObjCSelectorPiece,
since it only parses one identifier out of the selector, not the whole thing. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68867 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Parse/Parser.h2
-rw-r--r--lib/Parse/ParseObjc.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 85f6d50ebb..3e09a2cc53 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -584,7 +584,7 @@ private:
DeclPtrTy ParseObjCPropertySynthesize(SourceLocation atLoc);
DeclPtrTy ParseObjCPropertyDynamic(SourceLocation atLoc);
- IdentifierInfo *ParseObjCSelector(SourceLocation &MethodLocation);
+ IdentifierInfo *ParseObjCSelectorPiece(SourceLocation &MethodLocation);
// Definitions for Objective-c context sensitive keywords recognition.
enum ObjCTypeQual {
objc_in=0, objc_out, objc_inout, objc_oneway, objc_bycopy, objc_byref,
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index bac3f91d0a..42ec857251 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -477,7 +477,7 @@ Parser::DeclPtrTy Parser::ParseObjCMethodPrototype(DeclPtrTy IDecl,
/// unsigned long const short volatile signed restrict _Complex
/// in out inout bycopy byref oneway int char float double void _Bool
///
-IdentifierInfo *Parser::ParseObjCSelector(SourceLocation &SelectorLoc) {
+IdentifierInfo *Parser::ParseObjCSelectorPiece(SourceLocation &SelectorLoc) {
switch (Tok.getKind()) {
default:
return 0;
@@ -678,7 +678,7 @@ Parser::DeclPtrTy Parser::ParseObjCMethodDecl(SourceLocation mLoc,
ReturnType = ParseObjCTypeName(DSRet);
SourceLocation selLoc;
- IdentifierInfo *SelIdent = ParseObjCSelector(selLoc);
+ IdentifierInfo *SelIdent = ParseObjCSelectorPiece(selLoc);
// An unnamed colon is valid.
if (!SelIdent && Tok.isNot(tok::colon)) { // missing selector name.
@@ -739,7 +739,7 @@ Parser::DeclPtrTy Parser::ParseObjCMethodDecl(SourceLocation mLoc,
// Check for another keyword selector.
SourceLocation Loc;
- SelIdent = ParseObjCSelector(Loc);
+ SelIdent = ParseObjCSelectorPiece(Loc);
if (!SelIdent && Tok.isNot(tok::colon))
break;
// We have a selector or a colon, continue parsing.
@@ -1494,7 +1494,7 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
ExprArg ReceiverExpr) {
// Parse objc-selector
SourceLocation Loc;
- IdentifierInfo *selIdent = ParseObjCSelector(Loc);
+ IdentifierInfo *selIdent = ParseObjCSelectorPiece(Loc);
SourceLocation SelectorLoc = Loc;
@@ -1530,7 +1530,7 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
KeyExprs.push_back(Res.release());
// Check for another keyword selector.
- selIdent = ParseObjCSelector(Loc);
+ selIdent = ParseObjCSelectorPiece(Loc);
if (!selIdent && Tok.isNot(tok::colon))
break;
// We have a selector or a colon, continue parsing.
@@ -1677,7 +1677,7 @@ Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) {
llvm::SmallVector<IdentifierInfo *, 12> KeyIdents;
SourceLocation LParenLoc = ConsumeParen();
SourceLocation sLoc;
- IdentifierInfo *SelIdent = ParseObjCSelector(sLoc);
+ IdentifierInfo *SelIdent = ParseObjCSelectorPiece(sLoc);
if (!SelIdent && Tok.isNot(tok::colon)) // missing selector name.
return ExprError(Diag(Tok, diag::err_expected_ident));
@@ -1694,7 +1694,7 @@ Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) {
break;
// Check for another keyword selector.
SourceLocation Loc;
- SelIdent = ParseObjCSelector(Loc);
+ SelIdent = ParseObjCSelectorPiece(Loc);
KeyIdents.push_back(SelIdent);
if (!SelIdent && Tok.isNot(tok::colon))
break;