[clang-format][NFC] Move LeftRightQualifierAlignmentFixer::is...() #91930
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move static member functions LeftRightQualifierAlignmentFixer::is...() out the class so that llvm#91712 can reland.
|
@llvm/pr-subscribers-clang-format Author: Owen Pan (owenca) ChangesMove static member functions LeftRightQualifierAlignmentFixer::is...() out the class so that #91712 can reland. Full diff: https://github.com/llvm/llvm-project/pull/91930.diff 3 Files Affected:
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) {
|
HazardyKnusperkeks
approved these changes
May 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move static member functions LeftRightQualifierAlignmentFixer::is...() out of the class so that #91712 can reland.