ymandel updated this revision to Diff 352450.
ymandel added a comment.
cleanup tweaks
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D104390/new/
https://reviews.llvm.org/D104390
Files:
clang/lib/Tooling/Transformer/Stencil.cpp
clang/unittests/Tooling/StencilTest.cpp
Index: clang/unittests/Tooling/StencilTest.cpp
===================================================================
--- clang/unittests/Tooling/StencilTest.cpp
+++ clang/unittests/Tooling/StencilTest.cpp
@@ -407,7 +407,7 @@
*x;
)cc";
StringRef Id = "id";
- testExpr(Id, Snippet, access(Id, "field"), "(*x).field");
+ testExpr(Id, Snippet, access(Id, "field"), "x->field");
}
TEST_F(StencilTest, AccessOpSmartPointerMemberCall) {
Index: clang/lib/Tooling/Transformer/Stencil.cpp
===================================================================
--- clang/lib/Tooling/Transformer/Stencil.cpp
+++ clang/lib/Tooling/Transformer/Stencil.cpp
@@ -73,6 +73,21 @@
return match(SmartPointer, Ty, Context).size() > 0;
}
+static const Expr *isDereference(const Expr &E, ASTContext &Context) {
+ using namespace ::clang::ast_matchers;
+
+ const auto HasOverloadedArrow = cxxRecordDecl(hasMethod(cxxMethodDecl(
+ hasOverloadedOperatorName("->"), returns(qualType(pointsTo(type()))))));
+ auto Deref = expr(anyOf(
+ cxxOperatorCallExpr(hasOverloadedOperatorName("*"),
+ hasUnaryOperand(expr().bind("arg")),
+ callee(cxxMethodDecl(ofClass(HasOverloadedArrow)))),
+ unaryOperator(hasOperatorName("*"),
+ hasUnaryOperand(expr().bind("arg")))));
+ auto matches = match(Deref, E, Context);
+ return selectFirst<Expr>("arg", matches);
+}
+
namespace {
// An arbitrary fragment of code within a stencil.
class RawTextStencil : public StencilInterface {
@@ -309,6 +324,8 @@
}
}
S = tooling::buildArrow(*E, *Match.Context);
+ } else if (const auto *Operand = isDereference(*E, *Match.Context)) {
+ S = tooling::buildArrow(*Operand, *Match.Context);
} else {
S = tooling::buildDot(*E, *Match.Context);
}
Index: clang/unittests/Tooling/StencilTest.cpp
===================================================================
--- clang/unittests/Tooling/StencilTest.cpp
+++ clang/unittests/Tooling/StencilTest.cpp
@@ -407,7 +407,7 @@
*x;
)cc";
StringRef Id = "id";
- testExpr(Id, Snippet, access(Id, "field"), "(*x).field");
+ testExpr(Id, Snippet, access(Id, "field"), "x->field");
}
TEST_F(StencilTest, AccessOpSmartPointerMemberCall) {
Index: clang/lib/Tooling/Transformer/Stencil.cpp
===================================================================
--- clang/lib/Tooling/Transformer/Stencil.cpp
+++ clang/lib/Tooling/Transformer/Stencil.cpp
@@ -73,6 +73,21 @@
return match(SmartPointer, Ty, Context).size() > 0;
}
+static const Expr *isDereference(const Expr &E, ASTContext &Context) {
+ using namespace ::clang::ast_matchers;
+
+ const auto HasOverloadedArrow = cxxRecordDecl(hasMethod(cxxMethodDecl(
+ hasOverloadedOperatorName("->"), returns(qualType(pointsTo(type()))))));
+ auto Deref = expr(anyOf(
+ cxxOperatorCallExpr(hasOverloadedOperatorName("*"),
+ hasUnaryOperand(expr().bind("arg")),
+ callee(cxxMethodDecl(ofClass(HasOverloadedArrow)))),
+ unaryOperator(hasOperatorName("*"),
+ hasUnaryOperand(expr().bind("arg")))));
+ auto matches = match(Deref, E, Context);
+ return selectFirst<Expr>("arg", matches);
+}
+
namespace {
// An arbitrary fragment of code within a stencil.
class RawTextStencil : public StencilInterface {
@@ -309,6 +324,8 @@
}
}
S = tooling::buildArrow(*E, *Match.Context);
+ } else if (const auto *Operand = isDereference(*E, *Match.Context)) {
+ S = tooling::buildArrow(*Operand, *Match.Context);
} else {
S = tooling::buildDot(*E, *Match.Context);
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
