[clang] 87f0b51 - [SyntaxTree][NFC] follow naming convention + remove auto on empty vector declaration
Eduardo Caldas via cfe-commits
cfe-commits at lists.llvm.org
Mon Sep 21 04:45:25 PDT 2020
Author: Eduardo Caldas
Date: 2020-09-21T11:45:15Z
New Revision: 87f0b51d68de40e7106be89d934b5191d983e3d5
URL: https://github.com/llvm/llvm-project/commit/87f0b51d68de40e7106be89d934b5191d983e3d5
DIFF: https://github.com/llvm/llvm-project/commit/87f0b51d68de40e7106be89d934b5191d983e3d5.diff
LOG: [SyntaxTree][NFC] follow naming convention + remove auto on empty vector declaration
Differential Revision: https://reviews.llvm.org/D88004
Added:
Modified:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/lib/Tooling/Syntax/Nodes.cpp
clang/lib/Tooling/Syntax/Tree.cpp
Removed:
################################################################################
diff --git a/clang/lib/Tooling/Syntax/BuildTree.cpp b/clang/lib/Tooling/Syntax/BuildTree.cpp
index 3e0573ac4ffc..4d365090abf1 100644
--- a/clang/lib/Tooling/Syntax/BuildTree.cpp
+++ b/clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -155,10 +155,10 @@ struct GetStartLoc : TypeLocVisitor<GetStartLoc, SourceLocation> {
} // namespace
static CallExpr::arg_range dropDefaultArgs(CallExpr::arg_range Args) {
- auto firstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto it) {
- return isa<CXXDefaultArgExpr>(it);
+ auto FirstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto It) {
+ return isa<CXXDefaultArgExpr>(It);
});
- return llvm::make_range(Args.begin(), firstDefaultArg);
+ return llvm::make_range(Args.begin(), FirstDefaultArg);
}
static syntax::NodeKind getOperatorNodeKind(const CXXOperatorCallExpr &E) {
@@ -954,12 +954,12 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> {
bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc QualifierLoc) {
if (!QualifierLoc)
return true;
- for (auto it = QualifierLoc; it; it = it.getPrefix()) {
- auto *NS = buildNameSpecifier(it);
+ for (auto It = QualifierLoc; It; It = It.getPrefix()) {
+ auto *NS = buildNameSpecifier(It);
if (!NS)
return false;
Builder.markChild(NS, syntax::NodeRole::ListElement);
- Builder.markChildToken(it.getEndLoc(), syntax::NodeRole::ListDelimiter);
+ Builder.markChildToken(It.getEndLoc(), syntax::NodeRole::ListDelimiter);
}
Builder.foldNode(Builder.getRange(QualifierLoc.getSourceRange()),
new (allocator()) syntax::NestedNameSpecifier,
diff --git a/clang/lib/Tooling/Syntax/Nodes.cpp b/clang/lib/Tooling/Syntax/Nodes.cpp
index bb63585cbd7c..24b7a8596382 100644
--- a/clang/lib/Tooling/Syntax/Nodes.cpp
+++ b/clang/lib/Tooling/Syntax/Nodes.cpp
@@ -226,23 +226,23 @@ raw_ostream &syntax::operator<<(raw_ostream &OS, NodeRole R) {
// vector
std::vector<syntax::NameSpecifier *>
syntax::NestedNameSpecifier::getSpecifiers() {
- auto specifiersAsNodes = getElementsAsNodes();
+ auto SpecifiersAsNodes = getElementsAsNodes();
std::vector<syntax::NameSpecifier *> Children;
- for (const auto &element : specifiersAsNodes) {
- Children.push_back(llvm::cast<syntax::NameSpecifier>(element));
+ for (const auto &Element : SpecifiersAsNodes) {
+ Children.push_back(llvm::cast<syntax::NameSpecifier>(Element));
}
return Children;
}
std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
syntax::NestedNameSpecifier::getSpecifiersAndDoubleColons() {
- auto specifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters();
+ auto SpecifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters();
std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
Children;
- for (const auto &specifierAndDoubleColon : specifiersAsNodesAndDoubleColons) {
+ for (const auto &SpecifierAndDoubleColon : SpecifiersAsNodesAndDoubleColons) {
Children.push_back(
- {llvm::cast<syntax::NameSpecifier>(specifierAndDoubleColon.element),
- specifierAndDoubleColon.delimiter});
+ {llvm::cast<syntax::NameSpecifier>(SpecifierAndDoubleColon.element),
+ SpecifierAndDoubleColon.delimiter});
}
return Children;
}
diff --git a/clang/lib/Tooling/Syntax/Tree.cpp b/clang/lib/Tooling/Syntax/Tree.cpp
index 1edd2583105a..2c77e8f64944 100644
--- a/clang/lib/Tooling/Syntax/Tree.cpp
+++ b/clang/lib/Tooling/Syntax/Tree.cpp
@@ -153,7 +153,7 @@ static void dumpLeaf(raw_ostream &OS, const syntax::Leaf *L,
static void dumpNode(raw_ostream &OS, const syntax::Node *N,
const SourceManager &SM, std::vector<bool> IndentMask) {
- auto dumpExtraInfo = [&OS](const syntax::Node *N) {
+ auto DumpExtraInfo = [&OS](const syntax::Node *N) {
if (N->getRole() != syntax::NodeRole::Unknown)
OS << " " << N->getRole();
if (!N->isOriginal())
@@ -167,14 +167,14 @@ static void dumpNode(raw_ostream &OS, const syntax::Node *N,
OS << "'";
dumpLeaf(OS, L, SM);
OS << "'";
- dumpExtraInfo(N);
+ DumpExtraInfo(N);
OS << "\n";
return;
}
const auto *T = cast<syntax::Tree>(N);
OS << T->getKind();
- dumpExtraInfo(N);
+ DumpExtraInfo(N);
OS << "\n";
for (const auto *It = T->getFirstChild(); It; It = It->getNextSibling()) {
@@ -302,20 +302,20 @@ syntax::List::getElementsAsNodesAndDelimiters() {
if (!getFirstChild())
return {};
- auto children = std::vector<syntax::List::ElementAndDelimiter<Node>>();
- syntax::Node *elementWithoutDelimiter = nullptr;
+ std::vector<syntax::List::ElementAndDelimiter<Node>> Children;
+ syntax::Node *ElementWithoutDelimiter = nullptr;
for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
switch (C->getRole()) {
case syntax::NodeRole::ListElement: {
- if (elementWithoutDelimiter) {
- children.push_back({elementWithoutDelimiter, nullptr});
+ if (ElementWithoutDelimiter) {
+ Children.push_back({ElementWithoutDelimiter, nullptr});
}
- elementWithoutDelimiter = C;
+ ElementWithoutDelimiter = C;
break;
}
case syntax::NodeRole::ListDelimiter: {
- children.push_back({elementWithoutDelimiter, cast<syntax::Leaf>(C)});
- elementWithoutDelimiter = nullptr;
+ Children.push_back({ElementWithoutDelimiter, cast<syntax::Leaf>(C)});
+ ElementWithoutDelimiter = nullptr;
break;
}
default:
@@ -326,19 +326,19 @@ syntax::List::getElementsAsNodesAndDelimiters() {
switch (getTerminationKind()) {
case syntax::List::TerminationKind::Separated: {
- children.push_back({elementWithoutDelimiter, nullptr});
+ Children.push_back({ElementWithoutDelimiter, nullptr});
break;
}
case syntax::List::TerminationKind::Terminated:
case syntax::List::TerminationKind::MaybeTerminated: {
- if (elementWithoutDelimiter) {
- children.push_back({elementWithoutDelimiter, nullptr});
+ if (ElementWithoutDelimiter) {
+ Children.push_back({ElementWithoutDelimiter, nullptr});
}
break;
}
}
- return children;
+ return Children;
}
// Almost the same implementation of `getElementsAsNodesAndDelimiters` but
@@ -347,20 +347,20 @@ std::vector<syntax::Node *> syntax::List::getElementsAsNodes() {
if (!getFirstChild())
return {};
- auto children = std::vector<syntax::Node *>();
- syntax::Node *elementWithoutDelimiter = nullptr;
+ std::vector<syntax::Node *> Children;
+ syntax::Node *ElementWithoutDelimiter = nullptr;
for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
switch (C->getRole()) {
case syntax::NodeRole::ListElement: {
- if (elementWithoutDelimiter) {
- children.push_back(elementWithoutDelimiter);
+ if (ElementWithoutDelimiter) {
+ Children.push_back(ElementWithoutDelimiter);
}
- elementWithoutDelimiter = C;
+ ElementWithoutDelimiter = C;
break;
}
case syntax::NodeRole::ListDelimiter: {
- children.push_back(elementWithoutDelimiter);
- elementWithoutDelimiter = nullptr;
+ Children.push_back(ElementWithoutDelimiter);
+ ElementWithoutDelimiter = nullptr;
break;
}
default:
@@ -370,19 +370,19 @@ std::vector<syntax::Node *> syntax::List::getElementsAsNodes() {
switch (getTerminationKind()) {
case syntax::List::TerminationKind::Separated: {
- children.push_back(elementWithoutDelimiter);
+ Children.push_back(ElementWithoutDelimiter);
break;
}
case syntax::List::TerminationKind::Terminated:
case syntax::List::TerminationKind::MaybeTerminated: {
- if (elementWithoutDelimiter) {
- children.push_back(elementWithoutDelimiter);
+ if (ElementWithoutDelimiter) {
+ Children.push_back(ElementWithoutDelimiter);
}
break;
}
}
- return children;
+ return Children;
}
clang::tok::TokenKind syntax::List::getDelimiterTokenKind() const {
More information about the cfe-commits
mailing list