This is an archive of the discontinued LLVM Phabricator instance.

Differential D80812

Add support for Overloaded Binary Operators in SyntaxTree
ClosedPublic

Authored by eduucaldas on May 29 2020, 9:15 AM.

Details

Reviewers
gribozavr2
Commits
rG3a574a6cb359: Add support for Overloaded Binary Operators in SyntaxTree

Diff Detail

Event Timeline

eduucaldas created this revision.May 29 2020, 9:15 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 29 2020, 9:15 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
eduucaldas added a reviewer: gribozavr2.May 29 2020, 9:15 AM
Harbormaster completed remote builds in B58440: Diff 267264.May 29 2020, 10:21 AM
gribozavr2 accepted this revision.May 29 2020, 11:04 AM
This revision is now accepted and ready to land.May 29 2020, 11:04 AM
Closed by commit rG3a574a6cb359: Add support for Overloaded Binary Operators in SyntaxTree (authored by eduucaldas, committed by gribozavr). · Explain WhyMay 29 2020, 11:27 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Tooling/
Syntax/
18 lines
unittests/
Tooling/
Syntax/
128 lines

Diff 267309

clang/lib/Tooling/Syntax/BuildTree.cpp

Show First 20 Lines • Show All 634 Lines • ▼ Show 20 Lines Builder.markChildToken(
syntax::NodeRole::BinaryOperatorExpression_operatorToken); syntax::NodeRole::BinaryOperatorExpression_operatorToken);
Builder.markExprChild( Builder.markExprChild(
S->getRHS(), syntax::NodeRole::BinaryOperatorExpression_rightHandSide); S->getRHS(), syntax::NodeRole::BinaryOperatorExpression_rightHandSide);
Builder.foldNode(Builder.getExprRange(S), Builder.foldNode(Builder.getExprRange(S),
new (allocator()) syntax::BinaryOperatorExpression, S); new (allocator()) syntax::BinaryOperatorExpression, S);
return true; return true;
} }
bool WalkUpFromCXXOperatorCallExpr(CXXOperatorCallExpr *S) {
if (S->isInfixBinaryOp()) {
Builder.markExprChild(
S->getArg(0),
syntax::NodeRole::BinaryOperatorExpression_leftHandSide);
Builder.markChildToken(
S->getOperatorLoc(),
syntax::NodeRole::BinaryOperatorExpression_operatorToken);
Builder.markExprChild(
S->getArg(1),
syntax::NodeRole::BinaryOperatorExpression_rightHandSide);
Builder.foldNode(Builder.getExprRange(S),
new (allocator()) syntax::BinaryOperatorExpression, S);
return true;
}
return RecursiveASTVisitor::WalkUpFromCXXOperatorCallExpr(S);
}
bool WalkUpFromNamespaceDecl(NamespaceDecl *S) { bool WalkUpFromNamespaceDecl(NamespaceDecl *S) {
auto Tokens = Builder.getDeclarationRange(S); auto Tokens = Builder.getDeclarationRange(S);
if (Tokens.front().kind() == tok::coloncolon) { if (Tokens.front().kind() == tok::coloncolon) {
// Handle nested namespace definitions. Those start at '::' token, e.g. // Handle nested namespace definitions. Those start at '::' token, e.g.
// namespace a^::b {} // namespace a^::b {}
// FIXME: build corresponding nodes for the name of this namespace. // FIXME: build corresponding nodes for the name of this namespace.
return true; return true;
} }
▲ Show 20 Lines • Show All 416 Lines • Show Last 20 Lines

clang/unittests/Tooling/Syntax/TreeTest.cpp

Show First 20 Lines • Show All 987 Lines • ▼ Show 20 Lines `-CompoundStatement
| | |-* | | |-*
| | `-UnknownExpression | | `-UnknownExpression
| | `-42 | | `-42
| `-; | `-;
`-} `-}
)txt"); )txt");
} }
TEST_F(SyntaxTreeTest, UserDefinedBinaryOperator) {
expectTreeDumpEqual(
R"cpp(
struct X {
X& operator=(const X&);
friend X operator+(X, const X&);
friend bool operator<(const X&, const X&);
};
void test(X x, X y) {
x = y;
x + y;
x < y;
}
)cpp",
R"txt(
*: TranslationUnit
|-SimpleDeclaration
| |-struct
| |-X
| |-{
| |-SimpleDeclaration
| | |-X
| | |-SimpleDeclarator
| | | |-&
| | | |-operator
| | | |-=
| | | `-ParametersAndQualifiers
| | | |-(
| | | |-SimpleDeclaration
| | | | |-const
| | | | |-X
| | | | `-SimpleDeclarator
| | | | `-&
| | | `-)
| | `-;
| |-UnknownDeclaration
| | `-SimpleDeclaration
| | |-friend
| | |-X
| | |-SimpleDeclarator
| | | |-operator
| | | |-+
| | | `-ParametersAndQualifiers
| | | |-(
| | | |-SimpleDeclaration
| | | | `-X
| | | |-,
| | | |-SimpleDeclaration
| | | | |-const
| | | | |-X
| | | | `-SimpleDeclarator
| | | | `-&
| | | `-)
| | `-;
| |-UnknownDeclaration
| | `-SimpleDeclaration
| | |-friend
| | |-bool
| | |-SimpleDeclarator
| | | |-operator
| | | |-<
| | | `-ParametersAndQualifiers
| | | |-(
| | | |-SimpleDeclaration
| | | | |-const
| | | | |-X
| | | | `-SimpleDeclarator
| | | | `-&
| | | |-,
| | | |-SimpleDeclaration
| | | | |-const
| | | | |-X
| | | | `-SimpleDeclarator
| | | | `-&
| | | `-)
| | `-;
| |-}
| `-;
`-SimpleDeclaration
|-void
|-SimpleDeclarator
| |-test
| `-ParametersAndQualifiers
| |-(
| |-SimpleDeclaration
| | |-X
| | `-SimpleDeclarator
| | `-x
| |-,
| |-SimpleDeclaration
| | |-X
| | `-SimpleDeclarator
| | `-y
| `-)
`-CompoundStatement
|-{
|-ExpressionStatement
| |-BinaryOperatorExpression
| | |-UnknownExpression
| | | `-x
| | |-UnknownExpression
| | | `-=
| | `-UnknownExpression
| | `-y
| `-;
|-ExpressionStatement
| |-BinaryOperatorExpression
| | |-UnknownExpression
| | | `-UnknownExpression
| | | `-x
| | |-UnknownExpression
| | | `-+
| | `-UnknownExpression
| | `-y
| `-;
|-ExpressionStatement
| |-BinaryOperatorExpression
| | |-UnknownExpression
| | | `-x
| | |-UnknownExpression
| | | `-<
| | `-UnknownExpression
| | `-y
| `-;
`-}
)txt");
}
TEST_F(SyntaxTreeTest, MultipleDeclaratorsGrouping) { TEST_F(SyntaxTreeTest, MultipleDeclaratorsGrouping) {
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
int *a, b; int *c, d; int *a, b; int *c, d;
)cpp", )cpp",
R"txt( R"txt(
*: TranslationUnit *: TranslationUnit
|-SimpleDeclaration |-SimpleDeclaration
▲ Show 20 Lines • Show All 1,277 Lines • Show Last 20 Lines