--- parser3/src/include/pa_array.h	2003/01/23 15:38:05	1.57.2.3
+++ parser3/src/include/pa_array.h	2003/04/11 15:00:05	1.58
@@ -1,5 +1,5 @@
 /** @file
-	Parser: Array & Array_iterator classes decls.
+	Parser: Array & Array_iter classes decls.
 
 	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
@@ -8,169 +8,191 @@
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 15:38:05 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/04/11 15:00:05 $";
 
 #include "pa_pool.h"
-//#include "pa_types.h"
-#include "pa_exception.h"
+#include "pa_types.h"
+#include "pa_string.h"
 
-template<typename T> class Array_iterator;
+class Array_iter;
 
 /**	
-	Simple Array.
+	Pooled Array.
 
+	Internal structure:
+	@verbatim
+		Array               Chunk0
+		======              ========
+		head--------------->[ptr]
+		append_here-------->[ptr]
+		link_row            ........
+				.			.
+				.			[ptr]
+				...........>[link to the next chunk]
+	@endverbatim
 */
-template<typename T> class Array: public PA_Object {
-
-	friend class Array_iterator;
-
-	// allocated size
-	int fallocated;
 
+class Array : public Pooled {
+	friend class Array_iter;
 public:
-	typedef T element_type;
 
-	Array(int initial=3, int delta=1):
-		fallocated(initial?initial:3),
-		fdelta(delta),
-		fused(0)
-	{
-		if(fallocated<=0 || fdelta<1)
-			throw Exception(0, 0,
-				"Array::Array(%d, %d) too small", initial, delta);
+	/// Array item type
+	typedef void Item;
 
-		felements=new T[fallocated];
-	}
-	override ~Array() {
-		T *last=felements+fused;
-		for(T *current=felements; current<last; current++)
-			delete current;
+	/*/// for_each iterator function type, const info
+	typedef void (*For_each_func_const)(Item *value, const void *info);
+	*/
+
+	/// for_each iterator function type
+	typedef void (*For_each_func)(Item *value, void *info);
+	/*
+	/// for_each iterator function type, passing item storage address
+	typedef void (*For_each_func_storage)(Item ** value, void *info);
+	*/
+
+	/// first_that iterator function type, const info
+	typedef void *(*Item_that_func_const)(Item *value, const void *info);
+
+	/// first_that iterator function type
+	typedef void *(*Item_that_func)(Item *value, void *info);
+
+	enum {
+		CR_INITIAL_ROWS_DEFAULT=3, ///< default preallocated row count
+		CR_GROW_COUNT=3 ///< each time the Array chunk_is_full() array expanded()
+	};
 
-		delete felements;
-	}
+public:
 
-	/// how many items are in Array
-	int count() const { return fused; }
-	/// append to array
-	Array& operator += (T src) {
-		if(is_full())
-			expand(fdelta);
+	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-		felements[fused++]=src;
+	/// 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); }
 
-		return *this;
-	}
+	/// 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 other Array portion to this one. starting from offset
-	Array& append(const Array& src, int offset=0, int limit=0) {
-		if(!(offset>=0 && offset<src.count())) {
-			throw Exception(0, 0,
-				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
-			//return 0; // never
-		}
-		// fix limit
-		{
-			int m=src.count()-offset;
-			if(!m || limit<0)
-				return *this;
-			if(!limit || limit>m)
-				limit=m;
-		}
-
-		int needed=limit-(fallocated-fused);
-		if(needed>0)
-			expand(needed);
-
-		memcpy(&felements[fused+=limit], &src.felements[offset], limit*sizeof(T));
-	}
-
-	/// get index-element
-	T get(int index) const {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0,
-				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return 0; // never
-		}
-
-		return felements[index];
-	}
-
-	/// put index-element
-	void put(int index, T element) {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0, 
-				"Array::put(%d) out of range [0..%d]", index, size()-1);
-			return; // never
-		}
-		felements[index]=element;
-	}
-
+	Array& append_array(const Array& src, 
+		int offset=0, 
+		int limit=-1, //< negative limit means 'all'. zero limit means 'nothing'
+		bool reverse=false);
+
+	Item *get(int index) const;
+	int get_int(int index) const { return reinterpret_cast<int>(get(index)); }
+
+	void put(int index, Item *item);
+	void put_int(int index, int value) { put(index, reinterpret_cast<Item *>(value)); }
+	/// 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))); 
+	}
+
+	/*/// iterate over all elements, const info
+	void for_each(For_each_func_const func, const void *info=0) const;
+	*/
 
 	/// iterate over all elements
-	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);
-	}
-
-	/// 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;
+	void for_each(For_each_func func, void *info=0) const;
 
-		return 0;
-	}
-
-protected:
+	/*/// iterate over all elements, passing address of item storage
+	void for_each(For_each_func_storage func, void *info=0);
+	*/
+
+	/// iterate over all elements until condition, const info
+	void* first_that(Item_that_func_const func, const void *info=0) const;
+
+	/// iterate over all elements until condition
+	void* first_that(Item_that_func func, void *info=0) const;
+
+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;
 
-	// default expand delta size
-	int fdelta;
-
-	/// elements[growing size] here
-	T *felements;
+private:
 
 	// array size
-	int fused;
+	int fused_rows;
 
-	bool is_full() {
-		return fused == fallocated;
-	}
-	void expand(int delta) {
-		fallocated+=delta;
-		felements = (T *)pa_realloc(felements, fallocated*sizeof(T));
+private:
+
+	bool chunk_is_full() {
+		return append_here == link_row;
 	}
+	void expand(int chunk_rows);
 
 private: //disabled
 
+	//Array(Array&) { }
 	Array& operator = (const Array&) { return *this; }
 };
 
-/// handy array iterator
-template<typename T> class Array_iterator {
-
-	const Array<T>& farray;
-	T *fcurrent;
-	T *flast;
 
+/// handy array iterator
+class Array_iter {
 public:
 
-	Array_iterator(const Array<T>& aarray) : farray(aarray) {
-		fcurrent(farray.felements);
-		flast=farray+farray.count();
+	Array_iter(const Array& aarray) : array(aarray),
+		chunk(aarray.head),
+		row(chunk->rows),
+		countdown(chunk->count) {
 	}
 
 	/// there are still elements
 	bool has_next() {
-		return fcurrent<flast;
+		return !(chunk==array.tail && row==array.append_here);
 	}
 
-	/// quickly extracts next Array element
-	T next() {
-		return *(furrent++);
+	/// quickly extracts next Array::Item
+	Array::Item *next() {
+		// assuming: never called after has_next()!
+		if(countdown==0) { // end of chunk?
+			chunk=row->link;
+			row=chunk->rows;
+			countdown=chunk->count;
+		}
+		Array::Item *result=row->item;
+		row++;  countdown--;
+		return result;
+	}
+
+	/// quickly extracts next Array::Item as const String
+	const String *next_string() { 
+		return const_cast<const String *>(static_cast<String *>(next())); 
 	}
 
+private:
+	const Array& array;
+	const Array::Chunk *chunk;
+	const Array::Chunk::Row *row;
+	int countdown;	
+
 };
 
 #endif