--- parser3/src/include/pa_array.h	2009/04/30 04:40:30	1.78
+++ parser3/src/include/pa_array.h	2015/10/26 01:21:55	1.83
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char * const IDENT_ARRAY_Y="$Date: 2009/04/30 04:40:30 $";
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.83 2015/10/26 01:21:55 moko Exp $"
 
 // includes
 
@@ -95,7 +95,7 @@ public:
 	/// append to array
 	inline Array& operator+=(T src) {
 		if(is_full())
-			expand(fallocated>0?2:3); // 3 is PAF default, confirmed by tests
+			expand(fallocated>0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests
 
 		felements[fused++]=src;
 
@@ -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; from<from_end; from++)
-				*to++=*from;
-		}
-		
+		for(T* from_end=from+limit; from<from_end; from++)
+			*to++=*from;
 		fused+=limit;
 		return *this;
 	}
@@ -161,6 +147,26 @@ public:
 		felements[index]=element;
 	}
 
+	/// insert index-element
+	inline void insert(size_t index, T element) {
+		assert(index<=count());
+
+		if(is_full())
+			expand(fallocated>0? 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<count());
+		if (index<--fused)
+			memmove(felements+index, felements+index+1, (fused-index) * sizeof(T));
+	}
+
 	inline T operator [](size_t index) const { return get(index); }
 
 	/// iterate over all elements