This is an archive of the discontinued LLVM Phabricator instance.

Differential D125510

[clang-format][NFC] Format unit tests with insert/remove braces
ClosedPublic

Authored by owenpan on May 12 2022, 6:23 PM.

Details

Reviewers
MyDeveloperDay
curdeius
HazardyKnusperkeks
Commits
rG2601355dc982: [clang-format][NFC] Format unit tests with insert/remove braces
Summary

This patch is the result of running clang-format version 753fe33 in clang/unittests/Format/:

clang-format -style="{InsertBraces: true, RemoveBracesLLVM: true}" -i *.cpp *.h

Diff Detail

Event Timeline

owenpan created this revision.May 12 2022, 6:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 12 2022, 6:23 PM
owenpan requested review of this revision.May 12 2022, 6:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 12 2022, 6:23 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B164220: Diff 429108.May 12 2022, 6:49 PM
curdeius accepted this revision.May 12 2022, 11:07 PM
This revision is now accepted and ready to land.May 12 2022, 11:07 PM
Closed by commit rG2601355dc982: [clang-format][NFC] Format unit tests with insert/remove braces (authored by owenpan). · Explain WhyMay 13 2022, 4:16 PM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rG2601355dc982: [clang-format][NFC] Format unit tests with insert/remove braces.

Revision Contents

PathSize
clang/
unittests/
Format/
3 lines
80 lines

Diff 429383

clang/unittests/Format/FormatTestUtils.h

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines if (MessedUp[i] == '/' && MessedUp[i + 1] == '/') {
} }
} else if (MessedUp[i] != ' ') { } else if (MessedUp[i] != ' ') {
JustReplacedNewline = false; JustReplacedNewline = false;
} }
} }
std::string WithoutWhitespace; std::string WithoutWhitespace;
if (MessedUp[0] != ' ') if (MessedUp[0] != ' ')
WithoutWhitespace.push_back(MessedUp[0]); WithoutWhitespace.push_back(MessedUp[0]);
for (unsigned i = 1, e = MessedUp.size(); i != e; ++i) { for (unsigned i = 1, e = MessedUp.size(); i != e; ++i)
if (MessedUp[i] != ' ' || MessedUp[i - 1] != ' ') if (MessedUp[i] != ' ' || MessedUp[i - 1] != ' ')
WithoutWhitespace.push_back(MessedUp[i]); WithoutWhitespace.push_back(MessedUp[i]);
}
return WithoutWhitespace; return WithoutWhitespace;
} }
} // end namespace test } // end namespace test
} // end namespace format } // end namespace format
} // end namespace clang } // end namespace clang
#endif #endif

clang/unittests/Format/TokenAnnotatorTest.cpp

