averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

parseStmtIf(): propagate error bits correctly

Browse Source 
This decreases noise in diagnostics.


Swift SVN r7644
This commit is contained in:
Dmitri Hrybenko
2013-08-27 22:59:52 +00:00
parent ff3ea6e3ce
commit 15a4a10cfe
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Parse/ParseStmt.cpp
View File

@@ -421,7 +421,10 @@ ParserResult<Stmt> Parser::parseStmtReturn() {
ParserResult<Stmt> Parser::parseStmtIf() {
SourceLoc IfLoc = consumeToken(tok::kw_if);
ParserStatus Status;
ParserResult<Expr> Condition = parseExprBasic(diag::expected_expr_if);
//Status |= Condition;
if (Condition.isNull() || Condition.hasCodeCompletion())
return makeParserResult<Stmt>(Condition, nullptr); // FIXME: better recovery
@@ -442,6 +445,8 @@ ParserResult<Stmt> Parser::parseStmtIf() {
if (NormalBody.isNull())
return nullptr; // FIXME: better recovery
Status |= NormalBody;
SourceLoc ElseLoc;
ParserResult<Stmt> ElseBody;
if (Tok.is(tok::kw_else)) {
@@ -450,11 +455,12 @@ ParserResult<Stmt> Parser::parseStmtIf() {
ElseBody = parseStmtIf();
else
ElseBody = parseBraceItemList(diag::expected_lbrace_after_else);
Status |= ElseBody;
}
return makeParserResult(
new (Context) IfStmt(IfLoc, Condition.get(), NormalBody.get(),
ElseLoc, ElseBody.getPtrOrNull()));
Status, new (Context) IfStmt(IfLoc, Condition.get(), NormalBody.get(),
ElseLoc, ElseBody.getPtrOrNull()));
}
///