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

Support uniform inits in braced lists. 

This made it necessary to remove an error detection which would let us
bail out of braced lists in certain situations of missing "}". However,
as we always entirely escape from the braced list on finding ";", this
should not be a big problem.

With this, we can no format braced lists with uniformat inits:

return { arg1, SomeType { parameter } };

llvm-svn: 182788
This commit is contained in:
Daniel Jasper 2013-05-28 18:50:02 +00:00
parent 427354ee21
commit 1ec31065e8
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -634,11 +634,6 @@ void UnwrappedLineParser::parseBracedList() {
// might be to just implement a more or less complete expression parser.
switch (FormatTok->Tok.getKind()) {
case tok::l_brace:
if (!StartOfExpression) {
// Probably a missing closing brace. Bail out.
addUnwrappedLine();
return;
}
parseBracedList();
StartOfExpression = false;
break;

19
clang/unittests/Format/FormatTest.cpp
View File

@ -3386,6 +3386,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
verifyFormat("new vector<int>{ 1, 2, 3 };");
verifyFormat("new int[3]{ 1, 2, 3 };");
verifyFormat("return { arg1, arg2 };");
verifyFormat("return { arg1, SomeType{ parameter } };");
verifyFormat("new T{ arg1, arg2 };");
verifyFormat("class Class {\n"
" T member = { arg1, arg2 };\n"
@ -3402,6 +3403,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
verifyFormat("new vector<int>{1, 2, 3};", NoSpaces);
verifyFormat("new int[3]{1, 2, 3};", NoSpaces);
verifyFormat("return {arg1, arg2};", NoSpaces);
verifyFormat("return {arg1, SomeType{parameter}};", NoSpaces);
verifyFormat("new T{arg1, arg2};", NoSpaces);
verifyFormat("class Class {\n"
" T member = {arg1, arg2};\n"
@ -4161,15 +4163,8 @@ TEST_F(FormatTest, ObjCLiterals) {
verifyFormat("return @{ @\"one\" : @1 };");
verifyFormat("@{ @\"one\" : @1, }");
// FIXME: Breaking in cases where we think there's a structural error
// showed that we're incorrectly parsing this code. We need to fix the
// parsing here.
verifyFormat("@{ @\"one\" : @\n"
"{ @2 : @1 }\n"
"}");
verifyFormat("@{ @\"one\" : @\n"
"{ @2 : @1 },\n"
"}");
verifyFormat("@{ @\"one\" : @{ @2 : @1 } }");
verifyFormat("@{ @\"one\" : @{ @2 : @1 }, }");
verifyFormat("@{ 1 > 2 ? @\"one\" : @\"two\" : 1 > 2 ? @1 : @2 }");
verifyFormat("[self setDict:@{}");
@ -4458,10 +4453,8 @@ TEST_F(FormatTest, DoNotCreateUnreasonableUnwrappedLines) {
verifyFormat("if (foo)\n"
" return { forgot_closing_brace();\n"
"test();");
verifyFormat("int a[] = { void forgot_closing_brace()\n"
"{\n"
" f();\n"
" g();\n"
verifyFormat("int a[] = { void forgot_closing_brace() { f();\n"
"g();\n"
"}");
}