This is an archive of the discontinued LLVM Phabricator instance.

Differential D129982

[clang-format][NFC] Refactor RequiresDoesNotChangeParsingOfTheRest
ClosedPublic

Authored by owenpan on Jul 17 2022, 9:46 PM.

Details

Reviewers
HazardyKnusperkeks
curdeius
MyDeveloperDay
Commits
rGa4c62f66545d: [clang-format][NFC] Refactor RequiresDoesNotChangeParsingOfTheRest

Diff Detail

Event Timeline

owenpan created this revision.Jul 17 2022, 9:46 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 17 2022, 9:46 PM
owenpan requested review of this revision.Jul 17 2022, 9:46 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 17 2022, 9:46 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
owenpan mentioned this in D129940: [clang-format] Fix misannotation of colon in presence of requires clause.Jul 17 2022, 9:52 PM
Harbormaster completed remote builds in B175948: Diff 445387.Jul 17 2022, 10:48 PM
curdeius accepted this revision.Jul 18 2022, 12:18 AM
This revision is now accepted and ready to land.Jul 18 2022, 12:18 AM
HazardyKnusperkeks accepted this revision.Jul 18 2022, 12:38 PM

Not the way I would have gone. I'm not fond of the allocations for the strings.

owenpan updated this revision to Diff 445708.Jul 19 2022, 12:16 AM

Use string literals instead of std::string.

Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2022, 12:16 AM
Herald added subscribers: llvm-commits, jsji, Enna1 and 29 others. · View Herald Transcript
Harbormaster completed remote builds in B176176: Diff 445708.Jul 19 2022, 12:17 AM
owenpan removed a project: Restricted Project.Jul 19 2022, 12:25 AM
owenpan removed subscribers: nemanjai, hiraditya, kbarton and 29 others.
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2022, 12:25 AM
owenpan updated this revision to Diff 445725.Jul 19 2022, 1:34 AM

Uploaded the correct diff.

owenpan removed a project: Restricted Project.Jul 19 2022, 1:35 AM
owenpan requested review of this revision.Jul 19 2022, 1:48 AM
Harbormaster completed remote builds in B176184: Diff 445725.Jul 19 2022, 2:18 AM
HazardyKnusperkeks accepted this revision.Jul 20 2022, 1:00 PM
This revision is now accepted and ready to land.Jul 20 2022, 1:00 PM
curdeius accepted this revision.Jul 20 2022, 2:18 PM
This revision was landed with ongoing or failed builds.Jul 20 2022, 9:57 PM
Closed by commit rGa4c62f66545d: [clang-format][NFC] Refactor RequiresDoesNotChangeParsingOfTheRest (authored by owenpan). · Explain Why
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rGa4c62f66545d: [clang-format][NFC] Refactor RequiresDoesNotChangeParsingOfTheRest.

Revision Contents

PathSize
clang/
unittests/
Format/
478 lines

Diff 446351

clang/unittests/Format/TokenAnnotatorTest.cpp

