--- parser3/src/include/pa_array.h 2003/01/27 15:07:47 1.57.2.9 +++ parser3/src/include/pa_array.h 2003/02/17 09:56:15 1.57.2.22 @@ -1,14 +1,14 @@ /** @file Parser: Array & Array_iterator classes decls. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_ARRAY_H #define PA_ARRAY_H -static const char* IDENT_ARRAY_Y="$Date: 2003/01/27 15:07:47 $"; +static const char* IDENT_ARRAY_Y="$Date: 2003/02/17 09:56:15 $"; #include "pa_pool.h" #include "pa_exception.h" @@ -23,9 +23,20 @@ template class Array: public friend class Array_iterator; +protected: + + // default expand delta size + int fdelta; + + /// elements[growing size] here + T *felements; + // allocated size int fallocated; + // array size + int fused; + public: typedef T element_type; @@ -39,14 +50,14 @@ public: Exception::undefined_source, "Array::Array(%d, %d) too small", initial, delta); - felements=new T[fallocated]; + felements=static_cast(calloc(fallocated*sizeof(T))); } override ~Array() { T *last=felements+fused; for(T *current=felements; current~T(); // manually invoking destructors - delete felements; + free(felements); } /// how many items are in Array @@ -87,23 +98,25 @@ public: } /// get index-element - T get(int index) const { + T& get(int index) const { if(!(index>=0 && index=0 && index=0 && index CharPtr; +/** + Pool mechanizm allows users not to free up allocated memory, + leaving that problem to 'pools'. +*/ class Pool: public Array { public: char *malloc(size_t size) { - CharPtr result=CharPtr(new char[size]); + CharPtr result=CharPtr((char *)Array::malloc(size)); *this += result; return result.get(); } - char *malloc(const char *buf, size_t size) { + char *copy(const char* buf, size_t size=0) { + if(!size) + size=strlen(buf)+1; + char *result=malloc(size); memcpy(result, buf, size); return result; } }; -void *operator new(size_t size, Pool& pool) { +inline void *operator new[] (size_t size, Pool& pool) { return pool.malloc(size); } @@ -192,7 +204,7 @@ public: } /// quickly extracts next Array element - T next() { + T& next() { return *(fcurrent++); }