--- parser3/src/include/pa_array.h	2003/01/23 11:37:55	1.57.2.2
+++ parser3/src/include/pa_array.h	2024/09/16 23:22:52	1.94
@@ -1,148 +1,297 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001, 2003 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* IDENT_ARRAY_Y="$Date: 2003/01/23 11:37:55 $";
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.94 2024/09/16 23:22:52 moko Exp $"
 
-#include "pa_pool.h"
-//#include "pa_types.h"
+// includes
 
-class Array_iterator;
+#include "pa_memory.h"
+#include "pa_types.h"
+#include "pa_exception.h"
 
-/**	
-	Simple Array.
+// forwards
 
-*/
+template<typename T> class Array_iterator;
+template<typename T> class Array_reverse_iterator;
+
+// defines
+
+#define ARRAY_OPTION_LIMIT_ALL ((size_t)-1)
+
+/// Simple Array
 template<typename T> class Array: public PA_Object {
 
-	friend class Array_iterator;
+	friend class Array_iterator<T>;
+	friend class Array_reverse_iterator<T>;
+
+protected:
 
 	/// elements[growing size] here
 	T *felements;
 
-	// array size
-	int fused;
-
 	// allocated size
-	int fallocated;
+	size_t fallocated;
 
-	// default expand delta size
-	int fdelta;
+	// array size
+	size_t fsize;
 
 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'
+		bool reverse;
+		bool defined;
+		
+		Action_options(
+			size_t aoffset=0, 
+			size_t alimit=ARRAY_OPTION_LIMIT_ALL, 
+			bool areverse=false): 
+			offset(aoffset), limit(alimit), reverse(areverse), 
+			defined(false) {}
+
+		bool adjust(size_t count) {
+			if(!count || !limit)
+				return false;
+			if(offset>=count)
+				return false;
+			// max(limit)
+			size_t m=reverse?
+				offset+1
+				:count-offset;
+			if(!m)
+				return false;
+			// fix limit
+			if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+				limit=m;
+
+			return true;
+		}
+	};
+
 	typedef T element_type;
 
