rexy712/rexylib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify same string details and fix a couple foreseeable bugs

Browse Source
This commit is contained in:
rexy712 2020-05-07 11:55:40 -07:00
parent d876f65e7b
commit 31a177fc86
2 changed files with 64 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/rexy/string_base.hpp
View File

@ -55,8 +55,7 @@ namespace rexy{
public: public:
//Stop managing stored pointer. Does not free. //Stop managing stored pointer. Does not free.
constexpr char* release(void)noexcept(noexcept(cx::exchange(m_data, nullptr))) constexpr char* release(void)noexcept{return cx::exchange(m_data, nullptr);}
{return cx::exchange(m_data, nullptr);}
//Length of string not including null terminator //Length of string not including null terminator
constexpr size_t length(void)const noexcept{return m_length;} constexpr size_t length(void)const noexcept{return m_length;}
@ -82,18 +81,17 @@ namespace rexy{
using allocator_type = Allocator; using allocator_type = Allocator;
private: private:
string_intermediary& _copy_string(const char* s, size_t len)noexcept(noexcept(Allocator::free(m_data)) && string_intermediary& _copy_string(const char* s, size_t len)
noexcept(Allocator::copy(s, len))); noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)));
public: public:
constexpr string_intermediary(void)noexcept; constexpr string_intermediary(void)noexcept;
constexpr string_intermediary(rexy::steal<char*> data, size_t len)noexcept; constexpr string_intermediary(rexy::steal<char*> data, size_t len)noexcept;
constexpr string_intermediary(rexy::steal<char*> data, size_t len, size_t cap)noexcept; constexpr string_intermediary(rexy::steal<char*> data, size_t len, size_t cap)noexcept;
constexpr string_intermediary(rexy::steal<char*> data)noexcept; constexpr string_intermediary(rexy::steal<char*> data)noexcept;
[[deprecated]] constexpr string_intermediary(char* data, size_t len)noexcept;
[[deprecated]] constexpr string_intermediary(char* data, size_t len, size_t cap)noexcept;
string_intermediary(const char* data, size_t len)noexcept(noexcept(Allocator::copy(data,len))); string_intermediary(const char* data, size_t len)noexcept(noexcept(Allocator::copy(data,len)));
string_intermediary(const char* data)noexcept(noexcept(strlen(data)) && noexcept(Allocator::copy(data, m_cap))); string_intermediary(const char* data)noexcept(noexcept(Allocator::copy(data, m_cap)));
string_intermediary(size_t len)noexcept(noexcept(Allocator::allocate(len))); string_intermediary(size_t len)noexcept(noexcept(Allocator::allocate(len)));
string_intermediary(size_t len, size_t cap)noexcept(noexcept(Allocator::allocate(len))); string_intermediary(size_t len, size_t cap)noexcept(noexcept(Allocator::allocate(len)));
@ -107,22 +105,35 @@ namespace rexy{
~string_intermediary(void)noexcept(noexcept(Allocator::free(m_data))); ~string_intermediary(void)noexcept(noexcept(Allocator::free(m_data)));
string_intermediary& operator=(const string_intermediary& s) string_intermediary& operator=(const string_intermediary& s)
noexcept(std::is_nothrow_copy_constructible<string_intermediary<Allocator>>::value && noexcept(noexcept(Allocator::copy(nullptr,0)) &&
std::is_nothrow_move_assignable<string_intermediary<Allocator>>::value); noexcept(Allocator::free(nullptr)));
constexpr string_intermediary& operator=(string_intermediary&& s)noexcept(noexcept(cx::swap(m_data, s.m_data)));
constexpr string_intermediary& operator=(string_intermediary&& s)noexcept;
//Copy from c string //Copy from c string
string_intermediary& operator=(const char* c)noexcept(noexcept(_copy_string(c, 0))); string_intermediary& operator=(const char* c)
noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)));
//Copy from other string_base //Copy from other string_base
string_intermediary& operator=(const string_base& s)noexcept(noexcept(_copy_string(s.get(), 0))); string_intermediary& operator=(const string_base& s)
noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)));
//Replace managed pointer. Frees existing value //Replace managed pointer. Frees existing value
void reset(char* val = nullptr)noexcept(noexcept(Allocator::free(m_data))); void reset(char* val = nullptr)noexcept(noexcept(Allocator::free(m_data)));
void reset(char* val, size_t len)noexcept(noexcept(Allocator::free(m_data))); void reset(char* val, size_t len)noexcept(noexcept(Allocator::free(m_data)));
bool resize(size_t newsize)noexcept(std::is_nothrow_copy_constructible<string_intermediary<Allocator>>::value && bool resize(size_t newsize)
std::is_nothrow_move_assignable<string_intermediary<Allocator>>::value); noexcept(noexcept(Allocator::copy(nullptr,0)) &&
void append(const char* data, size_t len)noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value); noexcept(Allocator::free(nullptr)));
void append(const char* data)noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value);
void append(const string_base& s)noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value); void append(const char* data, size_t len)
noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)));
void append(const char* data)
noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)));
void append(const string_base& s)
noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)));
}; };
@ -146,7 +157,7 @@ namespace rexy{
constexpr string_cat_expr(string_cat_expr&& s)noexcept(std::is_nothrow_constructible<Left,decltype(s.m_l)>::value && constexpr string_cat_expr(string_cat_expr&& s)noexcept(std::is_nothrow_constructible<Left,decltype(s.m_l)>::value &&
std::is_nothrow_constructible<Right,decltype(s.m_r)>::value); std::is_nothrow_constructible<Right,decltype(s.m_r)>::value);
constexpr size_t length(void)const noexcept(noexcept(m_l.length()) && noexcept(m_r.length())); constexpr size_t length(void)const noexcept;
template<class Alloc> template<class Alloc>
operator string_intermediary<Alloc>(void) operator string_intermediary<Alloc>(void)
noexcept(std::is_nothrow_constructible<string_intermediary<Alloc>, size_t>::value && noexcept(std::is_nothrow_constructible<string_intermediary<Alloc>, size_t>::value &&

94
include/rexy/string_base.tpp
View File

@ -40,27 +40,20 @@ namespace rexy{
} }
template<class Allocator> template<class Allocator>
constexpr string_intermediary<Allocator>::string_intermediary(rexy::steal<char*> data, size_t len)noexcept: constexpr string_intermediary<Allocator>::string_intermediary(rexy::steal<char*> data, size_t len)noexcept:
string_base(data.value(), len){} string_base(data.value(), len, len){}
template<class Allocator> template<class Allocator>
constexpr string_intermediary<Allocator>::string_intermediary(rexy::steal<char*> data, size_t len, size_t cap)noexcept: constexpr string_intermediary<Allocator>::string_intermediary(rexy::steal<char*> data, size_t len, size_t cap)noexcept:
string_base(data.value(), len, cap){} string_base(data.value(), len, cap){}
template<class Allocator> template<class Allocator>
/*deprecated*/ constexpr string_intermediary<Allocator>::string_intermediary(char* data, size_t len)noexcept:
string_base(data, len){}
template<class Allocator>
/*deprecated*/ constexpr string_intermediary<Allocator>::string_intermediary(char* data, size_t len, size_t cap)noexcept:
string_base(data, len, cap){}
template<class Allocator>
string_intermediary<Allocator>::string_intermediary(const char* data, size_t len) string_intermediary<Allocator>::string_intermediary(const char* data, size_t len)
noexcept(noexcept(Allocator::copy(data,len))): noexcept(noexcept(Allocator::copy(data,len))):
string_base(reinterpret_cast<char*>(len ? Allocator::copy(data, len+1) : nullptr), len) string_base(reinterpret_cast<char*>(len ? Allocator::copy(data, len+1) : nullptr), len, len)
{ {
m_data[len] = 0; m_data[len] = 0;
} }
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>::string_intermediary(const char* data) string_intermediary<Allocator>::string_intermediary(const char* data)
noexcept(noexcept(strlen(data)) && noexcept(noexcept(Allocator::copy(data, m_cap))):
noexcept(Allocator::copy(data, m_cap))):
string_base(data ? strlen(data) : 0) string_base(data ? strlen(data) : 0)
{ {
if(m_cap){ if(m_cap){
@ -108,10 +101,10 @@ namespace rexy{
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const string_intermediary& s) string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const string_intermediary& s)
noexcept(std::is_nothrow_copy_constructible<string_intermediary<Allocator>>::value && noexcept(noexcept(Allocator::copy(nullptr,0)) &&
std::is_nothrow_move_assignable<string_intermediary<Allocator>>::value) noexcept(Allocator::free(nullptr)))
{ {
if(s.m_length < m_length){ if(s.m_length < m_cap){
memcpy(m_data, s.m_data, s.m_length+1); memcpy(m_data, s.m_data, s.m_length+1);
m_length = s.m_length; m_length = s.m_length;
return *this; return *this;
@ -120,9 +113,7 @@ namespace rexy{
return (*this = std::move(tmp)); return (*this = std::move(tmp));
} }
template<class Allocator> template<class Allocator>
constexpr string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(string_intermediary&& s) constexpr string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(string_intermediary&& s)noexcept{
noexcept(noexcept(cx::swap(m_data, s.m_data)))
{
cx::swap(m_data, s.m_data); cx::swap(m_data, s.m_data);
m_length = s.m_length; m_length = s.m_length;
m_cap = s.m_cap; m_cap = s.m_cap;
@ -131,14 +122,16 @@ namespace rexy{
//Copy from c string //Copy from c string
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const char* c) string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const char* c)
noexcept(noexcept(_copy_string(c, 0))) noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)))
{ {
return _copy_string(c, strlen(c)); return _copy_string(c, strlen(c));
} }
//Copy from other string_base //Copy from other string_base
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const string_base& s) string_intermediary<Allocator>& string_intermediary<Allocator>::operator=(const string_base& s)
noexcept(noexcept(_copy_string(s.get(), 0))) noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)))
{ {
return _copy_string(s.get(), s.length()); return _copy_string(s.get(), s.length());
} }
@ -164,76 +157,61 @@ namespace rexy{
} }
template<class Allocator> template<class Allocator>
bool string_intermediary<Allocator>::resize(size_t newsize) bool string_intermediary<Allocator>::resize(size_t newsize)
noexcept(std::is_nothrow_copy_constructible<string_intermediary<Allocator>>::value && noexcept(noexcept(Allocator::copy(nullptr,0)) &&
std::is_nothrow_move_assignable<string_intermediary<Allocator>>::value) noexcept(Allocator::free(nullptr)))
{ {
if(newsize < m_cap) if(newsize < m_cap)
return false; return false;
string_intermediary tmp(newsize); return (*this = string_intermediary(m_data, newsize));
if(m_data){
memcpy(tmp.get(), m_data, m_length);
tmp[m_length] = 0;
}
*this = std::move(tmp);
return true;
} }
template<class Allocator> template<class Allocator>
void string_intermediary<Allocator>::append(const char* data, size_t len) void string_intermediary<Allocator>::append(const char* data, size_t len)
noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value) noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)))
{ {
if(len+m_length <= m_cap){ if(len+m_length <= m_cap){
memcpy(m_data+m_length, data, len); memcpy(m_data+m_length, data, len);
m_length += len; m_length += len;
m_data[m_length] = 0; m_data[m_length] = 0;
}else if(!m_data){
*this = string_intermediary(len, len);
memcpy(m_data, data, len+1);
}else{ }else{
string_intermediary tmp(cx::max(m_length + len, m_cap*2)); auto newsize = cx::max(m_length+len, m_cap*2);
if(m_data) string_intermediary tmp(newsize);
memcpy(STOP_STRICT_ALIAS_WARNING(tmp).m_data, m_data, m_length); tmp.append(m_data, m_length);
memcpy(STOP_STRICT_ALIAS_WARNING(tmp).m_data+m_length, data, len); tmp.append(data, len);
STOP_STRICT_ALIAS_WARNING(tmp).m_length = len+m_length;
tmp[m_length+len] = 0;
*this = std::move(tmp); *this = std::move(tmp);
} }
} }
template<class Allocator> template<class Allocator>
void string_intermediary<Allocator>::append(const char* data) void string_intermediary<Allocator>::append(const char* data)
noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value) noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)))
{ {
if(data) if(data)
append(data, strlen(data)); append(data, strlen(data));
} }
template<class Allocator> template<class Allocator>
void string_intermediary<Allocator>::append(const string_base& s) void string_intermediary<Allocator>::append(const string_base& s)
noexcept(std::is_nothrow_constructible<string_intermediary<Allocator>,decltype(m_length)>::value) noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr)))
{ {
append(s.get(), s.length()); append(s.get(), s.length());
} }
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>& string_intermediary<Allocator>::_copy_string(const char* s, size_t len) string_intermediary<Allocator>& string_intermediary<Allocator>::_copy_string(const char* s, size_t len)
noexcept(noexcept(Allocator::free(m_data)) && noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::copy(s, len))) noexcept(Allocator::free(nullptr)))
{ {
if(!len){ if(len <= m_length){
Allocator::free(m_data); m_length = len;
m_length = 0; memcpy(m_data, s, len);
m_cap = 0; m_data[len] = 0;
return *this; return *this;
} }
if(len <= m_length){ return (*this = string_intermediary(s, len));
strcpy(m_data, s);
}else{
Allocator::free(m_data);
m_cap = cx::max(len, m_cap*2);
m_data = reinterpret_cast<char*>(Allocator::copy(s, m_cap+1));
if(!m_data){
m_length = 0;
m_cap = 0;
return *this;
}
}
m_length = len;
return *this;
} }
@ -252,9 +230,7 @@ namespace rexy{
m_r(std::forward<Right>(s.m_r)){} m_r(std::forward<Right>(s.m_r)){}
template<class Left, class Right> template<class Left, class Right>
constexpr size_t string_cat_expr<Left,Right>::length(void)const constexpr size_t string_cat_expr<Left,Right>::length(void)const noexcept{
noexcept(noexcept(m_l.length()) && noexcept(m_r.length()))
{
return m_l.length() + m_r.length(); return m_l.length() + m_r.length();
} }
template<class Left, class Right> template<class Left, class Right>