--- parser3/src/include/pa_array.h	2024/09/07 16:30:26	1.89
+++ parser3/src/include/pa_array.h	2024/09/16 23:22:52	1.94
@@ -8,16 +8,18 @@
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.89 2024/09/07 16:30:26 moko Exp $"
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.94 2024/09/16 23:22:52 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:
 
@@ -37,10 +40,11 @@ protected:
 	size_t fallocated;
 
 	// array size
-	size_t fused;
+	size_t fsize;
 
 public:
 	typedef Array_iterator<T> Iterator;
+	typedef Array_reverse_iterator<T> ReverseIterator;
 
 	struct Action_options {
 		size_t offset;
@@ -72,20 +76,18 @@ public:
 
 			return true;
 		}
-
-		
 	};
 
 	typedef T element_type;
 
 	inline Array(size_t initial=0):
 		fallocated(initial),
-		fused(0)
+		fsize(0)
 	{
 		felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0;
 	}
 
-#ifdef USE_DESTRUCTORS 
+#ifdef USE_DESTRUCTORS
 	inline ~Array(){
 		if(felements)
 			pa_free(felements);
@@ -93,13 +95,14 @@ public:
 #endif
 
 	/// how many items are in Array
-	inline size_t count() const { return fused; }
+	inline size_t count() const { return fsize; }
+
 	/// append to array
 	inline Array& operator+=(T src) {
 		if(is_full())
-			expand(fallocated>0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests
+			expand();
 
-		felements[fused++]=src;
+		felements[fsize++]=src;
 
 		return *this;
 	}
@@ -119,15 +122,13 @@ public:
 		if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
 			limit=m;
 
-		ssize_t delta=limit-(fallocated-fused);
-		if(delta>0)
-			expand(delta);
+		fit(fsize-1+limit);
 
 		T* from=&src.felements[offset];
-		T* to=&felements[fused];
-		for(T* from_end=from+limit; from<from_end; from++)
-			*to++=*from;
-		fused+=limit;
+		T* to=&felements[fsize];
+		for(T* from_end=from+limit; from<from_end;)
+			*to++=*from++;
+		fsize+=limit;
 		return *this;
 	}
 
@@ -154,37 +155,39 @@ public:
 		assert(index<=count());
 
 		if(is_full())
-			expand(fallocated>0? 2+fallocated/32 : 3); // 3 is PAF default, confirmed by tests
+			expand();
 
-		memmove(felements+index+1, felements+index, (fused-index) * sizeof(T));
+		memmove(felements+index+1, felements+index, (fsize-index) * sizeof(T));
 
 		felements[index]=element;
-		fused++;
+		fsize++;
 	}
 
 	/// 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));
+		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() {
-		fused=0;
+		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;
+		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+fused;
+		T *last=felements+fsize;
 		for(T *current=felements; current<last; current++)
 			if(callback(*current, info))
 				return;
@@ -192,14 +195,14 @@ public:
 
 	/// iterate over all elements
 	template<typename I> void for_each_ref(void (*callback)(T&, I), I info) {
-		T *last=felements+fused;
+		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;
+		T *last=felements+fsize;
 		for(T *current=felements; current<last; current++)
 			if(callback(*current, info))
 				return *current;
@@ -211,34 +214,28 @@ public:
 		return felements + index;
 	}
 
-	void fit(size_t index, T element){
-		if(index >= fallocated){
-			size_t new_allocated=fallocated>0 ? fallocated : 3;
-			while(new_allocated <= index){
-				new_allocated+=2 + new_allocated/32;
-			}
-			expand(new_allocated - fallocated);
-		}
-		felements[index]=element;
-		if(index >= fused){
-			fused=index+1;
-		}
+protected:
+
+	inline bool is_full() {
+		return fsize == fallocated;
 	}
 
-protected:
+	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(size_t delta) {
+	void resize(size_t asize) {
 		if(fallocated){
-			size_t new_allocated=fallocated+delta;
-			felements=(T *)pa_realloc(felements, new_allocated*sizeof(T));
-			fallocated=new_allocated;
+			felements=(T *)pa_realloc(felements, asize*sizeof(T));
+			fallocated=asize;
 		} else {
-			fallocated=delta;
-			felements=(T *)pa_malloc(fallocated*sizeof(T));
+			fallocated=asize;
+			felements=(T *)pa_malloc(asize*sizeof(T));
 		}
 	}
 
@@ -249,6 +246,43 @@ 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;
@@ -268,28 +302,64 @@ public:
 
 	Array_iterator(const Array<T>& aarray): farray(aarray) {
 		fcurrent=farray.felements;
-		flast=farray.felements+farray.count();
+		flast=farray.felements + farray.fsize;
 	}
 
 	/// there are still elements
-	operator bool () {
-		return fcurrent<flast;
+	inline operator bool () {
+		return fcurrent < flast;
 	}
 
 	/// returns the current element and advances the iterator
-	T next() {
+	inline T next() {
 		return *(fcurrent++);
 	}
 
 	/// returns the current element
-	T value() {
+	inline T value() {
 		return *(fcurrent);
 	}
 
 	// returns the current index of the iterator
-	size_t index() {
+	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