--- parser3/src/include/pa_array.h 2024/09/10 19:09:56 1.90 +++ parser3/src/include/pa_array.h 2024/10/07 23:46:24 1.97 @@ -8,7 +8,7 @@ #ifndef PA_ARRAY_H #define PA_ARRAY_H -#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.90 2024/09/10 19:09:56 moko Exp $" +#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.97 2024/10/07 23:46:24 moko Exp $" // includes @@ -40,7 +40,7 @@ protected: size_t fallocated; // array size - size_t fused; + size_t fsize; public: typedef Array_iterator Iterator; @@ -53,9 +53,9 @@ public: bool defined; Action_options( - size_t aoffset=0, - size_t alimit=ARRAY_OPTION_LIMIT_ALL, - bool areverse=false): + size_t aoffset=0, + size_t alimit=ARRAY_OPTION_LIMIT_ALL, + bool areverse=false): offset(aoffset), limit(alimit), reverse(areverse), defined(false) {} @@ -71,25 +71,23 @@ public: if(!m) return false; // fix limit - if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m) + if(limit>m) limit=m; return true; } - - }; typedef T element_type; inline Array(size_t initial=0): fallocated(initial), - fused(0) + fsize(0) { felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0; } -#ifdef USE_DESTRUCTORS +#ifdef USE_DESTRUCTORS inline ~Array(){ if(felements) pa_free(felements); @@ -97,13 +95,14 @@ public: #endif /// how many items are in Array - inline size_t count() const { return fused; } + inline size_t count() const { return fsize; } + /// append to array inline Array& operator+=(T src) { if(is_full()) - expand(fallocated>0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests + expand(); - felements[fused++]=src; + felements[fsize++]=src; return *this; } @@ -111,7 +110,7 @@ public: /// append other Array portion to this one. starting from offset Array& append(const Array& src, size_t offset=0, - size_t limit=ARRAY_OPTION_LIMIT_ALL) { //< negative limit means 'all'. zero limit means 'nothing' + size_t limit=ARRAY_OPTION_LIMIT_ALL) { //< zero limit means 'nothing' size_t src_count=src.count(); // skip tivials @@ -120,18 +119,16 @@ public: // max(limit) size_t m=src_count-offset; // fix limit - if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m) + if(limit>m) limit=m; - ssize_t delta=limit-(fallocated-fused); - if(delta>0) - expand(delta); + fit(fsize-1+limit); T* from=&src.felements[offset]; - T* to=&felements[fused]; - for(T* from_end=from+limit; from0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests + expand(); - memmove(felements+index+1, felements+index, (fused-index) * sizeof(T)); + memmove(felements+index+1, felements+index, (fsize-index) * sizeof(T)); felements[index]=element; - fused++; + fsize++; } /// remove index-element inline void remove(size_t index) { assert(index void for_each(void (*callback)(T, I), I info) const { - T *last=felements+fused; + T *last=felements+fsize; for(T *current=felements; current void for_each(bool (*callback)(T, I), I info) const { - T *last=felements+fused; + T *last=felements+fsize; for(T *current=felements; current void for_each_ref(void (*callback)(T&, I), I info) { - T *last=felements+fused; + T *last=felements+fsize; for(T *current=felements; current T first_that(bool (*callback)(T, I), I info) const { - T *last=felements+fused; + T *last=felements+fsize; for(T *current=felements; current= fallocated){ - size_t new_allocated=fallocated>0 ? fallocated : 3; - while(new_allocated <= index){ - new_allocated+=2 + new_allocated/32; - } - expand(new_allocated - fallocated); - } - felements[index]=element; - if(index >= fused){ - fused=index+1; - } +protected: + + inline bool is_full() { + return fsize == fallocated; } -protected: + inline void expand() { + resize(fallocated>0 ? fallocated+fallocated/2+2 : 3); // 3 is PAF default, confirmed by tests + } - bool is_full() { - return fused == fallocated; + inline void fit(size_t index){ + if(index >= fallocated) + resize(max(this->fallocated + this->fallocated/4, index+1)); } - void expand(size_t delta) { + void resize(size_t asize) { if(fallocated){ - size_t new_allocated=fallocated+delta; - felements=(T *)pa_realloc(felements, new_allocated*sizeof(T)); - fallocated=new_allocated; + felements=(T *)pa_realloc(felements, asize*sizeof(T)); + fallocated=asize; } else { - fallocated=delta; - felements=(T *)pa_malloc(fallocated*sizeof(T)); + fallocated=asize; + felements=(T *)pa_malloc(asize*sizeof(T)); } } @@ -255,6 +246,43 @@ private: //disabled }; +/// Commonly used, templated to work with any integer type + +template char* pa_itoa(T n, T base=10){ + char buf[MAX_NUMBER + 1]; + char* pos=buf + MAX_NUMBER; + *pos='\0'; + + bool negative=n < 0; + if (n < 0){ + n=-n; + } + + do { + *(--pos)=(char)(n % base) + '0'; + n/=base; + } while (n > 0); + + if (negative) { + *(--pos) = '-'; + } + return pa_strdup(pos, buf + MAX_NUMBER - pos); +} + +template char* pa_uitoa(T n, T base=10){ + char buf[MAX_NUMBER + 1]; + char* pos=buf + MAX_NUMBER; + *pos='\0'; + + do { + *(--pos)=(char)(n % base) + '0'; + n/=base; + } while (n > 0); + + return pa_strdup(pos, buf + MAX_NUMBER - pos); +} + + /** Array iterator, usage: @code // Array a; @@ -274,7 +302,7 @@ public: Array_iterator(const Array& aarray): farray(aarray) { fcurrent=farray.felements; - flast=farray.felements + farray.count(); + flast=farray.felements + farray.fsize; } /// there are still elements @@ -298,9 +326,7 @@ public: } inline char *key(){ - char local_buf[MAX_NUMBER]; - size_t length=snprintf(local_buf, MAX_NUMBER, "%zu", index()); - return pa_strdup(local_buf, length); + return pa_uitoa(index()); } }; @@ -313,7 +339,7 @@ template class Array_reverse public: Array_reverse_iterator(const Array& aarray): farray(aarray) { - fcurrent=farray.felements+farray.count(); + fcurrent=farray.felements + farray.fsize; } /// there are still elements @@ -332,9 +358,7 @@ public: } inline char *key(){ - char local_buf[MAX_NUMBER]; - size_t length=snprintf(local_buf, MAX_NUMBER, "%zu", index()); - return pa_strdup(local_buf, length); + return pa_uitoa(index()); } };