--- parser3/src/include/pa_array.h	2001/01/29 20:10:31	1.11
+++ parser3/src/include/pa_array.h	2001/02/20 18:45:51	1.14
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_array.h,v 1.11 2001/01/29 20:10:31 paf Exp $
+  $Id: pa_array.h,v 1.14 2001/02/20 18:45:51 paf Exp $
 */
 
 /*
@@ -20,12 +20,11 @@
 
 #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;
@@ -37,20 +36,34 @@ public:
 
 public:
 
-	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& append_array(Array& src);
-	Item *get(int index);
-	char *get_cstr(int index) { return static_cast<char *>(get(index)); }
-	String *get_string(int index) { return static_cast<String *>(get(index)); }
-
-protected:
+	int size() const { return fused_rows; }
+	Array& operator += (const Item *src);
+	Array& append_array(const Array& src);
+	const 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;
+	}
 
-	// the pool I'm allocated on
-	Pool& pool;
+	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)); 
+	}
 
 private:
 
@@ -58,7 +71,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
@@ -81,8 +94,8 @@ private:
 	// array size
 	int fused_rows;
 
-	int cache_chunk_base;
-	Chunk *cache_chunk;
+	mutable int cache_chunk_base;
+	mutable Chunk *cache_chunk;
 	
 private:
 
@@ -94,7 +107,7 @@ private:
 private: //disabled
 
 	//Array(Array&) { }
-	Array& operator = (Array&) { return *this; }
+	Array& operator = (const Array&) { return *this; }
 };
 
 #endif