zinovy.nis updated this revision to Diff 144727.
zinovy.nis added a comment.
- Applied Alexander's changes.
https://reviews.llvm.org/D45927
Files:
clang-tidy/checks/modernize-use-auto.rst
clang-tidy/modernize-use-auto-min-type-name-length.cpp
modernize/UseAutoCheck.cpp
Index: clang-tidy/modernize-use-auto-min-type-name-length.cpp
===================================================================
--- clang-tidy/modernize-use-auto-min-type-name-length.cpp
+++ clang-tidy/modernize-use-auto-min-type-name-length.cpp
@@ -1,29 +1,87 @@
-// RUN: %check_clang_tidy %s modernize-use-auto %t -- \
-// RUN: -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '5'}]}" \
-// RUN: -- -std=c++11 -frtti
+// RUN: %check_clang_tidy -check-suffix=0-0 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 0}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- --std=c++11 -frtti
+// RUN: %check_clang_tidy -check-suffix=0-5 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 0}, {key: modernize-use-auto.MinTypeNameLength, value: 5}]}" -- --std=c++11 -frtti
+// RUN: %check_clang_tidy -check-suffix=1-0 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 1}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- --std=c++11 -frtti
+// RUN: %check_clang_tidy -check-suffix=1-5 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 1}, {key: modernize-use-auto.MinTypeNameLength, value: 5}]}" -- --std=c++11 -frtti
-extern int foo();
-
-using VeryVeryVeryLongTypeName = int;
+template <class T>
+extern T foo();
int bar() {
- int a = static_cast<VeryVeryVeryLongTypeName>(foo());
- // strlen('int') = 4 < 5, so skip it,
- // even strlen('VeryVeryVeryLongTypeName') > 5.
+ {
+ using VeryVeryVeryLongTypeName = int;
+ int i = static_cast<VeryVeryVeryLongTypeName>(foo<int>());
+ // CHECK-FIXES-0-0: auto i = {{.*}}
+ // CHECK-FIXES-0-5: int i = {{.*}}
+ // CHECK-FIXES-1-0: auto i = {{.*}}
+ // CHECK-FIXES-1-5: int i = {{.*}}
+ int *pi = static_cast<VeryVeryVeryLongTypeName *>(foo<int*>());
+ // CHECK-FIXES-0-0: auto *pi = {{.*}}
+ // CHECK-FIXES-0-5: int *pi = {{.*}}
+ // CHECK-FIXES-1-0: auto pi = {{.*}}
+ // CHECK-FIXES-1-5: int *pi = {{.*}}
+ int *pi2 = static_cast<VeryVeryVeryLongTypeName *>(foo<int*>());
+ // CHECK-FIXES-0-0: auto *pi2 = {{.*}}
+ // CHECK-FIXES-0-5: int *pi2 = {{.*}}
+ // CHECK-FIXES-1-0: auto pi2 = {{.*}}
+ // CHECK-FIXES-1-5: int *pi2 = {{.*}}
+ int **ppi = static_cast<VeryVeryVeryLongTypeName **>(foo<int**>());
+ // CHECK-FIXES-0-0: auto **ppi = {{.*}}
+ // CHECK-FIXES-0-5: int **ppi = {{.*}}
+ // CHECK-FIXES-1-0: auto ppi = {{.*}}
+ // CHECK-FIXES-1-5: auto ppi = {{.*}}
+ }
- unsigned b = static_cast<unsigned>(foo());
- // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use auto when initializing with a cast to avoid duplicating the type name [modernize-use-auto]
- // CHECK-FIXES: auto b = static_cast<unsigned>(foo());
+ {
+ bool b = static_cast<bool>(foo<bool>());
+ // CHECK-FIXES-0-0: auto b = {{.*}}
+ // CHECK-FIXES-0-5: bool b = {{.*}}
+ // CHECK-FIXES-1-0: auto b = {{.*}}
+ // CHECK-FIXES-1-5: bool b = {{.*}}
+ bool *pb = static_cast<bool *>(foo<bool*>());
+ // CHECK-FIXES-0-0: auto *pb = {{.*}}
+ // CHECK-FIXES-0-5: bool *pb = {{.*}}
+ // CHECK-FIXES-1-0: auto pb = {{.*}}
+ // CHECK-FIXES-1-5: auto pb = {{.*}}
+ }
- bool c = static_cast<bool>(foo());
- // strlen('bool') = 4 < 5, so skip it.
+ {
+ const bool cb = static_cast<const bool>(foo<const bool>());
+ // CHECK-FIXES-0-0: auto cb = {{.*}}
+ // CHECK-FIXES-0-5: bool cb = {{.*}}
+ // CHECK-FIXES-1-0: auto cb = {{.*}}
+ // CHECK-FIXES-1-5: bool cb = {{.*}}
+ const bool *pcb = static_cast<const bool *>(foo<const bool*>());
+ // CHECK-FIXES-0-0: const auto *pcb = {{.*}}
+ // CHECK-FIXES-0-5: const bool *pcb = {{.*}}
+ // CHECK-FIXES-1-0: const auto pcb = {{.*}}
+ // CHECK-FIXES-1-5: const auto pcb = {{.*}}
+ }
- const bool c1 = static_cast<const bool>(foo());
- // strlen('bool') = 4 < 5, so skip it, even there's a 'const'.
+ {
+ long int li = static_cast<long int>(foo<long int>());
+ // CHECK-FIXES-0-0: auto li = {{.*}}
+ // CHECK-FIXES-0-5: auto li = {{.*}}
+ // CHECK-FIXES-1-0: auto li = {{.*}}
+ // CHECK-FIXES-1-5: auto li = {{.*}}
+ long int *pli = static_cast<long int *>(foo<long int*>());
+ // CHECK-FIXES-0-0: auto *pli = {{.*}}
+ // CHECK-FIXES-0-5: auto *pli = {{.*}}
+ // CHECK-FIXES-1-0: auto pli = {{.*}}
+ // CHECK-FIXES-1-5: auto pli = {{.*}}
+ }
- unsigned long long ull = static_cast<unsigned long long>(foo());
- // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use auto when initializing with a cast to avoid duplicating the type name [modernize-use-auto]
- // CHECK-FIXES: auto ull = static_cast<unsigned long long>(foo());
+ {
+ unsigned long long ull = static_cast<unsigned long long>(foo<unsigned long long>());
+ // CHECK-FIXES-0-0: auto ull = {{.*}}
+ // CHECK-FIXES-0-5: auto ull = {{.*}}
+ // CHECK-FIXES-1-0: auto ull = {{.*}}
+ // CHECK-FIXES-1-5: auto ull = {{.*}}
+ unsigned long long *pull = static_cast<unsigned long long *>(foo<unsigned long long*>());
+ // CHECK-FIXES-0-0: auto *pull = {{.*}}
+ // CHECK-FIXES-0-5: auto *pull = {{.*}}
+ // CHECK-FIXES-1-0: auto pull = {{.*}}
+ // CHECK-FIXES-1-5: auto pull = {{.*}}
+ }
return 1;
}
Index: clang-tidy/checks/modernize-use-auto.rst
===================================================================
--- clang-tidy/checks/modernize-use-auto.rst
+++ clang-tidy/checks/modernize-use-auto.rst
@@ -182,20 +182,37 @@
If the option is set to non-zero (default `5`), the check will ignore type
names having a length less than the option value. The option affects
expressions only, not iterators.
+ Spaces between multi-lexeme type names (``long int``) are considered as one.
+ If ``RemoveStars`` option (see below) is set to non-zero, then ``*s`` in
+ the type are also counted as a part of the type name.
.. code-block:: c++
- // MinTypeNameLength = 0
+ // MinTypeNameLength = 0, RemoveStars=0
int a = static_cast<int>(foo()); // ---> auto a = ...
- bool b = new bool; // ---> auto b = ...
+ // length(bool *) = 4
+ bool *b = new bool; // ---> auto *b = ...
unsigned c = static_cast<unsigned>(foo()); // ---> auto c = ...
- // MinTypeNameLength = 8
+ // MinTypeNameLength = 5, RemoveStars=0
- int a = static_cast<int>(foo()); // ---> int a = ...
- bool b = new bool; // ---> bool b = ...
- unsigned c = static_cast<unsigned>(foo()); // ---> auto c = ...
+ int a = static_cast<int>(foo()); // ---> int a = ...
+ bool b = static_cast<bool>(foo()); // ---> bool b = ...
+ bool *pb = static_cast<bool*>(foo()); // ---> bool *pb = ...
+ unsigned c = static_cast<unsigned>(foo()); // ---> auto c = ...
+ // length(long <on-or-more-spaces> int) = 8
+ long int d = static_cast<long int>(foo()); // ---> auto d = ...
+
+ // MinTypeNameLength = 5, RemoveStars=1
+
+ int a = static_cast<int>(foo()); // ---> int a = ...
+ // length(int * * ) = 5
+ int **pa = static_cast<int**>(foo()); // ---> auto pa = ...
+ bool b = static_cast<bool>(foo()); // ---> bool b = ...
+ bool *pb = static_cast<bool*>(foo()); // ---> auto pb = ...
+ unsigned c = static_cast<unsigned>(foo()); // ---> auto c = ...
+ long int d = static_cast<long int>(foo()); // ---> auto d = ...
.. option:: RemoveStars
Index: modernize/UseAutoCheck.cpp
===================================================================
--- modernize/UseAutoCheck.cpp
+++ modernize/UseAutoCheck.cpp
@@ -12,6 +12,7 @@
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Tooling/FixIt.h"
+#include <cctype>
using namespace clang;
using namespace clang::ast_matchers;
@@ -27,6 +28,28 @@
const char DeclWithCastId[] = "decl_cast";
const char DeclWithTemplateCastId[] = "decl_template";
+size_t GetTypeNameLength(bool RemoveStars, const SourceRange &SR,
+ const ASTContext &Context) {
+ enum CharType { Space, Alpha, Punctuation };
+ CharType LastChar = Space, BeforeSpace = Punctuation;
+ size_t NumChars = 0;
+ for (const unsigned char C : tooling::fixit::getText(SR, Context)) {
+ const CharType NextChar =
+ std::isalnum(C)
+ ? Alpha
+ : (std::isspace(C) || (!RemoveStars && C == '*')) ? Space
+ : Punctuation;
+ if (NextChar != Space) {
+ ++NumChars; // Count the non-space character.
+ if (LastChar == Space && NextChar == Alpha && BeforeSpace == Alpha)
+ ++NumChars; // Count a single space character between two words.
+ BeforeSpace = NextChar;
+ }
+ LastChar = NextChar;
+ }
+ return NumChars;
+}
+
/// \brief Matches variable declarations that have explicit initializers that
/// are not initializer lists.
///
@@ -417,10 +440,9 @@
Loc = Loc.getNextTypeLoc();
}
SourceRange Range(Loc.getSourceRange());
-
if (MinTypeNameLength != 0 &&
- tooling::fixit::getText(Loc.getSourceRange(), FirstDecl->getASTContext())
- .size() < MinTypeNameLength)
+ GetTypeNameLength(RemoveStars, Loc.getSourceRange(),
+ FirstDecl->getASTContext()) < MinTypeNameLength)
return;
auto Diag = diag(Range.getBegin(), Message);
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
