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

minor refactoring of ParseParenExpression 

llvm-svn: 60928
This commit is contained in:
Chris Lattner 2008-12-12 06:00:12 +00:00
parent dca17ceb19
commit d8980509b3
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1062,34 +1062,37 @@ Parser::ParseParenExpression(ParenParseOption &ExprType,
if (!Result.isInvalid())
return Owned(Actions.ActOnCompoundLiteral(OpenLoc, Ty, RParenLoc,
Result.release()));
} else if (ExprType == CastExpr) {
return move(Result);
}
if (ExprType == CastExpr) {
// Note that this doesn't parse the subsequence cast-expression, it just
// returns the parsed type to the callee.
ExprType = CastExpr;
CastTy = Ty;
return OwningExprResult(Actions);
} else {
Diag(Tok, diag::err_expected_lbrace_in_compound_literal);
return ExprError();
}
return move(Result);
Diag(Tok, diag::err_expected_lbrace_in_compound_literal);
return ExprError();
} else {
Result = ParseExpression();
ExprType = SimpleExpr;
if (!Result.isInvalid() && Tok.is(tok::r_paren))
Result = Actions.ActOnParenExpr(
OpenLoc, Tok.getLocation(), Result.release());
Result = Actions.ActOnParenExpr(OpenLoc, Tok.getLocation(),
Result.release());
}
// Match the ')'.
if (Result.isInvalid())
if (Result.isInvalid()) {
SkipUntil(tok::r_paren);
else {
if (Tok.is(tok::r_paren))
RParenLoc = ConsumeParen();
else
MatchRHSPunctuation(tok::r_paren, OpenLoc);
return ExprError();
}
if (Tok.is(tok::r_paren))
RParenLoc = ConsumeParen();
else
MatchRHSPunctuation(tok::r_paren, OpenLoc);
return move(Result);
}