Skip to content

Add ReadList helper #285

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

Open
ViniciusCestarii wants to merge 2 commits into
base: master
Choose a base branch
from
+46 −61
Open

Add ReadList helper #285

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
4d0f8db
proxy: add ReadList helper and dedup map/set/vector read handlers
ViniciusCestarii Jun 3, 2026
6450345
type: reserve first when reading std::unordered_set
ViniciusCestarii Jun 3, 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
15 changes: 15 additions & 0 deletions include/mp/proxy-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,21 @@ void BuildList(TypeList<LocalType>, InvokeContext& invoke_context, Output&& outp
}
}

template <typename LocalType, typename Input, typename ReadDest, typename InitFn, typename EmplaceFn>
decltype(auto) ReadList(TypeList<LocalType>, InvokeContext& invoke_context, Input&& input, ReadDest&& read_dest, InitFn&& init, EmplaceFn&& emplace)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
init(value, data.size());
for (auto item : data) {
ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
ReadDestEmplace(TypeList<LocalType>(), [&emplace, &value](auto&&... args) -> decltype(auto) {
return emplace(value, std::forward<decltype(args)>(args)...);
}));
}
});
}

template <typename LocalType, typename Value, typename Output>
void CustomBuildField(TypeList<LocalType>, Priority<0>, InvokeContext& invoke_context, Value&& value, Output&& output)
{
Expand Down
18 changes: 6 additions & 12 deletions include/mp/type-map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,12 @@ decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
Input&& input,
ReadDest&& read_dest)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
value.clear();
for (auto item : data) {
ReadField(TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context,
Make<ValueField>(item),
ReadDestEmplace(
TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), [&](auto&&... args) -> auto& {
return *EmplacePiecewiseSafe(value, std::forward<decltype(args)>(args)...).first;
}));
}
});
return ReadList(
TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context, input, read_dest,
[&](auto& value, size_t) { value.clear(); },
[&](auto& value, auto&&... args) -> auto& {
return *EmplacePiecewiseSafe(value, std::forward<decltype(args)>(args)...).first;
});
}
} // namespace mp

Expand Down
16 changes: 6 additions & 10 deletions include/mp/type-set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ decltype(auto) CustomReadField(TypeList<std::set<LocalType>>,
Input&& input,
ReadDest&& read_dest)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
value.clear();
for (auto item : data) {
ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
ReadDestEmplace(TypeList<const LocalType>(), [&](auto&&... args) -> auto& {

@ryanofsky ryanofsky Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In commit "type: reserve first when reading std::unordered_set" (043b8a8)

Note: new code is dropping const LocalType here which I could look like a problem, because std::set members are const and can't be updated. So this might seem to break cases like std::set<std::shared_ptr<T>> because shared_ptr readfield uses read_dest.update and would be unable to update the new emplaced set element. But this works because the is_const_v check ignores LocalType entirely and just checks type of the return value of the emplace function. And that is still const below (*value.emplace(std::forward<decltype(args)>(args)...).first is const).

return *value.emplace(std::forward<decltype(args)>(args)...).first;
}));
}
});
return ReadList(
TypeList<LocalType>(), invoke_context, input, read_dest,
[&](auto& value, size_t) { value.clear(); },
[&](auto& value, auto&&... args) -> auto& {
return *value.emplace(std::forward<decltype(args)>(args)...).first;
});
}
} // namespace mp

Expand Down
19 changes: 9 additions & 10 deletions include/mp/type-unordered-set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ decltype(auto) CustomReadField(TypeList<std::unordered_set<LocalType>>,
Input&& input,
ReadDest&& read_dest)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
value.clear();
for (auto item : data) {
ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
ReadDestEmplace(TypeList<const LocalType>(), [&](auto&&... args) -> auto& {
return *value.emplace(std::forward<decltype(args)>(args)...).first;
}));
}
});
return ReadList(
TypeList<LocalType>(), invoke_context, input, read_dest,
[&](auto& value, size_t size) {
value.clear();
value.reserve(size);
},
[&](auto& value, auto&&... args) -> auto& {
return *value.emplace(std::forward<decltype(args)>(args)...).first;
});
}
} // namespace mp

Expand Down
39 changes: 10 additions & 29 deletions include/mp/type-vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,16 @@ decltype(auto) CustomReadField(TypeList<std::vector<LocalType>>,
Input&& input,
ReadDest&& read_dest)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
value.clear();
value.reserve(data.size());
for (auto item : data) {
ReadField(TypeList<LocalType>(), invoke_context, Make<ValueField>(item),
ReadDestEmplace(TypeList<LocalType>(), [&](auto&&... args) -> auto& {
value.emplace_back(std::forward<decltype(args)>(args)...);
return value.back();
}));
}
});
}

template <typename Input, typename ReadDest>
decltype(auto) CustomReadField(TypeList<std::vector<bool>>,
Priority<1>,
InvokeContext& invoke_context,
Input&& input,
ReadDest&& read_dest)
{
return read_dest.update([&](auto& value) {
auto data = input.get();
value.clear();
value.reserve(data.size());
for (auto item : data) {
value.push_back(ReadField(TypeList<bool>(), invoke_context, Make<ValueField>(item), ReadDestTemp<bool>()));
}
});
return ReadList(
TypeList<LocalType>(), invoke_context, input, read_dest,
[&](auto& value, size_t size) {
value.clear();
value.reserve(size);
},
[&](auto& value, auto&&... args) -> decltype(auto) {
value.emplace_back(std::forward<decltype(args)>(args)...);
return value.back();
});
}
} // namespace mp

Expand Down
Loading