--- parser3/src/include/pa_array.h	2003/07/24 11:31:21	1.59
+++ parser3/src/include/pa_array.h	2017/02/07 22:00:31	1.85
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 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* IDENT_ARRAY_Y="$Date: 2003/07/24 11:31:21 $";
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.85 2017/02/07 22:00:31 moko Exp $"
 
 // includes
 
@@ -56,12 +56,11 @@ public:
 		bool adjust(size_t count) {
 			if(!count || !limit)
 				return false;
-			size_t row=offset;
-			if(row>=count)
+			if(offset>=count)
 				return false;
 			// max(limit)
 			size_t m=reverse?
-				offset
+				offset+1
 				:count-offset;
 			if(!m)
 				return false;
@@ -77,19 +76,26 @@ public:
 
 	typedef T element_type;
 
-	Array(size_t initial=3):
-		fallocated(initial>3?initial:3),
+	inline Array(size_t initial=0):
+		fallocated(initial),
 		fused(0)
 	{
-		felements=static_cast<T*>(malloc(fallocated*sizeof(T)));
+		felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0;
 	}
 
+#ifdef USE_DESTRUCTORS 
+	inline ~Array(){
+		if(felements)
+			pa_free(felements);
+	}
+#endif
+
 	/// how many items are in Array
-	size_t count() const { return fused; }
+	inline size_t count() const { return fused; }
 	/// append to array
-	Array& operator += (T src) {
+	inline Array& operator+=(T src) {
 		if(is_full())
-			expand(2);
+			expand(fallocated>0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests
 
 		felements[fused++]=src;
 
@@ -99,63 +105,73 @@ 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;
 	}
 
 	/// get index-element
-	T get(size_t index) const {
-		assert(index>=0 && index<count());
+	inline T get(size_t index) const {
+		assert(index<count());
 		return felements[index];
 	}
 
 	/// ref version of get
-	T& get_ref(size_t index) const {
-		assert(index>=0 && index<count());
+	inline T& get_ref(size_t index) const {
+		assert(index<count());
 		return felements[index];
 	}
 
 	/// put index-element
-	void put(size_t index, T element) {
-		assert(index>=0 && index<count());
+	inline void put(size_t index, T element) {
+		assert(index<count());
 		felements[index]=element;
 	}
 
-	T operator [](size_t index) const { return get(index); }
+	/// 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); }
+
+	inline void clear() {
+		fused=0;
+	}
 
 	/// iterate over all elements
 	template<typename I> void for_each(void (*callback)(T, I), I info) const {
@@ -164,6 +180,21 @@ public:
 			callback(*current, info);
 	}
 
+	/// iterate over all elements
+	template<typename I> void for_each(bool (*callback)(T, I), I info) const {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			if(callback(*current, info))
+				return;
+	}
+
+	/// iterate over all elements
+	template<typename I> void for_each_ref(void (*callback)(T&, I), I info) {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			callback(*current, info);
+	}
+
 	/// iterate over all elements until condition becomes true, return that element
 	template<typename I> T first_that(bool (*callback)(T, I), I info) const {
 		T *last=felements+fused;
@@ -174,16 +205,24 @@ public:
 		return T(0);
 	}
 
+	inline T* ptr(size_t index){
+		return felements + index;
+	}
+
 protected:
 
 	bool is_full() {
 		return fused == fallocated;
 	}
 	void expand(size_t delta) {
-		size_t new_allocated=fallocated+delta;
-		felements = (T *)realloc(felements, new_allocated*sizeof(T));
-		memset(&felements[fallocated], 0, delta*sizeof(T));
-		fallocated=new_allocated;
+		if(fallocated){
+			size_t new_allocated=fallocated+delta;
+			felements=(T *)pa_realloc(felements, new_allocated*sizeof(T));
+			fallocated=new_allocated;
+		} else {
+			fallocated=delta;
+			felements=(T *)pa_malloc(fallocated*sizeof(T));
+		}
 	}
 
 private: //disabled
@@ -221,44 +260,9 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	const T next() {
-		return *(fcurrent++);
-	}
-
-};
-/*
-/** Nonconst array iterator, usage:
-	@code
-	// Array<T> a;
-	for(Array_iterator<T> i(a); i.has_next(); ) {
-		T& element=i.next();
-		...
-	}	
-	@endcode
-* /
-template<typename T> class Array_modifing_iterator {
-
-	Array<T>& farray;
-	T *fcurrent;
-	T *flast;
-
-public:
-
-	Array_modifing_iterator(Array<T>& aarray): farray(aarray) {
-		fcurrent=farray.felements;
-		flast=farray.felements+farray.count();
-	}
-
-	/// there are still elements
-	bool has_next() {
-		return fcurrent<flast;
-	}
-
-	/// quickly extracts next Array element
-	T& next() {
+	T next() {
 		return *(fcurrent++);
 	}
 
 };
-*/
 #endif