This revision was automatically updated to reflect the committed changes.
Closed by commit rG85c15f17cc68: [SyntaxTree] Add support for `this` (authored
by eduucaldas).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86298/new/
https://reviews.llvm.org/D86298
Files:
clang/include/clang/Tooling/Syntax/Nodes.h
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/lib/Tooling/Syntax/Nodes.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===================================================================
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -905,6 +905,68 @@
)txt"}));
}
+TEST_P(SyntaxTreeTest, This_Simple) {
+ if (!GetParam().isCXX()) {
+ return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S* test(){
+ return [[this]];
+ }
+};
+)cpp",
+ {R"txt(
+ThisExpression
+`-this
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, This_ExplicitMemberAccess) {
+ if (!GetParam().isCXX()) {
+ return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ int a;
+ void test(){
+ [[this->a]];
+ }
+};
+)cpp",
+ {R"txt(
+MemberExpression
+|-ThisExpression
+| `-this
+|-->
+`-IdExpression
+ `-UnqualifiedId
+ `-a
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, This_ImplicitMemberAccess) {
+ if (!GetParam().isCXX()) {
+ return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ int a;
+ void test(){
+ [[a]];
+ }
+};
+)cpp",
+ {R"txt(
+IdExpression
+`-UnqualifiedId
+ `-a
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, ParenExpr) {
EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
@@ -2099,29 +2161,6 @@
)txt"}));
}
-TEST_P(SyntaxTreeTest, MemberExpression_Implicit) {
- if (!GetParam().isCXX()) {
- return;
- }
- EXPECT_TRUE(treeDumpEqualOnAnnotations(
- R"cpp(
-struct S {
- int a;
- int test(){
- // FIXME: Remove the `UnknownExpression` wrapping `a`. This
- // `UnknownExpression` comes from an implicit leaf `CXXThisExpr`.
- [[a]];
- }
-};
-)cpp",
- {R"txt(
-IdExpression
-`-UnqualifiedId
- `-UnknownExpression
- `-a
-)txt"}));
-}
-
TEST_P(SyntaxTreeTest, MemberExpression_VariableTemplate) {
if (!GetParam().isCXX14OrLater()) {
return;
Index: clang/lib/Tooling/Syntax/Nodes.cpp
===================================================================
--- clang/lib/Tooling/Syntax/Nodes.cpp
+++ clang/lib/Tooling/Syntax/Nodes.cpp
@@ -20,6 +20,8 @@
return OS << "UnknownExpression";
case NodeKind::ParenExpression:
return OS << "ParenExpression";
+ case NodeKind::ThisExpression:
+ return OS << "ThisExpression";
case NodeKind::IntegerLiteralExpression:
return OS << "IntegerLiteralExpression";
case NodeKind::CharacterLiteralExpression:
@@ -286,6 +288,11 @@
return cast_or_null<syntax::Leaf>(findChild(syntax::NodeRole::CloseParen));
}
+syntax::Leaf *syntax::ThisExpression::thisKeyword() {
+ return cast_or_null<syntax::Leaf>(
+ findChild(syntax::NodeRole::IntroducerKeyword));
+}
+
syntax::Leaf *syntax::LiteralExpression::literalToken() {
return cast_or_null<syntax::Leaf>(findChild(syntax::NodeRole::LiteralToken));
}
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===================================================================
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -950,6 +950,16 @@
return true;
}
+ bool WalkUpFromCXXThisExpr(CXXThisExpr *S) {
+ if (!S->isImplicit()) {
+ Builder.markChildToken(S->getLocation(),
+ syntax::NodeRole::IntroducerKeyword);
+ Builder.foldNode(Builder.getExprRange(S),
+ new (allocator()) syntax::ThisExpression, S);
+ }
+ return true;
+ }
+
bool WalkUpFromParenExpr(ParenExpr *S) {
Builder.markChildToken(S->getLParen(), syntax::NodeRole::OpenParen);
Builder.markExprChild(S->getSubExpr(),
Index: clang/include/clang/Tooling/Syntax/Nodes.h
===================================================================
--- clang/include/clang/Tooling/Syntax/Nodes.h
+++ clang/include/clang/Tooling/Syntax/Nodes.h
@@ -56,6 +56,7 @@
StringUserDefinedLiteralExpression,
IdExpression,
MemberExpression,
+ ThisExpression,
// Statements.
UnknownStatement,
@@ -313,6 +314,16 @@
}
};
+/// Models a this expression `this`. C++ [expr.prim.this]
+class ThisExpression final : public Expression {
+public:
+ ThisExpression() : Expression(NodeKind::ThisExpression) {}
+ static bool classof(const Node *N) {
+ return N->kind() == NodeKind::ThisExpression;
+ }
+ Leaf *thisKeyword();
+};
+
/// Models a parenthesized expression `(E)`. C++ [expr.prim.paren]
/// e.g. `(3 + 2)` in `a = 1 + (3 + 2);`
class ParenExpression final : public Expression {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
