[clang] [clang-format][NFC] Move LeftRightQualifierAlignmentFixer::is...() (PR #91930)
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Mon May 13 00:20:30 PDT 2024
https://github.com/owenca created https://github.com/llvm/llvm-project/pull/91930
Move static member functions LeftRightQualifierAlignmentFixer::is...() out the class so that #91712 can reland.
>From 6d346a4ec253110288a806fabde093678228184b Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Mon, 13 May 2024 00:07:50 -0700
Subject: [PATCH] [clang-format][NFC] Move
LeftRightQualifierAlignmentFixer::is...()
Move static member functions LeftRightQualifierAlignmentFixer::is...() out
the class so that #91712 can reland.
---
clang/lib/Format/QualifierAlignmentFixer.cpp | 11 +--
clang/lib/Format/QualifierAlignmentFixer.h | 19 ++--
clang/unittests/Format/QualifierFixerTest.cpp | 98 +++++++------------
3 files changed, 52 insertions(+), 76 deletions(-)
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp
index c263530456727..36d0639041c6c 100644
--- a/clang/lib/Format/QualifierAlignmentFixer.cpp
+++ b/clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -614,22 +614,21 @@ void prepareLeftRightOrderingForQualifierAlignmentFixer(
}
}
-bool LeftRightQualifierAlignmentFixer::isQualifierOrType(const FormatToken *Tok,
- bool IsCpp) {
+bool isQualifierOrType(const FormatToken *Tok, bool IsCpp) {
return Tok &&
(Tok->isTypeName(IsCpp) || Tok->is(tok::kw_auto) || isQualifier(Tok));
}
-bool LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- const FormatToken *Tok, const std::vector<tok::TokenKind> &Qualifiers,
- bool IsCpp) {
+bool isConfiguredQualifierOrType(const FormatToken *Tok,
+ const std::vector<tok::TokenKind> &Qualifiers,
+ bool IsCpp) {
return Tok && (Tok->isTypeName(IsCpp) || Tok->is(tok::kw_auto) ||
isConfiguredQualifier(Tok, Qualifiers));
}
// If a token is an identifier and it's upper case, it could
// be a macro and hence we need to be able to ignore it.
-bool LeftRightQualifierAlignmentFixer::isPossibleMacro(const FormatToken *Tok) {
+bool isPossibleMacro(const FormatToken *Tok) {
if (!Tok)
return false;
if (Tok->isNot(tok::identifier))
diff --git a/clang/lib/Format/QualifierAlignmentFixer.h b/clang/lib/Format/QualifierAlignmentFixer.h
index e1cc27e62b13a..e31d525da1640 100644
--- a/clang/lib/Format/QualifierAlignmentFixer.h
+++ b/clang/lib/Format/QualifierAlignmentFixer.h
@@ -32,6 +32,15 @@ void prepareLeftRightOrderingForQualifierAlignmentFixer(
std::vector<std::string> &RightOrder,
std::vector<tok::TokenKind> &Qualifiers);
+// Is the Token a simple or qualifier type
+bool isQualifierOrType(const FormatToken *Tok, bool IsCpp = true);
+bool isConfiguredQualifierOrType(const FormatToken *Tok,
+ const std::vector<tok::TokenKind> &Qualifiers,
+ bool IsCpp = true);
+
+// Is the Token likely a Macro
+bool isPossibleMacro(const FormatToken *Tok);
+
class LeftRightQualifierAlignmentFixer : public TokenAnalyzer {
std::string Qualifier;
bool RightAlign;
@@ -69,16 +78,6 @@ class LeftRightQualifierAlignmentFixer : public TokenAnalyzer {
const FormatToken *Tok,
const std::string &Qualifier,
tok::TokenKind QualifierType);
-
- // Is the Token a simple or qualifier type
- static bool isQualifierOrType(const FormatToken *Tok, bool IsCpp = true);
- static bool
- isConfiguredQualifierOrType(const FormatToken *Tok,
- const std::vector<tok::TokenKind> &Qualifiers,
- bool IsCpp = true);
-
- // Is the Token likely a Macro
- static bool isPossibleMacro(const FormatToken *Tok);
};
} // end namespace format
diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp
index 792d8f3c3a982..1e997bb06b867 100644
--- a/clang/unittests/Format/QualifierFixerTest.cpp
+++ b/clang/unittests/Format/QualifierFixerTest.cpp
@@ -1059,66 +1059,44 @@ TEST_F(QualifierFixerTest, IsQualifierType) {
"const static inline auto restrict int double long constexpr friend");
ASSERT_EQ(Tokens.size(), 11u) << Tokens;
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[0], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[1], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[2], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[3], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[4], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[5], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[6], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[7], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[8], ConfiguredTokens));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- Tokens[9], ConfiguredTokens));
-
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[0]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[1]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[2]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[3]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[4]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[5]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[6]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[7]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[8]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[9]));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[0], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[1], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[2], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[3], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[4], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[5], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[6], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[7], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[8], ConfiguredTokens));
+ EXPECT_TRUE(isConfiguredQualifierOrType(Tokens[9], ConfiguredTokens));
+
+ EXPECT_TRUE(isQualifierOrType(Tokens[0]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[1]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[2]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[3]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[4]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[5]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[6]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[7]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[8]));
+ EXPECT_TRUE(isQualifierOrType(Tokens[9]));
auto NotTokens = annotate("for while do Foo Bar ");
ASSERT_EQ(NotTokens.size(), 6u) << Tokens;
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[0], ConfiguredTokens));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[1], ConfiguredTokens));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[2], ConfiguredTokens));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[3], ConfiguredTokens));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[4], ConfiguredTokens));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
- NotTokens[5], ConfiguredTokens));
-
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[0]));
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[1]));
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[2]));
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[3]));
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[4]));
- EXPECT_FALSE(
- LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[5]));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[0], ConfiguredTokens));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[1], ConfiguredTokens));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[2], ConfiguredTokens));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[3], ConfiguredTokens));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[4], ConfiguredTokens));
+ EXPECT_FALSE(isConfiguredQualifierOrType(NotTokens[5], ConfiguredTokens));
+
+ EXPECT_FALSE(isQualifierOrType(NotTokens[0]));
+ EXPECT_FALSE(isQualifierOrType(NotTokens[1]));
+ EXPECT_FALSE(isQualifierOrType(NotTokens[2]));
+ EXPECT_FALSE(isQualifierOrType(NotTokens[3]));
+ EXPECT_FALSE(isQualifierOrType(NotTokens[4]));
+ EXPECT_FALSE(isQualifierOrType(NotTokens[5]));
}
TEST_F(QualifierFixerTest, IsMacro) {
@@ -1126,10 +1104,10 @@ TEST_F(QualifierFixerTest, IsMacro) {
auto Tokens = annotate("INT INTPR Foo int");
ASSERT_EQ(Tokens.size(), 5u) << Tokens;
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isPossibleMacro(Tokens[0]));
- EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isPossibleMacro(Tokens[1]));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isPossibleMacro(Tokens[2]));
- EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isPossibleMacro(Tokens[3]));
+ EXPECT_TRUE(isPossibleMacro(Tokens[0]));
+ EXPECT_TRUE(isPossibleMacro(Tokens[1]));
+ EXPECT_FALSE(isPossibleMacro(Tokens[2]));
+ EXPECT_FALSE(isPossibleMacro(Tokens[3]));
}
TEST_F(QualifierFixerTest, OverlappingQualifier) {
More information about the cfe-commits
mailing list