small changes
[c11tester.git] / stl-model.h
index 30a9b8c69872f9122e7494bcf28a5962ab2d4ab1..611520fc70515fa745239df32b4248d1db8068d6 100644 (file)
 
 #include <list>
 #include "mymemory.h"
+typedef unsigned int uint;
 
 template<typename _Tp>
-class ModelList : public std::list<_Tp, ModelAlloc<_Tp> >
+class mllnode {
+public:
+       _Tp getVal() {return val;}
+       mllnode<_Tp> * getNext() {return next;}
+       mllnode<_Tp> * getPrev() {return prev;}
+
+       MEMALLOC;
+
+private:
+       mllnode<_Tp> * next;
+       mllnode<_Tp> * prev;
+       _Tp val;
+       template<typename T>
+       friend class ModelList;
+};
+
+template<typename _Tp>
+class ModelList
 {
 public:
-       typedef std::list< _Tp, ModelAlloc<_Tp> > list;
+       ModelList() : head(NULL),
+               tail(NULL), _size(0) {
+       }
+
+       void push_front(_Tp val) {
+               mllnode<_Tp> * tmp = new mllnode<_Tp>();
+               tmp->prev = NULL;
+               tmp->next = head;
+               tmp->val = val;
+               if (head == NULL)
+                       tail = tmp;
+               else
+                       head->prev = tmp;
+               head = tmp;
+               _size++;
+       }
+
+       void push_back(_Tp val) {
+               mllnode<_Tp> * tmp = new mllnode<_Tp>();
+               tmp->prev = tail;
+               tmp->next = NULL;
+               tmp->val = val;
+               if (tail == NULL)
+                       head = tmp;
+               else tail->next = tmp;
+               tail = tmp;
+               _size++;
+       }
+
+       void pop_front() {
+               mllnode<_Tp> *tmp = head;
+               head = head->next;
+               if (head == NULL)
+                       tail = NULL;
+               else
+                       head->prev = NULL;
+               delete tmp;
+               _size--;
+       }
+
+       void pop_back() {
+               mllnode<_Tp> *tmp = tail;
+               tail = tail->prev;
+               if (tail == NULL)
+                       head = NULL;
+               else
+                       tail->next = NULL;
+               delete tmp;
+               _size--;
+       }
+
+       void clear() {
+               while(head != NULL) {
+                       mllnode<_Tp> *tmp=head->next;
+                       delete head;
+                       head = tmp;
+               }
+               tail=NULL;
+               _size=0;
+       }
+
+       void insertAfter(mllnode<_Tp> * node, _Tp val) {
+               mllnode<_Tp> *tmp = new mllnode<_Tp>();
+               tmp->val = val;
+               tmp->prev = node;
+               tmp->next = node->next;
+               node->next = tmp;
+               if (tmp->next == NULL) {
+                       tail = tmp;
+               } else {
+                       tmp->next->prev = tmp;
+               }
+               _size++;
+       }
+
+       void insertBefore(mllnode<_Tp> * node, _Tp val) {
+               mllnode<_Tp> *tmp = new mllnode<_Tp>();
+               tmp->val = val;
+               tmp->next = node;
+               tmp->prev = node->prev;
+               node->prev = tmp;
+               if (tmp->prev == NULL) {
+                       head = tmp;
+               } else {
+                       tmp->prev->next = tmp;
+               }
+               _size++;
+       }
+
+       mllnode<_Tp> * erase(mllnode<_Tp> * node) {
+               if (head == node) {
+                       head = node->next;
+               } else {
+                       node->prev->next = node->next;
+               }
+
+               if (tail == node) {
+                       tail = node->prev;
+               } else {
+                       node->next->prev = node->prev;
+               }
+               mllnode<_Tp> *next = node->next;
+               delete node;
+               _size--;
+               return next;
+       }
+
+       mllnode<_Tp> * begin() {
+               return head;
+       }
+
+       mllnode<_Tp> * end() {
+               return tail;
+       }
+
+       _Tp front() {
+               return head->val;
+       }
+
+       _Tp back() {
+               return tail->val;
+       }
+
+       uint size() {
+               return _size;
+       }
+
+       bool empty() {
+               return _size == 0;
+       }
+
+       MEMALLOC;
+private:
+       mllnode<_Tp> *head;
+       mllnode<_Tp> *tail;
+       uint _size;
+};
 
-       ModelList() :
-               list()
-       { }
+class actionlist;
 
-       ModelList(size_t n, const _Tp& val = _Tp()) :
-               list(n, val)
-       { }
+template<typename _Tp>
+class sllnode {
+public:
+       _Tp getVal() {return val;}
+       sllnode<_Tp> * getNext() {return next;}
+       sllnode<_Tp> * getPrev() {return prev;}
+       SNAPSHOTALLOC;
 
-       MEMALLOC
+private:
+       sllnode<_Tp> * next;
+       sllnode<_Tp> * prev;
+       _Tp val;
+       template<typename T>
+       friend class SnapList;
+       friend class actionlist;
 };
 
 template<typename _Tp>
