Skip to content

Commit 1121dc5

Browse files
committed
general refactor.
1 parent 8aecbc4 commit 1121dc5

File tree

7 files changed

+100
-100
lines changed

7 files changed

+100
-100
lines changed

ReflectionTemplateLib/rtl/detail/inc/FunctionCaller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace rtl::detail
143143
{
144144
using fn_cast = dispatch::functor_cast<dispatch::fn_void::no, traits::normal_sign_t<args_t>...>;
145145
auto fn = fn_cast(ty_meta.get_functor()).template to_function<dispatch::erase::t_return>();
146-
pHopper.get_rhop().push_back(fn.get_hop());
146+
pHopper.get_rhop().push_back(fn.f_ptr());
147147
}
148148

149149
pHopper.get_overloads().push_back(&ty_meta.get_functor());

ReflectionTemplateLib/rtl/detail/inc/MethodInvoker.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ namespace rtl::detail
286286
}
287287
else {
288288
auto fn = lambda.template operator() < dispatch::fn_void::no > ();
289-
pHopper.get_rhop().push_back(fn.get_hop());
289+
pHopper.get_rhop().push_back(fn.f_ptr());
290290
}
291291

292292
pHopper.get_overloads().push_back(&ty_meta.get_functor());

ReflectionTemplateLib/rtl/dispatch/function_lambda.h

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -15,125 +15,125 @@
1515

1616
namespace rtl::dispatch
1717
{
18-
template<class...args_t>
19-
struct function_lambda<fn_void::no, erase::t_ctor, args_t...> : lambda
20-
{
21-
// ditch all std::functions and use fn-pointer directly - what??? Yes!
22-
using fptr_t = Return(*)(alloc, traits::normal_sign_t<args_t>&&...);
18+
template<class...args_t>
19+
struct function_lambda<fn_void::no, erase::t_ctor, args_t...> : lambda
20+
{
21+
// ditch all std::functions and use fn-pointer directly - what??? Yes!
22+
using fptr_t = Return(*)(alloc, traits::normal_sign_t<args_t>&&...);
2323

24-
const fptr_t& get_hop() const {
25-
return m_fptr;
26-
}
24+
const fptr_t& f_ptr() const {
25+
return m_fptr;
26+
}
2727

28-
private:
28+
private:
2929

30-
void set_hop(const fptr_t& fptr) {
31-
m_fptr = fptr;
32-
}
30+
void init(const fptr_t& fptr) {
31+
m_fptr = fptr;
32+
}
3333

34-
fptr_t m_fptr;
34+
fptr_t m_fptr;
3535

36-
template<class, class ...>
37-
friend struct dispatch::function_ptr;
38-
};
36+
template<class, class ...>
37+
friend struct dispatch::function_ptr;
38+
};
3939
}
4040

4141

4242
namespace rtl::dispatch
4343
{
44-
template<class...args_t>
45-
struct function_lambda<fn_void::yes, erase::t_return, args_t...> : lambda
46-
{
47-
using fptr_t = void(*)(const functor&, traits::normal_sign_t<args_t>&&...);
44+
template<class...args_t>
45+
struct function_lambda<fn_void::yes, erase::t_return, args_t...> : lambda
46+
{
47+
using fptr_t = void(*)(const functor&, traits::normal_sign_t<args_t>&&...);
4848

49-
fptr_t f_ptr() const {
50-
return m_fptr;
51-
}
49+
fptr_t f_ptr() const {
50+
return m_fptr;
51+
}
5252

53-
private:
53+
private:
5454

55-
void init(fptr_t fptr) {
56-
m_fptr = fptr;
57-
}
55+
void init(fptr_t fptr) {
56+
m_fptr = fptr;
57+
}
5858

59-
fptr_t m_fptr;
59+
fptr_t m_fptr;
6060

61-
template<class, class ...>
62-
friend struct dispatch::function_ptr;
63-
};
61+
template<class, class ...>
62+
friend struct dispatch::function_ptr;
63+
};
6464
}
6565

