sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean-up

Browse source
This commit is contained in:
neargye 2022-08-14 15:54:27 +04:00
parent f14c1b5065
commit 54a6a795a9
2 changed files with 27 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
include/nameof.hpp
View file

@ -866,7 +866,7 @@ string nameof_type_rtti(const char* tn) {
const auto dmg = abi::__cxa_demangle(tn, nullptr, nullptr, nullptr);
const auto name = string{dmg};
free(dmg);
assert(name.size() > 0 && "Type does not have a name.");
assert(!name.empty() && "Type does not have a name.");
return name;
}
@ -877,7 +877,7 @@ string nameof_full_type_rtti(const char* tn) {
const auto dmg = abi::__cxa_demangle(tn, nullptr, nullptr, nullptr);
auto name = string{dmg};
free(dmg);
assert(name.size() > 0 && "Type does not have a name.");
assert(!name.empty() && "Type does not have a name.");
if constexpr (std::is_const_v<std::remove_reference_t<T>>) {
name = string{"const "}.append(name);
}
@ -901,7 +901,7 @@ string nameof_short_type_rtti(const char* tn) {
const auto pname = pretty_name(dmg);
const auto name = string{pname.data(), pname.size()};
free(dmg);
assert(name.size() > 0 && "Type does not have a short name.");
assert(!name.empty() && "Type does not have a short name.");
return name;
}
@ -910,16 +910,16 @@ template <typename T>
string nameof_type_rtti(const char* tn) noexcept {
static_assert(nameof_type_rtti_supported<T>::value, "nameof::nameof_type_rtti unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
const auto name = string_view{tn};
assert(name.size() > 0 && "Type does not have a name.");
assert(!name.empty() && "Type does not have a name.");
return {name.begin(), name.end()};
return {name.data(), name.size()};
}
template <typename T>
string nameof_full_type_rtti(const char* tn) noexcept {
static_assert(nameof_type_rtti_supported<T>::value, "nameof::nameof_type_rtti unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
auto name = string{tn};
assert(name.size() > 0 && "Type does not have a name.");
assert(!name.empty() && "Type does not have a name.");
if constexpr (std::is_const_v<std::remove_reference_t<T>>) {
name = string{"const "}.append(name);
}
@ -940,9 +940,9 @@ template <typename T, enable_if_has_short_name_t<T, int> = 0>
string nameof_short_type_rtti(const char* tn) noexcept {
static_assert(nameof_type_rtti_supported<T>::value, "nameof::nameof_type_rtti unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
const auto name = pretty_name(tn);
assert(name.size() > 0 && "Type does not have a short name.");
assert(!name.empty() && "Type does not have a short name.");
return {name.begin(), name.end()};
return {name.data(), name.size()};
}
#endif
@ -1084,7 +1084,7 @@ template <auto V>
using D = std::decay_t<decltype(V)>;
static_assert(detail::nameof_enum_supported<D>::value, "nameof::nameof_enum unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
constexpr string_view name = detail::enum_name_v<D, V>;
static_assert(name.size() > 0, "Enum value does not have a name.");
static_assert(!name.empty(), "Enum value does not have a name.");
return name;
}
@ -1095,7 +1095,7 @@ template <typename T>
static_assert(detail::nameof_type_supported<T>::value, "nameof::nameof_type unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
using U = detail::identity<detail::remove_cvref_t<T>>;
constexpr string_view name = detail::type_name_v<U>;
static_assert(name.size() > 0, "Type does not have a name.");
static_assert(!name.empty(), "Type does not have a name.");
return name;
}
@ -1106,7 +1106,7 @@ template <typename T>
static_assert(detail::nameof_type_supported<T>::value, "nameof::nameof_type unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
using U = detail::identity<T>;
constexpr string_view name = detail::type_name_v<U>;
static_assert(name.size() > 0, "Type does not have a full name.");
static_assert(!name.empty(), "Type does not have a full name.");
return name;
}
@ -1117,7 +1117,7 @@ template <typename T>
static_assert(detail::nameof_type_supported<T>::value, "nameof::nameof_type unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
using U = detail::identity<detail::remove_cvref_t<T>>;
constexpr string_view name = detail::pretty_name(detail::type_name_v<U>);
static_assert(name.size() > 0, "Type does not have a short name.");
static_assert(!name.empty(), "Type does not have a short name.");
return name;
}
@ -1127,7 +1127,7 @@ template <auto V>
[[nodiscard]] constexpr auto nameof_member() noexcept -> std::enable_if_t<std::is_member_pointer_v<decltype(V)>, string_view> {
static_assert(detail::nameof_member_supported<decltype(V)>::value, "nameof::nameof_memder unsupported compiler (https://github.com/Neargye/nameof#compiler-compatibility).");
constexpr string_view name = detail::member_name_v<V>;
static_assert(name.size() > 0, "Member does not have a name.");
static_assert(!name.empty(), "Member does not have a name.");
return name;
}
@ -1138,7 +1138,7 @@ template <auto V>
#define NAMEOF(...) []() constexpr noexcept { \
::std::void_t<decltype(__VA_ARGS__)>(); \
constexpr auto _name = ::nameof::detail::pretty_name(#__VA_ARGS__); \
static_assert(_name.size() > 0, "Expression does not have a name."); \
static_assert(!_name.empty(), "Expression does not have a name."); \
constexpr auto _size = _name.size(); \
constexpr auto _nameof = ::nameof::cstring<_size>{_name}; \
return _nameof; }()
@ -1147,7 +1147,7 @@ template <auto V>
#define NAMEOF_FULL(...) []() constexpr noexcept { \
::std::void_t<decltype(__VA_ARGS__)>(); \
constexpr auto _name = ::nameof::detail::pretty_name(#__VA_ARGS__, false); \
static_assert(_name.size() > 0, "Expression does not have a name."); \
static_assert(!_name.empty(), "Expression does not have a name."); \
constexpr auto _size = _name.size(); \
constexpr auto _nameof_full = ::nameof::cstring<_size>{_name}; \
return _nameof_full; }()
@ -1156,7 +1156,7 @@ template <auto V>
#define NAMEOF_RAW(...) []() constexpr noexcept { \
::std::void_t<decltype(__VA_ARGS__)>(); \
constexpr auto _name = ::nameof::string_view{#__VA_ARGS__}; \
static_assert(_name.size() > 0, "Expression does not have a name."); \
static_assert(!_name.empty(), "Expression does not have a name."); \
constexpr auto _size = _name.size(); \
constexpr auto _nameof_raw = ::nameof::cstring<_size>{_name}; \
return _nameof_raw; }()

13
test/test_aliases.cpp
View file

@ -31,13 +31,11 @@ struct MyString {
MyString(const char* s) : str{s} {} // required
MyString(const char* s, std::size_t l) : str{s, l} {} // required
bool empty() const { return str.empty(); } // required
std::size_t size() const { return str.size(); } // required
auto begin() const { return str.begin(); } // required
auto end() const { return str.end(); } // required
MyString& append(std::size_t count, char c) { str.append(count, c); return *this; } // required
MyString& append(const char* s) { str.append(s); return *this; } // required
MyString& append(const MyString& s) { str.append(s.str); return *this; } // required
std::size_t size() const { return str.size(); }
int compare(const char* s) const { return str.compare(s); }
private:
@ -55,14 +53,9 @@ struct MyStringView {
constexpr std::size_t size() const { return str.size(); } // required
constexpr const char* data() const { return str.data(); } // required
constexpr const char& operator[](std::size_t i) const { return str[i]; } // required
constexpr auto begin() const { return str.begin(); } // required
constexpr auto end() const { return str.end(); } // required
constexpr std::size_t find(char c) const { return str.find(c); } // required
constexpr MyStringView substr(std::size_t p, std::size_t n) { return str.substr(p, n); } // required
constexpr void remove_prefix(std::size_t n) { str.remove_prefix(n); } // required
constexpr void remove_suffix(std::size_t n) { str.remove_suffix(n); } // required
constexpr int compare(MyStringView s) const { return str.compare(s.str); } // required
friend constexpr bool operator==(MyStringView lhs, MyStringView rhs); // required
constexpr int compare(const char* s) const { return str.compare(s); }
@ -72,10 +65,6 @@ struct MyStringView {
constexpr MyStringView(std::string_view s) : str{s} {}
};
constexpr bool operator==(MyStringView lhs, MyStringView rhs) {
return lhs.str == rhs.str;
}
#define NAMEOF_USING_ALIAS_STRING using string = MyString;
#define NAMEOF_USING_ALIAS_STRING_VIEW using string_view = MyStringView;