Skip to content

🎨 Allow "relaxed" fields to have defaults, matchers etc #687

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
merged 1 commit into from
Feb 8, 2025
Merged

🎨 Allow "relaxed" fields to have defaults, matchers etc #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 16 additions & 11 deletions include/msg/field.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,19 @@ concept compatible_with_default = D::template is_compatible_value<V>;
template <typename Name, typename T = std::uint32_t, auto... Ats>
struct field_id_t {};

template <at... Ats> struct sort_key_t {
constexpr static auto sort_key = std::min({Ats.sort_key()...});
};
template <> struct sort_key_t<> {};

template <typename Name, typename T = std::uint32_t,
typename Default = detail::with_default<T>,
match::matcher M = match::always_t, at... Ats>
requires std::is_trivially_copyable_v<T>
class field_t : public field_spec_t<Name, T, detail::field_size<Ats...>>,
public detail::locator_for<Ats...>,
public Default {
public Default,
public sort_key_t<Ats...> {
using spec_t = field_spec_t<Name, T, detail::field_size<Ats...>>;
using locator_t = detail::locator_for<Ats...>;

Expand All @@ -412,7 +418,6 @@ class field_t : public field_spec_t<Name, T, detail::field_size<Ats...>>,
using field_id = field_id_t<Name, T, Ats...>;
using value_type = T;
using matcher_t = M;
constexpr static auto sort_key = std::min({Ats.sort_key()...});

template <stdx::range R>
[[nodiscard]] constexpr static auto extract(R &&r) -> value_type {
Expand Down Expand Up @@ -511,6 +516,12 @@ class field_t : public field_spec_t<Name, T, detail::field_size<Ats...>>,
using shifted_by =
field_t<Name, T, Default, M, Ats.shifted_by(unit_bit_size<Unit>(N))...>;

template <at... NewAts>
using located = field_t<Name, T, Default, M, NewAts...>;

constexpr static auto bitsize = sizeof(T) * CHAR_BIT;
using default_located = located<at{msb_t{bitsize - 1}, lsb_t{}}>;

// ======================================================================
// legacy aliases
template <typename X> using WithMatch = with_matcher<X>;
Expand All @@ -527,13 +538,7 @@ class field_t : public field_spec_t<Name, T, detail::field_size<Ats...>>,
template <stdx::ct_string Name, typename T = std::uint32_t,
typename Default = detail::with_default<T>,
match::matcher M = match::always_t>
struct field {
template <at... Ats>
using located = detail::field_t<
decltype(stdx::ct_string_to_type<Name, sc::string_constant>()), T,
Default, M, Ats...>;

constexpr static auto bitsize = sizeof(T) * CHAR_BIT;
using default_located = located<at{msb_t{bitsize - 1}, lsb_t{}}>;
};
using field = detail::field_t<
decltype(stdx::ct_string_to_type<Name, sc::string_constant>()), T, Default,
M>;
} // namespace msg
22 changes: 22 additions & 0 deletions test/msg/relaxed_message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,25 @@ TEST_CASE("message with no automatically packed fields", "[relaxed_message]") {
using expected_defn = msg::message<"msg", fixed_f>;
static_assert(std::is_same_v<defn, expected_defn>);
}

TEST_CASE("auto field with default value", "[relaxed_message]") {
using defn = relaxed_message<"msg", auto_f1::with_default<42>>;
using expected_defn = msg::message<
"msg", auto_f1::located<at{0_dw, 31_msb, 0_lsb}>::with_default<42>>;
static_assert(std::is_same_v<defn, expected_defn>);
}

TEST_CASE("auto field with const default value", "[relaxed_message]") {
using defn = relaxed_message<"msg", auto_f1::with_const_default<42>>;
using expected_defn =
msg::message<"msg", auto_f1::located<at{
0_dw, 31_msb, 0_lsb}>::with_const_default<42>>;
static_assert(std::is_same_v<defn, expected_defn>);
}

TEST_CASE("auto field without default value", "[relaxed_message]") {
using defn = relaxed_message<"msg", auto_f1::without_default>;
using expected_defn = msg::message<
"msg", auto_f1::located<at{0_dw, 31_msb, 0_lsb}>::without_default>;
static_assert(std::is_same_v<defn, expected_defn>);
}
Loading