[clang] a5af874 - [clang-format][NFC] Use `empty()` instead of comparing size() to 0 or 1
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Sun Jul 6 23:54:07 PDT 2025
Author: Owen Pan
Date: 2025-07-06T23:54:00-07:00
New Revision: a5af8745039f906c4fc4184a1fe0d35d42355f52
URL: https://github.com/llvm/llvm-project/commit/a5af8745039f906c4fc4184a1fe0d35d42355f52
DIFF: https://github.com/llvm/llvm-project/commit/a5af8745039f906c4fc4184a1fe0d35d42355f52.diff
LOG: [clang-format][NFC] Use `empty()` instead of comparing size() to 0 or 1
Added:
Modified:
clang/lib/Format/FormatTokenLexer.cpp
clang/lib/Format/MacroExpander.cpp
clang/lib/Format/UnwrappedLineParser.cpp
Removed:
################################################################################
diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp
index 05dee26735cc9..40b62b2a993d8 100644
--- a/clang/lib/Format/FormatTokenLexer.cpp
+++ b/clang/lib/Format/FormatTokenLexer.cpp
@@ -488,7 +488,7 @@ bool FormatTokenLexer::tryMergeCSharpKeywordVariables() {
// In C# transform identifier foreach into kw_foreach
bool FormatTokenLexer::tryTransformCSharpForEach() {
- if (Tokens.size() < 1)
+ if (Tokens.empty())
return false;
auto &Identifier = *(Tokens.end() - 1);
if (Identifier->isNot(tok::identifier))
@@ -948,7 +948,7 @@ void FormatTokenLexer::handleTableGenNumericLikeIdentifier() {
// 4. The first non-digit character is 'x', and the next is a hex digit.
// Note that in the case 3 and 4, if the next character does not exists in
// this token, the token is an identifier.
- if (Text.size() < 1 || Text[0] == '+' || Text[0] == '-')
+ if (Text.empty() || Text[0] == '+' || Text[0] == '-')
return;
const auto NonDigitPos = Text.find_if([](char C) { return !isdigit(C); });
// All the characters are digits
diff --git a/clang/lib/Format/MacroExpander.cpp b/clang/lib/Format/MacroExpander.cpp
index 37c25e6941ef2..85a53c9bb12fe 100644
--- a/clang/lib/Format/MacroExpander.cpp
+++ b/clang/lib/Format/MacroExpander.cpp
@@ -226,7 +226,7 @@ MacroExpander::expand(FormatToken *ID,
New->MacroCtx = MacroExpansion(MR_Hidden);
pushToken(New);
}
- assert(Result.size() >= 1 && Result.back()->is(tok::eof));
+ assert(!Result.empty() && Result.back()->is(tok::eof));
if (Result.size() > 1) {
++Result[0]->MacroCtx->StartOfExpansion;
++Result[Result.size() - 2]->MacroCtx->EndOfExpansion;
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index c961ce7959750..7e8634aeec4e0 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -4601,7 +4601,7 @@ void UnwrappedLineParser::addUnwrappedLine(LineLevel AdjustLevel) {
} else {
// At the top level we only get here when no unexpansion is going on, or
// when conditional formatting led to unfinished macro reconstructions.
- assert(!Reconstruct || (CurrentLines != &Lines) || PPStack.size() > 0);
+ assert(!Reconstruct || (CurrentLines != &Lines) || !PPStack.empty());
CurrentLines->push_back(std::move(*Line));
}
Line->Tokens.clear();
More information about the cfe-commits
mailing list