зеркало из https://github.com/microsoft/clang-1.git
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
This commit is contained in:
Родитель
5272b7f6ac
Коммит
2fc5c2428e
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче