Skip to content

Rename get_vtable/get_mutable_vtable to get_const_vtable/get_vtable (2/20) #102

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
jbcoe wants to merge 1 commit into
base: reflection/00-python-exact-match
Choose a base branch
from
+13 −12
Open

Rename get_vtable/get_mutable_vtable to get_const_vtable/get_vtable (2/20) #102

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
13 changes: 7 additions & 6 deletions protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ const void* get_mapped_vtable(const void* source_vtable_pointer,
void* target));

template <typename FromProtocol, typename ToProtocol>
const typename protocol_vtable_traits<ToProtocol>::const_vtable* get_vtable(
const typename protocol_vtable_traits<ToProtocol>::const_vtable*
get_const_vtable(
const typename protocol_vtable_traits<FromProtocol>::const_vtable*
source_vtable_pointer) {
using FromVtable =
Expand All @@ -68,8 +69,8 @@ const typename protocol_vtable_traits<ToProtocol>::const_vtable* get_vtable(
static const char conversion_anchor = 0;

auto mapping_function = [](const void* source, void* target) {
map_vtable_members(static_cast<const FromVtable*>(source),
static_cast<ToVtable*>(target));
map_const_vtable_members(static_cast<const FromVtable*>(source),
static_cast<ToVtable*>(target));
};

return static_cast<const ToVtable*>(
Expand All @@ -78,7 +79,7 @@ const typename protocol_vtable_traits<ToProtocol>::const_vtable* get_vtable(
}

template <typename FromProtocol, typename ToProtocol>
const typename protocol_vtable_traits<ToProtocol>::vtable* get_mutable_vtable(
const typename protocol_vtable_traits<ToProtocol>::vtable* get_vtable(
const typename protocol_vtable_traits<FromProtocol>::vtable*
source_vtable_pointer) {
using FromVtable = typename protocol_vtable_traits<FromProtocol>::vtable;
Expand All @@ -87,8 +88,8 @@ const typename protocol_vtable_traits<ToProtocol>::vtable* get_mutable_vtable(
static const char conversion_anchor = 0;

auto mapping_function = [](const void* source, void* target) {
map_mutable_vtable_members(static_cast<const FromVtable*>(source),
static_cast<ToVtable*>(target));
map_vtable_members(static_cast<const FromVtable*>(source),
static_cast<ToVtable*>(target));
};

return static_cast<const ToVtable*>(
Expand Down
12 changes: 6 additions & 6 deletions scripts/protocol.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ struct protocol_owning_vtable_traits<{{ full_class_name }}, Allocator> {
};

template <typename From>
inline void map_vtable_members(const From* from, const_view_vtable_{{ c.name }}* to) {
inline void map_const_vtable_members(const From* from, const_view_vtable_{{ c.name }}* to) {
{% for m in c.methods %}{% if m.is_const %}
to->{{ m.name | mangle }}_{{ method_guids[loop.index0] }} = from->{{ m.name | mangle }}_{{ method_guids[loop.index0] }};
{% endif %}{% endfor %}
}

template <typename From>
inline void map_mutable_vtable_members(const From* from, view_vtable_{{ c.name }}* to) {
inline void map_vtable_members(const From* from, view_vtable_{{ c.name }}* to) {
{% for m in c.methods %}{% if m.is_const %}
to->const_view.{{ m.name | mangle }}_{{ method_guids[loop.index0] }} = from->const_view.{{ m.name | mangle }}_{{ method_guids[loop.index0] }};
{% endif %}{% endfor %}
Expand All @@ -149,7 +149,7 @@ inline void map_owning_vtable_members(const From* from, typename protocol_owning
to->xyz_protocol_clone = from->xyz_protocol_clone;
to->xyz_protocol_move = from->xyz_protocol_move;
to->xyz_protocol_destroy = from->xyz_protocol_destroy;
to->view_vt = get_mutable_vtable<typename From::protocol_type, {{ full_class_name }}>(from->view_vt);
to->view_vt = get_vtable<typename From::protocol_type, {{ full_class_name }}>(from->view_vt);
{% for m in c.methods %}
to->{{ m.name | mangle }}_{{ method_guids[loop.index0] }} = from->{{ m.name | mangle }}_{{ method_guids[loop.index0] }};
{% endfor %}
Expand Down Expand Up @@ -581,13 +581,13 @@ class protocol_view<const {{ full_class_name }}> {
requires(!std::same_as<Other, {{ full_class_name }}>)
protocol_view(const protocol_view<const Other>& other) noexcept
: ptr_(other.ptr_),
vptr_(get_vtable<Other, {{ full_class_name }}>(other.vptr_)) {}
vptr_(get_const_vtable<Other, {{ full_class_name }}>(other.vptr_)) {}

template <typename Other>
requires(!std::same_as<Other, {{ full_class_name }}>)
protocol_view(const protocol_view<Other>& other) noexcept
: ptr_(other.ptr_),
vptr_(get_vtable<Other, {{ full_class_name }}>(&other.vptr_->const_view)) {}
vptr_(get_const_vtable<Other, {{ full_class_name }}>(&other.vptr_->const_view)) {}

template <typename Other, typename Alloc>
requires(!std::same_as<Other, {{ full_class_name }}>)
Expand Down Expand Up @@ -661,7 +661,7 @@ class protocol_view<{{ full_class_name }}> {
requires(!std::same_as<Other, {{ full_class_name }}>)
protocol_view(const protocol_view<Other>& other) noexcept
: ptr_(other.ptr_),
vptr_(get_mutable_vtable<Other, {{ full_class_name }}>(other.vptr_)) {}
vptr_(get_vtable<Other, {{ full_class_name }}>(other.vptr_)) {}

template <typename Other, typename Alloc>
requires(!std::same_as<Other, {{ full_class_name }}>)
Expand Down
Loading