Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-09 02:49:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "[clang-format] Correctly format variable templates."

Browse Source 
This reverts commit a140b7104fdae0d9eff5b18efbc784754e0ca274.

It provoked the bug https://github.com/llvm/llvm-project/issues/54374.
This commit is contained in:
Marek Kurdej 2022-03-14 16:01:24 +01:00
parent 3297571e32
commit a6b2f50fb4
3 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1526,30 +1526,8 @@ private:
if (Current.getPrecedence() != prec::Assignment)
return false;
if (Line.First->isOneOf(tok::kw_using, tok::kw_return))
if (Line.First->isOneOf(tok::kw_template, tok::kw_using, tok::kw_return))
return false;
if (Line.First->is(tok::kw_template)) {
// `template` keyword can start a variable template.
const FormatToken *Tok = Line.First->getNextNonComment();
assert(Tok); // Current token is on the same line.
if (Tok->isNot(TT_TemplateOpener)) {
// Explicit template instantiations do not have `<>`.
return false;
}
Tok = Tok->MatchingParen;
if (!Tok)
return false;
Tok = Tok->getNextNonComment();
if (!Tok)
return false;
if (Tok->isOneOf(tok::kw_class, tok::kw_enum, tok::kw_concept,
tok::kw_struct, tok::kw_using))
return false;
return true;
}
// Type aliases use `type X = ...;` in TypeScript and can be exported
// using `export type ...`.

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

@ -25625,12 +25625,6 @@ TEST_F(FormatTest, AlignArrayOfStructuresRightAlignmentNonSquare) {
Style);
}
TEST_F(FormatTest, FormatsVariableTemplates) {
verifyFormat("inline bool var = is_integral_v<int> && is_signed_v<int>;");
verifyFormat("template <typename T> "
"inline bool var = is_integral_v<T> && is_signed_v<T>;");
}
} // namespace
} // namespace format
} // namespace clang

25
clang/unittests/Format/TokenAnnotatorTest.cpp
View File

@ -117,31 +117,6 @@ TEST_F(TokenAnnotatorTest, UnderstandsEnums) {
EXPECT_TOKEN(Tokens[2], tok::l_brace, TT_EnumLBrace);
}
TEST_F(TokenAnnotatorTest, UnderstandsDefaultedAndDeletedFunctions) {
auto Tokens = annotate("auto operator<=>(const T &) const & = default;");
EXPECT_EQ(Tokens.size(), 14u) << Tokens;
EXPECT_TOKEN(Tokens[9], tok::amp, TT_PointerOrReference);
Tokens = annotate("template <typename T> void F(T) && = delete;");
EXPECT_EQ(Tokens.size(), 15u) << Tokens;
EXPECT_TOKEN(Tokens[10], tok::ampamp, TT_PointerOrReference);
}
TEST_F(TokenAnnotatorTest, UnderstandsVariables) {
auto Tokens =
annotate("inline bool var = is_integral_v<int> && is_signed_v<int>;");
EXPECT_EQ(Tokens.size(), 15u) << Tokens;
EXPECT_TOKEN(Tokens[8], tok::ampamp, TT_BinaryOperator);
}
TEST_F(TokenAnnotatorTest, UnderstandsVariableTemplates) {
auto Tokens =
annotate("template <typename T> "
"inline bool var = is_integral_v<int> && is_signed_v<int>;");
EXPECT_EQ(Tokens.size(), 20u) << Tokens;
EXPECT_TOKEN(Tokens[13], tok::ampamp, TT_BinaryOperator);
}
TEST_F(TokenAnnotatorTest, UnderstandsLBracesInMacroDefinition) {
auto Tokens = annotate("#define BEGIN NS {");
EXPECT_EQ(Tokens.size(), 6u) << Tokens;