--- parser3/src/include/pa_array.h	2001/04/23 15:49:58	1.35
+++ parser3/src/include/pa_array.h	2001/10/29 15:27:02	1.46
@@ -1,22 +1,22 @@
 /** @file
-	Parser: array class decl.
+	Parser: Array & Array_iter 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.35 2001/04/23 15:49:58 paf Exp $
+	$Id: pa_array.h,v 1.46 2001/10/29 15:27:02 paf Exp $
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#include <stddef.h>
-
+#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_types.h"
 #include "pa_string.h"
 
+class Array_iter;
+
 /**	
 	Pooled Array.
 
@@ -34,6 +34,7 @@
 */
 
 class Array : public Pooled {
+	friend class Array_iter;
 public:
 
 	/// Array item type
@@ -47,75 +48,41 @@ public:
 	typedef void (*For_each_func)(Item *value, void *info);
 
 	/// first_that iterator function type, const info
-	typedef bool (*First_that_func_const)(Item *value, const void *info);
+	typedef void *(*Item_that_func_const)(Item *value, const void *info);
 
 	/// first_that iterator function type
-	typedef bool (*First_that_func)(Item *value, void *info);
+	typedef void *(*Item_that_func)(Item *value, void *info);
 
 	enum {
-		CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count
-		CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded()
+		CR_INITIAL_ROWS_DEFAULT=3, ///< default preallocated row count
+		CR_GROW_COUNT=3 ///< each time the Array chunk_is_full() array expanded()
 	};
 
 public:
 
 	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-	/**
-		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); }
 
 	/// 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& operator += (const Item *src) { return *this+=const_cast<Item *>(src); }
 
 	/// append other Array portion to this one. starting from offset
 	Array& append_array(const Array& src, int offset=0);
 
-	/** 
-		quickly gets some item considering...
-
-		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;
-	}
-
 	Item *get(int index) const;
+	int get_int(int index) const { return reinterpret_cast<int>(get(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))); 
 	}
-	const String *quick_get_string(int index) const { 
-		return const_cast<const String *>(static_cast<String *>(quick_get(index))); 
-	}
 
 	/*/// iterate over all elements, const info
 	void for_each(For_each_func_const func, const void *info=0) const;
@@ -125,33 +92,36 @@ public:
 	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;
+	void* first_that(Item_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;
+	void* first_that(Item_that_func func, void *info=0) const;
 
 private:
 
+	/// several record elements
 	struct Chunk {
-		// the number of rows in chunk
-		int count;
+		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
+			Chunk *link;  ///< link to the next chunk in chain
 		} rows[1];
 		// next rows are here
 	}
-		*head;  // the head chunk of the chunk chain
+		*head;  ///< the head chunk of the chunk chain
 
-	// last allocated chunk
-	// helps appending Arrays
+	/** last allocated chunk
+		helps appending Arrays
+	*/
 	Chunk *tail;
 
-	// next append would write to this record
+	/// 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
+	/**	the address of place where lies address 
+		of the link to the next chunk to allocate
+	*/
 	Chunk::Row *link_row;
 
 private:
@@ -159,9 +129,6 @@ private:
 	// array size
 	int fused_rows;
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
 private:
 
 	bool chunk_is_full() {
@@ -175,4 +142,46 @@ private: //disabled
 	Array& operator = (const Array&) { return *this; }
 };
 
+
+/// handy array iterator
+class Array_iter {
+public:
+
+	Array_iter(const Array& aarray) : array(aarray),
+		chunk(aarray.head),
+		row(chunk->rows),
+		countdown(chunk->count) {
+	}
+
+	/// there are still elements
+	bool has_next() {
+		return !(chunk==array.tail && row==array.append_here);
+	}
+
+	/// 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