Show First 20 Lines • Show All 503 Lines • ▼ Show 20 LinesTEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) {
auto NumberOfBaseTokens = 11u; auto NumberOfBaseTokens = 11u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"struct Bar;"); "struct Bar;");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"struct Bar;"); "struct Bar;");
NumberOfBaseTokens = 9u; NumberOfBaseTokens = 9u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"struct Bar {" "struct Bar {"
" T foo();\n" " T foo();\n"
" T bar();\n" " T bar();\n"
"};"); "};");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"struct Bar {" "struct Bar {"
" T foo();\n" " T foo();\n"
" T bar();\n" " T bar();\n"
"};"); "};");
NumberOfBaseTokens = 21u; NumberOfBaseTokens = 21u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"Bar(T) -> Bar<T>;"); "Bar(T) -> Bar<T>;");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"Bar(T) -> Bar<T>;"); "Bar(T) -> Bar<T>;");
NumberOfBaseTokens = 16u; NumberOfBaseTokens = 16u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"T foo();"); "T foo();");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"T foo();"); "T foo();");
NumberOfBaseTokens = 11u; NumberOfBaseTokens = 11u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"T foo() {\n" "T foo() {\n"
" auto bar = baz();\n" " auto bar = baz();\n"
" return bar + T{};\n" " return bar + T{};\n"
"}"); "}");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"T foo() {\n" "T foo() {\n"
" auto bar = baz();\n" " auto bar = baz();\n"
" return bar + T{};\n" " return bar + T{};\n"
"}"); "}");
NumberOfBaseTokens = 26u; NumberOfBaseTokens = 26u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"T foo();"); "T foo();");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
"T foo() requires Foo<T>;"); "T foo() requires Foo<T>;");
NumberOfBaseTokens = 11u; NumberOfBaseTokens = 11u;
NumberOfTokensBeforeRequires = 9u; NumberOfTokensBeforeRequires = 9u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"T foo() {\n" "T foo() {\n"
" auto bar = baz();\n" " auto bar = baz();\n"
" return bar + T{};\n" " return bar + T{};\n"
"}"); "}");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
"T foo() requires Foo<T> {\n" "T foo() requires Foo<T> {\n"
" auto bar = baz();\n" " auto bar = baz();\n"
" return bar + T{};\n" " return bar + T{};\n"
"}"); "}");
NumberOfBaseTokens = 26u; NumberOfBaseTokens = 26u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseTokens = annotate("template<typename T>\n"
"Bar(T) -> Bar<typename T::I>;"); "Bar(T) -> Bar<typename T::I>;");
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedTokens = annotate("template<typename T>\n"
" requires requires(T &&t) {\n" " requires requires(T &&t) {\n"
" typename T::I;\n" " typename T::I;\n"
" }\n" " }\n"
"Bar(T) -> Bar<typename T::I>;"); "Bar(T) -> Bar<typename T::I>;");
NumberOfBaseTokens = 19u; NumberOfBaseTokens = 19u;
NumberOfAdditionalRequiresClauseTokens = 14u; NumberOfAdditionalRequiresClauseTokens = 14u;
NumberOfTokensBeforeRequires = 5u; NumberOfTokensBeforeRequires = 5u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
}
}
BaseTokens = annotate("struct [[nodiscard]] zero_t {\n" BaseTokens = annotate("struct [[nodiscard]] zero_t {\n"
" template<class T>\n" " template<class T>\n"
" [[nodiscard]] constexpr operator T() const { " " [[nodiscard]] constexpr operator T() const { "
"return number_zero_v<T>; }\n" "return number_zero_v<T>; }\n"
"};"); "};");
ConstrainedTokens = annotate("struct [[nodiscard]] zero_t {\n" ConstrainedTokens = annotate("struct [[nodiscard]] zero_t {\n"
" template<class T>\n" " template<class T>\n"
" requires requires { number_zero_v<T>; }\n" " requires requires { number_zero_v<T>; }\n"
" [[nodiscard]] constexpr operator T() const { " " [[nodiscard]] constexpr operator T() const { "
"return number_zero_v<T>; }\n" "return number_zero_v<T>; }\n"
"};"); "};");
NumberOfBaseTokens = 35u; NumberOfBaseTokens = 35u;
NumberOfAdditionalRequiresClauseTokens = 9u; NumberOfAdditionalRequiresClauseTokens = 9u;
NumberOfTokensBeforeRequires = 13u; NumberOfTokensBeforeRequires = 13u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens; << ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else } else {
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
} }
}
}
TEST_F(TokenAnnotatorTest, UnderstandsAsm) { TEST_F(TokenAnnotatorTest, UnderstandsAsm) {
auto Tokens = annotate("__asm{\n" auto Tokens = annotate("__asm{\n"
"a:\n" "a:\n"
"};"); "};");
ASSERT_EQ(Tokens.size(), 7u) << Tokens; ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown);
EXPECT_TOKEN(Tokens[1], tok::l_brace, TT_InlineASMBrace); EXPECT_TOKEN(Tokens[1], tok::l_brace, TT_InlineASMBrace);
Show All 22 Lines