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

Improve the parsers resilience to sematic errors. This allows us to turn: 

void foo() {
  if (0) break;
  abc:
  def:
  hij:
    break;

into:

void foo() {
  if ((0)')
    ;
abc:
def:
hij:
  ;

instead of dropping the if and labels (due to break not being in a loop).

llvm-svn: 39508
This commit is contained in:
Chris Lattner 2007-05-28 05:38:24 +00:00
parent 2f6ac263ef
commit ac4471c963
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/Parse/ParseStmt.cpp
View File

@ -192,7 +192,10 @@ Parser::StmtResult Parser::ParseIdentifierStatement(bool OnlyStatement) {
ParseAttributes();
StmtResult SubStmt = ParseStatement();
if (SubStmt.isInvalid) return true;
// Broken substmt shouldn't prevent the label from being added to the AST.
if (SubStmt.isInvalid)
SubStmt = Actions.ParseNullStmt(ColonLoc);
// FIXME: Enter this label into the symbol table for the function.
return Actions.ParseLabelStmt(IdentTok.getLocation(),
@ -299,8 +302,10 @@ Parser::StmtResult Parser::ParseCaseStatement() {
}
StmtResult SubStmt = ParseStatement();
// Broken substmt shouldn't prevent the case from being added to the AST.
if (SubStmt.isInvalid)
return true;
SubStmt = Actions.ParseNullStmt(ColonLoc);
// TODO: look up enclosing switch stmt.
return Actions.ParseCaseStmt(CaseLoc, LHS.Val, DotDotDotLoc, RHSVal, ColonLoc,
@ -429,6 +434,11 @@ Parser::StmtResult Parser::ParseIfStatement() {
// Read the if condition.
StmtResult CondStmt = ParseStatement();
// Broken substmt shouldn't prevent the label from being added to the AST.
if (CondStmt.isInvalid)
CondStmt = Actions.ParseNullStmt(Tok.getLocation());
// If it has an else, parse it.
SourceLocation ElseLoc;
@ -436,11 +446,11 @@ Parser::StmtResult Parser::ParseIfStatement() {
if (Tok.getKind() == tok::kw_else) {
ElseLoc = ConsumeToken();
ElseStmt = ParseStatement();
if (ElseStmt.isInvalid)
ElseStmt = Actions.ParseNullStmt(ElseLoc);
}
if (CondStmt.isInvalid || ElseStmt.isInvalid)
return true;
return Actions.ParseIfStmt(IfLoc, CondExp.Val, CondStmt.Val,
ElseLoc, ElseStmt.Val);
}