--- parser3/src/include/pa_array.h	2009/04/29 03:26:38	1.76
+++ parser3/src/include/pa_array.h	2024/09/14 22:58:50	1.92
@@ -1,23 +1,25 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char * const IDENT_ARRAY_Y="$Date: 2009/04/29 03:26:38 $";
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.92 2024/09/14 22:58:50 moko Exp $"
 
 // includes
 
 #include "pa_memory.h"
+#include "pa_types.h"
 #include "pa_exception.h"
 
 // forwards
 
 template<typename T> class Array_iterator;
+template<typename T> class Array_reverse_iterator;
 
 // defines
 
@@ -27,6 +29,7 @@ template<typename T> class Array_iterato
 template<typename T> class Array: public PA_Object {
 
 	friend class Array_iterator<T>;
+	friend class Array_reverse_iterator<T>;
 
 protected:
 
@@ -40,6 +43,9 @@ protected:
 	size_t fused;
 
 public:
+	typedef Array_iterator<T> Iterator;
+	typedef Array_reverse_iterator<T> ReverseIterator;
+
 	struct Action_options {
 		size_t offset;
 		size_t limit; //< ARRAY_OPTION_LIMIT_ALL means 'all'. zero limit means 'nothing'
@@ -70,8 +76,6 @@ public:
 
 			return true;
 		}
-
-		
 	};
 
 	typedef T element_type;
@@ -80,22 +84,23 @@ public:
 		fallocated(initial),
 		fused(0)
 	{
-		felements=fallocated?static_cast<T*>(malloc(fallocated*sizeof(T))):0;
+		felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0;
 	}
 
-#ifdef USE_DESTRUCTORS 
+#ifdef USE_DESTRUCTORS
 	inline ~Array(){
 		if(felements)
-			free(felements);
+			pa_free(felements);
 	}
 #endif
 
 	/// how many items are in Array
 	inline size_t count() const { return fused; }
+
 	/// 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 +110,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,8 +152,34 @@ 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); }
 
+	inline void clear() {
+		if(fused)
+			memset(felements, 0, fused * sizeof(T));
+		fused=0;
+	}
+
 	/// iterate over all elements
 	template<typename I> void for_each(void (*callback)(T, I), I info) const {
 		T *last=felements+fused;
@@ -204,15 +221,15 @@ protected:
 	bool is_full() {
 		return fused == fallocated;
 	}
+
 	void expand(size_t delta) {
 		if(fallocated){
 			size_t new_allocated=fallocated+delta;
-			felements = (T *)realloc(felements, new_allocated*sizeof(T));
-			memset(&felements[fallocated], 0, delta*sizeof(T));
+			felements=(T *)pa_realloc(felements, new_allocated*sizeof(T));
 			fallocated=new_allocated;
 		} else {
 			fallocated=delta;
-			felements=static_cast<T*>(malloc(fallocated*sizeof(T)));
+			felements=(T *)pa_malloc(fallocated*sizeof(T));
 		}
 	}
 
@@ -223,10 +240,47 @@ private: //disabled
 };
 
 
+/// Commonly used, templated to work with any integer type
+
+template<typename T> 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)=(n % base) + '0';
+		n/=base;
+	} while (n > 0);
+
+	if (negative) {
+		*(--pos) = '-';
+	}
+	return pa_strdup(pos, buf + MAX_NUMBER - pos);
+}
+
+template<typename T> char* pa_uitoa(T n, T base=10){
+	char buf[MAX_NUMBER + 1];
+	char* pos=buf + MAX_NUMBER;
+	*pos='\0';
+
+	do {
+		*(--pos)=(n % base) + '0';
+		n/=base;
+	} while (n > 0);
+
+	return pa_strdup(pos, buf + MAX_NUMBER - pos);
+}
+
+
 /** Array iterator, usage:
 	@code
 	// Array<T> a;
-	for(Array_iterator<T> i(a); i.has_next(); ) {
+	for(Array_iterator<T> i(a); i; ) {
 		T& element=i.next();
 		...
 	}	
@@ -242,18 +296,64 @@ public:
 
 	Array_iterator(const Array<T>& aarray): farray(aarray) {
 		fcurrent=farray.felements;
-		flast=farray.felements+farray.count();
+		flast=farray.felements + farray.fused;
 	}
 
 	/// there are still elements
-	bool has_next() {
-		return fcurrent<flast;
+	inline operator bool () {
+		return fcurrent < flast;
 	}
 
-	/// quickly extracts next Array element
-	T next() {
+	/// returns the current element and advances the iterator
+	inline T next() {
 		return *(fcurrent++);
 	}
 
+	/// returns the current element
+	inline T value() {
+		return *(fcurrent);
+	}
+
+	// returns the current index of the iterator
+	inline size_t index() {
+		return fcurrent - farray.felements;
+	}
+
+	inline char *key(){
+		return pa_uitoa(index());
+	}
+
+};
+
+template<typename T> class Array_reverse_iterator {
+
+	const Array<T>& farray;
+	T *fcurrent;
+
+public:
+
+	Array_reverse_iterator(const Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements + farray.fused;
+	}
+
+	/// there are still elements
+	inline operator bool () {
+		return fcurrent > farray.felements;
+	}
+
+	/// returns the current element and advances the iterator
+	inline T prev() {
+		return *(--fcurrent);
+	}
+
+	// returns the current index of the iterator
+	inline size_t index() {
+		return fcurrent - farray.felements;
+	}
+
+	inline char *key(){
+		return pa_uitoa(index());
+	}
+
 };
 #endif