Skip to content
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

[reflection][refactor]Iguana with ylt reflection #766

Merged
merged 5 commits into from
Sep 7, 2024
Merged

[reflection][refactor]Iguana with ylt reflection #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9d29b5
update ylt
qicosmos Sep 6, 2024
b115dd0
update reflect_test
qicosmos Sep 6, 2024
b2e4b54
update iguana
qicosmos Sep 6, 2024
1905516
compile
qicosmos Sep 6, 2024
76ab1c9
for msvc
qicosmos Sep 6, 2024
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ struct person {
std::string name;
int age;
};
REFLECTION(person, name, age);
YLT_REFL(person, name, age);

int main() {
person p{.name = "tom", .age = 20};
Expand All @@ -274,7 +274,7 @@ struct person {
std::string name;
int age;
};
REFLECTION(person, name, age);
YLT_REFL(person, name, age);

void basic_usage() {
std::string xml = R"(
Expand Down Expand Up @@ -308,7 +308,7 @@ struct person {
std::string name;
int age;
};
REFLECTION(person, name, age);
YLT_REFL(person, name, age);

void basic_usage() {
// serialization the structure to the string
Expand Down
4 changes: 2 additions & 2 deletions include/ylt/metric/counter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ struct json_counter_metric_t {
std::map<std::string, std::string> labels;
std::variant<int64_t, double> value;
};
REFLECTION(json_counter_metric_t, labels, value);
YLT_REFL(json_counter_metric_t, labels, value);
struct json_counter_t {
std::string name;
std::string help;
std::string type;
std::vector<json_counter_metric_t> metrics;
};
REFLECTION(json_counter_t, name, help, type, metrics);
YLT_REFL(json_counter_t, name, help, type, metrics);
#endif

template <typename T, typename value_type>
Expand Down
4 changes: 2 additions & 2 deletions include/ylt/metric/histogram.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ struct json_histogram_metric_t {
int64_t count;
double sum;
};
REFLECTION(json_histogram_metric_t, labels, quantiles, count, sum);
YLT_REFL(json_histogram_metric_t, labels, quantiles, count, sum);
struct json_histogram_t {
std::string name;
std::string help;
std::string type;
std::vector<json_histogram_metric_t> metrics;
};
REFLECTION(json_histogram_t, name, help, type, metrics);
YLT_REFL(json_histogram_t, name, help, type, metrics);
#endif

template <typename value_type>
Expand Down
4 changes: 2 additions & 2 deletions include/ylt/metric/summary.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ struct json_summary_metric_t {
int64_t count;
double sum;
};
REFLECTION(json_summary_metric_t, labels, quantiles, count, sum);
YLT_REFL(json_summary_metric_t, labels, quantiles, count, sum);
struct json_summary_t {
std::string name;
std::string help;
std::string type;
std::vector<json_summary_metric_t> metrics;
};
REFLECTION(json_summary_t, name, help, type, metrics);
YLT_REFL(json_summary_t, name, help, type, metrics);
#endif

struct block_t {
Expand Down
4 changes: 2 additions & 2 deletions include/ylt/reflection/internal/arg_list_macro.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

#define WRAP_ARGS_(w, object, ...) \
YLT_CONCAT(WRAP_ARGS, YLT_ARG_COUNT(__VA_ARGS__)) \
(w, object, __VA_ARGS__)
#define WRAP_ARGS(w, object, ...) WRAP_ARGS_(w, object, __VA_ARGS__)
(w, object, ##__VA_ARGS__)
#define WRAP_ARGS(w, object, ...) WRAP_ARGS_(w, object, ##__VA_ARGS__)
51 changes: 40 additions & 11 deletions include/ylt/reflection/internal/args_count.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,45 @@

#define YLT_MACRO_EXPAND(...) __VA_ARGS__

#define YLT_ARG_COUNT(...) \
YLT_MACRO_EXPAND(YLT_ARG_COUNT_IMPL( \
0, ##__VA_ARGS__, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, \
113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, \
99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, \
81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, \
63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, \
45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, \
27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \
9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
#ifdef _MSC_VER // Microsoft compilers

#define YLT_ARG_COUNT_IMPL( \
#define __NARGS( \
_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, \
_17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, \
_32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, \
_47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, \
_62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, \
_77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, \
_92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, \
_105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, \
_117, _118, _119, _120, _121, _122, _123, _124, _125, N, ...) \
N
#define NARGS_1(...) \
YLT_MACRO_EXPAND(__NARGS( \
__VA_ARGS__, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, \
112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, \
97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, \
79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, \
61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, \
43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, \
25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, \
6, 5, 4, 3, 2, 1, 0))

#define AUGMENTER(...) unused, __VA_ARGS__
#define YLT_ARG_COUNT(...) NARGS_1(AUGMENTER(__VA_ARGS__))

#else // Others

#define YLT_ARG_COUNT(...) \
__NARGS(0, ##__VA_ARGS__, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, \
114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, \
101, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, \
85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, \
68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, \
51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, \
34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, \
17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
#define __NARGS( \
_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, \
_17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, \
_32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, \
Expand All @@ -24,3 +51,5 @@
_105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, \
_117, _118, _119, _120, _121, _122, _123, _124, N, ...) \
N

#endif
Loading
Loading