-class SnapList : public std::list<_Tp, SnapshotAlloc<_Tp> >
+class SnapList
 {
 public:
-       typedef std::list<_Tp, SnapshotAlloc<_Tp> > list;
+       SnapList() : head(NULL),
+               tail(NULL), _size(0) {
+       }
+
+       void push_front(_Tp val) {
+               sllnode<_Tp> * tmp = new sllnode<_Tp>();
+               tmp->prev = NULL;
+               tmp->next = head;
+               tmp->val = val;
+               if (head == NULL)
+                       tail = tmp;
+               else
+                       head->prev = tmp;
+               head = tmp;
+               _size++;
+       }
+
+       void push_back(_Tp val) {
+               sllnode<_Tp> * tmp = new sllnode<_Tp>();
+               tmp->prev = tail;
+               tmp->next = NULL;
+               tmp->val = val;
+               if (tail == NULL)
+                       head = tmp;
+               else tail->next = tmp;
+               tail = tmp;
+               _size++;
+       }
+
+       sllnode<_Tp>* add_front(_Tp val) {
+               sllnode<_Tp> * tmp = new sllnode<_Tp>();
+               tmp->prev = NULL;
+               tmp->next = head;
+               tmp->val = val;
+               if (head == NULL)
+                       tail = tmp;
+               else
+                       head->prev = tmp;
+               head = tmp;
+               _size++;
+               return tmp;
+       }
+
+       sllnode<_Tp> * add_back(_Tp val) {
+               sllnode<_Tp> * tmp = new sllnode<_Tp>();
+               tmp->prev = tail;
+               tmp->next = NULL;
+               tmp->val = val;
+               if (tail == NULL)
+                       head = tmp;
+               else tail->next = tmp;
+               tail = tmp;
+               _size++;
+               return tmp;
+       }
+
+       void pop_front() {
+               sllnode<_Tp> *tmp = head;
+               head = head->next;
+               if (head == NULL)
+                       tail = NULL;
+               else
+                       head->prev = NULL;
+               delete tmp;
+               _size--;
+       }
+
+       void pop_back() {
+               sllnode<_Tp> *tmp = tail;
+               tail = tail->prev;
+               if (tail == NULL)
+                       head = NULL;
+               else
+                       tail->next = NULL;
+               delete tmp;
+               _size--;
+       }
+
+       void clear() {
+               while(head != NULL) {
+                       sllnode<_Tp> *tmp=head->next;
+                       delete head;
+                       head = tmp;
+               }
+               tail=NULL;
+               _size=0;
+       }
+
+       sllnode<_Tp> * insertAfter(sllnode<_Tp> * node, _Tp val) {
+               sllnode<_Tp> *tmp = new sllnode<_Tp>();
+               tmp->val = val;
+               tmp->prev = node;
+               tmp->next = node->next;
+               node->next = tmp;
+               if (tmp->next == NULL) {
+                       tail = tmp;
+               } else {
+                       tmp->next->prev = tmp;
+               }
+               _size++;
+               return tmp;
+       }
+
+       void insertBefore(sllnode<_Tp> * node, _Tp val) {
+               sllnode<_Tp> *tmp = new sllnode<_Tp>();
+               tmp->val = val;
+               tmp->next = node;
+               tmp->prev = node->prev;
+               node->prev = tmp;
+               if (tmp->prev == NULL) {
+                       head = tmp;
+               } else {
+                       tmp->prev->next = tmp;
+               }
+               _size++;
+       }
+
+       sllnode<_Tp> * erase(sllnode<_Tp> * node) {
+               if (head == node) {
+                       head = node->next;
+               } else {
+                       node->prev->next = node->next;
+               }
+
+               if (tail == node) {
+                       tail = node->prev;
+               } else {
+                       node->next->prev = node->prev;
+               }
 
-       SnapList() :
-               list()
-       { }
+               sllnode<_Tp> *next = node->next;
+               delete node;
+               _size--;
+               return next;
+       }
+
+       sllnode<_Tp> * begin() {
+               return head;
+       }
+
+       sllnode<_Tp> * end() {
+               return tail;
+       }
 
-       SnapList(size_t n, const _Tp& val = _Tp()) :
-               list(n, val)
-       { }
+       _Tp front() {
+               return head->val;
+       }
+
+       _Tp back() {
+               return tail->val;
+       }
+       uint size() {
+               return _size;
+       }
+       bool empty() {
+               return _size == 0;
+       }
 
-       SNAPSHOTALLOC
+       SNAPSHOTALLOC;
+private:
+       sllnode<_Tp> *head;
+       sllnode<_Tp> *tail;
+       uint _size;
 };
 
+
 #define VECTOR_DEFCAP 8
 
-typedef unsigned int uint;
 
 template<typename type>
 class ModelVector {
@@ -62,7 +376,7 @@ public:
        }
 
        type back() const {
-               return array[size - 1];
+               return array[_size - 1];
        }
 
        void resize(uint psize) {
@@ -86,11 +400,11 @@ public:
                array[_size++] = item;
        }
 
-       type operator[](uint index) const {
+       type operator[](int index) const {
                return array[index];
        }
 
-       type & operator[](uint index) {
+       type & operator[](int index) {
                return array[index];
        }
 
@@ -191,11 +505,11 @@ public:
                array[_size++] = item;
        }
 
-       type & operator[](uint index) {
+       type operator[](int index) const {
                return array[index];
        }
 
-       type operator[](uint index) const {
+       type & operator[](int index) {
                return array[index];
        }
 
@@ -225,6 +539,15 @@ public:
                array[index] = item;
        }
 
+       void remove(type item) {
+               for(uint i = 0;i < _size;i++) {
+                       if (at(i) == item) {
+                               removeAt(i);
+                               return;
+                       }
+               }
+       }
+
        void removeAt(uint index) {
                for (uint i = index;(i + 1) < _size;i++) {
                        set(i, at(i + 1));