From: Zinovy Nis Date: Fri, 15 Jun 2018 13:35:40 +0000 (+0000) Subject: [clang-tidy] This patch is a fix for D45405 where spaces were mistakenly considered... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65d1cf8b165b739fb54326c40ec292cd9338a11c;p=platform%2Fupstream%2Fllvm.git [clang-tidy] This patch is a fix for D45405 where spaces were mistakenly considered as a part of a type name. So length("int *") was 5 instead of 3 with RemoveStars=0 or 4 with RemoveStars=1 Differential Revision: https://reviews.llvm.org/D45927 llvm-svn: 334829 --- diff --git a/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp index 23478ae..8687162 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp @@ -11,6 +11,7 @@ #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/ASTMatchers/ASTMatchers.h" +#include "clang/Basic/CharInfo.h" #include "clang/Tooling/FixIt.h" using namespace clang; @@ -27,6 +28,34 @@ const char DeclWithNewId[] = "decl_new"; const char DeclWithCastId[] = "decl_cast"; const char DeclWithTemplateCastId[] = "decl_template"; +size_t GetTypeNameLength(bool RemoveStars, StringRef Text) { + enum CharType { Space, Alpha, Punctuation }; + CharType LastChar = Space, BeforeSpace = Punctuation; + size_t NumChars = 0; + int TemplateTypenameCntr = 0; + for (const unsigned char C : Text) { + if (C == '<') + ++TemplateTypenameCntr; + else if (C == '>') + --TemplateTypenameCntr; + const CharType NextChar = + isAlphanumeric(C) + ? Alpha + : (isWhitespace(C) || + (!RemoveStars && TemplateTypenameCntr == 0 && 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. /// @@ -419,8 +448,10 @@ void UseAutoCheck::replaceExpr( SourceRange Range(Loc.getSourceRange()); if (MinTypeNameLength != 0 && - tooling::fixit::getText(Loc.getSourceRange(), FirstDecl->getASTContext()) - .size() < MinTypeNameLength) + GetTypeNameLength(RemoveStars, + tooling::fixit::getText(Loc.getSourceRange(), + FirstDecl->getASTContext())) < + MinTypeNameLength) return; auto Diag = diag(Range.getBegin(), Message); diff --git a/clang-tools-extra/docs/clang-tidy/checks/modernize-use-auto.rst b/clang-tools-extra/docs/clang-tidy/checks/modernize-use-auto.rst index 658de9a..a73e86e 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/modernize-use-auto.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/modernize-use-auto.rst @@ -182,20 +182,37 @@ Options 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(foo()); // ---> auto a = ... - bool b = new bool; // ---> auto b = ... + // length(bool *) = 4 + bool *b = new bool; // ---> auto *b = ... unsigned c = static_cast(foo()); // ---> auto c = ... - // MinTypeNameLength = 8 + // MinTypeNameLength = 5, RemoveStars=0 - int a = static_cast(foo()); // ---> int a = ... - bool b = new bool; // ---> bool b = ... - unsigned c = static_cast(foo()); // ---> auto c = ... + int a = static_cast(foo()); // ---> int a = ... + bool b = static_cast(foo()); // ---> bool b = ... + bool *pb = static_cast(foo()); // ---> bool *pb = ... + unsigned c = static_cast(foo()); // ---> auto c = ... + // length(long int) = 8 + long int d = static_cast(foo()); // ---> auto d = ... + + // MinTypeNameLength = 5, RemoveStars=1 + + int a = static_cast(foo()); // ---> int a = ... + // length(int * * ) = 5 + int **pa = static_cast(foo()); // ---> auto pa = ... + bool b = static_cast(foo()); // ---> bool b = ... + bool *pb = static_cast(foo()); // ---> auto pb = ... + unsigned c = static_cast(foo()); // ---> auto c = ... + long int d = static_cast(foo()); // ---> auto d = ... .. option:: RemoveStars diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp b/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp index 2d97828..1cd9158 100644 --- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp +++ b/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp @@ -1,30 +1,85 @@ -// 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-8 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 0}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- --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-8 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 1}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- --std=c++11 -frtti -extern int foo(); - -using VeryVeryVeryLongTypeName = int; +template extern T foo(); +template struct P { explicit P(T t) : t_(t) {} T t_;}; +template P *foo_ptr(); +template P &foo_ref(); int bar() { - int a = static_cast(foo()); - // strlen('int') = 4 < 5, so skip it, - // even strlen('VeryVeryVeryLongTypeName') > 5. + { + // Lenth(long) = 4 + long i = static_cast(foo()); + // CHECK-FIXES-0-0: auto i = {{.*}} + // CHECK-FIXES-0-8: long i = {{.*}} + // CHECK-FIXES-1-0: auto i = {{.*}} + // CHECK-FIXES-1-8: long i = {{.*}} + const long ci = static_cast(foo()); + // CHECK-FIXES-0-0: auto ci = {{.*}} + // CHECK-FIXES-0-8: long ci = {{.*}} + // CHECK-FIXES-1-0: auto ci = {{.*}} + // CHECK-FIXES-1-8: long ci = {{.*}} + long *pi = static_cast(foo()); + // CHECK-FIXES-0-0: auto *pi = {{.*}} + // CHECK-FIXES-0-8: long *pi = {{.*}} + // CHECK-FIXES-1-0: auto pi = {{.*}} + // CHECK-FIXES-1-8: long *pi = {{.*}} + + // Length(long *) is still 5 + long * pi2 = static_cast(foo()); + // CHECK-FIXES-0-0: auto * pi2 = {{.*}} + // CHECK-FIXES-0-8: long * pi2 = {{.*}} + // CHECK-FIXES-1-0: auto pi2 = {{.*}} + // CHECK-FIXES-1-8: long * pi2 = {{.*}} + + // Length(long **) = 6 + long **ppi = static_cast(foo()); + // CHECK-FIXES-0-0: auto **ppi = {{.*}} + // CHECK-FIXES-0-8: long **ppi = {{.*}} + // CHECK-FIXES-1-0: auto ppi = {{.*}} + // CHECK-FIXES-1-8: long **ppi = {{.*}} + } - unsigned b = static_cast(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(foo()); + { + // Lenth(long int) = 4 + 1 + 3 = 8 + // Lenth(long int) is still 8 + long int i = static_cast(foo()); + // CHECK-FIXES-0-0: auto i = {{.*}} + // CHECK-FIXES-0-8: auto i = {{.*}} + // CHECK-FIXES-1-0: auto i = {{.*}} + // CHECK-FIXES-1-8: auto i = {{.*}} - bool c = static_cast(foo()); - // strlen('bool') = 4 < 5, so skip it. + long int *pi = static_cast(foo()); + // CHECK-FIXES-0-0: auto *pi = {{.*}} + // CHECK-FIXES-0-8: auto *pi = {{.*}} + // CHECK-FIXES-1-0: auto pi = {{.*}} + // CHECK-FIXES-1-8: auto pi = {{.*}} + } - const bool c1 = static_cast(foo()); - // strlen('bool') = 4 < 5, so skip it, even there's a 'const'. + // Templates + { + // Length(P) = 7 + P& i = static_cast&>(foo_ref()); + // CHECK-FIXES-0-0: auto& i = {{.*}} + // CHECK-FIXES-0-8: P& i = {{.*}} + // CHECK-FIXES-1-0: auto & i = {{.*}} + // CHECK-FIXES-1-8: P& i = {{.*}} - unsigned long long ull = static_cast(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(foo()); + // Length(P) = 8 + P& pi = static_cast &>(foo_ref()); + // CHECK-FIXES-0-0: auto& pi = {{.*}} + // CHECK-FIXES-0-8: auto& pi = {{.*}} + // CHECK-FIXES-1-0: auto & pi = {{.*}} + // CHECK-FIXES-1-8: auto & pi = {{.*}} + + P* pi2 = static_cast*>(foo_ptr()); + // CHECK-FIXES-0-0: auto* pi2 = {{.*}} + // CHECK-FIXES-0-8: P* pi2 = {{.*}} + // CHECK-FIXES-1-0: auto pi2 = {{.*}} + // CHECK-FIXES-1-8: auto pi2 = {{.*}} + } return 1; } -