From eaa881bbf3a3fe114a39d27a3541554f63d5bdf8 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Thu, 12 Dec 2024 21:04:36 +0000 Subject: [PATCH] Add new clang-tidy exceptions also to template files --- src/Functions/HTMLCharacterReference.gperf | 4 ++-- src/Functions/HTMLCharacterReference.sh | 4 ++-- src/Functions/URL/tldLookup.generated.cpp | 6 +++--- src/Functions/URL/tldLookup.gperf | 2 ++ src/Functions/URL/tldLookup.sh | 2 ++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Functions/HTMLCharacterReference.gperf b/src/Functions/HTMLCharacterReference.gperf index 4093688c608..c2ff4505832 100644 --- a/src/Functions/HTMLCharacterReference.gperf +++ b/src/Functions/HTMLCharacterReference.gperf @@ -11,7 +11,7 @@ #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wshorten-64-to-32" -// NOLINTBEGIN(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr) +// NOLINTBEGIN(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr,modernize-macro-to-enum) %} struct NameAndGlyph { const char *name; @@ -2250,4 +2250,4 @@ const char *glyph; "zwj;", "‍" "zwnj;", "‌" %% -// NOLINTEND(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr) +// NOLINTEND(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr,modernize-macro-to-enum) diff --git a/src/Functions/HTMLCharacterReference.sh b/src/Functions/HTMLCharacterReference.sh index c7b728c5980..3d90a90b6bc 100755 --- a/src/Functions/HTMLCharacterReference.sh +++ b/src/Functions/HTMLCharacterReference.sh @@ -13,7 +13,7 @@ echo '%language=C++ #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wshorten-64-to-32" -// NOLINTBEGIN(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr) +// NOLINTBEGIN(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr,modernize-macro-to-enum) %} struct NameAndGlyph { const char *name; @@ -24,4 +24,4 @@ const char *glyph; # character reference as available at https://html.spec.whatwg.org/multipage/named-characters.html curl -X GET https://html.spec.whatwg.org/entities.json | jq -r 'keys[] as $k | "\"\($k)\", \(.[$k] | .characters|tojson)"' | sed 's/^"&/"/' >> HTMLCharacterReference.gperf echo '%%' >> HTMLCharacterReference.gperf -echo '// NOLINTEND(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr)' >> HTMLCharacterReference.gperf +echo '// NOLINTEND(google-runtime-int,hicpp-use-nullptr,modernize-use-nullptr,modernize-macro-to-enum)' >> HTMLCharacterReference.gperf diff --git a/src/Functions/URL/tldLookup.generated.cpp b/src/Functions/URL/tldLookup.generated.cpp index 51563f9886f..fe9eb6f85ab 100644 --- a/src/Functions/URL/tldLookup.generated.cpp +++ b/src/Functions/URL/tldLookup.generated.cpp @@ -24,9 +24,9 @@ #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma GCC diagnostic ignored "-Wunused-macros" -#include +// NOLINTBEGIN(modernize-macro-to-enum) -/// NOLINTBEGIN(modernize-macro-to-enum) +#include #define TOTAL_KEYWORDS 5045 #define MIN_WORD_LENGTH 4 @@ -110737,6 +110737,6 @@ const char * TopLevelDomainLookupHash::isValid(const char * str, size_t len) } return nullptr; } -/// NOLINTEND(modernize-macro-to-enum) +// NOLINTEND(modernize-macro-to-enum) #line 5060 "tldLookup.gperf" diff --git a/src/Functions/URL/tldLookup.gperf b/src/Functions/URL/tldLookup.gperf index 796835052e2..f925bed3621 100644 --- a/src/Functions/URL/tldLookup.gperf +++ b/src/Functions/URL/tldLookup.gperf @@ -9,6 +9,7 @@ #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma GCC diagnostic ignored "-Wunused-macros" +// NOLINTBEGIN(modernize-macro-to-enum) %} # List generated using https://publicsuffix.org/list/public_suffix_list.dat %% @@ -5058,3 +5059,4 @@ basicserver.io virtualserver.io enterprisecloud.nu %% +// NOLINTEND(modernize-macro-to-enum) diff --git a/src/Functions/URL/tldLookup.sh b/src/Functions/URL/tldLookup.sh index 7f9848411fc..1c693ec74f0 100755 --- a/src/Functions/URL/tldLookup.sh +++ b/src/Functions/URL/tldLookup.sh @@ -13,8 +13,10 @@ echo '%language=C++ #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma GCC diagnostic ignored "-Wunused-macros" +// NOLINTBEGIN(modernize-macro-to-enum) %} # List generated using https://publicsuffix.org/list/public_suffix_list.dat %%' > tldLookup.gperf grep -v "//" public_suffix_list.dat | grep . | grep "\." | grep -ve "\..*\..*" >> tldLookup.gperf echo "%%" >> tldLookup.gperf +echo '// NOLINTEND(modernize-macro-to-enum)' >> tldLookup.gperf