drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox/std] Make Vector erase methods return Errors

Browse Source
This commit is contained in:
Gary Talent 2021-04-17 12:44:27 -05:00
parent a22823e3b4
commit c46ec57431
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deps/ox/src/ox/std/vector.hpp vendored
View File

@ -84,15 +84,17 @@ class Vector {
/** /**
* Removes an item from the Vector. * Removes an item from the Vector.
* @param pos position of item to remove * @param pos position of item to remove
* @return Error if index is out of bounds
*/ */
void erase(std::size_t pos); Error erase(std::size_t pos);
/** /**
* Moves the last item in the Vector to position pos and decrements the * Moves the last item in the Vector to position pos and decrements the
* size by 1. * size by 1.
* @param pos position of item to remove * @param pos position of item to remove
* @return Error if index is out of bounds
*/ */
void unordered_erase(std::size_t pos); Error unordered_erase(std::size_t pos);
private: private:
void expandCap(std::size_t cap); void expandCap(std::size_t cap);
@ -301,17 +303,25 @@ void Vector<T>::pop_back() {
} }
template<typename T> template<typename T>
void Vector<T>::erase(std::size_t pos) { Error Vector<T>::erase(std::size_t pos) {
m_size--; if (pos >= m_size) {
for (auto i = pos; i < m_size; i++) { return OxError(1);
}
--m_size;
for (auto i = pos; i < m_size; ++i) {
m_items[i] = ox::move(m_items[i + 1]); m_items[i] = ox::move(m_items[i + 1]);
} }
return OxError(0);
} }
template<typename T> template<typename T>
void Vector<T>::unordered_erase(std::size_t pos) { Error Vector<T>::unordered_erase(std::size_t pos) {
if (pos >= m_size) {
return OxError(1);
}
m_size--; m_size--;
m_items[pos] = ox::move(m_items[m_size]); m_items[pos] = ox::move(m_items[m_size]);
return OxError(0);
} }
template<typename T> template<typename T>