--- parser3/src/include/pa_array.h	2001/01/29 09:38:33	1.4
+++ parser3/src/include/pa_array.h	2001/02/21 11:18:57	1.15
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_array.h,v 1.4 2001/01/29 09:38:33 paf Exp $
+  $Id: pa_array.h,v 1.15 2001/02/21 11:18:57 paf Exp $
 */
 
 /*
@@ -20,36 +20,68 @@
 
 #include <stddef.h>
 
+#include "pa_pool.h"
 #include "pa_types.h"
+#include "pa_string.h"
 
-class Pool;
-
-class Array {
+class Array : public Pooled {
 public:
-	typedef void *Item;
+
+	typedef void Item;
 
 	enum {
-		CR_PREALLOCATED_COUNT=10,
+		CR_INITIAL_ROWS_DEFAULT=10,
 		CR_GROW_PERCENT=60
 	};
 
-private:
-	friend Pool;
+public:
+
+	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-	// the pool I'm allocated on
-	Pool *pool;
+	int size() const { return fused_rows; }
+	Array& operator += (Item *src);
+	Array& append_array(const Array& src);
+	Item *raw_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;
+		}
+		
+		return cache_chunk->rows[index-cache_chunk_base].item;
+	}
+
+	Item *get(int index) const;
+	const char *get_cstr(int index) const { 
+		return static_cast<const char *>(get(index)); 
+	}
+	const String *get_string(int index) const { 
+		return static_cast<const String *>(get(index)); 
+	}
+
+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 +90,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