Finish up variadic methods/messages.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44172 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 10f0895..fa1a3c9 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -898,14 +898,14 @@
ObjCMessageExpr::ObjCMessageExpr(Expr *receiver, Selector selInfo,
QualType retType, ObjcMethodDecl *mproto,
SourceLocation LBrac, SourceLocation RBrac,
- Expr **ArgExprs)
+ Expr **ArgExprs, unsigned nargs)
: Expr(ObjCMessageExprClass, retType), SelName(selInfo),
MethodProto(mproto), ClassName(0) {
- unsigned numArgs = selInfo.getNumArgs();
- SubExprs = new Expr*[numArgs+1];
+ NumArgs = nargs;
+ SubExprs = new Expr*[NumArgs+1];
SubExprs[RECEIVER] = receiver;
- if (numArgs) {
- for (unsigned i = 0; i != numArgs; ++i)
+ if (NumArgs) {
+ for (unsigned i = 0; i != NumArgs; ++i)
SubExprs[i+ARGS_START] = static_cast<Expr *>(ArgExprs[i]);
}
LBracloc = LBrac;
@@ -917,14 +917,14 @@
ObjCMessageExpr::ObjCMessageExpr(IdentifierInfo *clsName, Selector selInfo,
QualType retType, ObjcMethodDecl *mproto,
SourceLocation LBrac, SourceLocation RBrac,
- Expr **ArgExprs)
+ Expr **ArgExprs, unsigned nargs)
: Expr(ObjCMessageExprClass, retType), SelName(selInfo),
MethodProto(mproto), ClassName(clsName) {
- unsigned numArgs = selInfo.getNumArgs();
- SubExprs = new Expr*[numArgs+1];
+ NumArgs = nargs;
+ SubExprs = new Expr*[NumArgs+1];
SubExprs[RECEIVER] = 0;
- if (numArgs) {
- for (unsigned i = 0; i != numArgs; ++i)
+ if (NumArgs) {
+ for (unsigned i = 0; i != NumArgs; ++i)
SubExprs[i+ARGS_START] = static_cast<Expr *>(ArgExprs[i]);
}
LBracloc = LBrac;
diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index be33f86..bc4bcbe 100644
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -1291,9 +1291,15 @@
}
// Parse the, optional, argument list, comma separated.
while (Tok.is(tok::comma)) {
- ConsumeToken();
- /// Parse the expression after ','
- ParseAssignmentExpression();
+ ConsumeToken(); // Eat the ','.
+ /// Parse the expression after ','
+ ExprResult Res = ParseAssignmentExpression();
+ if (Res.isInvalid) {
+ SkipUntil(tok::identifier);
+ return Res;
+ }
+ // We have a valid expression.
+ KeyExprs.push_back(Res.Val);
}
} else if (!selIdent) {
Diag(Tok, diag::err_expected_ident); // missing selector name.
@@ -1317,9 +1323,9 @@
if (ReceiverName)
return Actions.ActOnClassMessage(CurScope,
ReceiverName, Sel, LBracloc, RBracloc,
- &KeyExprs[0]);
+ &KeyExprs[0], KeyExprs.size());
return Actions.ActOnInstanceMessage(ReceiverExpr, Sel, LBracloc, RBracloc,
- &KeyExprs[0]);
+ &KeyExprs[0], KeyExprs.size());
}
Parser::ExprResult Parser::ParseObjCStringLiteral(SourceLocation AtLoc) {
diff --git a/Sema/Sema.h b/Sema/Sema.h
index a102644..4ed71f7 100644
--- a/Sema/Sema.h
+++ b/Sema/Sema.h
@@ -565,18 +565,20 @@
// ActOnClassMessage - used for both unary and keyword messages.
// ArgExprs is optional - if it is present, the number of expressions
- // is obtained from Sel.getNumArgs().
+ // is obtained from NumArgs.
virtual ExprResult ActOnClassMessage(
Scope *S,
IdentifierInfo *receivingClassName, Selector Sel,
- SourceLocation lbrac, SourceLocation rbrac, ExprTy **ArgExprs);
+ SourceLocation lbrac, SourceLocation rbrac,
+ ExprTy **ArgExprs, unsigned NumArgs);
// ActOnInstanceMessage - used for both unary and keyword messages.
// ArgExprs is optional - if it is present, the number of expressions
- // is obtained from Sel.getNumArgs().
+ // is obtained from NumArgs.
virtual ExprResult ActOnInstanceMessage(
ExprTy *receiver, Selector Sel,
- SourceLocation lbrac, SourceLocation rbrac, ExprTy **ArgExprs);
+ SourceLocation lbrac, SourceLocation rbrac,
+ ExprTy **ArgExprs, unsigned NumArgs);
private:
// UsualUnaryConversions - promotes integers (C99 6.3.1.1p2) and converts
// functions and arrays to their respective pointers (C99 6.3.2.1).
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 42961df..416661e 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -2124,7 +2124,7 @@
Sema::ExprResult Sema::ActOnClassMessage(
Scope *S,
IdentifierInfo *receiverName, Selector Sel,
- SourceLocation lbrac, SourceLocation rbrac, ExprTy **Args)
+ SourceLocation lbrac, SourceLocation rbrac, ExprTy **Args, unsigned NumArgs)
{
assert(receiverName && "missing receiver class name");
@@ -2142,7 +2142,7 @@
SourceLocation(), ReceiverExpr.Val);
return ActOnInstanceMessage(ReceiverExpr.Val, Sel, lbrac, rbrac,
- Args);
+ Args, NumArgs);
}
// class method
if (ClassDecl)
@@ -2168,7 +2168,7 @@
}
}
return new ObjCMessageExpr(receiverName, Sel, returnType, Method,
- lbrac, rbrac, ArgExprs);
+ lbrac, rbrac, ArgExprs, NumArgs);
}
// ActOnInstanceMessage - used for both unary and keyword messages.
@@ -2176,7 +2176,7 @@
// is obtained from Sel.getNumArgs().
Sema::ExprResult Sema::ActOnInstanceMessage(
ExprTy *receiver, Selector Sel,
- SourceLocation lbrac, SourceLocation rbrac, ExprTy **Args)
+ SourceLocation lbrac, SourceLocation rbrac, ExprTy **Args, unsigned NumArgs)
{
assert(receiver && "missing receiver expression");
@@ -2250,5 +2250,5 @@
}
}
return new ObjCMessageExpr(RExpr, Sel, returnType, Method, lbrac, rbrac,
- ArgExprs);
+ ArgExprs, NumArgs);
}
diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h
index 66dac91..6ba60f2 100644
--- a/include/clang/AST/Expr.h
+++ b/include/clang/AST/Expr.h
@@ -1292,6 +1292,8 @@
Expr **SubExprs;
+ unsigned NumArgs;
+
// A unigue name for this message.
Selector SelName;
@@ -1309,12 +1311,12 @@
ObjCMessageExpr(IdentifierInfo *clsName, Selector selInfo,
QualType retType, ObjcMethodDecl *methDecl,
SourceLocation LBrac, SourceLocation RBrac,
- Expr **ArgExprs);
+ Expr **ArgExprs, unsigned NumArgs);
// constructor for instance messages.
ObjCMessageExpr(Expr *receiver, Selector selInfo,
QualType retType, ObjcMethodDecl *methDecl,
SourceLocation LBrac, SourceLocation RBrac,
- Expr **ArgExprs);
+ Expr **ArgExprs, unsigned NumArgs);
~ObjCMessageExpr() {
delete [] SubExprs;
}
@@ -1332,20 +1334,20 @@
IdentifierInfo *getClassName() { return ClassName; }
/// getNumArgs - Return the number of actual arguments to this call.
- unsigned getNumArgs() const { return SelName.getNumArgs(); }
+ unsigned getNumArgs() const { return NumArgs; }
/// getArg - Return the specified argument.
Expr *getArg(unsigned Arg) {
- assert(Arg < SelName.getNumArgs() && "Arg access out of range!");
+ assert(Arg < NumArgs && "Arg access out of range!");
return SubExprs[Arg+ARGS_START];
}
const Expr *getArg(unsigned Arg) const {
- assert(Arg < SelName.getNumArgs() && "Arg access out of range!");
+ assert(Arg < NumArgs && "Arg access out of range!");
return SubExprs[Arg+ARGS_START];
}
/// setArg - Set the specified argument.
void setArg(unsigned Arg, Expr *ArgExpr) {
- assert(Arg < SelName.getNumArgs() && "Arg access out of range!");
+ assert(Arg < NumArgs && "Arg access out of range!");
SubExprs[Arg+ARGS_START] = ArgExpr;
}
SourceRange getSourceRange() const { return SourceRange(LBracloc, RBracloc); }
diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h
index e2aa1ba..2e8b4de 100644
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -590,22 +590,23 @@
// ActOnClassMessage - used for both unary and keyword messages.
// ArgExprs is optional - if it is present, the number of expressions
- // is obtained from Sel.getNumArgs().
+ // is obtained from NumArgs.
virtual ExprResult ActOnClassMessage(
Scope *S,
IdentifierInfo *receivingClassName,
Selector Sel,
SourceLocation lbrac,
SourceLocation rbrac,
- ExprTy **ArgExprs) {
+ ExprTy **ArgExprs, unsigned NumArgs) {
return 0;
}
// ActOnInstanceMessage - used for both unary and keyword messages.
// ArgExprs is optional - if it is present, the number of expressions
- // is obtained from Sel.getNumArgs().
+ // is obtained from NumArgs.
virtual ExprResult ActOnInstanceMessage(
ExprTy *receiver, Selector Sel,
- SourceLocation lbrac, SourceLocation rbrac, ExprTy **ArgExprs) {
+ SourceLocation lbrac, SourceLocation rbrac,
+ ExprTy **ArgExprs, unsigned NumArgs) {
return 0;
}
virtual DeclTy *ActOnForwardClassDeclaration(