dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve parser recovery in "for" statements, from Richard Smith! 

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125722 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Douglas Gregor 2011-02-17 03:38:46 +00:00
parent 6204159b21
commit b72c778554
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Parse/ParseStmt.cpp
View File

@ -1039,7 +1039,6 @@ StmtResult Parser::ParseForStatement(ParsedAttributes &attrs) {
Collection = ParseExpression();
} else {
Diag(Tok, diag::err_expected_semi_for);
SkipUntil(tok::semi);
}
} else {
Value = ParseExpression();
@ -1065,8 +1064,14 @@ StmtResult Parser::ParseForStatement(ParsedAttributes &attrs) {
}
Collection = ParseExpression();
} else {
if (!Value.isInvalid()) Diag(Tok, diag::err_expected_semi_for);
SkipUntil(tok::semi);
if (!Value.isInvalid()) {
Diag(Tok, diag::err_expected_semi_for);
} else {
// Skip until semicolon or rparen, don't consume it.
SkipUntil(tok::r_paren, true, true);
if (Tok.is(tok::semi))
ConsumeToken();
}
}
}
if (!ForEach) {
@ -1074,6 +1079,8 @@ StmtResult Parser::ParseForStatement(ParsedAttributes &attrs) {
// Parse the second part of the for specifier.
if (Tok.is(tok::semi)) { // for (...;;
// no second part.
} else if (Tok.is(tok::r_paren)) {
// missing both semicolons.
} else {
ExprResult Second;
if (getLang().CPlusPlus)
@ -1088,12 +1095,16 @@ StmtResult Parser::ParseForStatement(ParsedAttributes &attrs) {
SecondPart = Actions.MakeFullExpr(Second.get());
}
if (Tok.isNot(tok::semi)) {
if (!SecondPartIsInvalid || SecondVar)
Diag(Tok, diag::err_expected_semi_for);
else
// Skip until semicolon or rparen, don't consume it.
SkipUntil(tok::r_paren, true, true);
}
if (Tok.is(tok::semi)) {
ConsumeToken();
} else {
if (!SecondPartIsInvalid || SecondVar)
Diag(Tok, diag::err_expected_semi_for);
SkipUntil(tok::semi);
}
// Parse the third part of the for specifier.

20
test/Parser/for.cpp Normal file
View File

@ -0,0 +1,20 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
void f1() {
int n;
for (n = 0; n < 10; n++);
for (n = 0 n < 10; n++); // expected-error {{expected ';' in 'for'}}
for (n = 0; n < 10 n++); // expected-error {{expected ';' in 'for'}}
for (int n = 0 n < 10; n++); // expected-error {{expected ';' in 'for'}}
for (int n = 0; n < 10 n++); // expected-error {{expected ';' in 'for'}}
for (n = 0 bool b = n < 10; n++); // expected-error {{expected ';' in 'for'}}
for (n = 0; bool b = n < 10 n++); // expected-error {{expected ';' in 'for'}}
for (n = 0 n < 10 n++); // expected-error 2{{expected ';' in 'for'}}
for (;); // expected-error {{expected ';' in 'for'}}
}