Skip to content

Commit b5c241d

Browse files
committed
[clang-tidy] Add more constexpr options to readability-identifier-naming
1 parent 5401210 commit b5c241d

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,17 @@ namespace readability {
8383
m(Member) \
8484
m(ClassConstant) \
8585
m(ClassMember) \
86+
m(ConstexprGlobalVariable) \
8687
m(GlobalConstant) \
8788
m(GlobalConstantPointer) \
8889
m(GlobalPointer) \
8990
m(GlobalVariable) \
91+
m(ConstexprLocalVariable) \
9092
m(LocalConstant) \
9193
m(LocalConstantPointer) \
9294
m(LocalPointer) \
9395
m(LocalVariable) \
96+
m(ConstexprStaticVariable) \
9497
m(StaticConstant) \
9598
m(StaticVariable) \
9699
m(Constant) \
@@ -1497,8 +1500,19 @@ StyleKind IdentifierNamingCheck::findStyleKindForField(
14971500
StyleKind IdentifierNamingCheck::findStyleKindForVar(
14981501
const VarDecl *Var, QualType Type,
14991502
ArrayRef<std::optional<NamingStyle>> NamingStyles) const {
1500-
if (Var->isConstexpr() && NamingStyles[SK_ConstexprVariable])
1501-
return SK_ConstexprVariable;
1503+
if (Var->isConstexpr()) {
1504+
if (Var->isFileVarDecl() && NamingStyles[SK_ConstexprGlobalVariable])
1505+
return SK_ConstexprGlobalVariable;
1506+
1507+
if (Var->isStaticLocal() && NamingStyles[SK_ConstexprStaticVariable])
1508+
return SK_ConstexprStaticVariable;
1509+
1510+
if (Var->isLocalVarDecl() && NamingStyles[SK_ConstexprLocalVariable])
1511+
return SK_ConstexprLocalVariable;
1512+
1513+
if (NamingStyles[SK_ConstexprVariable])
1514+
return SK_ConstexprVariable;
1515+
}
15021516

15031517
if (!Type.isNull() && Type.isConstQualified()) {
15041518
if (Var->isStaticDataMember() && NamingStyles[SK_ClassConstant])

0 commit comments

Comments
 (0)