Skip to content

🔥 Replace old compiler macros #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elbeno merged 2 commits into from
Apr 14, 2026
Merged

🔥 Replace old compiler macros #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888c7c3
:fire: Replace old compiler macros
elbeno Apr 14, 2026
cfe8d46
:fire: Replace `CONSTEVAL_UDL`
elbeno Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/groov/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ struct clear_t {};
constexpr auto clear = clear_t{};

template <typename Bus, typename RegType>
CONSTEVAL auto transform_mask(RegType mask) -> RegType {
consteval auto transform_mask(RegType mask) -> RegType {
if constexpr (requires { Bus::transform_mask(RegType{}); }) {
return Bus::transform_mask(mask);
} else {
Expand Down
20 changes: 7 additions & 13 deletions include/groov/path.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ constexpr inline auto parent(path<> const &) { return path<>{}; }
template <typename Path> using parent_t = decltype(parent(Path{}));

template <stdx::ct_string S, stdx::ct_string... Parts>
CONSTEVAL auto make_path() -> pathlike auto {
consteval auto make_path() -> pathlike auto {
constexpr auto p = stdx::split<S, '.'>();
if constexpr (p.second.empty()) {
if constexpr (p.first.empty()) {
Expand All @@ -89,36 +89,30 @@ CONSTEVAL auto make_path() -> pathlike auto {

namespace literals {
#if __clang__ && __clang_major__ <= 14
template <class T, T... chars>
CONSTEVAL_UDL auto operator""_g() -> pathlike auto {
template <class T, T... chars> consteval auto operator""_g() -> pathlike auto {
constexpr auto s = stdx::ct_string<sizeof...(chars) + 1U>{{chars..., 0}};
return make_path<s>();
}

template <class T, T... chars>
CONSTEVAL_UDL auto operator""_r() -> pathlike auto {
template <class T, T... chars> consteval auto operator""_r() -> pathlike auto {
constexpr auto s = stdx::ct_string<sizeof...(chars) + 1U>{{chars..., 0}};
return make_path<s>();
}

template <class T, T... chars>
CONSTEVAL_UDL auto operator""_f() -> pathlike auto {
template <class T, T... chars> consteval auto operator""_f() -> pathlike auto {
constexpr auto s = stdx::ct_string<sizeof...(chars) + 1U>{{chars..., 0}};
return make_path<s>();
}
#else
template <stdx::ct_string S>
CONSTEVAL_UDL auto operator""_g() -> pathlike auto {
template <stdx::ct_string S> consteval auto operator""_g() -> pathlike auto {
return make_path<S>();
}

template <stdx::ct_string S>
CONSTEVAL_UDL auto operator""_r() -> pathlike auto {
template <stdx::ct_string S> consteval auto operator""_r() -> pathlike auto {
return make_path<S>();
}

template <stdx::ct_string S>
CONSTEVAL_UDL auto operator""_f() -> pathlike auto {
template <stdx::ct_string S> consteval auto operator""_f() -> pathlike auto {
return make_path<S>();
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions include/groov/read.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ template <typename Group> struct to_register_q {

template <typename Register> using to_fields = typename Register::children_t;

template <typename F, auto Mask> CONSTEVAL auto check_writeonly_field() {
template <typename F, auto Mask> consteval auto check_writeonly_field() {
constexpr auto mask_overlap = F::template mask<decltype(Mask)> & Mask;
if constexpr (registerlike<F>) {
STATIC_ASSERT(not write_only_write_function<typename F::write_fn_t> or
Expand All @@ -75,7 +75,7 @@ template <typename F, auto Mask> CONSTEVAL auto check_writeonly_field() {
}

template <typename Bus, typename L, typename Masks>
CONSTEVAL auto check_write_only() -> void {
consteval auto check_write_only() -> void {
[[maybe_unused]] auto r = stdx::for_each(
[]<typename... Fs>(boost::mp11::mp_list<Fs...>, auto mask) {
constexpr auto read_mask = transform_mask<Bus>(mask());
Expand Down
8 changes: 4 additions & 4 deletions include/groov/write.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ template <typename Reg>
using compute_reg_id_value_t =
std::integral_constant<typename Reg::type_t, Reg::unused_identity_value>;

template <typename F> CONSTEVAL auto check_readonly_field() {
template <typename F> consteval auto check_readonly_field() {
if constexpr (registerlike<F>) {
STATIC_ASSERT(not read_only_write_function<typename F::write_fn_t>,
"Attempting to write to a read-only register: {}",
Expand All @@ -67,15 +67,15 @@ template <typename F> CONSTEVAL auto check_readonly_field() {
}
}

template <typename Bus, typename L> CONSTEVAL auto check_read_only() -> void {
template <typename Bus, typename L> consteval auto check_read_only() -> void {
[[maybe_unused]] auto r = stdx::for_each(
[]<typename... Fs>(boost::mp11::mp_list<Fs...>) {
(check_readonly_field<Fs>(), ...);
},
L{});
}

template <typename F, auto Mask> CONSTEVAL auto check_rmw_field() {
template <typename F, auto Mask> consteval auto check_rmw_field() {
constexpr auto mask_overlap = F::template mask<decltype(Mask)> & Mask;
STATIC_ASSERT(not write_only_write_function<typename F::write_fn_t> or
identity_write_function<typename F::write_fn_t> or
Expand All @@ -84,7 +84,7 @@ template <typename F, auto Mask> CONSTEVAL auto check_rmw_field() {
}

template <typename Bus, typename L, typename Masks>
CONSTEVAL auto check_rmw() -> void {
consteval auto check_rmw() -> void {
[[maybe_unused]] auto r = stdx::for_each(
[]<typename... Fs>(boost::mp11::mp_list<Fs...>, auto mask) {
[[maybe_unused]] constexpr auto write_mask =
Expand Down
1 change: 0 additions & 1 deletion include/groov/write_spec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <groov/read_spec.hpp>
#include <groov/resolve.hpp>

#include <stdx/compiler.hpp>
#include <stdx/tuple.hpp>
#include <stdx/tuple_algorithms.hpp>
#include <stdx/type_traits.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ struct be_bus {
}

template <typename RegType>
CONSTEVAL static auto transform_mask(RegType mask) -> RegType {
consteval static auto transform_mask(RegType mask) -> RegType {
using A = std::array<std::uint8_t, sizeof(RegType)>;
auto arr = stdx::bit_cast<A>(mask);
for (auto &i : arr) {
Expand Down
2 changes: 1 addition & 1 deletion test/read.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ struct be_bus {
}

template <typename RegType>
CONSTEVAL static auto transform_mask(RegType mask) -> RegType {
consteval static auto transform_mask(RegType mask) -> RegType {
using A = std::array<std::uint8_t, sizeof(RegType)>;
auto arr = stdx::bit_cast<A>(mask);
for (auto &i : arr) {
Expand Down
2 changes: 1 addition & 1 deletion test/write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ struct be_bus {
}

template <typename RegType>
CONSTEVAL static auto transform_mask(RegType mask) -> RegType {
consteval static auto transform_mask(RegType mask) -> RegType {
using A = std::array<std::uint8_t, sizeof(RegType)>;
auto arr = stdx::bit_cast<A>(mask);
for (auto &i : arr) {
Expand Down