owenpan created this revision.
owenpan added reviewers: MyDeveloperDay, HazardyKnusperkeks.
owenpan added a project: clang-format.
owenpan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D114073
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/lib/Format/UnwrappedLineParser.h
Index: clang/lib/Format/UnwrappedLineParser.h
===================================================================
--- clang/lib/Format/UnwrappedLineParser.h
+++ clang/lib/Format/UnwrappedLineParser.h
@@ -84,7 +84,7 @@
void reset();
void parseFile();
void parseLevel(bool HasOpeningBrace);
- void parseBlock(bool MustBeDeclaration, unsigned AddLevels = 1u,
+ void parseBlock(bool MustBeDeclaration = false, unsigned AddLevels = 1u,
bool MunchSemi = true,
bool UnindentWhitesmithsBraces = false);
void parseChildBlock();
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -385,7 +385,7 @@
// be in a non-declaration context.
if (!FormatTok->is(TT_MacroBlockBegin) && tryToParseBracedList())
continue;
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
break;
case tok::r_brace:
@@ -1313,7 +1313,7 @@
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always)
addUnwrappedLine();
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
}
addUnwrappedLine();
return;
@@ -1326,7 +1326,7 @@
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always)
addUnwrappedLine();
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
}
addUnwrappedLine();
return;
@@ -1434,7 +1434,7 @@
if (Style.BraceWrapping.AfterFunction)
addUnwrappedLine();
FormatTok->setType(TT_FunctionLBrace);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
return;
}
@@ -2078,7 +2078,7 @@
bool NeedsUnwrappedLine = false;
if (FormatTok->Tok.is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
if (Style.BraceWrapping.BeforeElse)
addUnwrappedLine();
else
@@ -2096,7 +2096,7 @@
parseSquare();
if (FormatTok->Tok.is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
} else if (FormatTok->Tok.is(tok::kw_if)) {
FormatToken *Previous = AllTokens[Tokens->getPosition() - 1];
@@ -2158,7 +2158,7 @@
}
if (FormatTok->is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
if (Style.BraceWrapping.BeforeCatch) {
addUnwrappedLine();
} else {
@@ -2196,7 +2196,7 @@
}
NeedsUnwrappedLine = false;
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
if (Style.BraceWrapping.BeforeCatch)
addUnwrappedLine();
else
@@ -2309,7 +2309,7 @@
parseParens();
if (FormatTok->Tok.is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
} else {
addUnwrappedLine();
@@ -2324,7 +2324,7 @@
nextToken();
if (FormatTok->Tok.is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
if (Style.BraceWrapping.BeforeWhile)
addUnwrappedLine();
} else {
@@ -2363,7 +2363,7 @@
CompoundStatementIndenter Indenter(this, Line->Level,
Style.BraceWrapping.AfterCaseLabel,
Style.BraceWrapping.IndentBraces);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
if (FormatTok->Tok.is(tok::kw_break)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always) {
@@ -2405,7 +2405,7 @@
parseParens();
if (FormatTok->Tok.is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
} else {
addUnwrappedLine();
@@ -2457,7 +2457,7 @@
if (Style.BraceWrapping.AfterFunction)
addUnwrappedLine();
FormatTok->setType(TT_FunctionLBrace);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
} else {
parseConstraintExpression(OriginalLevel);
@@ -2494,7 +2494,7 @@
if (Style.BraceWrapping.AfterFunction)
addUnwrappedLine();
FormatTok->setType(TT_FunctionLBrace);
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
}
if (FormatTok->Tok.is(tok::semi)) {
// Eat any trailing semi.
@@ -2834,7 +2834,7 @@
} else if (FormatTok->Tok.is(tok::l_brace)) {
if (Style.BraceWrapping.AfterFunction)
addUnwrappedLine();
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
addUnwrappedLine();
return;
} else {
@@ -2863,7 +2863,7 @@
break;
}
if (FormatTok->is(tok::l_brace)) {
- parseBlock(/*MustBeDeclaration=*/false);
+ parseBlock();
// In ObjC interfaces, nothing should be following the "}".
addUnwrappedLine();
} else if (FormatTok->is(tok::r_brace)) {
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
