godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #103923 from Ivorforce/span-array-init

Browse Source 
Add C array constructor to `Span`.
This commit is contained in:
Rémi Verschelde
2025-03-28 14:32:14 +01:00
parent d560d5c5c7 78221946cc
commit 76c30189fa
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/templates/span.h
View File

@@ -43,10 +43,29 @@ class Span {
uint64_t _len = 0;
public:
static constexpr bool is_string = std::disjunction_v<
std::is_same<T, char>,
std::is_same<T, char16_t>,
std::is_same<T, char32_t>,
std::is_same<T, wchar_t>
>;
_FORCE_INLINE_ constexpr Span() = default;
_FORCE_INLINE_ constexpr Span(const T *p_ptr, uint64_t p_len) :
_ptr(p_ptr), _len(p_len) {}
// Allows creating Span directly from C arrays and string literals.
template <size_t N>
_FORCE_INLINE_ constexpr Span(const T (&p_array)[N]) :
_ptr(p_array), _len(N) {
if constexpr (is_string) {
// Cut off the \0 terminator implicitly added to string literals.
if (N > 0 && p_array[N - 1] == '\0') {
_len--;
}
}
}
_FORCE_INLINE_ constexpr uint64_t size() const { return _len; }
_FORCE_INLINE_ constexpr bool is_empty() const { return _len == 0; }

19
tests/core/templates/test_span.h
View File

@@ -48,17 +48,22 @@ TEST_CASE("[Span] Constexpr Validators") {
static_assert(span_value.size() == 1);
static_assert(!span_value.is_empty());
constexpr static char32_t array[] = U"122345";
constexpr Span<char32_t> span_array(array, strlen(array));
static_assert(span_array.ptr() == &array[0]);
static constexpr int ints[] = { 0, 1, 2, 3, 4, 5 };
constexpr Span<int> span_array = ints;
static_assert(span_array.size() == 6);
static_assert(!span_array.is_empty());
static_assert(span_array[0] == U'1');
static_assert(span_array[span_array.size() - 1] == U'5');
static_assert(span_array[0] == 0);
static_assert(span_array[span_array.size() - 1] == 5);
constexpr Span<char32_t> span_string = U"122345";
static_assert(span_string.size() == 6);
static_assert(!span_string.is_empty());
static_assert(span_string[0] == U'1');
static_assert(span_string[span_string.size() - 1] == U'5');
int idx = 0;
for (const char32_t &chr : span_array) {
CHECK_EQ(chr, span_array[idx++]);
for (const char32_t &chr : span_string) {
CHECK_EQ(chr, span_string[idx++]);
}
}