--- parser3/src/include/pa_array.h	2001/01/29 15:56:03	1.7
+++ parser3/src/include/pa_array.h	2001/01/29 20:46:21	1.12
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_array.h,v 1.7 2001/01/29 15:56:03 paf Exp $
+  $Id: pa_array.h,v 1.12 2001/01/29 20:46:21 paf Exp $
 */
 
 /*
@@ -21,13 +21,14 @@
 #include <stddef.h>
 
 #include "pa_types.h"
+#include "pa_string.h"
 
 class Pool;
 
 class Array {
 public:
 
-	typedef void *Item;
+	typedef void Item;
 
 	enum {
 		CR_INITIAL_ROWS_DEFAULT=10,
@@ -36,18 +37,24 @@ public:
 
 public:
 
-	void *operator new(size_t size, Pool *apool);
-	Array(Pool *apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+	void *operator new(size_t size, Pool& apool);
+	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-	int size() { return fused_rows; }
-	Array& operator += (Item src);
-	Array& operator += (Array& src);
-	Item& operator [] (int index);
+	int size() const { return fused_rows; }
+	Array& operator += (const Item *src);
+	Array& append_array(const Array& src);
+	const 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)); 
+	}
 
 protected:
 
 	// the pool I'm allocated on
-	Pool *pool;
+	Pool& pool;
 
 private:
 
@@ -55,7 +62,7 @@ private:
 		// the number of rows in chunk
 		int count;
 		union Row {
-			Item item;
+			const Item *item;
 			Chunk *link;  // link to the next chunk in chain
 		} rows[1];
 		// next rows are here
@@ -78,8 +85,8 @@ private:
 	// array size
 	int fused_rows;
 
-	int cache_chunk_base;
-	Chunk *cache_chunk;
+	mutable int cache_chunk_base;
+	mutable Chunk *cache_chunk;
 	
 private:
 
@@ -90,8 +97,8 @@ private:
 
 private: //disabled
 
-	Array(Array&) {}
-	Array& operator = (Array&) { return *this; }
+	//Array(Array&) { }
+	Array& operator = (const Array&) { return *this; }
 };
 
 #endif