Skip to content

Remove naming requirement for std::pair/std::tuple #85

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
ryanofsky merged 1 commit into from
Sep 20, 2023
Merged

Remove naming requirement for std::pair/std::tuple #85

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
28 changes: 14 additions & 14 deletions include/mp/proxy-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,12 @@ decltype(auto) CustomReadField(TypeList<std::pair<KeyLocalType, ValueLocalType>>
ReadDest&& read_dest)
{
const auto& pair = input.get();
using KeyAccessor = typename ProxyStruct<typename Decay<decltype(pair)>::Reads>::KeyAccessor;
using ValueAccessor = typename ProxyStruct<typename Decay<decltype(pair)>::Reads>::ValueAccessor;
using Accessors = typename ProxyStruct<typename Decay<decltype(pair)>::Reads>::Accessors;

ReadField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, KeyAccessor>(pair),
ReadField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<0, Accessors>>(pair),
ReadDestEmplace(TypeList<KeyLocalType>(), [&](auto&&... key_args) -> auto& {
KeyLocalType* key = nullptr;
ReadField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, ValueAccessor>(pair),
ReadField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<1, Accessors>>(pair),
ReadDestEmplace(TypeList<ValueLocalType>(), [&](auto&&... value_args) -> auto& {
auto& ret = read_dest.construct(std::piecewise_construct, std::forward_as_tuple(key_args...),
std::forward_as_tuple(value_args...));
Expand All @@ -427,6 +426,7 @@ decltype(auto) CustomReadField(TypeList<std::pair<KeyLocalType, ValueLocalType>>
}));
}

// TODO: Should generalize this to work with arbitrary length tuples, not just length 2-tuples.
template <typename KeyLocalType, typename ValueLocalType, typename Input, typename ReadDest>
decltype(auto) CustomReadField(TypeList<std::tuple<KeyLocalType, ValueLocalType>>,
Priority<1>,
Expand All @@ -437,9 +437,10 @@ decltype(auto) CustomReadField(TypeList<std::tuple<KeyLocalType, ValueLocalType>
return read_dest.update([&](auto& value) {
const auto& pair = input.get();
using Struct = ProxyStruct<typename Decay<decltype(pair)>::Reads>;
ReadField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, typename Struct::KeyAccessor>(pair),
using Accessors = typename Struct::Accessors;
ReadField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<0, Accessors>>(pair),
ReadDestValue(std::get<0>(value)));
ReadField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, typename Struct::ValueAccessor>(pair),
ReadField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<1, Accessors>>(pair),
ReadDestValue(std::get<1>(value)));
});
}
Expand Down Expand Up @@ -930,12 +931,12 @@ void CustomBuildField(TypeList<std::pair<KeyLocalType, ValueLocalType>>,
Output&& output)
{
auto pair = output.init();
using KeyAccessor = typename ProxyStruct<typename decltype(pair)::Builds>::KeyAccessor;
using ValueAccessor = typename ProxyStruct<typename decltype(pair)::Builds>::ValueAccessor;
BuildField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, KeyAccessor>(pair), value.first);
BuildField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, ValueAccessor>(pair), value.second);
using Accessors = typename ProxyStruct<typename decltype(pair)::Builds>::Accessors;
BuildField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<0, Accessors>>(pair), value.first);
BuildField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<1, Accessors>>(pair), value.second);
}

// TODO: Should generalize this to work with arbitrary length tuples, not just length 2-tuples.
template <typename KeyLocalType, typename ValueLocalType, typename Value, typename Output>
void CustomBuildField(TypeList<std::tuple<KeyLocalType, ValueLocalType>>,
Priority<1>,
Expand All @@ -944,10 +945,9 @@ void CustomBuildField(TypeList<std::tuple<KeyLocalType, ValueLocalType>>,
Output&& output)
{
auto pair = output.init();
using KeyAccessor = typename ProxyStruct<typename decltype(pair)::Builds>::KeyAccessor;
using ValueAccessor = typename ProxyStruct<typename decltype(pair)::Builds>::ValueAccessor;
BuildField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, KeyAccessor>(pair), std::get<0>(value));
BuildField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, ValueAccessor>(pair), std::get<1>(value));
using Accessors = typename ProxyStruct<typename decltype(pair)::Builds>::Accessors;
BuildField(TypeList<KeyLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<0, Accessors>>(pair), std::get<0>(value));
BuildField(TypeList<ValueLocalType>(), invoke_context, Make<StructField, std::tuple_element_t<1, Accessors>>(pair), std::get<1>(value));
}

template <typename LocalType, typename Value, typename Output>
Expand Down
6 changes: 3 additions & 3 deletions test/mp/test/foo.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct FooCustom $Proxy.wrap("mp::test::FooCustom") {
v2 @1 :Int32;
}

struct Pair(Key, Value) {
key @0 :Key;
value @1 :Value;
struct Pair(T1, T2) {
first @0 :T1;
second @1 :T2;
}