toward building a naive predicate tree

[c11tester.git] / stl-model.h

diff --git a/stl-model.h b/stl-model.h
index 74aaee698f0d9a05e74b030cf0e4cb285bc2fe12..cbcae7c04162f979cebb3d338cced3ad5d97e15e 100644 (file)
--- a/stl-model.h
+++ b/stl-model.h
@@ -60,9 +60,9 @@ public:
                mllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)
-                 tail = NULL;
+                       tail = NULL;
                else
-                 head->prev = NULL;
+                       head->prev = NULL;
                delete tmp;
                _size--;
        }
@@ -71,9 +71,9 @@ public:
                mllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)
-                 head = NULL;
+                       head = NULL;
                else
-                 tail->next = NULL;
+                       tail->next = NULL;
                delete tmp;
                _size--;
        }
@@ -126,7 +126,7 @@ public:
                if (tail == node) {
                        tail = node->prev;
                } else {
-                       tail->next->prev = node->prev;
+                       node->next->prev = node->prev;
                }
                mllnode<_Tp> *next = node->next;
                delete node;
@@ -218,9 +218,9 @@ public:
                sllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)
-                 tail = NULL;
+                       tail = NULL;
                else
-                 head->prev = NULL;
+                       head->prev = NULL;
                delete tmp;
                _size--;
        }
@@ -229,9 +229,9 @@ public:
                sllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)
-                 head = NULL;
+                       head = NULL;
                else
-                   tail->next = NULL;
+                       tail->next = NULL;
                delete tmp;
                _size--;
        }
@@ -284,7 +284,7 @@ public:
                if (tail == node) {
                        tail = node->prev;
                } else {
-                       tail->next->prev = node->prev;
+                       node->next->prev = node->prev;
                }
 
                sllnode<_Tp> *next = node->next;
@@ -346,7 +346,7 @@ public:
        }
 
        type back() const {
-               return array[size - 1];
+               return array[_size - 1];
        }
 
        void resize(uint psize) {