[PATCH] D73090: [clang-tidy] Fix PR#44528 'modernize-use-using and enums'
Karasev Nikita via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 30 07:27:24 PST 2020
f00kat updated this revision to Diff 241448.
f00kat added a comment.
1. Apply new tagDecl matcher
2. Trying to fix some bug
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D73090/new/
https://reviews.llvm.org/D73090
Files:
clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
clang-tools-extra/clang-tidy/modernize/UseUsingCheck.h
clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
@@ -267,3 +267,7 @@
// CHECK-MESSAGES: :[[@LINE-2]]:30: warning: use 'using' instead of 'typedef'
// CHECK-FIXES: using R_t = struct { int a; };
// CHECK-FIXES-NEXT: using R_p = R_t*;
+
+typedef enum { ea, eb } EnumT;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using EnumT = enum { ea, eb };
Index: clang-tools-extra/clang-tidy/modernize/UseUsingCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/modernize/UseUsingCheck.h
+++ clang-tools-extra/clang-tidy/modernize/UseUsingCheck.h
@@ -23,7 +23,7 @@
const bool IgnoreMacros;
SourceLocation LastReplacementEnd;
- SourceRange LastCxxDeclRange;
+ SourceRange LastTagDeclRange;
std::string FirstTypedefType;
std::string FirstTypedefName;
Index: clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
@@ -25,18 +25,17 @@
return;
Finder->addMatcher(typedefDecl(unless(isInstantiated())).bind("typedef"),
this);
- // This matcher used to find structs defined in source code within typedefs.
+ // This matcher used to find tag declarations in source code within typedefs.
// They appear in the AST just *prior* to the typedefs.
- Finder->addMatcher(cxxRecordDecl(unless(isImplicit())).bind("struct"), this);
+ Finder->addMatcher(tagDecl(unless(isImplicit())).bind("tagdecl"), this);
}
void UseUsingCheck::check(const MatchFinder::MatchResult &Result) {
// Match CXXRecordDecl only to store the range of the last non-implicit full
// declaration, to later check whether it's within the typdef itself.
- const auto *MatchedCxxRecordDecl =
- Result.Nodes.getNodeAs<CXXRecordDecl>("struct");
- if (MatchedCxxRecordDecl) {
- LastCxxDeclRange = MatchedCxxRecordDecl->getSourceRange();
+ const auto *MatchedTagDecl = Result.Nodes.getNodeAs<TagDecl>("tagdecl");
+ if (MatchedTagDecl) {
+ LastTagDeclRange = MatchedTagDecl->getSourceRange();
return;
}
@@ -72,7 +71,8 @@
// the end of the current TypedefDecl definition.
std::string Using = "using ";
if (ReplaceRange.getBegin().isMacroID() ||
- ReplaceRange.getBegin() >= LastReplacementEnd) {
+ (Result.SourceManager->getFileID(ReplaceRange.getBegin()) != Result.SourceManager->getFileID(LastReplacementEnd)) ||
+ (ReplaceRange.getBegin() >= LastReplacementEnd)) {
// This is the first (and possibly the only) TypedefDecl in a typedef. Save
// Type and Name in case we find subsequent TypedefDecl's in this typedef.
FirstTypedefType = Type;
@@ -95,11 +95,11 @@
auto Diag = diag(ReplaceRange.getBegin(), UseUsingWarning);
- // If typedef contains a full struct/class declaration, extract its full text.
- if (LastCxxDeclRange.isValid() && ReplaceRange.fullyContains(LastCxxDeclRange)) {
+ // If typedef contains a full tag declaration, extract its full text.
+ if (LastTagDeclRange.isValid() && ReplaceRange.fullyContains(LastTagDeclRange)) {
bool Invalid;
Type = std::string(
- Lexer::getSourceText(CharSourceRange::getTokenRange(LastCxxDeclRange),
+ Lexer::getSourceText(CharSourceRange::getTokenRange(LastTagDeclRange),
*Result.SourceManager, getLangOpts(), &Invalid));
if (Invalid)
return;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73090.241448.patch
Type: text/x-patch
Size: 3772 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200130/5591e722/attachment.bin>
More information about the cfe-commits
mailing list