clang-tidy fixes

Signed-off-by: Benedek Kupper <kupper.benedek@gmail.com>

Author: benedekkupper

.clang-tidy

@@ -18,12 +18,16 @@ Checks: >
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   clang-analyzer-*,
   hicpp-*,
+  -hicpp-explicit-conversions,
+  -hicpp-signed-bitwise,
   portability-*,
   misc-*,
+  -misc-include-cleaner,
+  -misc-non-private-member-variables-in-classes,
+  -misc-unconventional-assign-operator
 
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*'
-ExcludePaths: '.*\\.test\\.cpp$'
 FormatStyle: file
 CheckOptions:
   - key:             readability-braces-around-statements.ShortStatementLines

.github/workflows/codeql.yml

@@ -5,8 +5,6 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
-  schedule:
-    - cron: '25 3 * * 2'
 
 jobs:
   analyze:

.github/workflows/gh-pages.yml

@@ -22,7 +22,7 @@ jobs:
             DST=$(git tag)
           fi
           mkdir -p web/dist/$DST
-          quom -g __BITFILLED_.* -I bitfilled bitfilled/bitfilled.hpp web/dist/$DST/bitfilled.hpp
+          quom -I bitfilled bitfilled/bitfilled.hpp web/dist/$DST/bitfilled.hpp
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@v4

bitfilled/bitfield_traits.hpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MPL-2.0
-#ifndef __BITFIELD_TRAITS_HPP__
-#define __BITFIELD_TRAITS_HPP__
+#pragma once
 
 #include <array>
 #include "bitfilled/size.hpp"
@@ -62,15 +61,16 @@ constexpr inline std::endian endianness = []() constexpr
     return x == 1 ? std::endian::little : std::endian::big;
 }();
 #else
-inline std::endian endianness = []()
+const inline std::endian endianness = []()
 {
     struct s
     {
-        char a : 1 = 1;
+        bool a : 1 = true;
         char b : 7 = 0;
-    } val;
-    static const auto x = std::bit_cast<std::array<char, bitfilled::aligned_size<s>>>(val).front();
-    return x == 1 ? std::endian::little : std::endian::big;
+    } const val;
+    static const auto ended =
+        std::bit_cast<std::array<char, bitfilled::aligned_size<s>>>(val).front();
+    return ended == 1 ? std::endian::little : std::endian::big;
 }();
 #endif
 
@@ -80,10 +80,8 @@ constexpr inline bool overflow_wraps = []() constexpr
     struct s
     {
         int a : 2;
-    } val{2};
+    } const val{2}; // NOLINT(clang-diagnostic-bitfield-constant-conversion)
     return val.a == -2;
 }();
 
 } // namespace bitfield_traits
-
-#endif // __BITFIELD_TRAITS_HPP__

bitfilled/bitfilled/base_ops.hpp

@@ -58,7 +58,7 @@ struct bitfield_props
     template <typename T = unsigned>
     constexpr static T mask()
     {
-        return ((1 << size_bits()) - 1);
+        return ((1U << size_bits()) - 1U);
     }
     template <typename T>
     constexpr static T extract_field(T memory)
@@ -83,7 +83,7 @@ struct bitfield_props
             struct
             {
                 T field : size_bits();
-            } storage{.field = v};
+            } const storage{.field = v};
             return storage.field;
         }
         return v;
@@ -108,7 +108,7 @@ struct regbitfieldset_props : public bitfield_props<OFFSET, ITEM_SIZE + OFFSET -
 
     constexpr static std::size_t offset(std::size_t index)
     {
-        return base::offset() + index * base::size_bits();
+        return base::offset() + (index * base::size_bits());
     }
     template <typename T>
     constexpr static T extract_field(T memory, std::size_t index)

bitfilled/bitfilled/bits.hpp

