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

Add support for Overloaded Binary Operators in SyntaxTree 

Reviewers: gribozavr2

Subscribers: cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D80812
This commit is contained in:
Eduardo Caldas 2020-05-29 20:03:58 +02:00 committed by Dmitri Gribenko
parent 81443ac1bc
commit 3a574a6cb3
2 changed files with 146 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,6 +640,24 @@ public:
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) {
auto Tokens = Builder.getDeclarationRange(S);
if (Tokens.front().kind() == tok::coloncolon) {

128
clang/unittests/Tooling/Syntax/TreeTest.cpp
View File

@ -993,6 +993,134 @@ void test(int a, int b) {
)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) {
expectTreeDumpEqual(
R"cpp(