aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-03-01 02:59:17 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-03-01 02:59:17 +0000
commit5e4e58b805e0e03a669aa517d1d20d4735a3192e (patch)
tree48516597e0264269d5ffac1f90be4f2a1a10ca35 /lib/Parse/ParseExpr.cpp
parent1d9f4c16ad9ece766870752c0647187e0b5481ba (diff)
Reject 'a = {0} = {0}' rather than parsing it as '(a = {0}) = {0}'. Also
improve the diagnostics for some attempts to use initializer lists in expressions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151794 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExpr.cpp')
-rw-r--r--lib/Parse/ParseExpr.cpp40
1 files changed, 28 insertions, 12 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 2f30e6bd2b..65949edf41 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -282,6 +282,12 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
Token OpToken = Tok;
ConsumeToken();
+ if (!LHS.isInvalid() && isa<InitListExpr>(LHS.get())) {
+ Diag(OpToken, diag::err_init_list_bin_op)
+ << /*LHS*/0 << PP.getSpelling(OpToken) << LHS.get()->getSourceRange();
+ LHS = ExprError();
+ }
+
// Special case handling for the ternary operator.
ExprResult TernaryMiddle(true);
if (NextTokPrec == prec::Conditional) {
@@ -353,22 +359,16 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
// Therefore we need some special-casing here.
// Also note that the third operand of the conditional operator is
// an assignment-expression in C++, and in C++11, we can have a
- // braced-init-list on the RHS of an assignment.
+ // braced-init-list on the RHS of an assignment. For better diagnostics,
+ // parse as if we were allowed braced-init-lists everywhere, and check that
+ // they only appear on the RHS of assignments later.
ExprResult RHS;
- if (getLang().CPlusPlus0x && MinPrec == prec::Assignment &&
- Tok.is(tok::l_brace)) {
- Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
+ if (getLang().CPlusPlus0x && Tok.is(tok::l_brace))
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) {
+ else if (getLang().CPlusPlus && NextTokPrec <= prec::Conditional)
RHS = ParseAssignmentExpression();
- } else {
+ else
RHS = ParseCastExpression(false);
- }
if (RHS.isInvalid())
LHS = ExprError();
@@ -387,6 +387,11 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
// more tightly with RHS than we do, evaluate it completely first.
if (ThisPrec < NextTokPrec ||
(ThisPrec == NextTokPrec && isRightAssoc)) {
+ if (!LHS.isInvalid() && isa<InitListExpr>(LHS.get())) {
+ Diag(OpToken, diag::err_init_list_bin_op)
+ << /*LHS*/0 << PP.getSpelling(OpToken) << LHS.get()->getSourceRange();
+ LHS = ExprError();
+ }
// If this is left-associative, only parse things on the RHS that bind
// more tightly than the current operator. If it is left-associative, it
// is okay, to bind exactly as tightly. For example, compile A=B=C=D as
@@ -403,6 +408,17 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
}
assert(NextTokPrec <= ThisPrec && "Recursion didn't work!");
+ if (!RHS.isInvalid() && isa<InitListExpr>(RHS.get())) {
+ if (ThisPrec == prec::Assignment) {
+ Diag(OpToken, diag::warn_cxx98_compat_generalized_initializer_lists)
+ << RHS.get()->getSourceRange();
+ } else {
+ Diag(OpToken, diag::err_init_list_bin_op)
+ << /*RHS*/1 << PP.getSpelling(OpToken) << RHS.get()->getSourceRange();
+ LHS = ExprError();
+ }
+ }
+
if (!LHS.isInvalid()) {
// Combine the LHS and RHS into the LHS (e.g. build AST).
if (TernaryMiddle.isInvalid()) {