Author: Alexis Murzeau Date: 2023-02-20T19:18:51Z New Revision: 37e6a4f9496c8e35efc654d7619a79d6dbb72f99
URL: https://github.com/llvm/llvm-project/commit/37e6a4f9496c8e35efc654d7619a79d6dbb72f99 DIFF: https://github.com/llvm/llvm-project/commit/37e6a4f9496c8e35efc654d7619a79d6dbb72f99.diff LOG: [clang-tidy] add primitive types for hungarian identifier-naming (unsigned char and void) Add `unsigned char` and `void` types to recognized PrimitiveTypes. Fixes: #60670 Depends on D144037 Reviewed By: carlosgalvezp Differential Revision: https://reviews.llvm.org/D144041 Added: Modified: clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp index b2b2875731874..96bf035843577 100644 --- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp @@ -173,6 +173,7 @@ static StringRef const StyleNames[] = { m(unsigned-short-int) \ m(unsigned-short) \ m(unsigned-int) \ + m(unsigned-char) \ m(unsigned) \ m(long-long-int) \ m(long-double) \ @@ -180,6 +181,7 @@ static StringRef const StyleNames[] = { m(long-int) \ m(long) \ m(ptr diff _t) \ + m(void) \ static StringRef const HungarainNotationPrimitiveTypes[] = { #define STRINGIZE(v) #v, @@ -751,13 +753,15 @@ void IdentifierNamingCheck::HungarianNotation::loadDefaultConfig( {"unsigned short int", "usi" }, {"unsigned short", "us" }, {"unsigned int", "ui" }, + {"unsigned char", "uc" }, {"unsigned", "u" }, {"long long int", "lli" }, {"long double", "ld" }, {"long long", "ll" }, {"long int", "li" }, {"long", "l" }, - {"ptr diff _t", "p" }}; + {"ptr diff _t", "p" }, + {"void", "" }}; // clang-format on for (const auto &PT : PrimitiveTypes) HNOption.PrimitiveType.try_emplace(PT.first, PT.second); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy index 2ae91cab1c484..e9ed35e2c6c23 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy @@ -200,6 +200,8 @@ CheckOptions: value: us - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-int value: ui + - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-char + value: uc - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned value: u - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long-long-int @@ -214,6 +216,8 @@ CheckOptions: value: l - key: readability-identifier-naming.HungarianNotation.PrimitiveType.ptr diff _t value: p + - key: readability-identifier-naming.HungarianNotation.PrimitiveType.void + value: v - key: readability-identifier-naming.HungarianNotation.UserDefinedType.BOOL value: b - key: readability-identifier-naming.HungarianNotation.UserDefinedType.BOOLEAN diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp index 4efc455aa3ce9..d5e96f1ddedda 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp @@ -366,15 +366,15 @@ int *DataIntPtr[1] = {0}; void *BufferPtr1; // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for global pointer 'BufferPtr1' [readability-identifier-naming] -// CHECK-FIXES: {{^}}void *pBufferPtr1; +// CHECK-FIXES: {{^}}void *pvBufferPtr1; void **BufferPtr2; // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: invalid case style for global pointer 'BufferPtr2' [readability-identifier-naming] -// CHECK-FIXES: {{^}}void **ppBufferPtr2; +// CHECK-FIXES: {{^}}void **ppvBufferPtr2; void **pBufferPtr3; // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: invalid case style for global pointer 'pBufferPtr3' [readability-identifier-naming] -// CHECK-FIXES: {{^}}void **ppBufferPtr3; +// CHECK-FIXES: {{^}}void **ppvBufferPtr3; int *pBufferPtr4; // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: invalid case style for global pointer 'pBufferPtr4' [readability-identifier-naming] @@ -387,7 +387,7 @@ FUNC_PTR_HELLO Hello = NULL; void *ValueVoidPtr = NULL; // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for global pointer 'ValueVoidPtr' [readability-identifier-naming] -// CHECK-FIXES: {{^}}void *pValueVoidPtr = NULL; +// CHECK-FIXES: {{^}}void *pvValueVoidPtr = NULL; ptr diff _t PtrDiff = NULL; // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: invalid case style for global variable 'PtrDiff' [readability-identifier-naming] @@ -403,7 +403,7 @@ uint8_t *ValueU8Ptr; void MyFunc2(void* Val){} // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: invalid case style for pointer parameter 'Val' [readability-identifier-naming] -// CHECK-FIXES: {{^}}void MyFunc2(void* pVal){} +// CHECK-FIXES: {{^}}void MyFunc2(void* pvVal){} //===----------------------------------------------------------------------===// @@ -567,6 +567,10 @@ unsigned int ValueUnsignedInt = 0; // CHECK-MESSAGES: :[[@LINE-1]]:14: warning: invalid case style for global variable 'ValueUnsignedInt' [readability-identifier-naming] // CHECK-FIXES: {{^}}unsigned int uiValueUnsignedInt = 0; +unsigned char ValueUnsignedChar = 0; +// CHECK-MESSAGES: :[[@LINE-1]]:15: warning: invalid case style for global variable 'ValueUnsignedChar' [readability-identifier-naming] +// CHECK-FIXES: {{^}}unsigned char ucValueUnsignedChar = 0; + long int ValueLongInt = 0; // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: invalid case style for global variable 'ValueLongInt' [readability-identifier-naming] // CHECK-FIXES: {{^}}long int liValueLongInt = 0; diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp index 83aa88758e138..72dbfd4cdbbba 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp @@ -567,6 +567,10 @@ unsigned int ValueUnsignedInt = 0; // CHECK-MESSAGES: :[[@LINE-1]]:14: warning: invalid case style for global variable 'ValueUnsignedInt' [readability-identifier-naming] // CHECK-FIXES: {{^}}unsigned int uiValueUnsignedInt = 0; +unsigned char ValueUnsignedChar = 0; +// CHECK-MESSAGES: :[[@LINE-1]]:15: warning: invalid case style for global variable 'ValueUnsignedChar' [readability-identifier-naming] +// CHECK-FIXES: {{^}}unsigned char ucValueUnsignedChar = 0; + long int ValueLongInt = 0; // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: invalid case style for global variable 'ValueLongInt' [readability-identifier-naming] // CHECK-FIXES: {{^}}long int liValueLongInt = 0; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
