--- parser3/src/include/pa_array.h	2024/10/26 15:46:52	1.98
+++ parser3/src/include/pa_array.h	2024/11/17 14:04:28	1.101
@@ -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.98 2024/10/26 15:46:52 moko Exp $"
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.101 2024/11/17 14:04:28 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 {
@@ -218,7 +221,7 @@ protected:
 
 	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) {
@@ -291,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;
@@ -317,41 +319,65 @@ public:
 		return fcurrent - farray.felements;
 	}
 
-	inline char *key(){
+	// returns the current index string value of the iterator
+	inline char *key() {
 		return pa_uitoa(index());
 	}
-
 };
 
-template<typename T> class Array_reverse_iterator {
+// Slower array iterator for arrays that can be modified during iteration
+template<typename T> class Array_robust_iterator {
 
 	const Array<T>& farray;
-	T *fcurrent;
+	size_t findex;
 
 public:
+	Array_robust_iterator(const Array<T>& aarray) : farray(aarray), findex(0) {}
 
-	Array_reverse_iterator(const Array<T>& aarray): farray(aarray) {
-		fcurrent=farray.felements + farray.fsize;
+	inline operator bool() {
+		return findex < farray.fsize;
 	}
 
-	/// there are still elements
+	inline void next() {
+		findex++;
+	}
+
+	inline T value() {
+		return farray.felements[findex];
+	}
+
+	inline size_t index() {
+		return findex;
+	}
+
+	inline char* key() {
+		return pa_uitoa(findex);
+	}
+};
+
+// Robust as used for arrays that can be modified during iteration
+template<typename T> class Array_reverse_iterator {
+
+	const Array<T>& farray;
+	size_t findex;
+
+public:
+	Array_reverse_iterator(const Array<T>& aarray): farray(aarray), findex(aarray.fsize) {}
+
 	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(){
+	inline char *key() {
 		return pa_uitoa(index());
 	}
-
 };
 #endif