eduucaldas updated this revision to Diff 268397.
eduucaldas added a comment.
answer comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D81135/new/
https://reviews.llvm.org/D81135
Files:
clang/include/clang/Tooling/Syntax/Nodes.h
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/lib/Tooling/Syntax/Nodes.cpp
Index: clang/lib/Tooling/Syntax/Nodes.cpp
===================================================================
--- clang/lib/Tooling/Syntax/Nodes.cpp
+++ clang/lib/Tooling/Syntax/Nodes.cpp
@@ -120,18 +120,14 @@
return OS << "IfStatement_elseKeyword";
case syntax::NodeRole::IfStatement_elseStatement:
return OS << "IfStatement_elseStatement";
- case syntax::NodeRole::IntegerLiteralExpression_literalToken:
+ case syntax::NodeRole::LiteralToken:
return OS << "IntegerLiteralExpression_literalToken";
- case syntax::NodeRole::CxxNullPtrExpression_keyword:
- return OS << "CxxNullPtrExpression_keyword";
- case syntax::NodeRole::UnaryOperatorExpression_operatorToken:
- return OS << "UnaryOperatorExpression_operatorToken";
+ case syntax::NodeRole::OperatorExpression_operatorToken:
+ return OS << "OperatorExpression_operatorToken";
case syntax::NodeRole::UnaryOperatorExpression_operand:
return OS << "UnaryOperatorExpression_operand";
case syntax::NodeRole::BinaryOperatorExpression_leftHandSide:
return OS << "BinaryOperatorExpression_leftHandSide";
- case syntax::NodeRole::BinaryOperatorExpression_operatorToken:
- return OS << "BinaryOperatorExpression_operatorToken";
case syntax::NodeRole::BinaryOperatorExpression_rightHandSide:
return OS << "BinaryOperatorExpression_rightHandSide";
case syntax::NodeRole::ReturnStatement_value:
@@ -154,8 +150,8 @@
return OS << "ExplicitTemplateInstantiation_declaration";
case syntax::NodeRole::ArraySubscript_sizeExpression:
return OS << "ArraySubscript_sizeExpression";
- case syntax::NodeRole::TrailingReturnType_arrow:
- return OS << "TrailingReturnType_arrow";
+ case syntax::NodeRole::TrailingReturnType_arrowToken:
+ return OS << "TrailingReturnType_arrowToken";
case syntax::NodeRole::TrailingReturnType_declarator:
return OS << "TrailingReturnType_declarator";
case syntax::NodeRole::ParametersAndQualifiers_parameter:
@@ -168,12 +164,12 @@
syntax::Leaf *syntax::IntegerLiteralExpression::literal() {
return llvm::cast_or_null<syntax::Leaf>(
- findChild(syntax::NodeRole::IntegerLiteralExpression_literalToken));
+ findChild(syntax::NodeRole::LiteralToken));
}
syntax::Leaf *syntax::CxxNullPtrExpression::nullPtrKeyword() {
return llvm::cast_or_null<syntax::Leaf>(
- findChild(syntax::NodeRole::CxxNullPtrExpression_keyword));
+ findChild(syntax::NodeRole::LiteralToken));
}
syntax::Expression *syntax::BinaryOperatorExpression::lhs() {
@@ -183,7 +179,7 @@
syntax::Leaf *syntax::UnaryOperatorExpression::operatorToken() {
return llvm::cast_or_null<syntax::Leaf>(
- findChild(syntax::NodeRole::UnaryOperatorExpression_operatorToken));
+ findChild(syntax::NodeRole::OperatorExpression_operatorToken));
}
syntax::Expression *syntax::UnaryOperatorExpression::operand() {
@@ -193,7 +189,7 @@
syntax::Leaf *syntax::BinaryOperatorExpression::operatorToken() {
return llvm::cast_or_null<syntax::Leaf>(
- findChild(syntax::NodeRole::BinaryOperatorExpression_operatorToken));
+ findChild(syntax::NodeRole::OperatorExpression_operatorToken));
}
syntax::Expression *syntax::BinaryOperatorExpression::rhs() {
@@ -402,7 +398,7 @@
syntax::Leaf *syntax::TrailingReturnType::arrow() {
return llvm::cast_or_null<syntax::Leaf>(
- findChild(syntax::NodeRole::TrailingReturnType_arrow));
+ findChild(syntax::NodeRole::TrailingReturnType_arrowToken));
}
syntax::SimpleDeclarator *syntax::TrailingReturnType::declarator() {
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===================================================================
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -609,26 +609,22 @@
}
bool WalkUpFromIntegerLiteral(IntegerLiteral *S) {
- Builder.markChildToken(
- S->getLocation(),
- syntax::NodeRole::IntegerLiteralExpression_literalToken);
+ Builder.markChildToken(S->getLocation(), syntax::NodeRole::LiteralToken);
Builder.foldNode(Builder.getExprRange(S),
new (allocator()) syntax::IntegerLiteralExpression, S);
return true;
}
bool WalkUpFromCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr *S) {
- Builder.markChildToken(S->getLocation(),
- syntax::NodeRole::CxxNullPtrExpression_keyword);
+ Builder.markChildToken(S->getLocation(), syntax::NodeRole::LiteralToken);
Builder.foldNode(Builder.getExprRange(S),
new (allocator()) syntax::CxxNullPtrExpression, S);
return true;
}
bool WalkUpFromUnaryOperator(UnaryOperator *S) {
- Builder.markChildToken(
- S->getOperatorLoc(),
- syntax::NodeRole::UnaryOperatorExpression_operatorToken);
+ Builder.markChildToken(S->getOperatorLoc(),
+ syntax::NodeRole::OperatorExpression_operatorToken);
Builder.markExprChild(S->getSubExpr(),
syntax::NodeRole::UnaryOperatorExpression_operand);
@@ -647,9 +643,8 @@
bool WalkUpFromBinaryOperator(BinaryOperator *S) {
Builder.markExprChild(
S->getLHS(), syntax::NodeRole::BinaryOperatorExpression_leftHandSide);
- Builder.markChildToken(
- S->getOperatorLoc(),
- syntax::NodeRole::BinaryOperatorExpression_operatorToken);
+ Builder.markChildToken(S->getOperatorLoc(),
+ syntax::NodeRole::OperatorExpression_operatorToken);
Builder.markExprChild(
S->getRHS(), syntax::NodeRole::BinaryOperatorExpression_rightHandSide);
Builder.foldNode(Builder.getExprRange(S),
@@ -664,7 +659,7 @@
syntax::NodeRole::BinaryOperatorExpression_leftHandSide);
Builder.markChildToken(
S->getOperatorLoc(),
- syntax::NodeRole::BinaryOperatorExpression_operatorToken);
+ syntax::NodeRole::OperatorExpression_operatorToken);
Builder.markExprChild(
S->getArg(1),
syntax::NodeRole::BinaryOperatorExpression_rightHandSide);
@@ -984,7 +979,8 @@
const auto *Arrow = Return.begin() - 1;
assert(Arrow->kind() == tok::arrow);
auto Tokens = llvm::makeArrayRef(Arrow, Return.end());
- Builder.markChildToken(Arrow, syntax::NodeRole::TrailingReturnType_arrow);
+ Builder.markChildToken(Arrow,
+ syntax::NodeRole::TrailingReturnType_arrowToken);
if (ReturnDeclarator)
Builder.markChild(ReturnDeclarator,
syntax::NodeRole::TrailingReturnType_declarator);
Index: clang/include/clang/Tooling/Syntax/Nodes.h
===================================================================
--- clang/include/clang/Tooling/Syntax/Nodes.h
+++ clang/include/clang/Tooling/Syntax/Nodes.h
@@ -91,6 +91,10 @@
/// A relation between a parent and child node, e.g. 'left-hand-side of
/// a binary expression'. Used for implementing accessors.
+// How to name NodeRole:
+// If the child node is a token/keyword, end its name with 'Token'/'Keyword'
+// If this role is not shared between multiple nodes then it is a specific role.
+// In that case prepend with `NodeKind_` of the parent
enum class NodeRole : uint8_t {
// Roles common to multiple node kinds.
/// A node without a parent
@@ -103,19 +107,18 @@
CloseParen,
/// A keywords that introduces some grammar construct, e.g. 'if', 'try', etc.
IntroducerKeyword,
+ /// A token that represents a literal, e.g. 'nullptr', '1', 'true', etc.
+ LiteralToken,
/// An inner statement for those that have only a single child of kind
/// statement, e.g. loop body for while, for, etc; inner statement for case,
/// default, etc.
BodyStatement,
// Roles specific to particular node kinds.
- UnaryOperatorExpression_operatorToken,
+ OperatorExpression_operatorToken,
UnaryOperatorExpression_operand,
BinaryOperatorExpression_leftHandSide,
- BinaryOperatorExpression_operatorToken,
BinaryOperatorExpression_rightHandSide,
- CxxNullPtrExpression_keyword,
- IntegerLiteralExpression_literalToken,
CaseStatement_value,
IfStatement_thenStatement,
IfStatement_elseKeyword,
@@ -130,7 +133,7 @@
ExplicitTemplateInstantiation_externKeyword,
ExplicitTemplateInstantiation_declaration,
ArraySubscript_sizeExpression,
- TrailingReturnType_arrow,
+ TrailingReturnType_arrowToken,
TrailingReturnType_declarator,
ParametersAndQualifiers_parameter,
ParametersAndQualifiers_trailingReturn
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
