maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

split the second half of ParseObjCMessageExpression into a new 

ParseObjCMessageExpressionBody method.

llvm-svn: 46363
This commit is contained in:
Chris Lattner 2008-01-25 18:59:06 +00:00
parent b241a1ba4c
commit 8f6970663a
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
clang/Parse/ParseObjc.cpp
View File

@ -1262,6 +1262,30 @@ Parser::ExprResult Parser::ParseObjCAtExpression(SourceLocation AtLoc) {
/// expression
/// class-name
/// type-name
Parser::ExprResult Parser::ParseObjCMessageExpression() {
assert(Tok.is(tok::l_square) && "'[' expected");
SourceLocation LBracLoc = ConsumeBracket(); // consume '['
// Parse receiver
if (Tok.is(tok::identifier) &&
(Actions.isTypeName(*Tok.getIdentifierInfo(), CurScope)
|| Tok.isNamedIdentifier("super"))) {
IdentifierInfo *ReceiverName = Tok.getIdentifierInfo();
ConsumeToken();
return ParseObjCMessageExpressionBody(LBracLoc, ReceiverName, 0);
}
ExprResult Res = ParseAssignmentExpression();
if (Res.isInvalid) {
Diag(Tok, diag::err_invalid_receiver_to_message);
SkipUntil(tok::identifier);
return Res;
}
return ParseObjCMessageExpressionBody(LBracLoc, 0, Res.Val);
}
/// ParseObjCMessageExpressionBody - Having parsed "'[' objc-receiver", parse
/// the rest of a message expression.
///
/// objc-message-args:
/// objc-selector
@ -1281,26 +1305,10 @@ Parser::ExprResult Parser::ParseObjCAtExpression(SourceLocation AtLoc) {
/// assignment-expression
/// nonempty-expr-list , assignment-expression
///
Parser::ExprResult Parser::ParseObjCMessageExpression() {
assert(Tok.is(tok::l_square) && "'[' expected");
SourceLocation LBracloc = ConsumeBracket(); // consume '['
IdentifierInfo *ReceiverName = 0;
ExprTy *ReceiverExpr = 0;
// Parse receiver
if (Tok.is(tok::identifier) &&
(Actions.isTypeName(*Tok.getIdentifierInfo(), CurScope)
|| Tok.isNamedIdentifier("super"))) {
ReceiverName = Tok.getIdentifierInfo();
ConsumeToken();
} else {
ExprResult Res = ParseAssignmentExpression();
if (Res.isInvalid) {
Diag(Tok, diag::err_invalid_receiver_to_message);
SkipUntil(tok::identifier);
return Res;
}
ReceiverExpr = Res.Val;
}
Parser::ExprResult
Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
IdentifierInfo *ReceiverName,
ExprTy *ReceiverExpr) {
// Parse objc-selector
SourceLocation Loc;
IdentifierInfo *selIdent = ParseObjCSelector(Loc);
@ -1357,7 +1365,7 @@ Parser::ExprResult Parser::ParseObjCMessageExpression() {
SkipUntil(tok::semi);
return true;
}
SourceLocation RBracloc = ConsumeBracket(); // consume ']'
SourceLocation RBracLoc = ConsumeBracket(); // consume ']'
unsigned nKeys = KeyIdents.size();
if (nKeys == 0)
@ -1367,9 +1375,9 @@ Parser::ExprResult Parser::ParseObjCMessageExpression() {
// We've just parsed a keyword message.
if (ReceiverName)
return Actions.ActOnClassMessage(CurScope,
ReceiverName, Sel, LBracloc, RBracloc,
ReceiverName, Sel, LBracLoc, RBracLoc,
&KeyExprs[0], KeyExprs.size());
return Actions.ActOnInstanceMessage(ReceiverExpr, Sel, LBracloc, RBracloc,
return Actions.ActOnInstanceMessage(ReceiverExpr, Sel, LBracLoc, RBracLoc,
&KeyExprs[0], KeyExprs.size());
}

5
clang/include/clang/Parse/Parser.h
View File

@ -368,7 +368,10 @@ private:
ExprResult ParseObjCSelectorExpression(SourceLocation AtLoc);
ExprResult ParseObjCProtocolExpression(SourceLocation AtLoc);
ExprResult ParseObjCMessageExpression();
ExprResult ParseObjCMessageExpressionBody(SourceLocation LBracloc,
IdentifierInfo *ReceiverName,
ExprTy *ReceiverExpr);
//===--------------------------------------------------------------------===//
// C99 6.8: Statements and Blocks.