Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-24 05:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
ykiko 2024-02-18 22:10:51 +08:00
parent 065359fbbf
commit 3e74e1ee16
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/pocketpy/vector.h
View File

@ -194,11 +194,7 @@ namespace pkpy {
template <typename T, std::size_t N> class small_vector { template <typename T, std::size_t N> class small_vector {
public: public:
union Internal { union Internal {
struct {
T *begin; T *begin;
} data;
alignas(T) char buffer[sizeof(T) * N]; alignas(T) char buffer[sizeof(T) * N];
} m_internal; } m_internal;
@ -229,12 +225,12 @@ namespace pkpy {
pointer data() { pointer data() {
return is_small() ? reinterpret_cast<T *>(m_internal.buffer) return is_small() ? reinterpret_cast<T *>(m_internal.buffer)
: m_internal.data.begin; : m_internal.begin;
} }
const_pointer data() const { const_pointer data() const {
return is_small() ? reinterpret_cast<const T *>(m_internal.buffer) return is_small() ? reinterpret_cast<const T *>(m_internal.buffer)
: m_internal.data.begin; : m_internal.begin;
} }
reference operator[](size_type index) { return data()[index]; } reference operator[](size_type index) { return data()[index]; }
@ -312,9 +308,9 @@ namespace pkpy {
uninitialized_copy_n(other.m_internal.buffer, other.m_size, uninitialized_copy_n(other.m_internal.buffer, other.m_size,
m_internal.buffer); m_internal.buffer);
} else { } else {
m_internal.data.begin = (pointer)std::malloc(sizeof(T) * m_capacity); m_internal.begin = (pointer)std::malloc(sizeof(T) * m_capacity);
uninitialized_copy_n(other.m_internal.data.begin, other.m_size, uninitialized_copy_n(other.m_internal.begin, other.m_size,
m_internal.data.begin); m_internal.begin);
} }
} }
@ -324,7 +320,7 @@ namespace pkpy {
uninitialized_relocate_n(other.m_internal.buffer, other.m_size, uninitialized_relocate_n(other.m_internal.buffer, other.m_size,
m_internal.buffer); m_internal.buffer);
} else { } else {
m_internal.data.begin = other.m_internal.data.begin; m_internal.begin = other.m_internal.begin;
other.m_capacity = N; other.m_capacity = N;
} }
other.m_size = 0; other.m_size = 0;
@ -337,9 +333,9 @@ namespace pkpy {
uninitialized_copy_n(other.m_internal.buffer, other.m_size, uninitialized_copy_n(other.m_internal.buffer, other.m_size,
m_internal.buffer); m_internal.buffer);
} else { } else {
m_internal.data.begin = (pointer)std::malloc(sizeof(T) * other.m_capacity); m_internal.begin = (pointer)std::malloc(sizeof(T) * other.m_capacity);
uninitialized_copy_n(other.m_internal.data.begin, other.m_size, uninitialized_copy_n(other.m_internal.begin, other.m_size,
m_internal.data.begin); m_internal.begin);
} }
m_capacity = other.m_capacity; m_capacity = other.m_capacity;
m_size = other.m_size; m_size = other.m_size;
@ -354,7 +350,7 @@ namespace pkpy {
uninitialized_relocate_n(other.m_internal.buffer, other.m_size, uninitialized_relocate_n(other.m_internal.buffer, other.m_size,
m_internal.buffer); m_internal.buffer);
} else { } else {
m_internal.data.begin = other.m_internal.data.begin; m_internal.begin = other.m_internal.begin;
} }
m_capacity = other.m_capacity; m_capacity = other.m_capacity;
m_size = other.m_size; m_size = other.m_size;
@ -366,22 +362,23 @@ namespace pkpy {
template <typename... Args> void emplace_back(Args &&...args) noexcept { template <typename... Args> void emplace_back(Args &&...args) noexcept {
if (m_size == m_capacity) { if (m_size == m_capacity) {
m_capacity *= 2; auto new_capacity = m_capacity * 2;
if (!is_small()) { if (!is_small()) {
if constexpr (is_trivially_relocatable_v<T>) { if constexpr (is_trivially_relocatable_v<T>) {
m_internal.data.begin = m_internal.begin =
(pointer)std::realloc(m_internal.data.begin, sizeof(T) * m_capacity); (pointer)std::realloc(m_internal.begin, sizeof(T) * new_capacity);
} else { } else {
auto new_data = (pointer)std::malloc(sizeof(T) * m_capacity); auto new_data = (pointer)std::malloc(sizeof(T) * new_capacity);
uninitialized_relocate_n(m_internal.data.begin, m_size, new_data); uninitialized_relocate_n(m_internal.begin, m_size, new_data);
std::free(m_internal.data.begin); std::free(m_internal.begin);
m_internal.data.begin = new_data; m_internal.begin = new_data;
} }
} else { } else {
auto new_data = (pointer)std::malloc(sizeof(T) * m_capacity); auto new_data = (pointer)std::malloc(sizeof(T) * new_capacity);
uninitialized_relocate_n(m_internal.buffer, m_size, new_data); uninitialized_relocate_n(m_internal.buffer, m_size, new_data);
m_internal.data.begin = new_data; m_internal.begin = new_data;
} }
m_capacity = new_capacity;
} }
::new (data() + m_size) T(std::forward<Args>(args)...); ::new (data() + m_size) T(std::forward<Args>(args)...);
m_size++; m_size++;