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

Half of PR12088: parse braced-init-lists on the RHS of assignment operators. 

If the assignment operator is a scalar type, we continue to incorrectly reject
the initializer, but semantic analysis (and codegen) is correct for overloaded
operators.

llvm-svn: 151508
This commit is contained in:
Richard Smith 2012-02-26 23:40:27 +00:00
parent ce50eec7c6
commit 9a6403a9de
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/Parse/ParseExpr.cpp
View File

@ -351,12 +351,23 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
// be a throw-expression, which is not a valid cast-expression.
// Therefore we need some special-casing here.
// Also note that the third operand of the conditional operator is
// an assignment-expression in C++.
// an assignment-expression in C++, and in C++11, we can have a
// braced-init-list on the RHS of an assignment.
ExprResult RHS;
if (getLang().CPlusPlus && NextTokPrec <= prec::Conditional)
if (getLang().CPlusPlus0x && MinPrec == prec::Assignment &&
Tok.is(tok::l_brace)) {
Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
RHS = ParseBraceInitializer();
if (LHS.isInvalid() || RHS.isInvalid())
return ExprError();
// A braced-init-list can never be followed by more operators.
return Actions.ActOnBinOp(getCurScope(), OpToken.getLocation(),
OpToken.getKind(), LHS.take(), RHS.take());
} else if (getLang().CPlusPlus && NextTokPrec <= prec::Conditional) {
RHS = ParseAssignmentExpression();
else
} else {
RHS = ParseCastExpression(false);
}
if (RHS.isInvalid())
LHS = ExprError();