X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=stl-model.h;h=30a9b8c69872f9122e7494bcf28a5962ab2d4ab1;hp=300cbd045ad6bc7c6b808d1b83ccc77a47511f26;hb=651e9182baf50ef1e235ad7a587730b989bb44c7;hpb=c8b9d01f03c5ceae9b3ad503e29f6900564cc242

diff --git a/stl-model.h b/stl-model.h
index 300cbd04..30a9b8c6 100644
--- a/stl-model.h
+++ b/stl-model.h
@@ -1,7 +1,6 @@
 #ifndef __STL_MODEL_H__
 #define __STL_MODEL_H__
 
-#include <vector>
 #include <list>
 #include "mymemory.h"
 
@@ -39,38 +38,217 @@ public:
 	SNAPSHOTALLOC
 };
 
-template<typename _Tp>
-class ModelVector : public std::vector<_Tp, ModelAlloc<_Tp> >
-{
-public:
-	typedef std::vector< _Tp, ModelAlloc<_Tp> > vector;
-
-	ModelVector() :
-		vector()
-	{ }
+#define VECTOR_DEFCAP 8
 
-	ModelVector(size_t n, const _Tp& val = _Tp()) :
-		vector(n, val)
-	{ }
-
-	MEMALLOC
-};
+typedef unsigned int uint;
 
-template<typename _Tp>
-class SnapVector : public std::vector<_Tp, SnapshotAlloc<_Tp> >
-{
+template<typename type>
+class ModelVector {
 public:
-	typedef std::vector< _Tp, SnapshotAlloc<_Tp> > vector;
-
-	SnapVector() :
-		vector()
-	{ }
+	ModelVector(uint _capacity = VECTOR_DEFCAP) :
+		_size(0),
+		capacity(_capacity),
+		array((type *) model_malloc(sizeof(type) * _capacity)) {
+	}
+
+	ModelVector(uint _capacity, type *_array)  :
+		_size(_capacity),
+		capacity(_capacity),
+		array((type *) model_malloc(sizeof(type) * _capacity)) {
+		memcpy(array, _array, capacity * sizeof(type));
+	}
+	void pop_back() {
+		_size--;
+	}
+
+	type back() const {
+		return array[size - 1];
+	}
+
+	void resize(uint psize) {
+		if (psize <= _size) {
+			_size = psize;
+			return;
+		} else if (psize > capacity) {
+			array = (type *)model_realloc(array, (psize << 1) * sizeof(type));
+			capacity = psize << 1;
+		}
+		bzero(&array[_size], (psize - _size) * sizeof(type));
+		_size = psize;
+	}
+
+	void push_back(type item) {
+		if (_size >= capacity) {
+			uint newcap = capacity << 1;
+			array = (type *)model_realloc(array, newcap * sizeof(type));
+			capacity = newcap;
+		}
+		array[_size++] = item;
+	}
+
+	type operator[](uint index) const {
+		return array[index];
+	}
+
+	type & operator[](uint index) {
+		return array[index];
+	}
+
+	bool empty() const {
+		return _size == 0;
+	}
+
+	type & at(uint index) const {
+		return array[index];
+	}
+
+	void setExpand(uint index, type item) {
+		if (index >= _size)
+			resize(index + 1);
+		set(index, item);
+	}
+
+	void set(uint index, type item) {
+		array[index] = item;
+	}
+
+	void insertAt(uint index, type item) {
+		resize(_size + 1);
+		for (uint i = _size - 1;i > index;i--) {
+			set(i, at(i - 1));
+		}
+		array[index] = item;
+	}
+
+	void removeAt(uint index) {
+		for (uint i = index;(i + 1) < _size;i++) {
+			set(i, at(i + 1));
+		}
+		resize(_size - 1);
+	}
+
+	inline uint size() const {
+		return _size;
+	}
+
+	~ModelVector() {
+		model_free(array);
+	}
+
+	void clear() {
+		_size = 0;
+	}
+
+	MEMALLOC;
+private:
+	uint _size;
+	uint capacity;
+	type *array;
+};
 
-	SnapVector(size_t n, const _Tp& val = _Tp()) :
-		vector(n, val)
-	{ }
 
-	SNAPSHOTALLOC
+template<typename type>
+class SnapVector {
+public:
+	SnapVector(uint _capacity = VECTOR_DEFCAP) :
+		_size(0),
+		capacity(_capacity),
+		array((type *) snapshot_malloc(sizeof(type) * _capacity)) {
+	}
+
+	SnapVector(uint _capacity, type *_array)  :
+		_size(_capacity),
+		capacity(_capacity),
+		array((type *) snapshot_malloc(sizeof(type) * _capacity)) {
+		memcpy(array, _array, capacity * sizeof(type));
+	}
+	void pop_back() {
+		_size--;
+	}
+
+	type back() const {
+		return array[_size - 1];
+	}
+
+	void resize(uint psize) {
+		if (psize <= _size) {
+			_size = psize;
+			return;
+		} else if (psize > capacity) {
+			array = (type *)snapshot_realloc(array, (psize <<1 )* sizeof(type));
+			capacity = psize << 1;
+		}
+		bzero(&array[_size], (psize - _size) * sizeof(type));
+		_size = psize;
+	}
+
+	void push_back(type item) {
+		if (_size >= capacity) {
+			uint newcap = capacity << 1;
+			array = (type *)snapshot_realloc(array, newcap * sizeof(type));
+			capacity = newcap;
+		}
+		array[_size++] = item;
+	}
+
+	type & operator[](uint index) {
+		return array[index];
+	}
+
+	type operator[](uint index) const {
+		return array[index];
+	}
+
+	bool empty() const {
+		return _size == 0;
+	}
+
+	type & at(uint index) const {
+		return array[index];
+	}
+
+	void setExpand(uint index, type item) {
+		if (index >= _size)
+			resize(index + 1);
+		set(index, item);
+	}
+
+	void set(uint index, type item) {
+		array[index] = item;
+	}
+
+	void insertAt(uint index, type item) {
+		resize(_size + 1);
+		for (uint i = _size - 1;i > index;i--) {
+			set(i, at(i - 1));
+		}
+		array[index] = item;
+	}
+
+	void removeAt(uint index) {
+		for (uint i = index;(i + 1) < _size;i++) {
+			set(i, at(i + 1));
+		}
+		resize(_size - 1);
+	}
+
+	inline uint size() const {
+		return _size;
+	}
+
+	~SnapVector() {
+		snapshot_free(array);
+	}
+
+	void clear() {
+		_size = 0;
+	}
+
+	SNAPSHOTALLOC;
+private:
+	uint _size;
+	uint capacity;
+	type *array;
 };
 
 #endif	/* __STL_MODEL_H__ */