--- parser3/src/include/pa_array.h	2001/05/15 15:51:05	1.38
+++ parser3/src/include/pa_array.h	2003/11/25 12:58:53	1.63
@@ -1,185 +1,236 @@
 /** @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.38 2001/05/15 15:51:05 parser Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#include <stddef.h>
+static const char * const IDENT_ARRAY_Y="$Date: 2003/11/25 12:58:53 $";
 
-#include "pa_pool.h"
-#include "pa_types.h"
-#include "pa_string.h"
-
-/**	
-	Pooled Array.
-
-	Internal structure:
-	@verbatim
-		Array               Chunk0
-		======              ========
-		head--------------->[ptr]
-		append_here-------->[ptr]
-		link_row            ........
-				.			.
-				.			[ptr]
-				...........>[link to the next chunk]
-	@endverbatim
-*/
+// includes
 
-class Array : public Pooled {
-public:
+#include "pa_memory.h"
+#include "pa_exception.h"
 
-	/// Array item type
-	typedef void Item;
+// forwards
 
-	/*/// for_each iterator function type, const info
-	typedef void (*For_each_func_const)(Item *value, const void *info);
-	*/
+template<typename T> class Array_iterator;
 
-	/// for_each iterator function type
-	typedef void (*For_each_func)(Item *value, void *info);
+// defines
 
-	/// first_that iterator function type, const info
-	typedef bool (*First_that_func_const)(Item *value, const void *info);
+#define ARRAY_OPTION_LIMIT_ALL ((size_t)-1)
 
-	/// first_that iterator function type
-	typedef bool (*First_that_func)(Item *value, void *info);
+/// Simple Array
+template<typename T> class Array: public PA_Object {
 
-	enum {
-		CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count
-		CR_GROW_COUNT=10 ///< each time the Array chunk_is_full() array expanded()
-	};
+	friend class Array_iterator<T>;
+
+protected:
+
+	/// elements[growing size] here
+	T *felements;
+
+	// allocated size
+	size_t fallocated;
+
+	// array size
+	size_t fused;
 
 public:
+	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;
+			size_t row=offset;
+			if(row>=count)
+				return false;
+			// max(limit)
+			size_t m=reverse?
+				offset
+				:count-offset;
+			if(!m)
+				return false;
+			// fix limit
+			if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+				limit=m;
 
-	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+			return true;
+		}
+
+		
+	};
 
-	/**
-		size Array. how many items are in it. 
-		must be used with quick_get like this:
-		@code
-			int size=src.quick_size();
-			for(int i=0; i<size; i++) {
-				z=src.quick_get(i);
-			}
-		@endcode
-	*/
-	int quick_size() const { 
-		// for quick_get
-		cache_chunk_base=0;
-		cache_chunk=head;
-		return size(); 
-	}
-	/// size Array. how many items are in it
-	int size() const { return fused_rows; }
-	/// append Item to array
-	Array& operator += (Item *src);
-	/// append int value to array
-	Array& operator += (int value) { return *this+=reinterpret_cast<Item *>(value); }
+	typedef T element_type;
 
-	/// dirty hack to allow constant items storage. I long for Array<const Item*>
-	Array& operator += (const Item *src) { return *this+=const_cast<Item *>(src); }
+	Array(size_t initial=3):
+		fallocated(initial>3?initial:3),
+		fused(0)
+	{
+		felements=static_cast<T*>(malloc(fallocated*sizeof(T)));
+	}
 
-	/// append other Array portion to this one. starting from offset
-	Array& append_array(const Array& src, int offset=0);
+	/// how many items are in Array
+	size_t count() const { return fused; }
+	/// append to array
+	Array& operator += (T src) {
+		if(is_full())
+			expand(2);
 
-	/** 
-		quickly gets some item considering...
+		felements[fused++]=src;
 
-		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 *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'
+		bool reverse=false) {
+
+		size_t src_count=src.count();
+		// skip tivials
+		if(!src_count || !limit || offset>=src_count)
+			return *this;
+		// max(limit)
+		size_t m=reverse?
+			1+offset
+			:src_count-offset;
+		if(!m)
+			return *this;
+		// fix limit
+		if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+			limit=m;
+
+		ssize_t delta=reverse?
+			(ssize_t)limit
+			:limit-(fallocated-fused);
+		if(delta>0)
+			expand(delta);
+
+		T* from=&src.felements[offset];
+		T* to=&felements[fused];
+		if(reverse) { // reverse
+			for(T* from_end=from-limit; from>from_end; --from)
+				*to++=*from;
+
+		} else { // forward
+			for(T* from_end=from+limit; from<from_end; from++)
+				*to++=*from;
 		}
 		
-		return cache_chunk->rows[index-cache_chunk_base].item;
+		fused+=limit;
+		return *this;
 	}
 
-	Item *get(int index) const;
-	int get_int(int index) const { return reinterpret_cast<int>(get(index)); }
+	/// get index-element
+	T get(size_t index) const {
+		assert(index<count());
+		return felements[index];
+	}
 
-	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))); 
+	/// ref version of get
+	T& get_ref(size_t index) const {
+		assert(index<count());
+		return felements[index];
 	}
-	const String *quick_get_string(int index) const { 
-		return const_cast<const String *>(static_cast<String *>(quick_get(index))); 
+
+	/// put index-element
+	void put(size_t index, T element) {
+		assert(index<count());
+		felements[index]=element;
 	}
 
-	/*/// iterate over all elements, const info
-	void for_each(For_each_func_const func, const void *info=0) const;
-	/*/
+	T operator [](size_t index) const { return get(index); }
 
 	/// iterate over all elements
-	void for_each(For_each_func func, void *info=0) const;
-
-	/// iterate over all elements until condition, const info
-	void* first_that(First_that_func_const func, const void *info=0) const;
-
-	/// iterate over all elements until condition
-	void* first_that(First_that_func func, void *info=0) const;
+	template<typename I> void for_each(void (*callback)(T, I), I info) const {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			callback(*current, info);
+	}
 
-private:
-
-	/// several record elements
-	struct Chunk {
-		int count;  ///< the number of rows in chunk
-		/// item or a link to next chunk union
-		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
+	template<typename I> void for_each_ref(void (*callback)(T&, I), I info) {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			callback(*current, info);
+	}
 
-private:
+	/// 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;
+		for(T *current=felements; current<last; current++)
+			if(callback(*current, info))
+				return *current;
 
-	// array size
-	int fused_rows;
+		return T(0);
+	}
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
-private:
+protected:
 
-	bool chunk_is_full() {
-		return append_here == link_row;
+	bool is_full() {
+		return fused == fallocated;
+	}
+	void expand(size_t delta) {
+		size_t new_allocated=fallocated+delta;
+		felements = (T *)realloc(felements, new_allocated*sizeof(T));
+		memset(&felements[fallocated], 0, delta*sizeof(T));
+		fallocated=new_allocated;
 	}
-	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.has_next(); ) {
+		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.count();
+	}
+
+	/// there are still elements
+	bool has_next() {
+		return fcurrent<flast;
+	}
+
+	/// quickly extracts next Array element
+	const T next() {
+		return *(fcurrent++);
+	}
+
+};
 #endif