@@ -212,7 +212,7 @@ struct regbitfieldset
     operator=(const regbitfieldset & other)
         requires(is_readwrite<ACCESS>)
     {
-        using bf_type = regbitfield<T, TOps, ACCESS, OFFSET, OFFSET + ITEM_COUNT * ITEM_SIZE - 1>;
+        using bf_type = regbitfield<T, TOps, ACCESS, OFFSET, OFFSET + (ITEM_COUNT * ITEM_SIZE) - 1>;
         // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         reinterpret_cast<bf_type&>(*this) = reinterpret_cast<const bf_type&>(other);
         return BITFILLED_ASSIGN_RETURN_EXPR(reinterpret_cast<bf_type&>(*this));
@@ -222,7 +222,7 @@ struct regbitfieldset
     operator=(const regbitfieldset& other) volatile
         requires(is_readwrite<ACCESS>)
     {
-        using bf_type = regbitfield<T, TOps, ACCESS, OFFSET, OFFSET + ITEM_COUNT * ITEM_SIZE - 1>;
+        using bf_type = regbitfield<T, TOps, ACCESS, OFFSET, OFFSET + (ITEM_COUNT * ITEM_SIZE) - 1>;
         // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         reinterpret_cast<volatile bf_type&>(*this) = reinterpret_cast<const bf_type&>(other);
         return BITFILLED_ASSIGN_RETURN_EXPR(reinterpret_cast<volatile bf_type&>(*this));

bitfilled/bitfilled/integer.hpp

@@ -70,7 +70,7 @@ struct integer_storage : public std::array<sized_unsigned_t<1>, SIZE>
         // if the value is signed, fill the target with sign extend bytes
         if (std::is_signed_v<T> and (value < static_cast<T>(0)))
         {
-            std::fill(this->begin(), this->end(), 0xffu);
+            std::fill(this->begin(), this->end(), 0xffU);
         }
 
         // byteswap if the endian is not native
@@ -120,9 +120,9 @@ struct integer_storage : public std::array<sized_unsigned_t<1>, SIZE>
 
         // if the value is signed, fill the target with sign extend bytes
         if (std::is_signed_v<T> and
-            ((endianness == std::endian::little ? this->back() : this->front()) & 0x80u))
+            ((endianness == std::endian::little ? this->back() : this->front()) & 0x80U))
         {
-            std::fill(value_repr.begin(), value_repr.end(), 0xffu);
+            std::fill(value_repr.begin(), value_repr.end(), 0xffU);
         }
 
         // transfer the bytes to the correct position
@@ -176,7 +176,7 @@ struct integer_storage : public std::array<sized_unsigned_t<1>, SIZE>
 template <std::endian ENDIAN, std::size_t SIZE, Integral T = sized_unsigned_t<std::bit_ceil(SIZE)>>
 struct packed_integer
 {
-  protected:
+  protected: // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
     integer_storage<SIZE> storage;
 
   public:

test/CMakeLists.txt

@@ -2,17 +2,22 @@ include(get_cpm)
 CPMAddPackage("gh:boost-ext/ut@2.3.1")
 include(CTest)
 
-add_executable(${PROJECT_NAME}-test main.cpp)
+add_library(${PROJECT_NAME}-build-test OBJECT main.cpp)
+add_executable(${PROJECT_NAME}-test)
 target_sources(${PROJECT_NAME}-test
     PRIVATE
         integer.test.cpp
         size.test.cpp
         variable_bits.test.cpp
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:mmreg.test.cpp>
 )
+target_link_libraries(${PROJECT_NAME}-build-test
+    PUBLIC
+        ${PROJECT_NAME}
+)
 target_link_libraries(${PROJECT_NAME}-test
     PRIVATE
-        ${PROJECT_NAME}
+        ${PROJECT_NAME}-build-test
         ut
 )
 add_test(NAME ${PROJECT_NAME}-test COMMAND ${PROJECT_NAME}-test)
@@ -78,8 +83,8 @@ target_compile_options(${PROJECT_NAME}-test
 )
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    find_program(CLANG_TIDY_EXE NAMES "clang-tidy" REQUIRED)
-    set_target_properties(${PROJECT_NAME}-test
+    find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-20")
+    set_target_properties(${PROJECT_NAME}-build-test
         PROPERTIES
             CXX_CLANG_TIDY "${CLANG_TIDY_EXE}"
     )

test/integer.test.cpp

@@ -25,7 +25,7 @@ struct packed_integer_with_bfs : packed_integer<ENDIAN, SIZE, T>
     BF_BITS(unsigned, 0, 15) halfword;
 };
 
-const suite integer = []
+const suite<"integer"> integer = []
 {
     "integer_storage"_test = []<class TestType>
     {

test/main.cpp

@@ -1 +1,4 @@
+#include "bitfield_traits.hpp"
+#include "bitfilled.hpp"
+
 int main() {}