--- parser3/src/include/pa_array.h	2024/09/21 23:51:04	1.95
+++ parser3/src/include/pa_array.h	2025/05/28 00:58:02	1.104
@@ -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.95 2024/09/21 23:51:04 moko Exp $"
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.104 2025/05/28 00:58:02 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:
@@ -44,6 +46,7 @@ protected:
 
 public:
 	typedef Array_iterator<T> Iterator;
+	typedef Array_robust_iterator<T> RobustIterator;
 	typedef Array_reverse_iterator<T> ReverseIterator;
 
 	struct Action_options {
@@ -108,14 +111,11 @@ 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) { //< 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
@@ -123,13 +123,8 @@ public:
 			limit=m;
 
 		fit(fsize-1+limit);
-
-		T* from=&src.felements[offset];
-		T* to=&felements[fsize];
-		for(T* from_end=from+limit; from<from_end;)
-			*to++=*from++;
+		memcpy(felements+fsize, src.felements+offset, limit * sizeof(T));
 		fsize+=limit;
-		return *this;
 	}
 
 	/// get index-element
@@ -174,7 +169,7 @@ public:
 
 	inline void clear() {
 		if(fsize)
-			memset(felements, 0, fsize * sizeof(T));
+			memset((void *)felements, 0, fsize * sizeof(T));
 		fsize=0;
 	}
 
@@ -221,12 +216,12 @@ protected:
 	}
 
 	inline void expand() {
-		resize(fallocated>0 ? fallocated+fallocated/4+2 : 3); // 3 is PAF default, confirmed by tests
+		resize(fallocated>0 ? fallocated+fallocated/2+2 : 3); // 3 is PAF default, confirmed by tests
 	}
 
 	inline void fit(size_t index){
 		if(index >= fallocated)
-			resize(max(this->fallocated + this->fallocated/4, index+1));
+			resize(max(fallocated+fallocated/4, index+1));
 	}
 
 	void resize(size_t asize) {
@@ -259,7 +254,7 @@ template<typename T> char* pa_itoa(T n,
 	}
 
 	do {
-		*(--pos)=(n % base) + '0';
+		*(--pos)=(char)(n % base) + '0';
 		n/=base;
 	} while (n > 0);
 
@@ -275,7 +270,7 @@ template<typename T> char* pa_uitoa(T n,
 	*pos='\0';
 
 	do {
-		*(--pos)=(n % base) + '0';
+		*(--pos)=(char)(n % base) + '0';
 		n/=base;
 	} while (n > 0);
 
@@ -299,7 +294,6 @@ template<typename T> class Array_iterato
 	T *flast;
 
 public:
-
 	Array_iterator(const Array<T>& aarray): farray(aarray) {
 		fcurrent=farray.felements;
 		flast=farray.felements + farray.fsize;
@@ -324,42 +318,53 @@ public:
 	inline size_t index() {
 		return fcurrent - farray.felements;
 	}
+};
+
+// 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 char *key(){
-		return pa_uitoa(index());
+	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.fsize;
-	}
-
-	/// 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;
+		return findex;
 	}
-
-	inline char *key(){
-		return pa_uitoa(index());
-	}
-
 };
 #endif