Skip to content

Fix bug reading with 'tagged' variants when a variant is non-copyable #464

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
liuzicheng1987 merged 1 commit into from
Jul 16, 2025
Merged

Fix bug reading with 'tagged' variants when a variant is non-copyable #464

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
2 changes: 1 addition & 1 deletion include/rfl/parsing/Parser_rfl_variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Parser<R, W, rfl::Variant<AlternativeTypes...>, ProcessorsType> {
using FieldVariantType =
rfl::Variant<VariantAlternativeWrapper<AlternativeTypes>...>;
const auto from_field_variant =
[](const auto& _field) -> rfl::Variant<AlternativeTypes...> {
[](auto&& _field) -> rfl::Variant<AlternativeTypes...> {
return std::move(_field.value());
};
return Parser<R, W, FieldVariantType, ProcessorsType>::read(_r, _var)
Expand Down
14 changes: 10 additions & 4 deletions tests/json/test_add_tag_to_rfl_variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ namespace test_add_tag_to_rfl_variant {

struct button_pressed_t {};

struct button_released_t {};
// Test that we can still use structs that must be moved
struct button_released_t {
rfl::Box<int> button;
};

struct key_pressed_t {
using Tag = rfl::Literal<"key_pressed">;
Expand All @@ -23,11 +26,14 @@ using my_event_type_t =
rfl::Variant<button_pressed_t, button_released_t, key_pressed_t, int>;

TEST(json, test_add_tag_to_rfl_variant) {
const auto vec = std::vector<my_event_type_t>(
{button_pressed_t{}, button_released_t{}, key_pressed_t{'c'}, 3});
std::vector<my_event_type_t> vec;
vec.emplace_back(button_pressed_t{});
vec.emplace_back(button_released_t{rfl::make_box<int>(4)});
vec.emplace_back(key_pressed_t{'c'});
vec.emplace_back(3);

write_and_read<rfl::AddTagsToVariants>(
vec,
R"([{"button_pressed_t":{}},{"button_released_t":{}},{"key_pressed":{"key":99}},{"int":3}])");
R"([{"button_pressed_t":{}},{"button_released_t":{"button":4}},{"key_pressed":{"key":99}},{"int":3}])");
}
} // namespace test_add_tag_to_rfl_variant
Loading