Show First 20 Lines • Show All 543 Lines • ▼ Show 20 Lines Tokens = annotate("bool r10 = requires (struct new_struct { int x; } s) { "
"requires true; };"); "requires true; };");
ASSERT_EQ(Tokens.size(), 21u) << Tokens; ASSERT_EQ(Tokens.size(), 21u) << Tokens;
EXPECT_TOKEN(Tokens[3], tok::kw_requires, TT_RequiresExpression); EXPECT_TOKEN(Tokens[3], tok::kw_requires, TT_RequiresExpression);
EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_RequiresExpressionLParen); EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_RequiresExpressionLParen);
EXPECT_TOKEN(Tokens[14], tok::l_brace, TT_RequiresExpressionLBrace); EXPECT_TOKEN(Tokens[14], tok::l_brace, TT_RequiresExpressionLBrace);
} }
TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) { TEST_F(TokenAnnotatorTest, RequiresDoesNotChangeParsingOfTheRest) {
auto NumberOfAdditionalRequiresClauseTokens = 5u; const char *BaseCode = nullptr;
auto NumberOfTokensBeforeRequires = 5u; const char *ConstrainedCode = nullptr;
auto BaseTokenCount = 0u;
auto BaseTokens = annotate("template<typename T>\n" auto RequiresTokenCount = 0u;
"T Pi = 3.14;"); auto PrefixTokenCount = 0u;
auto ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" auto TestRequires = [&](int Line) {
"T Pi = 3.14;"); const auto BaseTokens = annotate(BaseCode);
const auto ConstrainedTokens = annotate(ConstrainedCode);
auto NumberOfBaseTokens = 11u;
#define LINE " (Line " << Line << ')'
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), ASSERT_EQ(BaseTokens.size(), BaseTokenCount) << BaseTokens << LINE;
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) ASSERT_EQ(ConstrainedTokens.size(), BaseTokenCount + RequiresTokenCount)
<< ConstrainedTokens; << LINE;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) { for (auto I = 0u; I < BaseTokenCount; ++I) {
if (I < NumberOfTokensBeforeRequires) { EXPECT_EQ(
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; *BaseTokens[I],
} else { *ConstrainedTokens[I < PrefixTokenCount ? I : I + RequiresTokenCount])
EXPECT_EQ(*BaseTokens[I], << I << LINE;
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
} }
BaseTokens = annotate("template<typename T>\n" #undef LINE
"struct Bar;"); };
ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n"
"struct Bar;");
NumberOfBaseTokens = 9u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens; BaseCode = "template<typename T>\n"
ASSERT_EQ(ConstrainedTokens.size(), "T Pi = 3.14;";
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) ConstrainedCode = "template<typename T>\n"
<< ConstrainedTokens; " requires Foo<T>\n"
"T Pi = 3.14;";
for (auto I = 0u; I < NumberOfBaseTokens; ++I) { BaseTokenCount = 11;
if (I < NumberOfTokensBeforeRequires) { RequiresTokenCount = 5;
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; PrefixTokenCount = 5;
} else { TestRequires(__LINE__);
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) BaseCode = "template<typename T>\n"
<< I; "struct Bar;";
} ConstrainedCode = "template<typename T>\n"
} " requires Foo<T>\n"
"struct Bar;";
BaseTokenCount = 9;
TestRequires(__LINE__);
BaseTokens = annotate("template<typename T>\n" BaseCode = "template<typename T>\n"
"struct Bar {" "struct Bar {\n"
" T foo();\n" " T foo();\n"
" T bar();\n" " T bar();\n"
"};"); "};";
ConstrainedTokens = annotate("template<typename T>\n" ConstrainedCode = "template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"struct Bar {" "struct Bar {\n"
" T foo();\n" " T foo();\n"
" T bar();\n" " T bar();\n"
"};"); "};";
NumberOfBaseTokens = 21u; BaseTokenCount = 21;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), BaseCode = "template<typename T>\n"
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) "Bar(T) -> Bar<T>;";
<< ConstrainedTokens; ConstrainedCode = "template<typename T>\n"
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n"
"Bar(T) -> Bar<T>;");
ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"Bar(T) -> Bar<T>;"); "Bar(T) -> Bar<T>;";
NumberOfBaseTokens = 16u; BaseTokenCount = 16;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), BaseCode = "template<typename T>\n"
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) "T foo();";
<< ConstrainedTokens; ConstrainedCode = "template<typename T>\n"
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n"
"T foo();");
ConstrainedTokens = annotate("template<typename T>\n"
" requires Foo<T>\n" " requires Foo<T>\n"
"T foo();"); "T foo();";
NumberOfBaseTokens = 11u; BaseTokenCount = 11;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseCode = "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" ConstrainedCode = "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; BaseTokenCount = 26;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), BaseCode = "template<typename T>\n"
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) "T foo();";
<< ConstrainedTokens; ConstrainedCode = "template<typename T>\n"
"T foo() requires Foo<T>;";
for (auto I = 0u; I < NumberOfBaseTokens; ++I) { BaseTokenCount = 11;
if (I < NumberOfTokensBeforeRequires) { PrefixTokenCount = 9;
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; TestRequires(__LINE__);
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n"
"T foo();");
ConstrainedTokens = annotate("template<typename T>\n"
"T foo() requires Foo<T>;");
NumberOfBaseTokens = 11u;
NumberOfTokensBeforeRequires = 9u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n" BaseCode = "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" ConstrainedCode = "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; BaseTokenCount = 26;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(), BaseCode = "template<typename T>\n"
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens) "Bar(T) -> Bar<typename T::I>;";
<< ConstrainedTokens; ConstrainedCode = "template<typename T>\n"
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("template<typename T>\n"
"Bar(T) -> Bar<typename T::I>;");
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; BaseTokenCount = 19;
NumberOfAdditionalRequiresClauseTokens = 14u; RequiresTokenCount = 14;
NumberOfTokensBeforeRequires = 5u; PrefixTokenCount = 5;
TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("struct [[nodiscard]] zero_t {\n" BaseCode = "struct [[nodiscard]] zero_t {\n"
" template<class T>\n" " template<class T>\n"
" [[nodiscard]] constexpr operator T() const { " " [[nodiscard]] constexpr operator T() const { return v<T>; }\n"
"return number_zero_v<T>; }\n" "};";
"};"); ConstrainedCode =
"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 { v<T>; }\n"
" [[nodiscard]] constexpr operator T() const { " " [[nodiscard]] constexpr operator T() const { return v<T>; }\n"
"return number_zero_v<T>; }\n" "};";
"};"); BaseTokenCount = 35;
NumberOfBaseTokens = 35u; RequiresTokenCount = 9;
NumberOfAdditionalRequiresClauseTokens = 9u; PrefixTokenCount = 13;
NumberOfTokensBeforeRequires = 13u; TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("constexpr Foo(Foo const &other)\n" BaseCode = "constexpr Foo(Foo const &other)\n"
" : value{other.value} {\n" " : value{other.value} {\n"
" do_magic();\n" " do_magic();\n"
" do_more_magic();\n" " do_more_magic();\n"
"}"); "}";
ConstrainedCode = "constexpr Foo(Foo const &other)\n"
ConstrainedTokens = annotate("constexpr Foo(Foo const &other)\n"
" requires std::is_copy_constructible<T>\n" " requires std::is_copy_constructible<T>\n"
" : value{other.value} {\n" " : value{other.value} {\n"
" do_magic();\n" " do_magic();\n"
" do_more_magic();\n" " do_more_magic();\n"
"}"); "}";
BaseTokenCount = 26;
NumberOfBaseTokens = 26u; RequiresTokenCount = 7;
NumberOfAdditionalRequiresClauseTokens = 7u; PrefixTokenCount = 8;
NumberOfTokensBeforeRequires = 8u; TestRequires(__LINE__);
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I;
}
}
BaseTokens = annotate("constexpr Foo(Foo const &other)\n" BaseCode = "constexpr Foo(Foo const &other)\n"
" : value{other.value} {\n" " : value{other.value} {\n"
" do_magic();\n" " do_magic();\n"
" do_more_magic();\n" " do_more_magic();\n"
"}"); "}";
ConstrainedCode = "constexpr Foo(Foo const &other)\n"
ConstrainedTokens = annotate("constexpr Foo(Foo const &other)\n"
" requires (std::is_copy_constructible<T>)\n" " requires (std::is_copy_constructible<T>)\n"
" : value{other.value} {\n" " : value{other.value} {\n"
" do_magic();\n" " do_magic();\n"
" do_more_magic();\n" " do_more_magic();\n"
"}"); "}";
RequiresTokenCount = 9;
NumberOfBaseTokens = 26u; TestRequires(__LINE__);
NumberOfAdditionalRequiresClauseTokens = 9u;
NumberOfTokensBeforeRequires = 8u;
ASSERT_EQ(BaseTokens.size(), NumberOfBaseTokens) << BaseTokens;
ASSERT_EQ(ConstrainedTokens.size(),
NumberOfBaseTokens + NumberOfAdditionalRequiresClauseTokens)
<< ConstrainedTokens;
for (auto I = 0u; I < NumberOfBaseTokens; ++I) {
if (I < NumberOfTokensBeforeRequires) {
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
} else {
EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< 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);
Show All 30 Lines