[cfe-commits] r169518 - in /cfe/trunk: lib/Format/UnwrappedLineParser.cpp unittests/Format/FormatTest.cpp
Alexander Kornienko
alexfh at google.com
Thu Dec 6 09:49:17 PST 2012
Author: alexfh
Date: Thu Dec 6 11:49:17 2012
New Revision: 169518
URL: http://llvm.org/viewvc/llvm-project?rev=169518&view=rev
Log:
Clang-format: detect unbalanced braces.
Reviewers: klimek, djasper
Reviewed By: klimek
CC: cfe-commits, silvas
Differential Revision: http://llvm-reviews.chandlerc.com/D176
Modified:
cfe/trunk/lib/Format/UnwrappedLineParser.cpp
cfe/trunk/unittests/Format/FormatTest.cpp
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=169518&r1=169517&r2=169518&view=diff
==============================================================================
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Thu Dec 6 11:49:17 2012
@@ -52,8 +52,8 @@
addUnwrappedLine();
break;
case tok::r_brace:
- // FIXME: We need a test when it has to be "return Error;"
- return false;
+ // Stray '}' is an error.
+ return true;
default:
parseStatement();
break;
@@ -63,6 +63,7 @@
}
bool UnwrappedLineParser::parseBlock() {
+ assert(FormatTok.Tok.is(tok::l_brace) && "'{' expected");
nextToken();
// FIXME: Remove this hack to handle namespaces.
Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=169518&r1=169517&r2=169518&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Thu Dec 6 11:49:17 2012
@@ -428,6 +428,7 @@
EXPECT_EQ("{\n{\n}\n", format("{\n{\n}\n"));
EXPECT_EQ("{\n {\n}\n", format("{\n {\n}\n"));
EXPECT_EQ("{\n {\n }\n", format("{\n {\n }\n"));
+ EXPECT_EQ("{\n {\n }\n }\n}\n", format("{\n {\n }\n }\n}\n"));
FormatStyle Style = getLLVMStyle();
Style.ColumnLimit = 10;
More information about the cfe-commits
mailing list