diff options
Diffstat (limited to 'clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp')
| -rw-r--r-- | clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp index 175feea0faa..95a71f63986 100644 --- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp @@ -449,13 +449,13 @@ static StyleKind findStyleKind( if (const auto *Decl = dyn_cast<FieldDecl>(D)) { QualType Type = Decl->getType(); - if (!Type.isNull() && Type.isLocalConstQualified() && - NamingStyles[SK_ConstantMember]) - return SK_ConstantMember; + if (!Type.isNull() && Type.isConstQualified()) { + if (NamingStyles[SK_ConstantMember]) + return SK_ConstantMember; - if (!Type.isNull() && Type.isLocalConstQualified() && - NamingStyles[SK_Constant]) - return SK_Constant; + if (NamingStyles[SK_Constant]) + return SK_Constant; + } if (Decl->getAccess() == AS_private && NamingStyles[SK_PrivateMember]) return SK_PrivateMember; @@ -478,13 +478,13 @@ static StyleKind findStyleKind( if (Decl->isConstexpr() && NamingStyles[SK_ConstexprVariable]) return SK_ConstexprVariable; - if (!Type.isNull() && Type.isLocalConstQualified() && - NamingStyles[SK_ConstantParameter]) - return SK_ConstantParameter; + if (!Type.isNull() && Type.isConstQualified()) { + if (NamingStyles[SK_ConstantParameter]) + return SK_ConstantParameter; - if (!Type.isNull() && Type.isLocalConstQualified() && - NamingStyles[SK_Constant]) - return SK_Constant; + if (NamingStyles[SK_Constant]) + return SK_Constant; + } if (Decl->isParameterPack() && NamingStyles[SK_ParameterPack]) return SK_ParameterPack; @@ -501,29 +501,25 @@ static StyleKind findStyleKind( if (Decl->isConstexpr() && NamingStyles[SK_ConstexprVariable]) return SK_ConstexprVariable; - if (!Type.isNull() && Type.isLocalConstQualified() && - Decl->isStaticDataMember() && NamingStyles[SK_ClassConstant]) - return SK_ClassConstant; + if (!Type.isNull() && Type.isConstQualified()) { + if (Decl->isStaticDataMember() && NamingStyles[SK_ClassConstant]) + return SK_ClassConstant; - if (!Type.isNull() && Type.isLocalConstQualified() && - Decl->isFileVarDecl() && NamingStyles[SK_GlobalConstant]) - return SK_GlobalConstant; + if (Decl->isFileVarDecl() && NamingStyles[SK_GlobalConstant]) + return SK_GlobalConstant; - if (!Type.isNull() && Type.isLocalConstQualified() && - Decl->isStaticLocal() && NamingStyles[SK_StaticConstant]) - return SK_StaticConstant; + if (Decl->isStaticLocal() && NamingStyles[SK_StaticConstant]) + return SK_StaticConstant; - if (!Type.isNull() && Type.isLocalConstQualified() && - Decl->isLocalVarDecl() && NamingStyles[SK_LocalConstant]) - return SK_LocalConstant; + if (Decl->isLocalVarDecl() && NamingStyles[SK_LocalConstant]) + return SK_LocalConstant; - if (!Type.isNull() && Type.isLocalConstQualified() && - Decl->isFunctionOrMethodVarDecl() && NamingStyles[SK_LocalConstant]) - return SK_LocalConstant; + if (Decl->isFunctionOrMethodVarDecl() && NamingStyles[SK_LocalConstant]) + return SK_LocalConstant; - if (!Type.isNull() && Type.isLocalConstQualified() && - NamingStyles[SK_Constant]) - return SK_Constant; + if (NamingStyles[SK_Constant]) + return SK_Constant; + } if (Decl->isStaticDataMember() && NamingStyles[SK_ClassMember]) return SK_ClassMember; @@ -681,8 +677,9 @@ static void addUsage(IdentifierNamingCheck::NamingCheckFailureMap &Failures, static void addUsage(IdentifierNamingCheck::NamingCheckFailureMap &Failures, const NamedDecl *Decl, SourceRange Range, SourceManager *SourceMgr = nullptr) { - return addUsage(Failures, IdentifierNamingCheck::NamingCheckId( - Decl->getLocation(), Decl->getNameAsString()), + return addUsage(Failures, + IdentifierNamingCheck::NamingCheckId(Decl->getLocation(), + Decl->getNameAsString()), Range, SourceMgr); } @@ -699,7 +696,8 @@ void IdentifierNamingCheck::check(const MatchFinder::MatchResult &Result) { if (!Init->isWritten() || Init->isInClassMemberInitializer()) continue; if (const auto *FD = Init->getAnyMember()) - addUsage(NamingCheckFailures, FD, SourceRange(Init->getMemberLocation())); + addUsage(NamingCheckFailures, FD, + SourceRange(Init->getMemberLocation())); // Note: delegating constructors and base class initializers are handled // via the "typeLoc" matcher. } |
