460nm/asl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass string_view, span, and iterators by value

Browse Source
This commit is contained in:
Steven Le Rouzic
2025-03-14 18:53:40 +01:00
parent d1bb5a83f6
commit 8b6f57dc6a
4 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asl/containers/intrusive_list.hpp
View File

@ -151,7 +151,7 @@ public:
, m_advanced{end}
{}
constexpr bool operator==(const generic_iterator& other) const = default;
constexpr bool operator==(this generic_iterator, generic_iterator other) = default;
constexpr generic_iterator& operator++()
{
@ -167,9 +167,9 @@ public:
};
}
constexpr TT& operator*() const { return *m_node; }
constexpr TT& operator*(this generic_iterator self) { return *self.m_node; }
constexpr TT* operator->() const { return m_node; }
constexpr TT* operator->(this generic_iterator self) { return self.m_node; }
};
using iterator = generic_iterator<T>;

2
asl/strings/string_builder.hpp
View File

@ -45,7 +45,7 @@ public:
requires (!is_const<un_ref_t<decltype(self)>>)
{
const isize_t old_size = self.m_buffer.size();
self.m_buffer.resize_zero(old_size + sv.size());
self.m_buffer.resize_uninit(old_size + sv.size());
// NOLINTNEXTLINE(*-pointer-arithmetic)
asl::memcpy(self.m_buffer.data() + old_size, sv.data(), sv.size());
return std::forward<decltype(self)>(self);

70
asl/strings/string_view.hpp
View File

@ -12,6 +12,7 @@
namespace asl
{
// NOLINTBEGIN(*-convert-member-functions-to-static)
class string_view
{
const char* m_data{};
@ -49,51 +50,69 @@ public:
~string_view() = default;
[[nodiscard]] constexpr isize_t size() const { return m_size; }
[[nodiscard]] constexpr isize_t size(this string_view self)
{
return self.m_size;
}
[[nodiscard]] constexpr bool is_empty() const { return m_size == 0; }
[[nodiscard]] constexpr bool is_empty(this string_view self)
{
return self.m_size == 0;
}
[[nodiscard]] constexpr const char* data() const { return m_data; }
[[nodiscard]] constexpr const char* data(this string_view self)
{
return self.m_data;
}
[[nodiscard]] constexpr contiguous_iterator<const char> begin() const { return contiguous_iterator{m_data}; }
[[nodiscard]] constexpr contiguous_iterator<const char> begin(this string_view self)
{
return contiguous_iterator{self.m_data};
}
[[nodiscard]] constexpr contiguous_iterator<const char> end(this string_view self)
{
// NOLINTNEXTLINE(*-pointer-arithmetic)
[[nodiscard]] constexpr contiguous_iterator<const char> end() const { return contiguous_iterator{m_data + m_size}; }
[[nodiscard]] constexpr span<const char> as_span() const { return {m_data, m_size}; }
constexpr char operator[](isize_t i) const
{
ASL_ASSERT(i >= 0 && i < m_size);
return m_data[i]; // NOLINT(*-pointer-arithmetic)
return contiguous_iterator{self.m_data + self.m_size};
}
[[nodiscard]] constexpr string_view substr(isize_t offset, isize_t size) const
[[nodiscard]] constexpr span<const char> as_span(this string_view self)
{
ASL_ASSERT(offset >= 0 && size >= 0 && offset + size <= m_size);
return string_view{m_data + offset, size}; // NOLINT(*-pointer-arithmetic)
return {self.m_data, self.m_size};
}
[[nodiscard]] constexpr string_view substr(isize_t offset) const
[[nodiscard]] constexpr char operator[](this string_view self, isize_t i)
{
ASL_ASSERT(offset >= 0 && offset <= m_size);
return string_view{m_data + offset, m_size - offset}; // NOLINT(*-pointer-arithmetic)
ASL_ASSERT(i >= 0 && i < self.m_size);
return self.m_data[i]; // NOLINT(*-pointer-arithmetic)
}
[[nodiscard]] constexpr string_view first(isize_t size) const
[[nodiscard]] constexpr string_view substr(this string_view self, isize_t offset, isize_t size)
{
return substr(0, size);
ASL_ASSERT(offset >= 0 && size >= 0 && offset + size <= self.m_size);
return string_view{self.m_data + offset, size}; // NOLINT(*-pointer-arithmetic)
}
[[nodiscard]] constexpr string_view last(isize_t size) const
[[nodiscard]] constexpr string_view substr(this string_view self, isize_t offset)
{
return substr(m_size - size);
ASL_ASSERT(offset >= 0 && offset <= self.m_size);
return string_view{self.m_data + offset, self.m_size - offset}; // NOLINT(*-pointer-arithmetic)
}
constexpr bool operator==(string_view other) const
[[nodiscard]] constexpr string_view first(this string_view self, isize_t size)
{
if (m_size != other.m_size) { return false; }
return memcmp(m_data, other.m_data, m_size) == 0;
return self.substr(0, size);
}
[[nodiscard]] constexpr string_view last(this string_view self, isize_t size)
{
return self.substr(self.m_size - size);
}
constexpr bool operator==(this string_view self, string_view other)
{
if (self.m_size != other.m_size) { return false; }
return asl::memcmp(self.m_data, other.m_data, self.m_size) == 0;
}
template<typename H>
@ -102,6 +121,7 @@ public:
return H::combine(H::combine_contiguous(h, as_bytes(sv.as_span())), sv.size());
}
};
// NOLINTEND(*-convert-member-functions-to-static)
} // namespace asl

82
asl/types/span.hpp
View File

@ -14,6 +14,7 @@ namespace asl
static constexpr isize_t dynamic_size = -1;
// NOLINTBEGIN(*-convert-member-functions-to-static)
template<typename T>
class contiguous_iterator
{
@ -22,7 +23,7 @@ class contiguous_iterator
public:
constexpr explicit contiguous_iterator(T* ptr) : m_ptr{ptr} {}
constexpr bool operator==(const contiguous_iterator& other) const = default;
constexpr bool operator==(this contiguous_iterator self, contiguous_iterator other) = default;
constexpr contiguous_iterator& operator++()
{
@ -35,9 +36,9 @@ public:
return contiguous_iterator{ exchange(m_ptr, m_ptr + 1) };
}
constexpr T& operator*() const { return *m_ptr; }
constexpr T& operator*(this contiguous_iterator self) { return *self.m_ptr; }
constexpr T* operator->() const { return m_ptr; }
constexpr T* operator->(this contiguous_iterator self) { return self.m_ptr; }
};
template<typename T>
@ -109,109 +110,110 @@ public:
~span() = default;
[[nodiscard]] constexpr isize_t size() const
[[nodiscard]] constexpr isize_t size(this span self)
{
if constexpr (kIsDynamic) { return m_size; }
if constexpr (kIsDynamic) { return self.m_size; }
else { return kSize; }
}
[[nodiscard]] constexpr isize_t size_bytes() const { return size() * size_of<T>; }
[[nodiscard]] constexpr isize_t size_bytes(this span self) { return self.size() * size_of<T>; }
[[nodiscard]] constexpr bool is_empty() const { return size() == 0; }
[[nodiscard]] constexpr bool is_empty(this span self) { return self.size() == 0; }
[[nodiscard]] constexpr T* data() const { return m_data; }
[[nodiscard]] constexpr T* data(this span self) { return self.m_data; }
[[nodiscard]] constexpr contiguous_iterator<T> begin() const
[[nodiscard]] constexpr contiguous_iterator<T> begin(this span self)
{
return contiguous_iterator{m_data};
return contiguous_iterator{self.m_data};
}
[[nodiscard]] constexpr contiguous_iterator<T> end() const
[[nodiscard]] constexpr contiguous_iterator<T> end(this span self)
{
return contiguous_iterator{m_data + size()};
return contiguous_iterator{self.m_data + self.size()};
}
constexpr T& operator[](isize_t i) const
constexpr T& operator[](this span self, isize_t i)
{
ASL_ASSERT(i >= 0 && i < size());
return m_data[i]; // NOLINT(*-pointer-arithmetic)
ASL_ASSERT(i >= 0 && i < self.size());
return self.m_data[i]; // NOLINT(*-pointer-arithmetic)
}
template<isize_t kOffset, isize_t kSubSize = dynamic_size>
[[nodiscard]] constexpr auto subspan() const
[[nodiscard]] constexpr auto subspan(this span self)
requires (
kOffset >= 0 &&
(kIsDynamic || kOffset <= kSize) &&
(kIsDynamic || is_dynamic(kSubSize) || kSubSize <= kSize - kOffset)
)
{
ASL_ASSERT(kOffset <= size());
ASL_ASSERT(kOffset <= self.size());
if constexpr (is_dynamic(kSubSize))
{
if constexpr (kIsDynamic)
{
return span<T>(data() + kOffset, size() - kOffset);
return span<T>(self.data() + kOffset, self.size() - kOffset);
}
else
{
return span<T, kSize - kOffset>(data() + kOffset, size() - kOffset);
return span<T, kSize - kOffset>(self.data() + kOffset, self.size() - kOffset);
}
}
else
{
ASL_ASSERT(kSubSize <= size() - kOffset);
return span<T, kSubSize>(data() + kOffset, kSubSize);
ASL_ASSERT(kSubSize <= self.size() - kOffset);
return span<T, kSubSize>(self.data() + kOffset, kSubSize);
}
}
[[nodiscard]] constexpr span<T> subspan(isize_t offset) const
[[nodiscard]] constexpr span<T> subspan(this span self, isize_t offset)
{
ASL_ASSERT(offset <= size());
return span<T>{ data() + offset, size() - offset };
ASL_ASSERT(offset <= self.size());
return span<T>{ self.data() + offset, self.size() - offset };
}
[[nodiscard]] constexpr span<T> subspan(isize_t offset, isize_t sub_size) const
[[nodiscard]] constexpr span<T> subspan(this span self, isize_t offset, isize_t sub_size)
{
ASL_ASSERT(offset <= size() && !is_dynamic(sub_size));
ASL_ASSERT(sub_size <= size() - offset);
return span<T>{ data() + offset, sub_size };
ASL_ASSERT(offset <= self.size() && !is_dynamic(sub_size));
ASL_ASSERT(sub_size <= self.size() - offset);
return span<T>{ self.data() + offset, sub_size };
}
template<isize_t kSubSize>
[[nodiscard]] constexpr auto first() const
[[nodiscard]] constexpr auto first(this span self)
requires (
kSubSize >= 0 &&
(kIsDynamic || kSubSize <= kSize)
)
{
ASL_ASSERT(kSubSize <= size());
return span<T, kSubSize>{ data(), kSubSize };
ASL_ASSERT(kSubSize <= self.size());
return span<T, kSubSize>{ self.data(), kSubSize };
}
[[nodiscard]] constexpr span<T> first(isize_t sub_size) const
[[nodiscard]] constexpr span<T> first(this span self, isize_t sub_size)
{
ASL_ASSERT(sub_size >= 0 && sub_size <= size());
return span<T>{ data(), sub_size };
ASL_ASSERT(sub_size >= 0 && sub_size <= self.size());
return span<T>{ self.data(), sub_size };
}
template<isize_t kSubSize>
[[nodiscard]] constexpr auto last() const
[[nodiscard]] constexpr auto last(this span self)
requires (
kSubSize >= 0 &&
(kIsDynamic || kSubSize <= kSize)
)
{
ASL_ASSERT(kSubSize <= size());
return span<T, kSubSize>{ data() + size() - kSubSize, kSubSize };
ASL_ASSERT(kSubSize <= self.size());
return span<T, kSubSize>{ self.data() + self.size() - kSubSize, kSubSize };
}
[[nodiscard]] constexpr span<T> last(isize_t sub_size) const
[[nodiscard]] constexpr span<T> last(this span self, isize_t sub_size)
{
ASL_ASSERT(sub_size >= 0 && sub_size <= size());
return span<T>{ data() + size() - sub_size, sub_size };
ASL_ASSERT(sub_size >= 0 && sub_size <= self.size());
return span<T>{ self.data() + self.size() - sub_size, sub_size };
}
};
// NOLINTEND(*-convert-member-functions-to-static)
template<is_object T, isize_t kSize>
inline span<const byte> as_bytes(span<T, kSize> s)