--- parser3/src/include/pa_array.h	2001/03/28 08:01:41	1.32
+++ parser3/src/include/pa_array.h	2001/05/17 10:22:24	1.41
@@ -5,14 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_array.h,v 1.32 2001/03/28 08:01:41 paf Exp $
+	$Id: pa_array.h,v 1.41 2001/05/17 10:22:24 parser 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"
@@ -39,6 +38,10 @@ public:
 	/// Array item type
 	typedef void Item;
 
+	/*/// 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);
 
@@ -49,26 +52,39 @@ public:
 	typedef bool (*First_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
-	int size() const { 
-		// for get and quick_get
+	/**
+		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 fused_rows; 
+		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);
@@ -93,11 +109,20 @@ public:
 	}
 
 	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;
+	/*/
 
 	/// iterate over all elements
 	void for_each(For_each_func func, void *info=0) const;
@@ -110,26 +135,29 @@ public:
 
 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: