This is an archive of the discontinued LLVM Phabricator instance.

Differential D125593

[clang-format] Handle "if consteval { ... }" for RemoveBracesLLVM
ClosedPublic

Authored by owenpan on May 13 2022, 4:39 PM.

Details

Reviewers
curdeius
HazardyKnusperkeks
MyDeveloperDay
Commits
rG2cdabc032292: [clang-format] Handle "if consteval { ... }" for RemoveBracesLLVM

Diff Detail

Event Timeline

owenpan created this revision.May 13 2022, 4:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2022, 4:39 PM
owenpan requested review of this revision.May 13 2022, 4:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2022, 4:39 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B164416: Diff 429387.May 13 2022, 6:14 PM
owenpan updated this revision to Diff 429406.May 13 2022, 9:20 PM

Fixed a bug and added a test case.

Harbormaster completed remote builds in B164427: Diff 429406.May 13 2022, 9:48 PM
curdeius accepted this revision.May 13 2022, 10:46 PM

LGTM. Good finding!

This revision is now accepted and ready to land.May 13 2022, 10:46 PM
Closed by commit rG2cdabc032292: [clang-format] Handle "if consteval { ... }" for RemoveBracesLLVM (authored by owenpan). · Explain WhyMay 15 2022, 1:33 AM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rG2cdabc032292: [clang-format] Handle "if consteval { ... }" for RemoveBracesLLVM.

Revision Contents

PathSize
clang/
lib/
Format/
14 lines
unittests/
Format/
19 lines

Diff 429519

clang/lib/Format/UnwrappedLineParser.cpp

Show First 20 Lines • Show All 2,467 Lines • ▼ Show 20 Lines
} }
FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind, FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind,
bool KeepBraces) { bool KeepBraces) {
assert(FormatTok->is(tok::kw_if) && "'if' expected"); assert(FormatTok->is(tok::kw_if) && "'if' expected");
nextToken(); nextToken();
if (FormatTok->is(tok::exclaim)) if (FormatTok->is(tok::exclaim))
nextToken(); nextToken();
bool KeepIfBraces = false;
bool KeepElseBraces = false;
if (FormatTok->is(tok::kw_consteval)) { if (FormatTok->is(tok::kw_consteval)) {
KeepIfBraces = true;
KeepElseBraces = true;
nextToken(); nextToken();
} else { } else {
if (FormatTok->isOneOf(tok::kw_constexpr, tok::identifier)) if (FormatTok->isOneOf(tok::kw_constexpr, tok::identifier))
nextToken(); nextToken();
if (FormatTok->is(tok::l_paren)) if (FormatTok->is(tok::l_paren))
parseParens(); parseParens();
} }
handleAttributes(); handleAttributes();
Show All 11 Lines if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.BeforeElse) if (Style.BraceWrapping.BeforeElse)
addUnwrappedLine(); addUnwrappedLine();
else else
NeedsUnwrappedLine = true; NeedsUnwrappedLine = true;
} else { } else {
parseUnbracedBody(); parseUnbracedBody();
} }
bool KeepIfBraces = false;
if (Style.RemoveBracesLLVM) { if (Style.RemoveBracesLLVM) {
assert(!NestedTooDeep.empty()); assert(!NestedTooDeep.empty());
KeepIfBraces = (IfLeftBrace && !IfLeftBrace->MatchingParen) || KeepIfBraces = KeepIfBraces ||
(IfLeftBrace && !IfLeftBrace->MatchingParen) ||
NestedTooDeep.back() || IfBlockKind == IfStmtKind::IfOnly || NestedTooDeep.back() || IfBlockKind == IfStmtKind::IfOnly ||
IfBlockKind == IfStmtKind::IfElseIf; IfBlockKind == IfStmtKind::IfElseIf;
} }
FormatToken *ElseLeftBrace = nullptr; FormatToken *ElseLeftBrace = nullptr;
IfStmtKind Kind = IfStmtKind::IfOnly; IfStmtKind Kind = IfStmtKind::IfOnly;
if (FormatTok->is(tok::kw_else)) { if (FormatTok->is(tok::kw_else)) {
Show All 37 Lines if (FormatTok->is(tok::kw_else)) {
if (NeedsUnwrappedLine) if (NeedsUnwrappedLine)
addUnwrappedLine(); addUnwrappedLine();
} }
if (!Style.RemoveBracesLLVM) if (!Style.RemoveBracesLLVM)
return nullptr; return nullptr;
assert(!NestedTooDeep.empty()); assert(!NestedTooDeep.empty());
const bool KeepElseBraces = KeepElseBraces = KeepElseBraces ||
(ElseLeftBrace && !ElseLeftBrace->MatchingParen) || NestedTooDeep.back(); (ElseLeftBrace && !ElseLeftBrace->MatchingParen) ||
NestedTooDeep.back();
NestedTooDeep.pop_back(); NestedTooDeep.pop_back();
if (!KeepBraces && !KeepIfBraces && !KeepElseBraces) { if (!KeepBraces && !KeepIfBraces && !KeepElseBraces) {
markOptionalBraces(IfLeftBrace); markOptionalBraces(IfLeftBrace);
markOptionalBraces(ElseLeftBrace); markOptionalBraces(ElseLeftBrace);
} else if (IfLeftBrace) { } else if (IfLeftBrace) {
FormatToken *IfRightBrace = IfLeftBrace->MatchingParen; FormatToken *IfRightBrace = IfLeftBrace->MatchingParen;
▲ Show 20 Lines • Show All 1,609 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 25,373 Lines • ▼ Show 20 Lines verifyFormat("if (a) {\n"
Style); Style);
verifyFormat("if (a) {\n" verifyFormat("if (a) {\n"
" f();\n" " f();\n"
"Label:\n" "Label:\n"
"}", "}",
Style); Style);
verifyFormat("if consteval {\n"
" f();\n"
"} else {\n"
" g();\n"
"}",
Style);
verifyFormat("if not consteval {\n"
" f();\n"
"} else if (a) {\n"
" g();\n"
"}",
Style);
verifyFormat("if !consteval {\n"
" g();\n"
"}",
Style);
Style.ColumnLimit = 65; Style.ColumnLimit = 65;
verifyFormat("if (condition) {\n" verifyFormat("if (condition) {\n"
" ff(Indices,\n" " ff(Indices,\n"
" [&](unsigned LHSI, unsigned RHSI) { return true; });\n" " [&](unsigned LHSI, unsigned RHSI) { return true; });\n"
"} else {\n" "} else {\n"
" ff(Indices,\n" " ff(Indices,\n"
" [&](unsigned LHSI, unsigned RHSI) { return true; });\n" " [&](unsigned LHSI, unsigned RHSI) { return true; });\n"
▲ Show 20 Lines • Show All 413 Lines • Show Last 20 Lines