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 2018-08-28 20:51:04 +05:00
parent 2fa496381a
commit 5cddcb0099
3 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
example/example.cpp
View file

@ -50,7 +50,7 @@ void SomeMethod3() {
template <typename T, typename U>
std::string SomeMethod4(U value) {
return std::string(NAMEOF(SomeMethod4<T, U>)).append("<").append(NAMEOF_TYPE_T(T)).append(", ").append(NAMEOF_TYPE_T(U)).append(">(").append(NAMEOF_TYPE_T(U)).append(" value)");
return NAMEOF(SomeMethod4<T, U>) + "<" + NAMEOF_TYPE_T(T) + ", " + NAMEOF_TYPE_T(U) + ">(" + NAMEOF_TYPE_T(U) + " " + NAMEOF(value) + ")";
}
template <typename T>
@ -157,6 +157,7 @@ int main() {
std::cout << NAMEOF(structvar.somefield + structvar.somefield) << std::endl; // ' somefield'
std::cout << NAMEOF(42 + 42) << std::endl; // ' 42'
std::cout << NAMEOF(NAMEOF(structvar)) << std::endl; // 'NAMEOF'
std::cout << NAMEOF((SomeMethod4<int, float>)(1.0f)) << std::endl; // ''
#endif
#if 0

37
include/nameof.hpp
View file

@ -32,11 +32,15 @@
#include <cstddef>
#include <type_traits>
#include <limits>
#include <string>
#include <ostream>
#if defined(__cpp_constexpr) && __cpp_constexpr >= 201304L
# define NAMEOF_HAS_CONSTEXPR14 1
# define NAMEOF_CONSTEXPR14 constexpr
#else
# define NAMEOF_CONSTEXPR14 inline
#endif
#if (defined(__clang__) || defined(_MSC_VER)) || (defined(__GNUC__) && __GNUC__ >= 5)
@ -101,6 +105,8 @@ class cstring final {
constexpr cstring(const char* str) noexcept : cstring{str, StrLen(str), 0, 0} {}
cstring(const std::string& str) noexcept : cstring{str.data(), str.size(), 0, 0} {}
cstring(const cstring&) = default;
cstring(cstring&&) = default;
@ -115,6 +121,8 @@ class cstring final {
constexpr std::size_t length() const noexcept { return size_; }
constexpr std::size_t max_size() const noexcept { return (std::numeric_limits<std::size_t>::max)(); }
constexpr bool empty() const noexcept { return size_ == 0; }
constexpr const char* begin() const noexcept { return str_; }
@ -127,6 +135,13 @@ class cstring final {
constexpr const char& operator[](std::size_t i) const { return str_[i]; }
NAMEOF_CONSTEXPR14 const char& at(std::size_t i) const {
if (i < size_) {
return str_[i];
}
throw std::out_of_range("cstring::at()");
}
constexpr const char& front() const { return str_[0]; }
constexpr const char& back() const { return str_[size_ - 1]; }
@ -153,6 +168,20 @@ class cstring final {
return {str_ + pos, n};
}
int compare(cstring s) const {
auto result = std::char_traits<char>::compare(str_, s.str_, s.size_ < size_ ? s.size_ : size_);
if (result != 0) {
return result;
}
if (size_ < s.size_) {
return -1;
}
if (size_ > s.size_) {
return 1;
}
return 0;
}
friend constexpr bool operator==(cstring lhs, cstring rhs) noexcept {
return (lhs.size_ == rhs.size_) && StrEquals(lhs.str_, rhs.str_, lhs.size_);
}
@ -161,6 +190,14 @@ class cstring final {
return !(lhs == rhs);
}
std::string append(cstring s) {
return std::string(str_, size_).append(s.str_, s.size_);
}
friend std::string operator+(cstring lhs, cstring rhs) {
return std::string(lhs) + std::string(rhs);
}
friend std::ostream& operator<<(std::ostream& os, cstring str) {
os.write(str.str_, str.size_);
return os;

4
test/test.cpp
View file

@ -43,7 +43,7 @@ void SomeMethod3() {
template <typename T, typename U>
std::string SomeMethod4(U value) {
return std::string(NAMEOF(SomeMethod4<T, U>)).append("<").append(NAMEOF_TYPE_T(T)).append(", ").append(NAMEOF_TYPE_T(U)).append(">(").append(NAMEOF_TYPE_T(U)).append(" value)");
return NAMEOF(SomeMethod4<T, U>) + "<" + NAMEOF_TYPE_T(T) + ", " + NAMEOF_TYPE_T(U) + ">(" + NAMEOF_TYPE_T(U) + " " + NAMEOF(value) + ")";
}
template <typename T>
@ -389,3 +389,5 @@ TEST_CASE("Spaces and Tabs ignored") {
REQUIRE(NAMEOF_TYPE_T( decltype(struct_var) ) == "SomeStruct");
}
}
TEST_CASE("cstring") {}