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

Improve our parse recovery on 'case blah;' and 'default;'. 

llvm-svn: 124025
This commit is contained in:
John McCall 2011-01-22 09:28:32 +00:00
parent 6ed95945ed
commit 0140bfeead
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clang/lib/Parse/ParseStmt.cpp
View File

@ -311,13 +311,19 @@ StmtResult Parser::ParseCaseStatement(ParsedAttributes &attrs) {
ColonProtection.restore();
SourceLocation ColonLoc;
if (Tok.isNot(tok::colon)) {
if (Tok.is(tok::colon)) {
ColonLoc = ConsumeToken();
// Treat "case blah;" as a typo for "case blah:".
} else if (Tok.is(tok::semi)) {
ColonLoc = ConsumeToken();
Diag(ColonLoc, diag::err_expected_colon_after) << "'case'"
<< FixItHint::CreateReplacement(ColonLoc, ":");
} else {
SourceLocation ExpectedLoc = PP.getLocForEndOfToken(PrevTokLocation);
Diag(ExpectedLoc, diag::err_expected_colon_after) << "'case'"
<< FixItHint::CreateInsertion(ExpectedLoc, ":");
ColonLoc = ExpectedLoc;
} else {
ColonLoc = ConsumeToken();
}
StmtResult Case =
@ -382,13 +388,19 @@ StmtResult Parser::ParseDefaultStatement(ParsedAttributes &attrs) {
SourceLocation DefaultLoc = ConsumeToken(); // eat the 'default'.
SourceLocation ColonLoc;
if (Tok.isNot(tok::colon)) {
if (Tok.is(tok::colon)) {
ColonLoc = ConsumeToken();
// Treat "default;" as a typo for "default:".
} else if (Tok.is(tok::semi)) {
ColonLoc = ConsumeToken();
Diag(ColonLoc, diag::err_expected_colon_after) << "'default'"
<< FixItHint::CreateReplacement(ColonLoc, ":");
} else {
SourceLocation ExpectedLoc = PP.getLocForEndOfToken(PrevTokLocation);
Diag(ExpectedLoc, diag::err_expected_colon_after) << "'default'"
<< FixItHint::CreateInsertion(ExpectedLoc, ":");
ColonLoc = ExpectedLoc;
} else {
ColonLoc = ConsumeToken();
}
// Diagnose the common error "switch (X) {... default: }", which is not valid.

14
clang/test/Parser/switch-recovery.cpp
View File

@ -17,4 +17,18 @@ struct B {
return;
}
}
void test2() {
enum X { Xa, Xb } x;
switch (x) { // expected-warning {{enumeration value 'Xb' not handled in switch}}
case Xa; // expected-error {{expected ':' after 'case'}}
break;
}
switch (x) {
default; // expected-error {{expected ':' after 'default'}}
break;
}
}
};