--- parser3/src/include/pa_array.h	2001/03/24 10:54:44	1.29
+++ parser3/src/include/pa_array.h	2026/04/25 13:38:46	1.108
@@ -1,150 +1,338 @@
 /** @file
-	Parser: array class decl.
+	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_array.h,v 1.29 2001/03/24 10:54:44 paf Exp $
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#include <stddef.h>
+#define IDENT_PA_ARRAY_H "$Id: pa_array.h,v 1.108 2026/04/25 13:38:46 moko Exp $"
+
+// includes
 
-#include "pa_pool.h"
+#include "pa_memory.h"
 #include "pa_types.h"
-#include "pa_string.h"
+#include "pa_exception.h"
 
-/**	
-	Pooled Array.
+// forwards
 
-	Internal structure:
-	@verbatim
-		Array               Chunk0
-		======              ========
-		head--------------->[ptr]
-		append_here-------->[ptr]
-		link_row            ........
-				.			.
-				.			[ptr]
-				...........>[link to the next chunk]
-	@endverbatim
-*/
+template<typename T> class Array_iterator;
+template<typename T> class Array_robust_iterator;
+template<typename T> class Array_reverse_iterator;
 
-class Array : public Pooled {
-public:
+// defines
 
-	/// Array item type
-	typedef void Item;
+#define ARRAY_OPTION_LIMIT_ALL ((size_t)-1)
 
-	/// for_each iterator function type
-	typedef void (*For_each_func)(Item *value, void *info);
+/// Simple Array
+template<typename T> class Array: public PA_Object {
 
-	/// first_that iterator function type
-	typedef Item *(*First_that_func)(Item *value, const void *info);
+	friend class Array_iterator<T>;
+	friend class Array_robust_iterator<T>;
+	friend class Array_reverse_iterator<T>;
 
-	enum {
-		CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count
-		CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded()
-	};
+protected:
+
+	/// elements[growing size] here
+	T *felements;
+
+	// allocated size
+	size_t fallocated;
+
+	// array size
+	size_t fsize;
 
 public:
+	typedef Array_iterator<T> Iterator;
+	typedef Array_robust_iterator<T> RobustIterator;
+	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>m)
+				limit=m;
 
-	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+			return true;
+		}
+	};
+
+	typedef T element_type;
+
+	inline Array(size_t initial=0):
+		fallocated(initial),
+		fsize(0)
+	{
+		felements=fallocated?(T *)pa_malloc(fallocated*sizeof(T)):0;
+	}
 
-	/// size Array. how many items are in it
-	int size() const { 
-		// for get and quick_get
-		cache_chunk_base=0;
-		cache_chunk=head;
-		return fused_rows; 
+#ifdef USE_DESTRUCTORS
+	inline ~Array(){
+		if(felements)
+			pa_free(felements);
 	}
-	/// append Item to array
-	Array& operator += (Item *src);
+#endif
+
+	/// how many items are in Array
+	inline size_t count() const { return fsize; }
 
-	/// dirty hack to allow constant items storage. I long for Array<const Item*>
-	Array& operator += (const Item *src) { return *this+=const_cast<Item*>(src); }
+	/// append to array
+	inline Array& operator+=(T src) {
+		if(is_full())
+			expand();
+
+		felements[fsize++]=src;
+
+		return *this;
+	}
 
 	/// append other Array portion to this one. starting from offset
-	Array& append_array(const Array& src, int offset=0);
+	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;
+		// max(limit)
+		size_t m=src_count-offset;
+		// fix limit
+		if(limit>m)
+			limit=m;
+
+		fit(fsize-1+limit);
+		memcpy(felements+fsize, src.felements+offset, limit * sizeof(T));
+		fsize+=limit;
+	}
 
-	/** 
-		quickly gets some item considering...
+	/// get index-element
+	inline T get(size_t index) const {
+		assert(index<count());
+		return felements[index];
+	}
 
-		these true:
-			- index increments from 0 to size()-1
-			- index>=0 && index<size()
-			- index>=cache_chunk_base
-	*/
-	Item *quick_get(int index) const {
-		// next chunk will be with "index" row
-		if(!(index<cache_chunk_base+cache_chunk->count)) {
-			int count=cache_chunk->count;
-			cache_chunk_base+=count;
-			cache_chunk=cache_chunk->rows[count].link;
-		}
-		
-		return cache_chunk->rows[index-cache_chunk_base].item;
+	/// ref version of get
+	inline T& get_ref(size_t index) const {
+		assert(index<count());
+		return felements[index];
+	}
+
+	/// put index-element
+	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));
 	}
 
-	Item *get(int index) const;
-	void put(int index, Item *item);
-	/// convinient way to get strings from Array. I long for Array<const String *>
-	const String *get_string(int index) const { 
-		return const_cast<const String *>(static_cast<String *>(get(index))); 
+	inline T operator [](size_t index) const { return get(index); }
+
+	inline void clear() {
+		if(fsize)
+			memset((void *)felements, 0, fsize * sizeof(T));
+		fsize=0;
 	}
 
 	/// iterate over all elements
-	void for_each(For_each_func func, void *info=0);
+	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 until condition
-	void* first_that(First_that_func func, const void *info=0);
+	/// 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;
+	}
 
-private:
+	/// 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);
+	}
 
-	struct Chunk {
-		// the number of rows in chunk
-		int count;
-		union Row {
-			Item *item;
-			Chunk *link;  // link to the next chunk in chain
-		} rows[1];
-		// next rows are here
-	}
-		*head;  // the head chunk of the chunk chain
-
-	// last allocated chunk
-	// helps appending Arrays
-	Chunk *tail;
-
-	// next append would write to this record
-	Chunk::Row *append_here;
-	
-	// the address of place where lies address 
-	// of the link to the next chunk to allocate
-	Chunk::Row *link_row;
+	/// 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+fsize;
+		for(T *current=felements; current<last; current++)
+			if(callback(*current, info))
+				return *current;
 
-private:
+		return T(0);
+	}
 
-	// array size
-	int fused_rows;
+	inline T* ptr(size_t index){
+		return felements + index;
+	}
+
+protected:
+
+	inline bool is_full() {
+		return fsize == fallocated;
+	}
+
+	inline void expand() {
+		resize(fallocated>0 ? fallocated+fallocated/2+2 : 3); // 3 is PAF default, confirmed by tests
+	}
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
-private:
+	inline void fit(size_t index){
+		if(index >= fallocated)
+			resize(max(fallocated+fallocated/4, index+1));
+	}
 
-	bool chunk_is_full() {
-		return append_here == link_row;
+	void resize(size_t asize) {
+		if(fallocated){
+			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=asize;
+			felements=(T *)pa_malloc(asize*sizeof(T));
+		}
 	}
-	void expand(int chunk_rows);
 
 private: //disabled
 
-	//Array(Array&) { }
+	Array(const Array&) {}
 	Array& operator = (const Array&) { return *this; }
 };
 
+
+/** 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;
+	T *fcurrent;
+	T *flast;
+
+public:
+	Array_iterator(const Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements + farray.fsize;
+	}
+
+	/// there are still elements
+	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);
+	}
+
+	// returns the current index of the iterator
+	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 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;
+	size_t findex;
+
+public:
+	Array_reverse_iterator(const Array<T>& aarray): farray(aarray), findex(aarray.fsize) {}
+
+	inline operator bool () {
+		return (findex > 0) && (findex <= farray.fsize);
+	}
+
+	inline T prev() {
+		return farray.felements[--findex];
+	}
+
+	inline size_t index() {
+		return findex;
+	}
+};
 #endif