--- parser3/src/include/pa_array.h 2012/03/16 09:24:08 1.81 +++ parser3/src/include/pa_array.h 2015/07/28 14:41:32 1.82 @@ -8,7 +8,7 @@ #ifndef PA_ARRAY_H #define PA_ARRAY_H -#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.81 2012/03/16 09:24:08 moko Exp $" +#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.82 2015/07/28 14:41:32 moko Exp $" // includes @@ -105,40 +105,26 @@ 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' - bool reverse=false) { + size_t limit=ARRAY_OPTION_LIMIT_ALL) { //< negative limit means 'all'. zero limit means 'nothing' size_t src_count=src.count(); // skip tivials if(!src_count || !limit || offset>=src_count) return *this; // max(limit) - size_t m=reverse? - 1+offset - :src_count-offset; - if(!m) - return *this; + size_t m=src_count-offset; // fix limit if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m) limit=m; - ssize_t delta=reverse? - (ssize_t)limit - :limit-(fallocated-fused); + ssize_t delta=limit-(fallocated-fused); if(delta>0) expand(delta); T* from=&src.felements[offset]; T* to=&felements[fused]; - if(reverse) { // reverse - for(T* from_end=from-limit; from>from_end; --from) - *to++=*from; - - } else { // forward - for(T* from_end=from+limit; from0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests + + memmove(felements+index+1, felements+index, (fused-index) * sizeof(T)); + + felements[index]=element; + fused++; + } + /// remove index-element inline void remove(size_t index) { assert(index