--- parser3/src/include/pa_array.h 2003/01/24 11:33:02 1.57.2.7 +++ parser3/src/include/pa_array.h 2003/01/27 15:07:47 1.57.2.9 @@ -8,7 +8,7 @@ #ifndef PA_ARRAY_H #define PA_ARRAY_H -static const char* IDENT_ARRAY_Y="$Date: 2003/01/24 11:33:02 $"; +static const char* IDENT_ARRAY_Y="$Date: 2003/01/27 15:07:47 $"; #include "pa_pool.h" #include "pa_exception.h" @@ -21,7 +21,7 @@ template class Array_iterato */ template class Array: public PA_Object { - friend class Array_iterator; + friend class Array_iterator; // allocated size int fallocated; @@ -160,6 +160,12 @@ public: *this += result; return result.get(); } + + char *malloc(const char *buf, size_t size) { + char *result=malloc(size); + memcpy(result, buf, size); + return result; + } }; void *operator new(size_t size, Pool& pool) { @@ -169,15 +175,15 @@ void *operator new(size_t size, Pool& po /// handy array iterator template class Array_iterator { - const Array& farray; + Array& farray; T *fcurrent; T *flast; public: - Array_iterator(const Array& aarray) : farray(aarray) { - fcurrent(farray.felements); - flast=farray+farray.count(); + Array_iterator(Array& aarray): farray(aarray) { + fcurrent=farray.felements; + flast=farray.felements+farray.count(); } /// there are still elements @@ -187,7 +193,7 @@ public: /// quickly extracts next Array element T next() { - return *(furrent++); + return *(fcurrent++); } };