Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

BAN: Add Vector::Emplace and EmplaceBack() and fix insert assignment

This commit is contained in:
Bananymous 2023-01-17 11:59:36 +02:00
parent cf63552b2a
commit 1340e26148
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BAN/include/BAN/Vector.h
View File

@ -72,8 +72,12 @@ namespace BAN
[[nodiscard]] ErrorOr<void> PushBack(T&&); [[nodiscard]] ErrorOr<void> PushBack(T&&);
[[nodiscard]] ErrorOr<void> PushBack(const T&); [[nodiscard]] ErrorOr<void> PushBack(const T&);
[[nodiscard]] ErrorOr<void> Insert(T&&, size_type); template<typename... Args>
[[nodiscard]] ErrorOr<void> Insert(const T&, size_type); [[nodiscard]] ErrorOr<void> EmplaceBack(Args...);
template<typename... Args>
[[nodiscard]] ErrorOr<void> Emplace(size_type, Args...);
[[nodiscard]] ErrorOr<void> Insert(size_type, T&&);
[[nodiscard]] ErrorOr<void> Insert(size_type, const T&);
iterator begin(); iterator begin();
iterator end(); iterator end();
@ -180,7 +184,18 @@ namespace BAN
} }
template<typename T> template<typename T>
ErrorOr<void> Vector<T>::Insert(T&& value, size_type index) template<typename... Args>
ErrorOr<void> Vector<T>::EmplaceBack(Args... args)
{
TRY(EnsureCapasity(m_size + 1));
new (AddressOf(m_size)) T(Forward<Args>(args)...);
m_size++;
return {};
}
template<typename T>
template<typename... Args>
ErrorOr<void> Vector<T>::Emplace(size_type index, Args... args)
{ {
ASSERT(index <= m_size); ASSERT(index <= m_size);
TRY(EnsureCapasity(m_size + 1)); TRY(EnsureCapasity(m_size + 1));
@ -189,14 +204,38 @@ namespace BAN
new (AddressOf(m_size)) T(Move(*AddressOf(m_size - 1))); new (AddressOf(m_size)) T(Move(*AddressOf(m_size - 1)));
for (size_type i = m_size - 1; i > index; i--) for (size_type i = m_size - 1; i > index; i--)
*AddressOf(i) = Move(*AddressOf(i - 1)); *AddressOf(i) = Move(*AddressOf(i - 1));
*AddressOf(index) = Move(T(Forward<Args>(args)...));
}
else
{
new (AddressOf(m_size)) T(Forward<Args>(args)...);
} }
*AddressOf(index) = Move(value);
m_size++; m_size++;
return {}; return {};
} }
template<typename T> template<typename T>
ErrorOr<void> Vector<T>::Insert(const T& value, size_type index) ErrorOr<void> Vector<T>::Insert(size_type index, T&& value)
{
ASSERT(index <= m_size);
TRY(EnsureCapasity(m_size + 1));
if (index < m_size)
{
new (AddressOf(m_size)) T(Move(*AddressOf(m_size - 1)));
for (size_type i = m_size - 1; i > index; i--)
*AddressOf(i) = Move(*AddressOf(i - 1));
*AddressOf(index) = Move(value);
}
else
{
new (AddressOf(m_size)) T(Move(value));
}
m_size++;
return {};
}
template<typename T>
ErrorOr<void> Vector<T>::Insert(size_type index, const T& value)
{ {
return Insert(Move(T(value)), index); return Insert(Move(T(value)), index);
} }