--- parser3/src/include/pa_array.h	2001/01/29 09:38:33	1.4
+++ parser3/src/include/pa_array.h	2001/03/19 16:43:59	1.25
@@ -1,8 +1,24 @@
-/*
-  $Id: pa_array.h,v 1.4 2001/01/29 09:38:33 paf Exp $
+/** @file
+	Parser
+	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.25 2001/03/19 16:43:59 paf Exp $
 */
 
-/*
+#ifndef PA_ARRAY_H
+#define PA_ARRAY_H
+
+#include <stddef.h>
+
+#include "pa_pool.h"
+#include "pa_types.h"
+#include "pa_string.h"
+
+/**	
+	Pooled Array.
+
+	Internal structure: @verbatim	
 
 	Array               Chunk0
 	======              ========
@@ -13,43 +29,82 @@
 			.			[ptr]
 			...........>[link to the next chunk]
 
+	@endverbatim
 */
 
-#ifndef PA_ARRAY_H
-#define PA_ARRAY_H
+class Array : public Pooled {
+public:
 
-#include <stddef.h>
+	typedef void Item; ///< Array item type
 
-#include "pa_types.h"
-
-class Pool;
+	enum {
+		CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count
+		CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded()
+	};
 
-class Array {
 public:
-	typedef void *Item;
 
-	enum {
-		CR_PREALLOCATED_COUNT=10,
-		CR_GROW_PERCENT=60
-	};
+	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-private:
-	friend Pool;
+	/// size Array. how many items are in it
+	int size() const { 
+		// for get and quick_get
+		cache_chunk_base=0;
+		cache_chunk=head;
+		return fused_rows; 
+	}
+	/// append Item to array
+	Array& operator += (Item *src);
+
+	/// 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_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;
+	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 static_cast<const String *>(get(index)); 
+	}
 
-	// the pool I'm allocated on
-	Pool *pool;
+private:
 
 	struct Chunk {
 		// the number of rows in chunk
 		int count;
 		union Row {
-			Item item;
+			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;
 	
@@ -58,45 +113,24 @@ private:
 	Chunk::Row *link_row;
 
 private:
-	// last chank allocated count
-	int curr_chunk_rows;
 
 	// array size
 	int fused_rows;
 
-	int cache_chunk_base;
-	Chunk *cache_chunk;
+	mutable int cache_chunk_base;
+	mutable Chunk *cache_chunk;
 	
 private:
-	// new&constructors made private to enforce factory manufacturing at pool
-	void *operator new(size_t size, Pool *apool);
-
-	void construct(Pool *apool, int initial_rows);
-	Array(Pool *apool) {
-		construct(apool, CR_PREALLOCATED_COUNT); 
-	}
-	Array(Pool *apool, int initial_rows) {
-		construct(apool, initial_rows); 
-	}
-
 
 	bool chunk_is_full() {
 		return append_here == link_row;
 	}
-	void expand();
-
-public:
-
-	int size() { return fused_rows; }
-	Array& operator += (Item src);
-	Item& operator [] (int index);
-	Array& operator += (Array& src);
-	void remove(int index, int count=1);
+	void expand(int chunk_rows);
 
 private: //disabled
 
-	Array& operator = (Array& src) { return *this; }
-	Array(Array& src) {}
+	//Array(Array&) { }
+	Array& operator = (const Array&) { return *this; }
 };
 
 #endif