Skip to content

Rename GetName<>() to NameOf<> and add test for TypeNameOf<> #22

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
merged 1 commit into from
Feb 8, 2025
Merged

Rename GetName<>() to NameOf<> and add test for TypeNameOf<> #22

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
103 changes: 52 additions & 51 deletions include/reflection-cpp/reflection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ inline constexpr auto MemberNameOf = []() constexpr {
}();

template <class T>
constexpr auto TypeName = [] {
constexpr auto TypeNameOf = [] {
constexpr std::string_view name = detail::MangledName<T>();
constexpr auto begin = name.find(detail::reflect_type::end);
constexpr auto tmp = name.substr(0, begin);
Expand Down Expand Up @@ -589,7 +589,7 @@ namespace detail
consteval std::string_view func_name_msvc()
{
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.rfind(TypeName<T>) + TypeName<T>.size());
str = str.substr(str.rfind(TypeNameOf<T>) + TypeNameOf<T>.size());
str = str.substr(str.find("::") + 2);
return str.substr(0, str.find('('));
}
Expand All @@ -604,11 +604,9 @@ namespace detail
template <typename... Ts, typename F>
constexpr void enumerate_types(F&& f)
{
[&f]<auto... Is>(std::index_sequence<Is...>)
{
[&f]<auto... Is>(std::index_sequence<Is...>) {
(f.template operator()<Ts, Is>(), ...);
}
(std::index_sequence_for<Ts...> {});
}(std::index_sequence_for<Ts...> {});
}

template <auto... Xs, typename F>
Expand All @@ -627,67 +625,71 @@ constexpr void template_for(F&& f)
{
using t = std::common_type_t<decltype(B), decltype(E)>;

[&f]<auto... Xs>(std::integer_sequence<t, Xs...>)
{
[&f]<auto... Xs>(std::integer_sequence<t, Xs...>) {
detail::for_values<(B + Xs)...>(f);
}
(std::make_integer_sequence<t, E - B> {});
}(std::make_integer_sequence<t, E - B> {});
}

template <typename ElementMask, typename F>
constexpr void template_for(F&& f)
{
using t = typename ElementMask::value_type;
[&f]<auto... Xs>(std::integer_sequence<t, Xs...>)
{
[&f]<auto... Xs>(std::integer_sequence<t, Xs...>) {
Reflection::detail::for_values<(Xs)...>(f);
}
(ElementMask {});
}(ElementMask {});
}

template <auto P>
requires(std::is_member_pointer_v<decltype(P)>)
consteval std::string_view GetName()
namespace detail
{
#if defined(_MSC_VER) && !defined(__clang__)
if constexpr (std::is_member_object_pointer_v<decltype(P)>)
{
using T = detail::remove_member_pointer<std::decay_t<decltype(P)>>::type;
constexpr auto p = P;
return detail::get_name_msvc<T, &(detail::External<T>.*p)>();
}
else

template <auto P>
requires(std::is_member_pointer_v<decltype(P)>)
consteval std::string_view GetName()
{
using T = detail::remove_member_pointer<std::decay_t<decltype(P)>>::type;
return detail::func_name_msvc<T, P>();
}
#if defined(_MSC_VER) && !defined(__clang__)
if constexpr (std::is_member_object_pointer_v<decltype(P)>)
{
using T = detail::remove_member_pointer<std::decay_t<decltype(P)>>::type;
constexpr auto p = P;
return detail::get_name_msvc<T, &(detail::External<T>.*p)>();
}
else
{
using T = detail::remove_member_pointer<std::decay_t<decltype(P)>>::type;
return detail::func_name_msvc<T, P>();
}
#else
// TODO: Use std::source_location when deprecating clang 14
// std::string_view str = std::source_location::current().function_name();
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.find('&') + 1);
str = str.substr(0, str.find(detail::pretty_function_tail));
return str.substr(str.rfind("::") + 2);
// TODO: Use std::source_location when deprecating clang 14
// std::string_view str = std::source_location::current().function_name();
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.find('&') + 1);
str = str.substr(0, str.find(detail::pretty_function_tail));
return str.substr(str.rfind("::") + 2);
#endif
}
}

template <auto E>
requires(std::is_enum_v<decltype(E)>)
consteval auto GetName()
{
template <auto E>
requires(std::is_enum_v<decltype(E)>)
consteval auto GetName()
{
#if defined(_MSC_VER) && !defined(__clang__)
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.rfind("::") + 2);
str = str.substr(0, str.find('>'));
return str.substr(str.find('<') + 1);
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.rfind("::") + 2);
str = str.substr(0, str.find('>'));
return str.substr(str.find('<') + 1);
#else
constexpr auto MarkerStart = std::string_view { "E = " };
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.rfind(MarkerStart) + MarkerStart.size());
str = str.substr(0, str.find(']'));
return str;
constexpr auto MarkerStart = std::string_view { "E = " };
std::string_view str = REFLECTION_PRETTY_FUNCTION;
str = str.substr(str.rfind(MarkerStart) + MarkerStart.size());
str = str.substr(0, str.find(']'));
return str;
#endif
}
}
} // namespace detail

/// Gets the name of a member or function pointer
template <auto V>
constexpr std::string_view NameOf = detail::GetName<V>();

/// Calls a callable on members of an object specified with ElementMask sequence with the index of the member as the
/// first argument. and the member's default-constructed value as the second argument.
Expand Down Expand Up @@ -730,8 +732,7 @@ template <typename Object, typename Callable>
requires std::same_as<void, std::invoke_result_t<Callable, std::string, MemberTypeOf<0, Object>>>
void CallOnMembers(Object& object, Callable&& callable)
{
EnumerateMembers(object,
[&]<size_t I, typename T>(T&& value) { callable(MemberNameOf<I, Object>, value); });
EnumerateMembers(object, [&]<size_t I, typename T>(T&& value) { callable(MemberNameOf<I, Object>, value); });
}

/// Folds over the members of a type without an object of it.
Expand Down
17 changes: 12 additions & 5 deletions test-reflection-cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,25 @@ struct SingleValueRecord
int value;
};

TEST_CASE("GetName", "[reflection]")
TEST_CASE("TypeNameOf", "[reflection]")
{
auto const enumValue = Reflection::GetName<Color::Red>();
CHECK(Reflection::TypeNameOf<int> == "int");
CHECK(Reflection::TypeNameOf<Person> == "Person");
CHECK(Reflection::TypeNameOf<std::optional<float>> == "std::optional<float>");
}

TEST_CASE("NameOf", "[reflection]")
{
auto const enumValue = Reflection::NameOf<Color::Red>;
CHECK(enumValue == "Red");

auto const enumValue2 = Reflection::GetName<Color::Green>();
auto const enumValue2 = Reflection::NameOf<Color::Green>;
CHECK(enumValue2 == "Green");

auto const memberName1 = Reflection::GetName<&Person::email>();
auto const memberName1 = Reflection::NameOf<&Person::email>;
CHECK(memberName1 == "email");

auto const singleValueField = Reflection::GetName<&SingleValueRecord::value>();
auto const singleValueField = Reflection::NameOf<&SingleValueRecord::value>;
CHECK(singleValueField == "value");
}

Expand Down