--- parser3/src/include/pa_array.h	2024/09/10 19:09:56	1.90
+++ parser3/src/include/pa_array.h	2026/01/06 13:27:59	1.107
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2024 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
 
-#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.90 2024/09/10 19:09:56 moko Exp $"
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.107 2026/01/06 13:27:59 moko Exp $"
 
 // includes
 
@@ -19,6 +19,7 @@
 // forwards
 
 template<typename T> class Array_iterator;
+template<typename T> class Array_robust_iterator;
 template<typename T> class Array_reverse_iterator;
 
 // defines
@@ -29,6 +30,7 @@ template<typename T> class Array_reverse
 template<typename T> class Array: public PA_Object {
 
 	friend class Array_iterator<T>;
+	friend class Array_robust_iterator<T>;
 	friend class Array_reverse_iterator<T>;
 
 protected:
@@ -40,10 +42,11 @@ protected:
 	size_t fallocated;
 
 	// array size
-	size_t fused;
+	size_t fsize;
 
 public:
 	typedef Array_iterator<T> Iterator;
+	typedef Array_robust_iterator<T> RobustIterator;
 	typedef Array_reverse_iterator<T> ReverseIterator;
 
 	struct Action_options {
@@ -53,9 +56,9 @@ public:
 		bool defined;
 		
 		Action_options(
-			size_t aoffset=0, 
-			size_t alimit=ARRAY_OPTION_LIMIT_ALL, 
-			bool areverse=false): 
+			size_t aoffset=0,
+			size_t alimit=ARRAY_OPTION_LIMIT_ALL,
+			bool areverse=false):
 			offset(aoffset), limit(alimit), reverse(areverse), 
 			defined(false) {}
 
@@ -71,25 +74,23 @@ public:
 			if(!m)
 				return false;
 			// fix limit
-			if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+			if(limit>m)
 				limit=m;
 
 			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);
@@ -97,42 +98,33 @@ 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;
 	}
 
 	/// 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'
-
+	void append(const Array& src, size_t offset=0, size_t limit=ARRAY_OPTION_LIMIT_ALL) { //< zero limit means 'nothing'
 		size_t src_count=src.count();
 		// skip tivials
 		if(!src_count || !limit || offset>=src_count)
-			return *this;
+			return;
 		// max(limit)
 		size_t m=src_count-offset;
 		// fix limit
-		if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+		if(limit>m)
 			limit=m;
 
-		ssize_t delta=limit-(fallocated-fused);
-		if(delta>0)
-			expand(delta);
-
-		T* from=&src.felements[offset];
-		T* to=&felements[fused];
-		for(T* from_end=from+limit; from<from_end; from++)
-			*to++=*from;
-		fused+=limit;
-		return *this;
+		fit(fsize-1+limit);
+		memcpy(felements+fsize, src.felements+offset, limit * sizeof(T));
+		fsize+=limit;
 	}
 
 	/// get index-element
@@ -158,39 +150,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() {
-		if(fused)
-			memset(felements, 0, fused * sizeof(T));
-		fused=0;
+		if(fsize)
+			memset((void *)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;
@@ -198,14 +190,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;
@@ -217,34 +209,33 @@ 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/2+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(fallocated+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));
+#ifdef PA_DEBUG_DISABLE_GC
+			// non-gc realloc doesn't zero; manually zero expanded region
+			if(asize > fallocated)
+				memset((void *)(felements+fallocated), 0, (asize-fallocated) * sizeof(T));
+#endif
+			fallocated=asize;
 		} else {
-			fallocated=delta;
-			felements=(T *)pa_malloc(fallocated*sizeof(T));
+			fallocated=asize;
+			felements=(T *)pa_malloc(asize*sizeof(T));
 		}
 	}
 
@@ -271,10 +262,9 @@ template<typename T> class Array_iterato
 	T *flast;
 
 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
@@ -296,46 +286,53 @@ public:
 	inline size_t index() {
 		return fcurrent - farray.felements;
 	}
+};
 
-	inline char *key(){
-		char local_buf[MAX_NUMBER];
-		size_t length=snprintf(local_buf, MAX_NUMBER, "%zu", index());
-		return pa_strdup(local_buf, length);
+// Slower array iterator for arrays that can be modified during iteration
+template<typename T> class Array_robust_iterator {
+
+	const Array<T>& farray;
+	size_t findex;
+
+public:
+	Array_robust_iterator(const Array<T>& aarray) : farray(aarray), findex(0) {}
+
+	inline operator bool() {
+		return findex < farray.fsize;
+	}
+
+	inline void next() {
+		findex++;
 	}
 
+	inline T value() {
+		return farray.felements[findex];
+	}
+
+	inline size_t index() {
+		return findex;
+	}
 };
 
+// Robust as used for arrays that can be modified during iteration
 template<typename T> class Array_reverse_iterator {
 
 	const Array<T>& farray;
-	T *fcurrent;
+	size_t findex;
 
 public:
+	Array_reverse_iterator(const Array<T>& aarray): farray(aarray), findex(aarray.fsize) {}
 
-	Array_reverse_iterator(const Array<T>& aarray): farray(aarray) {
-		fcurrent=farray.felements+farray.count();
-	}
-
-	/// there are still elements
 	inline operator bool () {
-		return fcurrent > farray.felements;
+		return (findex > 0) && (findex <= farray.fsize);
 	}
 
-	/// returns the current element and advances the iterator
 	inline T prev() {
-		return *(--fcurrent);
+		return farray.felements[--findex];
 	}
 
-	// returns the current index of the iterator
 	inline size_t index() {
-		return fcurrent - farray.felements;
-	}
-
-	inline char *key(){
-		char local_buf[MAX_NUMBER];
-		size_t length=snprintf(local_buf, MAX_NUMBER, "%zu", index());
-		return pa_strdup(local_buf, length);
+		return findex;
 	}
-
 };
 #endif