pkarr: add c++ template + bump version to 0.4.2

1 files changed, 92 insertions, 0 deletions

diff --git a/pkarr.h b/pkarr.h
index fa2d88a..baa91e8 100644
--- a/pkarr.h
+++ b/pkarr.h
@@ -22,8 +22,82 @@ void pk_arr_resize(struct pk_arr *arr, uint32_t count);
 void pk_arr_move_to_back(struct pk_arr *arr, uint32_t index);
 void pk_arr_append(struct pk_arr *arr, void *data);
 void pk_arr_remove_at(struct pk_arr *arr, uint32_t index);
+void pk_arr_clone(struct pk_arr *lhs, struct pk_arr *rhs);
+void pk_arr_swap(struct pk_arr *lhs, struct pk_arr *rhs);
 uint32_t pk_arr_find_first_index(struct pk_arr *arr, void *user_data, pk_arr_item_compare *fn);
 
+#if defined(__cplusplus)
+template<typename T>
+struct pk_arr_t : public pk_arr {
+	pk_arr_t();
+	pk_arr_t(struct pk_membucket *bkt);
+	pk_arr_t(const pk_arr_t<T> &other);
+	pk_arr_t(pk_arr_t<T> &&other);
+	pk_arr_t &operator=(const pk_arr_t<T> &other);
+	pk_arr_t &operator=(pk_arr_t<T> &&other);
+	~pk_arr_t();
+	T &operator[](size_t index);
+};
+template<typename T>
+pk_arr_t<T>::pk_arr_t() {
+	this->next = 0;
+	this->reserved = 0;
+	this->stride = sizeof(T);
+	this->alignment = alignof(T);
+	this->bkt = NULL;
+	this->data = NULL;
+}
+template<typename T>
+pk_arr_t<T>::pk_arr_t(struct pk_membucket *bkt) : pk_arr_t<T>() {
+	this->bkt = bkt;
+}
+template<typename T>
+pk_arr_t<T>::pk_arr_t(const pk_arr_t<T> &other) {
+	// copy ctor
+	pk_arr_clone(static_cast<struct pk_arr_t *>(&const_cast<pk_arr_t<T>&>(other)), this);
+}
+template<typename T>
+pk_arr_t<T>::pk_arr_t(pk_arr_t<T> &&other) {
+	// move ctor
+	pk_arr_swap(this, &other);
+	other.data = NULL;
+}
+template<typename T>
+pk_arr_t<T> &
+pk_arr_t<T>::operator=(const pk_arr_t<T> &other) {
+	// copy assignment
+	if (this->data != NULL) {
+		pk_arr_reset(this);
+	}
+	pk_arr_clone(static_cast<struct pk_arr_t *>(&const_cast<pk_arr_t<T>&>(other)), this);
+	return *this;
+}
+template<typename T>
+pk_arr_t<T> &
+pk_arr_t<T>::operator=(pk_arr_t<T> &&other) {
+	// move assignment
+	if (this->data != NULL) {
+		pk_arr_reset(this);
+	}
+	pk_arr_swap(this, &other);
+	other.data = NULL;
+	return *this;
+}
+template<typename T>
+pk_arr_t<T>::~pk_arr_t() {
+	if (this->data != NULL) pk_delete(this->data, this->stride * this->reserved, this->bkt);
+}
+template<typename T>
+T &pk_arr_t<T>::operator[](size_t index) {
+	if(index >= this->next) throw "pk_arr_t<T>::operator[] out of range";
+	return reinterpret_cast<T*>(this->data)[index];
+}
+template<typename T>
+void pk_arr_append_t(pk_arr_t<T> *arr, const T &item) {
+	pk_arr_append(arr, &const_cast<T&>(item));
+}
+#endif
+
 #endif /* PK_PKARR_H */
 #ifdef PK_IMPL_ARR
 
@@ -194,6 +268,24 @@ pk_arr_remove_at(struct pk_arr *arr, uint32_t index)
 	arr->next -= 1;
 }
 
+void
+pk_arr_clone(struct pk_arr *lhs, struct pk_arr *rhs) {
+	size_t sz;
+	*rhs = *lhs;
+	if (lhs->data == NULL) return;
+	sz = lhs->stride * lhs->reserved;
+	rhs->data = pk_new(sz, lhs->alignment, lhs->bkt);
+	memcpy(rhs->data, lhs->data, sz);
+}
+
+void
+pk_arr_swap(struct pk_arr *lhs, struct pk_arr *rhs)
+{
+	struct pk_arr tmp = *lhs;
+	*lhs = *rhs;
+	*rhs = tmp;
+}
+
 uint32_t
 pk_arr_find_first_index(struct pk_arr *arr, void *user_data, pk_arr_item_compare *fn)
 {