1.1 --- a/sourcehook/sh_stack.h Wed Oct 12 20:25:15 2005 +0000
1.2 +++ b/sourcehook/sh_stack.h Thu Oct 13 20:46:52 2005 +0000
1.3 @@ -70,7 +70,7 @@
1.4 iterator operator++(int) // postincrement
1.5 {
1.6 iterator tmp = *this;
1.7 - ++m_Ptr;
1.8 + ++m_Index;
1.9 return tmp;
1.10 }
1.11
1.12 @@ -83,7 +83,7 @@
1.13 iterator operator--(int) // postdecrememnt
1.14 {
1.15 iterator tmp = *this;
1.16 - --m_Ptr;
1.17 + --m_Index;
1.18 return tmp;
1.19 }
1.20
1.21 @@ -110,12 +110,37 @@
1.22 assert(m_Elements);
1.23 }
1.24
1.25 + CStack(const CStack &other) : m_Elements(NULL),
1.26 + m_AllocatedSize(0),
1.27 + m_UsedSize(0)
1.28 + {
1.29 + assert(reserve(other.m_AllocatedSize) && m_Elements);
1.30 + m_UsedSize = other.m_UsedSize;
1.31 + for (size_t i = 0; i < m_UsedSize; ++i)
1.32 + m_Elements[i] = other.m_Elements[i];
1.33 + }
1.34 +
1.35 ~CStack()
1.36 {
1.37 if (m_Elements)
1.38 delete [] m_Elements;
1.39 }
1.40
1.41 + void operator=(const CStack &other)
1.42 + {
1.43 + if (m_AllocatedSize < other.m_AllocatedSize)
1.44 + {
1.45 + if (m_Elements)
1.46 + delete [] m_Elements;
1.47 + m_Elements = new T[other.m_AllocatedSize];
1.48 + assert(m_Elements);
1.49 + m_AllocatedSize = other.m_AllocatedSize;
1.50 + }
1.51 + m_UsedSize = other.m_UsedSize;
1.52 + for (size_t i = 0; i < m_UsedSize; ++i)
1.53 + m_Elements[i] = other.m_Elements[i];
1.54 + }
1.55 +
1.56 bool push(const T &val)
1.57 {
1.58 if (m_UsedSize + 1 == m_AllocatedSize)
1.59 @@ -128,9 +153,12 @@
1.60 m_AllocatedSize /= 2;
1.61 return false;
1.62 }
1.63 - for (size_t i = 0; i < m_UsedSize; ++i)
1.64 - newElements[i] = m_Elements[i];
1.65 - delete [] m_Elements;
1.66 + if (m_Elements)
1.67 + {
1.68 + for (size_t i = 0; i < m_UsedSize; ++i)
1.69 + newElements[i] = m_Elements[i];
1.70 + delete [] m_Elements;
1.71 + }
1.72 m_Elements = newElements;
1.73 }
1.74 m_Elements[m_UsedSize++] = val;
1.75 @@ -159,6 +187,37 @@
1.76 {
1.77 return iterator(this, m_UsedSize);
1.78 }
1.79 +
1.80 + size_t size()
1.81 + {
1.82 + return m_UsedSize;
1.83 + }
1.84 + size_t capacity()
1.85 + {
1.86 + return m_AllocatedSize;
1.87 + }
1.88 + bool empty()
1.89 + {
1.90 + return m_UsedSize == 0 ? true : false;
1.91 + }
1.92 + bool reserve(size_t size)
1.93 + {
1.94 + if (size > m_AllocatedSize)
1.95 + {
1.96 + T *newElements = new T[size];
1.97 + if (!newElements)
1.98 + return false;
1.99 + if (m_Elements)
1.100 + {
1.101 + for (size_t i = 0; i < m_UsedSize; ++i)
1.102 + newElements[i] = m_Elements[i];
1.103 + delete [] m_Elements;
1.104 + }
1.105 + m_Elements = newElements;
1.106 + m_AllocatedSize = size;
1.107 + }
1.108 + return true;
1.109 + }
1.110 };
1.111 }; //namespace SourceHook
1.112