Skip to content

Make invoke and reflect unqualified #23

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
mingxwa wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make invoke and reflect unqualified #23

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
ac3b12f
Make invoke and reflect unqualified
mingxwa Apr 12, 2026
3b23300
Refactor
mingxwa Apr 12, 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
180 changes: 119 additions & 61 deletions include/proxy/v4/proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,43 @@ class proxy_indirect_accessor
proxy_indirect_accessor() = default;
proxy_indirect_accessor(const proxy_indirect_accessor&) = default;
proxy_indirect_accessor& operator=(const proxy_indirect_accessor&) = default;

public:
template <class D, class O, class... Args>
friend auto invoke(proxy_indirect_accessor& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::lv>(p),
std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(const proxy_indirect_accessor& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::const_lv>(p),
std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(proxy_indirect_accessor&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::rv>(std::move(p)),
std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(const proxy_indirect_accessor&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::const_rv>(std::move(p)),
std::forward<Args>(args)...);
}
template <class R>
friend const R& reflect(const proxy_indirect_accessor& p) noexcept {
return static_cast<const details::refl_meta<false, R>&>(
details::proxy_helper::get_meta(
details::as_proxy<F, details::qualifier_type::const_lv>(p)))
.reflector;
}
};

template <facade F>
Expand Down Expand Up @@ -1118,6 +1155,34 @@ class proxy : public details::facade_traits<F>::direct_accessor,
friend bool operator==(const proxy& lhs, std::nullptr_t) noexcept {
return !lhs.has_value();
}
template <class D, class O, class... Args>
friend auto invoke(proxy& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(const proxy& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(proxy<F>&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(std::move(p),
std::forward<Args>(args)...);
}
template <class D, class O, class... Args>
friend auto invoke(const proxy&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(std::move(p),
std::forward<Args>(args)...);
}
template <class R>
friend const R& reflect(const proxy& p) noexcept {
return static_cast<const details::refl_meta<true, R>&>(
details::proxy_helper::get_meta(p))
.reflector;
}

private:
void initialize() {
Expand All @@ -1133,10 +1198,9 @@ class proxy : public details::facade_traits<F>::direct_accessor,
std::ranges::uninitialized_copy(rhs.ptr_, ptr_);
meta_ = rhs.meta_;
} else {
proxy_invoke<details::copy_dispatch,
void(proxy&) const noexcept(
F::copyability == constraint_level::nothrow)>(rhs,
*this);
invoke<details::copy_dispatch,
void(proxy&) const noexcept(
F::copyability == constraint_level::nothrow)>(rhs, *this);
}
} else {
meta_.reset();
Expand All @@ -1152,9 +1216,9 @@ class proxy : public details::facade_traits<F>::direct_accessor,
meta_ = rhs.meta_;
rhs.meta_.reset();
} else {
proxy_invoke<details::relocate_dispatch,
void(proxy&) && noexcept(F::relocatability ==
constraint_level::nothrow)>(
invoke<details::relocate_dispatch,
void(proxy&) &&
noexcept(F::relocatability == constraint_level::nothrow)>(
std::move(rhs), *this);
}
} else {
Expand All @@ -1179,9 +1243,9 @@ class proxy : public details::facade_traits<F>::direct_accessor,
{
if constexpr (F::destructibility != constraint_level::trivial) {
if (meta_.has_value()) {
proxy_invoke<details::destroy_dispatch,
void() noexcept(F::destructibility ==
constraint_level::nothrow)>(*this);
invoke<details::destroy_dispatch,
void() noexcept(F::destructibility ==
constraint_level::nothrow)>(*this);
}
}
}
Expand All @@ -1200,68 +1264,63 @@ class proxy : public details::facade_traits<F>::direct_accessor,
};

template <class D, class O, facade F, class... Args>
auto proxy_invoke(proxy_indirect_accessor<F>& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(proxy_indirect_accessor<F>& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::lv>(p),
std::forward<Args>(args)...);
return invoke<D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(const proxy_indirect_accessor<F>& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(const proxy_indirect_accessor<F>& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::const_lv>(p),
std::forward<Args>(args)...);
return invoke<D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(proxy_indirect_accessor<F>&& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(proxy_indirect_accessor<F>&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::rv>(std::move(p)),
std::forward<Args>(args)...);
return invoke<D, O>(std::move(p), std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(const proxy_indirect_accessor<F>&& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(const proxy_indirect_accessor<F>&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, false, D, O>(
details::as_proxy<F, details::qualifier_type::const_rv>(std::move(p)),
std::forward<Args>(args)...);
return invoke<D, O>(std::move(p), std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(proxy<F>& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(proxy<F>& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(p, std::forward<Args>(args)...);
return invoke<D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(const proxy<F>& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(const proxy<F>& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(p, std::forward<Args>(args)...);
return invoke<D, O>(p, std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(proxy<F>&& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(proxy<F>&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(std::move(p),
std::forward<Args>(args)...);
return invoke<D, O>(std::move(p), std::forward<Args>(args)...);
}
template <class D, class O, facade F, class... Args>
auto proxy_invoke(const proxy<F>&& p, Args&&... args) ->
[[deprecated("Use unqualified invoke instead")]] auto
proxy_invoke(const proxy<F>&& p, Args&&... args) ->
typename details::overload_traits<O>::return_type {
return details::invoke_impl<F, true, D, O>(std::move(p),
std::forward<Args>(args)...);
return invoke<D, O>(std::move(p), std::forward<Args>(args)...);
}

template <class R, facade F>
const R& proxy_reflect(const proxy_indirect_accessor<F>& p) noexcept {
return static_cast<const details::refl_meta<false, R>&>(
details::proxy_helper::get_meta(
details::as_proxy<F, details::qualifier_type::const_lv>(p)))
.reflector;
[[deprecated("Use unqualified reflect instead")]] const R&
proxy_reflect(const proxy_indirect_accessor<F>& p) noexcept {
return reflect<R>(p);
}
template <class R, facade F>
const R& proxy_reflect(const proxy<F>& p) noexcept {
return static_cast<const details::refl_meta<true, R>&>(
details::proxy_helper::get_meta(p))
.reflector;
[[deprecated("Use unqualified reflect instead")]] const R&
proxy_reflect(const proxy<F>& p) noexcept {
return reflect<R>(p);
}

// =============================================================================
Expand Down Expand Up @@ -1324,7 +1383,7 @@ struct converter {
return nullptr; \
} \
} \
return proxy_invoke<D, T() oq ne>(static_cast<P pq>(*this)); \
return invoke<D, T() oq ne>(static_cast<P pq>(*this)); \
} \
}
template <bool Expl, bool Nullable>
Expand Down Expand Up @@ -2209,7 +2268,7 @@ struct proxy_cast_accessor_impl {
.is_ref = true,
.is_const = std::is_const_v<U>,
.result_ptr = &result};
proxy_invoke<D, O>(static_cast<Self>(self), ctx);
invoke<D, O>(static_cast<Self>(self), ctx);
if (result == nullptr) [[unlikely]] {
PRO4D_THROW(bad_proxy_cast{});
}
Expand All @@ -2220,7 +2279,7 @@ struct proxy_cast_accessor_impl {
.is_ref = false,
.is_const = false,
.result_ptr = &result};
proxy_invoke<D, O>(static_cast<Self>(self), ctx);
invoke<D, O>(static_cast<Self>(self), ctx);
if (!result.has_value()) [[unlikely]] {
PRO4D_THROW(bad_proxy_cast{});
}
Expand All @@ -2236,7 +2295,7 @@ struct proxy_cast_accessor_impl {
.is_ref = true,
.is_const = std::is_const_v<T>,
.result_ptr = &result};
proxy_invoke<D, O>(*self, ctx);
invoke<D, O>(*self, ctx);
return static_cast<T*>(result);
}
};
Expand Down Expand Up @@ -2276,7 +2335,7 @@ struct proxy_typeid_reflector {
template <class Self, class R>
struct accessor {
friend const std::type_info& proxy_typeid(const Self& self) noexcept {
const proxy_typeid_reflector& refl = proxy_reflect<R>(self);
const proxy_typeid_reflector& refl = reflect<R>(self);
return *refl.info;
}
PRO4D_DEBUG(
Expand Down Expand Up @@ -2397,23 +2456,23 @@ struct operator_dispatch;
struct accessor<P, D, R() oq ne> { \
PRO4D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(__VA_ARGS__) \
R __VA_ARGS__() oq ne { \
return proxy_invoke<D, R() oq ne>(static_cast<P pq>(*this)); \
return invoke<D, R() oq ne>(static_cast<P pq>(*this)); \
} \
}
#define PROD_DEF_LHS_UNARY_OP_ACCESSOR(oq, pq, ne, ...) \
template <class P, class D, class R> \
struct accessor<P, D, R() oq ne> { \
PRO4D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(__VA_ARGS__) \
decltype(auto) __VA_ARGS__() oq ne { \
proxy_invoke<D, R() oq ne>(static_cast<P pq>(*this)); \
invoke<D, R() oq ne>(static_cast<P pq>(*this)); \
return static_cast<P pq>(*this); \
} \
}; \
template <class P, class D, class R> \
struct accessor<P, D, R(int) oq ne> { \
PRO4D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(__VA_ARGS__) \
R __VA_ARGS__(int) oq ne { \
return proxy_invoke<D, R(int) oq ne>(static_cast<P pq>(*this), 0); \
return invoke<D, R(int) oq ne>(static_cast<P pq>(*this), 0); \
} \
}
#define PROD_DEF_LHS_BINARY_OP_ACCESSOR PRO4D_DEF_MEM_ACCESSOR
Expand Down Expand Up @@ -2448,8 +2507,8 @@ struct operator_dispatch;
template <class P, class D, class R, class Arg> \
struct accessor<P, D, R(Arg) oq ne> { \
friend R operator __VA_ARGS__(Arg arg, P pq self) ne { \
return proxy_invoke<D, R(Arg) oq ne>(static_cast<P pq>(self), \
std::forward<Arg>(arg)); \
return invoke<D, R(Arg) oq ne>(static_cast<P pq>(self), \
std::forward<Arg>(arg)); \
} \
PRO4D_DEBUG( \
accessor() noexcept { std::ignore = &pro_symbol_guard; } \
Expand Down Expand Up @@ -2484,16 +2543,16 @@ struct operator_dispatch;
struct accessor<P, D, R(Arg) oq ne> { \
PRO4D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(__VA_ARGS__) \
decltype(auto) __VA_ARGS__(Arg arg) oq ne { \
proxy_invoke<D, R(Arg) oq ne>(static_cast<P pq>(*this), \
std::forward<Arg>(arg)); \
invoke<D, R(Arg) oq ne>(static_cast<P pq>(*this), \
std::forward<Arg>(arg)); \
return static_cast<P pq>(*this); \
} \
}
#define PROD_DEF_RHS_ASSIGNMENT_OP_ACCESSOR(oq, pq, ne, ...) \
template <class P, class D, class R, class Arg> \
struct accessor<P, D, R(Arg&) oq ne> { \
friend Arg& operator __VA_ARGS__(Arg& arg, P pq self) ne { \
proxy_invoke<D, R(Arg&) oq ne>(static_cast<P pq>(self), arg); \
invoke<D, R(Arg&) oq ne>(static_cast<P pq>(self), arg); \
return arg; \
} \
PRO4D_DEBUG( \
Expand Down Expand Up @@ -2661,9 +2720,8 @@ struct formatter<pro::v4::proxy_indirect_accessor<F>, CharT> {
template <class OutIt>
OutIt format(const pro::v4::proxy_indirect_accessor<F>& p,
basic_format_context<OutIt, CharT>& fc) const {
return pro::v4::proxy_invoke<pro::v4::details::format_dispatch,
pro::v4::details::format_overload_t<CharT>>(
p, spec_, fc);
return invoke<pro::v4::details::format_dispatch,
pro::v4::details::format_overload_t<CharT>>(p, spec_, fc);
}

private:
Expand Down
5 changes: 2 additions & 3 deletions include/proxy/v4/proxy_fmt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,8 @@ struct formatter<pro::v4::proxy_indirect_accessor<F>, CharT> {
template <class FormatContext>
auto format(const pro::v4::proxy_indirect_accessor<F>& p,
FormatContext& fc) const -> typename FormatContext::iterator {
return pro::v4::proxy_invoke<
pro::v4::details::fmt_format_dispatch,
pro::v4::details::fmt_format_overload_t<CharT>>(p, spec_, fc);
return invoke<pro::v4::details::fmt_format_dispatch,
pro::v4::details::fmt_format_overload_t<CharT>>(p, spec_, fc);
}

private:
Expand Down
4 changes: 2 additions & 2 deletions include/proxy/v4/proxy_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
struct accessor<ProP, ProD, ProR(ProArgs...) oq ne> { \
PRO4D_GEN_DEBUG_SYMBOL_FOR_MEM_ACCESSOR(__VA_ARGS__) \
ProR __VA_ARGS__(ProArgs... pro_args) oq ne { \
return ::pro::v4::proxy_invoke<ProD, ProR(ProArgs...) oq ne>( \
return invoke<ProD, ProR(ProArgs...) oq ne>( \
static_cast<ProP pq>(*this), ::std::forward<ProArgs>(pro_args)...); \
} \
}
Expand All @@ -106,7 +106,7 @@
template <class ProP, class ProD, class ProR, class... ProArgs> \
struct accessor<ProP, ProD, ProR(ProArgs...) oq ne> { \
friend ProR __VA_ARGS__(ProP pq pro_self, ProArgs... pro_args) ne { \
return ::pro::v4::proxy_invoke<ProD, ProR(ProArgs...) oq ne>( \
return invoke<ProD, ProR(ProArgs...) oq ne>( \
static_cast<ProP pq>(pro_self), \
::std::forward<ProArgs>(pro_args)...); \
} \
Expand Down
2 changes: 1 addition & 1 deletion tests/proxy_creation_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct LifetimeModelReflector {
struct accessor {
LifetimeModelType GetLifetimeType() const noexcept {
const LifetimeModelReflector& refl =
pro::proxy_reflect<R>(static_cast<const Self&>(*this));
reflect<R>(static_cast<const Self&>(*this));
return refl.Type;
}
};
Expand Down
2 changes: 1 addition & 1 deletion tests/proxy_reflection_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct TraitsReflector {
template <class Self, class R>
struct accessor {
const TraitsReflector& ReflectTraits() const noexcept {
return pro::proxy_reflect<R>(static_cast<const Self&>(*this));
return reflect<R>(static_cast<const Self&>(*this));
}
};

Expand Down
3 changes: 1 addition & 2 deletions tests/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ class RttiReflector {
template <class P, class R>
struct accessor {
const char* GetTypeName() const noexcept {
const RttiReflector& self =
pro::proxy_reflect<R>(static_cast<const P&>(*this));
const RttiReflector& self = reflect<R>(static_cast<const P&>(*this));
return self.type_.name();
}
};
Expand Down
Loading