aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Format/QualifierAlignmentFixer.cpp
diff options
context:
space:
mode:
authorMarek Kurdej <marek.kurdej+llvm.org@gmail.com>2022-02-02 15:00:40 +0100
committerMarek Kurdej <marek.kurdej+llvm.org@gmail.com>2022-02-02 15:28:53 +0100
commitd079995dd032e991bac295fb1a879efd32f20460 (patch)
tree2e5fa9637987943afb0e60b6be911aba26080963 /clang/lib/Format/QualifierAlignmentFixer.cpp
parent3cc544772848682bc77ff63db659a5aa4b3d4e6b (diff)
downloadllvm-d079995dd032e991bac295fb1a879efd32f20460.zip
llvm-d079995dd032e991bac295fb1a879efd32f20460.tar.gz
llvm-d079995dd032e991bac295fb1a879efd32f20460.tar.bz2
[clang-format] Elide unnecessary braces. NFC.
Diffstat (limited to 'clang/lib/Format/QualifierAlignmentFixer.cpp')
-rw-r--r--clang/lib/Format/QualifierAlignmentFixer.cpp27
1 files changed, 9 insertions, 18 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp
index b3a4684..aeec8da 100644
--- a/clang/lib/Format/QualifierAlignmentFixer.cpp
+++ b/clang/lib/Format/QualifierAlignmentFixer.cpp
@@ -149,16 +149,14 @@ static void insertQualifierBefore(const SourceManager &SourceMgr,
}
static bool endsWithSpace(const std::string &s) {
- if (s.empty()) {
+ if (s.empty())
return false;
- }
return isspace(s.back());
}
static bool startsWithSpace(const std::string &s) {
- if (s.empty()) {
+ if (s.empty())
return false;
- }
return isspace(s.front());
}
@@ -182,9 +180,8 @@ static void rotateTokens(const SourceManager &SourceMgr,
// Then move through the other tokens.
auto *Tok = Begin;
while (Tok != End) {
- if (!NewText.empty() && !endsWithSpace(NewText)) {
+ if (!NewText.empty() && !endsWithSpace(NewText))
NewText += " ";
- }
NewText += Tok->TokenText;
Tok = Tok->Next;
@@ -192,9 +189,8 @@ static void rotateTokens(const SourceManager &SourceMgr,
// If we are rotating to the right we move the first token to the back.
if (!Left) {
- if (!NewText.empty() && !startsWithSpace(NewText)) {
+ if (!NewText.empty() && !startsWithSpace(NewText))
NewText += " ";
- }
NewText += First->TokenText;
}
@@ -253,9 +249,8 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight(
// The case `const Foo &&` -> `Foo const &&`
// The case `const std::Foo &&` -> `std::Foo const &&`
// The case `const std::Foo<T> &&` -> `std::Foo<T> const &&`
- while (Next && Next->isOneOf(tok::identifier, tok::coloncolon)) {
+ while (Next && Next->isOneOf(tok::identifier, tok::coloncolon))
Next = Next->Next;
- }
if (Next && Next->is(TT_TemplateOpener)) {
Next = Next->MatchingParen;
// Move to the end of any template class members e.g.
@@ -296,9 +291,8 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
break;
}
- if (!Qual) {
+ if (!Qual)
return Tok;
- }
if (LastQual && Qual != LastQual && Qual->is(QualifierType)) {
rotateTokens(SourceMgr, Fixes, Tok, Qual, /*Left=*/true);
@@ -316,14 +310,12 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
}
if (Tok->is(TT_TemplateOpener) && Tok->Next &&
(Tok->Next->is(tok::identifier) || Tok->Next->isSimpleTypeSpecifier()) &&
- Tok->Next->Next && Tok->Next->Next->is(QualifierType)) {
+ Tok->Next->Next && Tok->Next->Next->is(QualifierType))
rotateTokens(SourceMgr, Fixes, Tok->Next, Tok->Next->Next, /*Left=*/true);
- }
if (Tok->startsSequence(tok::identifier) && Tok->Next) {
if (Tok->Previous &&
- Tok->Previous->isOneOf(tok::star, tok::ampamp, tok::amp)) {
+ Tok->Previous->isOneOf(tok::star, tok::ampamp, tok::amp))
return Tok;
- }
const FormatToken *Next = Tok->Next;
// The case `std::Foo<T> const` -> `const std::Foo<T> &&`
while (Next && Next->isOneOf(tok::identifier, tok::coloncolon))
@@ -435,9 +427,8 @@ void QualifierAlignmentFixer::PrepareLeftRightOrdering(
tok::TokenKind QualifierToken =
LeftRightQualifierAlignmentFixer::getTokenFromQualifier(s);
- if (QualifierToken != tok::kw_typeof && QualifierToken != tok::identifier) {
+ if (QualifierToken != tok::kw_typeof && QualifierToken != tok::identifier)
Qualifiers.push_back(QualifierToken);
- }
if (left)
// Reverse the order for left aligned items.