--- parser3/src/include/pa_array.h	2001/03/12 12:00:04	1.23
+++ parser3/src/include/pa_array.h	2003/01/23 11:37:55	1.57.2.2
@@ -1,122 +1,171 @@
-/*
-	Parser
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+/** @file
+	Parser: Array & Array_iterator classes decls.
 
-	$Id: pa_array.h,v 1.23 2001/03/12 12:00:04 paf 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
+
+static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 11:37:55 $";
+
+#include "pa_pool.h"
+//#include "pa_types.h"
+
+class Array_iterator;
 
-	Array               Chunk0
-	======              ========
-	head--------------->[ptr]
-	append_here-------->[ptr]
-	link_row            ........
-			.			.
-			.			[ptr]
-			...........>[link to the next chunk]
+/**	
+	Simple Array.
 
 */
+template<typename T> class Array: public PA_Object {
 
-#ifndef PA_ARRAY_H
-#define PA_ARRAY_H
+	friend class Array_iterator;
 
-#include <stddef.h>
+	/// elements[growing size] here
+	T *felements;
 
-#include "pa_pool.h"
-#include "pa_types.h"
-#include "pa_string.h"
+	// array size
+	int fused;
+
+	// allocated size
+	int fallocated;
+
+	// default expand delta size
+	int fdelta;
 
-class Array : public Pooled {
 public:
+	typedef T element_type;
+
+	Array(int initial=3, int delta=5):
+		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);
 
-	typedef void Item;
+		felements=new T[fallocated];
+	}
+	override ~Array() {
+		delete felements;
+	}
 
-	enum {
-		CR_INITIAL_ROWS_DEFAULT=10,
-		CR_GROW_PERCENT=60
-	};
+	/// how many items are in Array
+	int count() const { return fused; }
+	/// append to array
+	Array& operator += (T src) {
+		if(is_full())
+			expand(fdelta);
 
-public:
+		felements[fused++]=src;
 
-	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+		return *this;
+	}
 
-	int size() const { 
-		// for get and quick_get
-		cache_chunk_base=0;
-		cache_chunk=head;
-		return fused_rows; 
-	}
-	Array& operator += (Item *src);
-	// Array<const Item*> replacement
-	Array& operator += (const Item *src) { return *this+=const_cast<Item*>(src); }
-	Array& append_array(const Array& src, int offset=0);
-	Item *quick_get(int index) const {
-		// considering these true:
-		//   index increments from 0 to size()-1
-		//   index>=0 && index<size()
-		//   index>=cache_chunk_base
-
-		// 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;
+	/// 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
 		}
-		
-		return cache_chunk->rows[index-cache_chunk_base].item;
+		// 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));
 	}
 
-	Item *get(int index) const;
-	void put(int index, Item *item);
-	const String *get_string(int index) const { 
-		return static_cast<const String *>(get(index)); 
+	/// 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];
 	}
 
-private:
+	/// 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;
+	}
 
-	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;
 
-private:
+	/// 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);
+	}
 
-	// array size
-	int fused_rows;
+	/// 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;
+
+		return 0;
+	}
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
 private:
 
-	bool chunk_is_full() {
-		return append_here == link_row;
+	bool is_full() {
+		return fused == fallocated;
+	}
+	void expand(int delta) {
+		fallocated+=delta;
+		felements = (T *)pa_realloc(felements, fallocated*sizeof(T));
 	}
-	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;
+
+public:
+
+	Array_iterator(const Array<T>& aarray) : farray(aarray) {
+		fcurrent(farray.felements);
+		flast=farray+farray.count();
+	}
+
+	/// there are still elements
+	bool has_next() {
+		return fcurrent<flast;
+	}
+
+	/// quickly extracts next Array element
+	T next() {
+		return *(furrent++);
+	}
+
+};
+
 #endif