Do more error checking for '{}'.
This fixes llvm.org/PR14883, where clang-format would run into an
assertion on:
void f() { return } 42
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172049 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 1ab5770..4de26e2 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -651,6 +651,21 @@
return false;
}
+ bool parseBrace() {
+ while (CurrentToken != NULL) {
+ if (CurrentToken->is(tok::r_brace)) {
+ next();
+ return true;
+ }
+ if (CurrentToken->is(tok::r_paren) || CurrentToken->is(tok::r_square))
+ return false;
+ if (!consumeToken())
+ return false;
+ }
+ // Lines can currently end with '{'.
+ return true;
+ }
+
bool parseConditional() {
while (CurrentToken != NULL) {
if (CurrentToken->is(tok::colon)) {
@@ -693,6 +708,10 @@
if (!parseSquare())
return false;
break;
+ case tok::l_brace:
+ if (!parseBrace())
+ return false;
+ break;
case tok::less:
if (parseAngle())
Tok->Type = TT_TemplateOpener;
@@ -705,6 +724,11 @@
case tok::r_paren:
case tok::r_square:
return false;
+ case tok::r_brace:
+ // Lines can start with '}'.
+ if (Tok->Parent != NULL)
+ return false;
+ break;
case tok::greater:
Tok->Type = TT_BinaryOperator;
break;
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 389c58c..739bcdd 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1036,6 +1036,10 @@
// Error recovery tests.
//===----------------------------------------------------------------------===//
+TEST_F(FormatTest, IncorrectCodeTrailingStuff) {
+ verifyFormat("void f() { return } 42");
+}
+
TEST_F(FormatTest, IndentationWithinColumnLimitNotPossible) {
verifyFormat("int aaaaaaaa =\n"
" // Overly long comment\n"