[PATCH] D121434: [clang-format][NFC] Group QualifierAlignment with other C++ passes
This revision was automatically updated to reflect the committed changes.
Closed by commit rG9f616a467fc7: [clang-format][NFC] Group QualifierAlignment
with other C++ passes (authored by owenpan).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D121434/new/
https://reviews.llvm.org/D121434
Files:
clang/lib/Format/Format.cpp
Index: clang/lib/Format/Format.cpp
===
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -1784,9 +1784,9 @@
namespace {
-class BracesRemover : public TokenAnalyzer {
+class BracesInserter : public TokenAnalyzer {
public:
- BracesRemover(const Environment , const FormatStyle )
+ BracesInserter(const Environment , const FormatStyle )
: TokenAnalyzer(Env, Style) {}
std::pair
@@ -1795,40 +1795,40 @@
FormatTokenLexer ) override {
AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
tooling::Replacements Result;
-removeBraces(AnnotatedLines, Result);
+insertBraces(AnnotatedLines, Result);
return {Result, 0};
}
private:
- void removeBraces(SmallVectorImpl ,
+ void insertBraces(SmallVectorImpl ,
tooling::Replacements ) {
const auto = Env.getSourceManager();
for (AnnotatedLine *Line : Lines) {
- removeBraces(Line->Children, Result);
+ insertBraces(Line->Children, Result);
if (!Line->Affected)
continue;
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
-if (!Token->Optional)
+if (Token->BraceCount == 0)
continue;
-assert(Token->isOneOf(tok::l_brace, tok::r_brace));
-assert(Token->Next || Token == Line->Last);
-const auto Start =
-Token == Line->Last || (Token->Next->is(tok::kw_else) &&
-Token->Next->NewlinesBefore > 0)
-? Token->WhitespaceRange.getBegin()
-: Token->Tok.getLocation();
-const auto Range =
-CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
-cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
+std::string Brace;
+if (Token->BraceCount < 0) {
+ assert(Token->BraceCount == -1);
+ Brace = '{';
+} else {
+ Brace = '\n' + std::string(Token->BraceCount, '}');
+}
+Token->BraceCount = 0;
+const auto Start = Token->Tok.getEndLoc();
+cantFail(Result.add(tooling::Replacement(SourceMgr, Start, 0, Brace)));
}
}
}
};
-class BracesInserter : public TokenAnalyzer {
+class BracesRemover : public TokenAnalyzer {
public:
- BracesInserter(const Environment , const FormatStyle )
+ BracesRemover(const Environment , const FormatStyle )
: TokenAnalyzer(Env, Style) {}
std::pair
@@ -1837,32 +1837,32 @@
FormatTokenLexer ) override {
AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
tooling::Replacements Result;
-insertBraces(AnnotatedLines, Result);
+removeBraces(AnnotatedLines, Result);
return {Result, 0};
}
private:
- void insertBraces(SmallVectorImpl ,
+ void removeBraces(SmallVectorImpl ,
tooling::Replacements ) {
const auto = Env.getSourceManager();
for (AnnotatedLine *Line : Lines) {
- insertBraces(Line->Children, Result);
+ removeBraces(Line->Children, Result);
if (!Line->Affected)
continue;
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
-if (Token->BraceCount == 0)
+if (!Token->Optional)
continue;
-std::string Brace;
-if (Token->BraceCount < 0) {
- assert(Token->BraceCount == -1);
- Brace = '{';
-} else {
- Brace = '\n' + std::string(Token->BraceCount, '}');
-}
-Token->BraceCount = 0;
-const auto Start = Token->Tok.getEndLoc();
-cantFail(Result.add(tooling::Replacement(SourceMgr, Start, 0, Brace)));
+assert(Token->isOneOf(tok::l_brace, tok::r_brace));
+assert(Token->Next || Token == Line->Last);
+const auto Start =
+Token == Line->Last || (Token->Next->is(tok::kw_else) &&
+Token->Next->NewlinesBefore > 0)
+? Token->WhitespaceRange.getBegin()
+: Token->Tok.getLocation();
+const auto Range =
+CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
+cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
}
}
}
@@ -3169,18 +3169,18 @@
typedef std::function(
const Environment &)>
AnalyzerPass;
- SmallVector Passes;
-
- if (Style.isCpp() && Style.QualifierAlignment != FormatStyle::QAS_Leave) {
-Passes.emplace_back([&](const Environment ) {
-
[PATCH] D121434: [clang-format][NFC] Group QualifierAlignment with other C++ passes
owenpan updated this revision to Diff 414572.
owenpan added a comment.
Swapped the order of the definitions of `BracesRemover` and `BracesInserter`.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D121434/new/
https://reviews.llvm.org/D121434
Files:
clang/lib/Format/Format.cpp
Index: clang/lib/Format/Format.cpp
===
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -1784,9 +1784,9 @@
namespace {
-class BracesRemover : public TokenAnalyzer {
+class BracesInserter : public TokenAnalyzer {
public:
- BracesRemover(const Environment , const FormatStyle )
+ BracesInserter(const Environment , const FormatStyle )
: TokenAnalyzer(Env, Style) {}
std::pair
@@ -1795,40 +1795,40 @@
FormatTokenLexer ) override {
AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
tooling::Replacements Result;
-removeBraces(AnnotatedLines, Result);
+insertBraces(AnnotatedLines, Result);
return {Result, 0};
}
private:
- void removeBraces(SmallVectorImpl ,
+ void insertBraces(SmallVectorImpl ,
tooling::Replacements ) {
const auto = Env.getSourceManager();
for (AnnotatedLine *Line : Lines) {
- removeBraces(Line->Children, Result);
+ insertBraces(Line->Children, Result);
if (!Line->Affected)
continue;
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
-if (!Token->Optional)
+if (Token->BraceCount == 0)
continue;
-assert(Token->isOneOf(tok::l_brace, tok::r_brace));
-assert(Token->Next || Token == Line->Last);
-const auto Start =
-Token == Line->Last || (Token->Next->is(tok::kw_else) &&
-Token->Next->NewlinesBefore > 0)
-? Token->WhitespaceRange.getBegin()
-: Token->Tok.getLocation();
-const auto Range =
-CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
-cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
+std::string Brace;
+if (Token->BraceCount < 0) {
+ assert(Token->BraceCount == -1);
+ Brace = '{';
+} else {
+ Brace = '\n' + std::string(Token->BraceCount, '}');
+}
+Token->BraceCount = 0;
+const auto Start = Token->Tok.getEndLoc();
+cantFail(Result.add(tooling::Replacement(SourceMgr, Start, 0, Brace)));
}
}
}
};
-class BracesInserter : public TokenAnalyzer {
+class BracesRemover : public TokenAnalyzer {
public:
- BracesInserter(const Environment , const FormatStyle )
+ BracesRemover(const Environment , const FormatStyle )
: TokenAnalyzer(Env, Style) {}
std::pair
@@ -1837,32 +1837,32 @@
FormatTokenLexer ) override {
AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
tooling::Replacements Result;
-insertBraces(AnnotatedLines, Result);
+removeBraces(AnnotatedLines, Result);
return {Result, 0};
}
private:
- void insertBraces(SmallVectorImpl ,
+ void removeBraces(SmallVectorImpl ,
tooling::Replacements ) {
const auto = Env.getSourceManager();
for (AnnotatedLine *Line : Lines) {
- insertBraces(Line->Children, Result);
+ removeBraces(Line->Children, Result);
if (!Line->Affected)
continue;
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
-if (Token->BraceCount == 0)
+if (!Token->Optional)
continue;
-std::string Brace;
-if (Token->BraceCount < 0) {
- assert(Token->BraceCount == -1);
- Brace = '{';
-} else {
- Brace = '\n' + std::string(Token->BraceCount, '}');
-}
-Token->BraceCount = 0;
-const auto Start = Token->Tok.getEndLoc();
-cantFail(Result.add(tooling::Replacement(SourceMgr, Start, 0, Brace)));
+assert(Token->isOneOf(tok::l_brace, tok::r_brace));
+assert(Token->Next || Token == Line->Last);
+const auto Start =
+Token == Line->Last || (Token->Next->is(tok::kw_else) &&
+Token->Next->NewlinesBefore > 0)
+? Token->WhitespaceRange.getBegin()
+: Token->Tok.getLocation();
+const auto Range =
+CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
+cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
}
}
}
@@ -3169,18 +3169,18 @@
typedef std::function(
const Environment &)>
AnalyzerPass;
- SmallVector Passes;
-
- if (Style.isCpp() && Style.QualifierAlignment != FormatStyle::QAS_Leave) {
-Passes.emplace_back([&](const Environment ) {
- return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
-
[PATCH] D121434: [clang-format][NFC] Group QualifierAlignment with other C++ passes
owenpan created this revision.
owenpan added reviewers: MyDeveloperDay, curdeius, HazardyKnusperkeks.
owenpan added a project: clang-format.
Herald added a project: All.
owenpan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Also increases the initial size of Passes to 8.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D121434
Files:
clang/lib/Format/Format.cpp
Index: clang/lib/Format/Format.cpp
===
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -3169,18 +3169,18 @@
typedef std::function(
const Environment &)>
AnalyzerPass;
- SmallVector Passes;
-
- if (Style.isCpp() && Style.QualifierAlignment != FormatStyle::QAS_Leave) {
-Passes.emplace_back([&](const Environment ) {
- return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
- FirstStartColumn, NextStartColumn,
- LastStartColumn, FileName)
- .process();
-});
- }
+ SmallVector Passes;
if (Style.isCpp()) {
+if (Style.QualifierAlignment != FormatStyle::QAS_Leave) {
+ Passes.emplace_back([&](const Environment ) {
+return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
+ FirstStartColumn, NextStartColumn,
+ LastStartColumn, FileName)
+.process();
+ });
+}
+
if (Style.InsertBraces)
Passes.emplace_back([&](const Environment ) {
return BracesInserter(Env, Expanded).process();
Index: clang/lib/Format/Format.cpp
===
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -3169,18 +3169,18 @@
typedef std::function(
const Environment &)>
AnalyzerPass;
- SmallVector Passes;
-
- if (Style.isCpp() && Style.QualifierAlignment != FormatStyle::QAS_Leave) {
-Passes.emplace_back([&](const Environment ) {
- return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
- FirstStartColumn, NextStartColumn,
- LastStartColumn, FileName)
- .process();
-});
- }
+ SmallVector Passes;
if (Style.isCpp()) {
+if (Style.QualifierAlignment != FormatStyle::QAS_Leave) {
+ Passes.emplace_back([&](const Environment ) {
+return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
+ FirstStartColumn, NextStartColumn,
+ LastStartColumn, FileName)
+.process();
+ });
+}
+
if (Style.InsertBraces)
Passes.emplace_back([&](const Environment ) {
return BracesInserter(Env, Expanded).process();
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