-	Array(int initial=3, int delta=5):
-		fallocated(initial?initial:3),
-		fdelta(delta),
-		fused(0)
+	inline Array(size_t initial=0):
+		fallocated(initial),
+		fsize(0)
 	{
-		if(fallocated<=0 || fdelta<1) {
-			throw Exception(0, 0,
-				"Array::Array(%d, %d) too small", initial, delta);
-
-		felements=new T[fallocated];
+		felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0;
 	}
-	override ~Array() {
-		delete felements;
+
+#ifdef USE_DESTRUCTORS
+	inline ~Array(){
+		if(felements)
+			pa_free(felements);
 	}
+#endif
 
 	/// how many items are in Array
-	int count() const { return fused; }
+	inline size_t count() const { return fsize; }
+
 	/// append to array
-	Array& operator += (T src) {
+	inline Array& operator+=(T src) {
 		if(is_full())
-			expand(fdelta);
+			expand();
 
-		felements[fused++]=src;
+		felements[fsize++]=src;
 
 		return *this;
 	}
 
 	/// append other Array portion to this one. starting from offset
-	Array& append(const Array& src, int offset=0, int limit=0) {
-		if(!(offset>=0 && offset<src.count())) {
-			throw Exception(0, 0,
-				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
-			//return 0; // never
-		}
+	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 src_count=src.count();
+		// skip tivials
+		if(!src_count || !limit || offset>=src_count)
+			return *this;
+		// max(limit)
+		size_t m=src_count-offset;
 		// fix limit
-		{
-			int m=src.count()-offset;
-			if(!m || limit<0)
-				return *this;
-			if(!limit || limit>m)
-				limit=m;
-		}
+		if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+			limit=m;
 
-		int needed=limit-(fallocated-fused);
-		if(needed>0)
-			expand(needed);
+		fit(fsize-1+limit);
 
-		memcpy(&felements[fused+=limit], &src.felements[offset], limit*sizeof(T));
+		T* from=&src.felements[offset];
+		T* to=&felements[fsize];
+		for(T* from_end=from+limit; from<from_end;)
+			*to++=*from++;
+		fsize+=limit;
+		return *this;
 	}
 
 	/// get index-element
-	T get(int index) const {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0,
-				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return 0; // never
-		}
+	inline T get(size_t index) const {
+		assert(index<count());
+		return felements[index];
+	}
 
+	/// ref version of get
+	inline T& get_ref(size_t index) const {
+		assert(index<count());
 		return felements[index];
 	}
 
 	/// put index-element
-	void put(int index, T element) {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0, 
-				"Array::put(%d) out of range [0..%d]", index, size()-1);
-			return; // never
-		}
+	inline void put(size_t index, T element) {
+		assert(index<count());
+		felements[index]=element;
+	}
+
+	/// insert index-element
+	inline void insert(size_t index, T element) {
+		assert(index<=count());
+
+		if(is_full())
+			expand();
+
+		memmove(felements+index+1, felements+index, (fsize-index) * sizeof(T));
+
 		felements[index]=element;
+		fsize++;
+	}
+
+	/// remove index-element
+	inline void remove(size_t index) {
+		assert(index<count());
+		if (index<--fsize)
+			memmove(felements+index, felements+index+1, (fsize-index) * sizeof(T));
 	}
 
+	inline T operator [](size_t index) const { return get(index); }
+
+	inline void clear() {
+		if(fsize)
+			memset(felements, 0, fsize * sizeof(T));
+		fsize=0;
+	}
 
 	/// iterate over all elements
-	template<typename I> void for_each(void callback(T, I), I info) const {
-		T *last=felements+fused;
+	template<typename I> void for_each(void (*callback)(T, I), I info) const {
+		T *last=felements+fsize;
+		for(T *current=felements; current<last; current++)
+			callback(*current, info);
+	}
+
+	/// iterate over all elements
+	template<typename I> void for_each(bool (*callback)(T, I), I info) const {
+		T *last=felements+fsize;
+		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+fsize;
 		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;
+	template<typename I> T first_that(bool (*callback)(T, I), I info) const {
+		T *last=felements+fsize;
 		for(T *current=felements; current<last; current++)
 			if(callback(*current, info))
 				return *current;
 
-		return 0;
+		return T(0);
+	}
+
+	inline T* ptr(size_t index){
+		return felements + index;
+	}
+
+protected:
+
+	inline bool is_full() {
+		return fsize == fallocated;
 	}
 
-private:
+	inline void expand() {
+		resize(fallocated>0 ? fallocated+fallocated/4+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(int delta) {
-		fallocated+=delta;
-		felements = (T *)pa_realloc(felements, fallocated*sizeof(T));
+
+	void resize(size_t asize) {
+		if(fallocated){
+			felements=(T *)pa_realloc(felements, asize*sizeof(T));
+			fallocated=asize;
+		} else {
+			fallocated=asize;
+			felements=(T *)pa_malloc(asize*sizeof(T));
+		}
 	}
 
 private: //disabled
 
+	Array(const Array&) {}
 	Array& operator = (const Array&) { return *this; }
 };
 
-/// handy array iterator
+
+/// 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; ) {
+		T& element=i.next();
+		...
+	}	
+	@endcode
+*/
 template<typename T> class Array_iterator {
 
 	const Array<T>& farray;
@@ -151,21 +300,66 @@ template<typename T> class Array_iterato
 
 public:
 
-	Array_iterator(const Array<T>& aarray) : farray(aarray) {
-		fcurrent(farray.felements);
-		flast=farray+farray.count();
+	Array_iterator(const Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements + farray.fsize;
 	}
 
 	/// there are still elements
-	bool has_next() {
-		return fcurrent<flast;
+	inline operator bool () {
+		return fcurrent < flast;
+	}
+
+	/// returns the current element and advances the iterator
+	inline T next() {
+		return *(fcurrent++);
+	}
+
+	/// returns the current element
+	inline T value() {
+		return *(fcurrent);
 	}
 
-	/// quickly extracts next Array element
-	T next() {
-		return *(furrent++);
+	// 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.fsize;
+	}
+
+	/// 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