fixed_string refactored

This commit is contained in:
Mateusz Pusz
2019-12-23 13:21:48 +01:00
parent e622ecb35a
commit 7cad312b55

View File

@@ -31,15 +31,11 @@ namespace units {
struct basic_fixed_string { struct basic_fixed_string {
CharT data_[N + 1] = {}; CharT data_[N + 1] = {};
constexpr basic_fixed_string(CharT ch) noexcept constexpr basic_fixed_string(CharT ch) noexcept { data_[0] = ch; }
{
data_[0] = ch;
}
constexpr basic_fixed_string(const CharT (&txt)[N + 1]) noexcept constexpr basic_fixed_string(const CharT (&txt)[N + 1]) noexcept
{ {
for(std::size_t i = 0; i < N; ++i) for (std::size_t i = 0; i < N; ++i) data_[i] = txt[i];
data_[i] = txt[i];
} }
[[nodiscard]] constexpr std::size_t size() const noexcept { return N; } [[nodiscard]] constexpr std::size_t size() const noexcept { return N; }
@@ -47,24 +43,76 @@ namespace units {
[[nodiscard]] constexpr const CharT& operator[](std::size_t index) const noexcept { return data_[index]; } [[nodiscard]] constexpr const CharT& operator[](std::size_t index) const noexcept { return data_[index]; }
[[nodiscard]] constexpr CharT operator[](std::size_t index) noexcept { return data_[index]; } [[nodiscard]] constexpr CharT operator[](std::size_t index) noexcept { return data_[index]; }
// auto operator==(const basic_fixed_string &) = default; template<std::size_t N2>
[[nodiscard]] constexpr friend basic_fixed_string<CharT, N + N2> operator+(
const basic_fixed_string& lhs, const basic_fixed_string<CharT, N2>& rhs) noexcept
{
CharT txt[N + N2 + 1] = {};
[[nodiscard]] constexpr friend bool operator==(const basic_fixed_string& lhs, const basic_fixed_string& rhs) noexcept for (size_t i = 0; i != N; ++i) txt[i] = lhs[i];
for (size_t i = 0; i != N2; ++i) txt[N + i] = rhs[i];
return units::basic_fixed_string<CharT, N + N2>(txt);
}
#if __GNUC__ >= 10
[[nodiscard]] friend constexpr bool operator==(const basic_fixed_string& lhs, const basic_fixed_string& rhs)
{ {
for (size_t i = 0; i != lhs.size(); ++i) for (size_t i = 0; i != lhs.size(); ++i)
if(lhs.data_[i] != rhs.data_[i]) if (lhs[i] != rhs[i]) return false;
return true;
}
[[nodiscard]] friend constexpr bool operator!=(const basic_fixed_string&, const basic_fixed_string&) = default;
template<typename CharT2, std::size_t N2>
[[nodiscard]] friend constexpr bool operator==(const basic_fixed_string&, const basic_fixed_string<CharT2, N2>&)
{
return false; return false;
}
template<typename CharT2, std::size_t N2>
// TODO gcc-10 error: a template cannot be defaulted
// [[nodiscard]] friend constexpr bool operator!=(const basic_fixed_string&,
// const basic_fixed_string<CharT2, N2>&) = default;
[[nodiscard]] friend constexpr bool operator!=(const basic_fixed_string&, const basic_fixed_string<CharT2, N2>&)
{
return true; return true;
} }
template<typename CharT2, std::size_t N2> template<typename CharT2, std::size_t N2>
[[nodiscard]] constexpr friend bool operator==(const basic_fixed_string&, const basic_fixed_string<CharT2, N2>&) noexcept [[nodiscard]] friend constexpr auto operator<=>(const basic_fixed_string& lhs,
const basic_fixed_string<CharT2, N2>& rhs)
{
size_t min_size = std::min(lhs.size(), rhs.size());
for (size_t i = 0; i != min_size; ++i) {
if (auto const cmp = lhs[i] <=> rhs[i]; cmp != 0) {
return cmp;
}
}
return lhs.size() <=> rhs.size();
}
#else
[[nodiscard]] constexpr friend bool operator==(const basic_fixed_string& lhs, const basic_fixed_string& rhs) noexcept
{
for (size_t i = 0; i != lhs.size(); ++i)
if (lhs.data_[i] != rhs.data_[i]) return false;
return true;
}
template<typename CharT2, std::size_t N2>
[[nodiscard]] constexpr friend bool operator==(const basic_fixed_string&,
const basic_fixed_string<CharT2, N2>&) noexcept
{ {
return false; return false;
} }
template<typename CharT2, std::size_t N2> template<typename CharT2, std::size_t N2>
[[nodiscard]] constexpr friend bool operator<(const basic_fixed_string& lhs, const basic_fixed_string<CharT2, N2>& rhs) noexcept [[nodiscard]] constexpr friend bool operator<(const basic_fixed_string& lhs,
const basic_fixed_string<CharT2, N2>& rhs) noexcept
{ {
using std::begin, std::end; using std::begin, std::end;
auto first1 = begin(lhs.data_); auto first1 = begin(lhs.data_);
@@ -79,24 +127,14 @@ namespace units {
return first1 == last1 && first2 != last2; return first1 == last1 && first2 != last2;
} }
#endif
template<class Traits> template<class Traits>
friend std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const basic_fixed_string& txt) friend std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os,
const basic_fixed_string& txt)
{ {
return os << txt.c_str(); return os << txt.c_str();
} }
template<std::size_t N2>
[[nodiscard]] constexpr friend basic_fixed_string<CharT, N + N2> operator+(const basic_fixed_string& lhs, const basic_fixed_string<CharT, N2>& rhs) noexcept
{
CharT txt[N + N2 + 1] = {};
for(size_t i = 0; i != N; ++i)
txt[i] = lhs[i];
for(size_t i = 0; i != N2; ++i)
txt[N + i] = rhs[i];
return units::basic_fixed_string(txt);
}
}; };
template<typename CharT, std::size_t N> template<typename CharT, std::size_t N>
@@ -108,4 +146,4 @@ namespace units {
template<std::size_t N> template<std::size_t N>
using fixed_string = basic_fixed_string<char, N>; using fixed_string = basic_fixed_string<char, N>;
} } // namespace units