wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SyntaxTree][NFC] follow naming convention + remove auto on empty vector declaration 

Differential Revision: https://reviews.llvm.org/D88004
This commit is contained in:
Eduardo Caldas 2020-09-21 08:39:02 +00:00
parent 9ba3b7449d
commit 87f0b51d68
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Tooling/Syntax/BuildTree.cpp
View File

@ -155,10 +155,10 @@ private:
} // namespace } // namespace
static CallExpr::arg_range dropDefaultArgs(CallExpr::arg_range Args) { static CallExpr::arg_range dropDefaultArgs(CallExpr::arg_range Args) {
auto firstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto it) { auto FirstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto It) {
return isa<CXXDefaultArgExpr>(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) { static syntax::NodeKind getOperatorNodeKind(const CXXOperatorCallExpr &E) {
@ -954,12 +954,12 @@ public:
bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc QualifierLoc) { bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc QualifierLoc) {
if (!QualifierLoc) if (!QualifierLoc)
return true; return true;
for (auto it = QualifierLoc; it; it = it.getPrefix()) { for (auto It = QualifierLoc; It; It = It.getPrefix()) {
auto *NS = buildNameSpecifier(it); auto *NS = buildNameSpecifier(It);
if (!NS) if (!NS)
return false; return false;
Builder.markChild(NS, syntax::NodeRole::ListElement); 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()), Builder.foldNode(Builder.getRange(QualifierLoc.getSourceRange()),
new (allocator()) syntax::NestedNameSpecifier, new (allocator()) syntax::NestedNameSpecifier,

14
clang/lib/Tooling/Syntax/Nodes.cpp
View File

@ -226,23 +226,23 @@ raw_ostream &syntax::operator<<(raw_ostream &OS, NodeRole R) {
// vector // vector
std::vector<syntax::NameSpecifier *> std::vector<syntax::NameSpecifier *>
syntax::NestedNameSpecifier::getSpecifiers() { syntax::NestedNameSpecifier::getSpecifiers() {
auto specifiersAsNodes = getElementsAsNodes(); auto SpecifiersAsNodes = getElementsAsNodes();
std::vector<syntax::NameSpecifier *> Children; std::vector<syntax::NameSpecifier *> Children;
for (const auto &element : specifiersAsNodes) { for (const auto &Element : SpecifiersAsNodes) {
Children.push_back(llvm::cast<syntax::NameSpecifier>(element)); Children.push_back(llvm::cast<syntax::NameSpecifier>(Element));
} }
return Children; return Children;
} }
std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>> std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
syntax::NestedNameSpecifier::getSpecifiersAndDoubleColons() { syntax::NestedNameSpecifier::getSpecifiersAndDoubleColons() {
auto specifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters(); auto SpecifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters();
std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>> std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
Children; Children;
for (const auto &specifierAndDoubleColon : specifiersAsNodesAndDoubleColons) { for (const auto &SpecifierAndDoubleColon : SpecifiersAsNodesAndDoubleColons) {
Children.push_back( Children.push_back(
{llvm::cast<syntax::NameSpecifier>(specifierAndDoubleColon.element), {llvm::cast<syntax::NameSpecifier>(SpecifierAndDoubleColon.element),
specifierAndDoubleColon.delimiter}); SpecifierAndDoubleColon.delimiter});
} }
return Children; return Children;
} }

50
clang/lib/Tooling/Syntax/Tree.cpp
View File

@ -153,7 +153,7 @@ static void dumpLeaf(raw_ostream &OS, const syntax::Leaf *L,
static void dumpNode(raw_ostream &OS, const syntax::Node *N, static void dumpNode(raw_ostream &OS, const syntax::Node *N,
const SourceManager &SM, std::vector<bool> IndentMask) { 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) if (N->getRole() != syntax::NodeRole::Unknown)
OS << " " << N->getRole(); OS << " " << N->getRole();
if (!N->isOriginal()) if (!N->isOriginal())
@ -167,14 +167,14 @@ static void dumpNode(raw_ostream &OS, const syntax::Node *N,
OS << "'"; OS << "'";
dumpLeaf(OS, L, SM); dumpLeaf(OS, L, SM);
OS << "'"; OS << "'";
dumpExtraInfo(N); DumpExtraInfo(N);
OS << "\n"; OS << "\n";
return; return;
} }
const auto *T = cast<syntax::Tree>(N); const auto *T = cast<syntax::Tree>(N);
OS << T->getKind(); OS << T->getKind();
dumpExtraInfo(N); DumpExtraInfo(N);
OS << "\n"; OS << "\n";
for (const auto *It = T->getFirstChild(); It; It = It->getNextSibling()) { for (const auto *It = T->getFirstChild(); It; It = It->getNextSibling()) {
@ -302,20 +302,20 @@ syntax::List::getElementsAsNodesAndDelimiters() {
if (!getFirstChild()) if (!getFirstChild())
return {}; return {};
auto children = std::vector<syntax::List::ElementAndDelimiter<Node>>(); std::vector<syntax::List::ElementAndDelimiter<Node>> Children;
syntax::Node *elementWithoutDelimiter = nullptr; syntax::Node *ElementWithoutDelimiter = nullptr;
for (auto *C = getFirstChild(); C; C = C->getNextSibling()) { for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
switch (C->getRole()) { switch (C->getRole()) {
case syntax::NodeRole::ListElement: { case syntax::NodeRole::ListElement: {
if (elementWithoutDelimiter) { if (ElementWithoutDelimiter) {
children.push_back({elementWithoutDelimiter, nullptr}); Children.push_back({ElementWithoutDelimiter, nullptr});
} }
elementWithoutDelimiter = C; ElementWithoutDelimiter = C;
break; break;
} }
case syntax::NodeRole::ListDelimiter: { case syntax::NodeRole::ListDelimiter: {
children.push_back({elementWithoutDelimiter, cast<syntax::Leaf>(C)}); Children.push_back({ElementWithoutDelimiter, cast<syntax::Leaf>(C)});
elementWithoutDelimiter = nullptr; ElementWithoutDelimiter = nullptr;
break; break;
} }
default: default:
@ -326,19 +326,19 @@ syntax::List::getElementsAsNodesAndDelimiters() {
switch (getTerminationKind()) { switch (getTerminationKind()) {
case syntax::List::TerminationKind::Separated: { case syntax::List::TerminationKind::Separated: {
children.push_back({elementWithoutDelimiter, nullptr}); Children.push_back({ElementWithoutDelimiter, nullptr});
break; break;
} }
case syntax::List::TerminationKind::Terminated: case syntax::List::TerminationKind::Terminated:
case syntax::List::TerminationKind::MaybeTerminated: { case syntax::List::TerminationKind::MaybeTerminated: {
if (elementWithoutDelimiter) { if (ElementWithoutDelimiter) {
children.push_back({elementWithoutDelimiter, nullptr}); Children.push_back({ElementWithoutDelimiter, nullptr});
} }
break; break;
} }
} }
return children; return Children;
} }
// Almost the same implementation of `getElementsAsNodesAndDelimiters` but // Almost the same implementation of `getElementsAsNodesAndDelimiters` but
@ -347,20 +347,20 @@ std::vector<syntax::Node *> syntax::List::getElementsAsNodes() {
if (!getFirstChild()) if (!getFirstChild())
return {}; return {};
auto children = std::vector<syntax::Node *>(); std::vector<syntax::Node *> Children;
syntax::Node *elementWithoutDelimiter = nullptr; syntax::Node *ElementWithoutDelimiter = nullptr;
for (auto *C = getFirstChild(); C; C = C->getNextSibling()) { for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
switch (C->getRole()) { switch (C->getRole()) {
case syntax::NodeRole::ListElement: { case syntax::NodeRole::ListElement: {
if (elementWithoutDelimiter) { if (ElementWithoutDelimiter) {
children.push_back(elementWithoutDelimiter); Children.push_back(ElementWithoutDelimiter);
} }
elementWithoutDelimiter = C; ElementWithoutDelimiter = C;
break; break;
} }
case syntax::NodeRole::ListDelimiter: { case syntax::NodeRole::ListDelimiter: {
children.push_back(elementWithoutDelimiter); Children.push_back(ElementWithoutDelimiter);
elementWithoutDelimiter = nullptr; ElementWithoutDelimiter = nullptr;
break; break;
} }
default: default:
@ -370,19 +370,19 @@ std::vector<syntax::Node *> syntax::List::getElementsAsNodes() {
switch (getTerminationKind()) { switch (getTerminationKind()) {
case syntax::List::TerminationKind::Separated: { case syntax::List::TerminationKind::Separated: {
children.push_back(elementWithoutDelimiter); Children.push_back(ElementWithoutDelimiter);
break; break;
} }
case syntax::List::TerminationKind::Terminated: case syntax::List::TerminationKind::Terminated:
case syntax::List::TerminationKind::MaybeTerminated: { case syntax::List::TerminationKind::MaybeTerminated: {
if (elementWithoutDelimiter) { if (ElementWithoutDelimiter) {
children.push_back(elementWithoutDelimiter); Children.push_back(ElementWithoutDelimiter);
} }
break; break;
} }
} }
return children; return Children;
} }
clang::tok::TokenKind syntax::List::getDelimiterTokenKind() const { clang::tok::TokenKind syntax::List::getDelimiterTokenKind() const {