6666

6767
namespace rtl::dispatch
6868
{
69-
template<class...args_t>
70-
struct function_lambda<fn_void::no, erase::t_return, args_t...> : lambda
71-
{
72-
using fptr_t = std::any(*)(const functor&, traits::normal_sign_t<args_t>&&...);
69+
template<class...args_t>
70+
struct function_lambda<fn_void::no, erase::t_return, args_t...> : lambda
71+
{
72+
using fptr_t = std::any(*)(const functor&, traits::normal_sign_t<args_t>&&...);
7373

74-
const fptr_t& get_hop() const {
75-
return m_fptr;
76-
}
74+
const fptr_t& f_ptr() const {
75+
return m_fptr;
76+
}
7777

78-
private:
78+
private:
7979

80-
void set_hop(const fptr_t& fptr) {
81-
m_fptr = fptr;
82-
}
80+
void init(const fptr_t& fptr) {
81+
m_fptr = fptr;
82+
}
8383

84-
fptr_t m_fptr;
84+
fptr_t m_fptr;
8585

86-
template<class, class ...>
87-
friend struct dispatch::function_ptr;
88-
};
86+
template<class, class ...>
87+
friend struct dispatch::function_ptr;
88+
};
8989
}
9090

9191

9292
namespace rtl::dispatch
9393
{
94-
template<class...args_t>
95-
struct function_lambda<fn_void::yes, erase::t_method, args_t...> : lambda
96-
{
97-
using fptr_t = void(*)(const functor&, const RObject&, traits::normal_sign_t<args_t>&&...);
98-
99-
fptr_t f_ptr() const {
100-
return m_fptr;
101-
}
102-
103-
private:
104-
105-
void init(fptr_t fptr) {
106-
m_fptr = fptr;
107-
}
108-
109-
fptr_t m_fptr;
110-
111-
template<class, class, class ...>
112-
friend struct dispatch::method_ptr;
113-
};
94+
template<class...args_t>
95+
struct function_lambda<fn_void::yes, erase::t_method, args_t...> : lambda
96+
{
97+
using fptr_t = void(*)(const functor&, const RObject&, traits::normal_sign_t<args_t>&&...);
98+
99+
fptr_t f_ptr() const {
100+
return m_fptr;
101+
}
102+
103+
private:
104+
105+
void init(fptr_t fptr) {
106+
m_fptr = fptr;
107+
}
108+
109+
fptr_t m_fptr;
110+
111+
template<class, class, class ...>
112+
friend struct dispatch::method_ptr;
113+
};
114114
}
115115

116116

117117
namespace rtl::dispatch
118118
{
119-
template<class...args_t>
120-
struct function_lambda<fn_void::no, erase::t_method, args_t...> : lambda
121-
{
122-
using fptr_t = std::any(*)(const functor&, const RObject&, traits::normal_sign_t<args_t>&&...);
123-
124-
const fptr_t& get_hop() const {
125-
return m_fptr;
126-
}
127-
128-
private:
129-
130-
void set_hop(const fptr_t& fptr) {
131-
m_fptr = fptr;
132-
}
133-
134-
fptr_t m_fptr;
135-
136-
template<class, class, class ...>
137-
friend struct dispatch::method_ptr;
138-
};
119+
template<class...args_t>
120+
struct function_lambda<fn_void::no, erase::t_method, args_t...> : lambda
121+
{
122+
using fptr_t = std::any(*)(const functor&, const RObject&, traits::normal_sign_t<args_t>&&...);
123+
124+
const fptr_t& f_ptr() const {
125+
return m_fptr;
126+
}
127+
128+
private:
129+
130+
void init(const fptr_t& fptr) {
131+
m_fptr = fptr;
132+
}
133+
134+
fptr_t m_fptr;
135+
136+
template<class, class, class ...>
137+
friend struct dispatch::method_ptr;
138+
};
139139
}

