--- parser3/src/include/pa_array.h 2003/01/23 11:37:55 1.57.2.2 +++ parser3/src/include/pa_array.h 2003/01/23 15:38:05 1.57.2.3 @@ -8,12 +8,13 @@ #ifndef PA_ARRAY_H #define PA_ARRAY_H -static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 11:37:55 $"; +static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 15:38:05 $"; #include "pa_pool.h" //#include "pa_types.h" +#include "pa_exception.h" -class Array_iterator; +template class Array_iterator; /** Simple Array. @@ -23,33 +24,28 @@ template class Array: public friend class Array_iterator; - /// elements[growing size] here - T *felements; - - // array size - int fused; - // allocated size int fallocated; - // default expand delta size - int fdelta; - public: typedef T element_type; - Array(int initial=3, int delta=5): + Array(int initial=3, int delta=1): fallocated(initial?initial:3), fdelta(delta), fused(0) { - if(fallocated<=0 || fdelta<1) { + if(fallocated<=0 || fdelta<1) throw Exception(0, 0, "Array::Array(%d, %d) too small", initial, delta); felements=new T[fallocated]; } override ~Array() { + T *last=felements+fused; + for(T *current=felements; current