ReflectionTemplateLib/rtl/dispatch/function_ptr.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace rtl::dispatch
2828
m_functor = &aware_constructor<record_t>::default_ctor;
2929
}
3030
else {
31-
fn.set_hop(&aware_constructor<record_t, signature_t...>::overloaded_ctor);
31+
fn.init(&aware_constructor<record_t, signature_t...>::overloaded_ctor);
3232
}
3333

3434
functor::m_lambdas = std::vector<lambda*>(1);
@@ -46,7 +46,7 @@ namespace rtl::dispatch
4646
fn.init(&aware_return<return_t, signature_t...>::get_lambda_void);
4747
}
4848
else {
49-
fn.set_hop(&aware_return<return_t, signature_t...>::get_lambda_any_return);
49+
fn.init(&aware_return<return_t, signature_t...>::get_lambda_any_return);
5050
}
5151

5252
functor::m_lambdas = std::vector<lambda*>(1);

ReflectionTemplateLib/rtl/dispatch/method_lambda.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ namespace rtl::dispatch
4747
using record_t = known_t;
4848
using fptr_t = std::any(*)(const functor&, const record_t&, traits::normal_sign_t<args_t>&&...);
4949

50-
const fptr_t& get_hop() const {
50+
const fptr_t& f_ptr() const {
5151
return m_fptr;
5252
}
5353

5454
private:
5555

56-
void set_hop(const fptr_t& fptr) {
56+
void init(const fptr_t& fptr) {
5757
m_fptr = fptr;
5858
}
5959

@@ -99,13 +99,13 @@ namespace rtl::dispatch
9999
using return_t = known_t;
100100
using fptr_t = return_t(*)(const functor&, const rtl::RObject&, traits::normal_sign_t<args_t>&&...);
101101

102-
const fptr_t& get_hop() const {
102+
const fptr_t& f_ptr() const {
103103
return m_fptr;
104104
}
105105

106106
private:
107107

108-
void set_hop(const fptr_t& fptr) {
108+
void init(const fptr_t& fptr) {
109109
m_fptr = fptr;
110110
}
111111

ReflectionTemplateLib/rtl/dispatch/method_ptr.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ namespace rtl::dispatch
2828
}
2929
else
3030
{
31-
m_erased_return.set_hop(&lambda_t::e_return_a_target_fnr); // erased-return-aware-target
32-
m_erased_target.set_hop(lambda_t::e_target_a_return_fnr()); // erased-target-aware-return
33-
m_erased_method.set_hop(&lambda_t::e_return_e_target_fnr); // erased-return-erased-target
31+
m_erased_return.init(&lambda_t::e_return_a_target_fnr); // erased-return-aware-target
32+
m_erased_target.init(lambda_t::e_target_a_return_fnr()); // erased-target-aware-return
33+
m_erased_method.init(&lambda_t::e_return_e_target_fnr); // erased-return-erased-target
3434
}
3535

3636
functor::m_lambdas = std::vector<lambda*>(3);

ReflectionTemplateLib/rtl/dispatch/method_ptr_const.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ namespace rtl::dispatch
2929
}
3030
else
3131
{
32-
m_erased_return.set_hop(&lambda_t::e_return_a_target_fnr); // erased-return-aware-target
33-
m_erased_target.set_hop(lambda_t::e_target_a_return_fnr()); // erased-target-aware-return
34-
m_erased_method.set_hop(&lambda_t::e_return_e_target_fnr); // erased-return-erased-target
32+
m_erased_return.init(&lambda_t::e_return_a_target_fnr); // erased-return-aware-target
33+
m_erased_target.init(lambda_t::e_target_a_return_fnr()); // erased-target-aware-return
34+
m_erased_method.init(&lambda_t::e_return_e_target_fnr); // erased-return-erased-target
3535
}
3636

3737
functor::m_lambdas = std::vector<lambda*>(3);

0 commit comments

Comments
 (0)