--- parser3/src/include/pa_array.h	2001/01/29 20:46:21	1.12
+++ parser3/src/include/pa_array.h	2001/03/10 16:34:34	1.21
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_array.h,v 1.12 2001/01/29 20:46:21 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru>
+
+	$Id: pa_array.h,v 1.21 2001/03/10 16:34:34 paf Exp $
 */
 
 /*
@@ -20,12 +24,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,13 +40,36 @@ public:
 
 public:
 
-	void *operator new(size_t size, Pool& apool);
 	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-	int size() const { return fused_rows; }
-	Array& operator += (const Item *src);
-	Array& append_array(const Array& src);
-	const Item *get(int index) const;
+	int size() const { 
+		// for get and quick_get
+		cache_chunk_base=0;
+		cache_chunk=head;
+		return fused_rows; 
+	}
+	Array& operator += (Item *src);
+	// Array<const Item*> replacement
+	Array& operator += (const Item *src) { return *this+=const_cast<Item*>(src); }
+	Array& append_array(const Array& src, int offset=0);
+	Item *quick_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;
+	void put(int index, Item *item);
 	const char *get_cstr(int index) const { 
 		return static_cast<const char *>(get(index)); 
 	}
@@ -51,18 +77,13 @@ public:
 		return static_cast<const String *>(get(index)); 
 	}
 
-protected:
-
-	// the pool I'm allocated on
-	Pool& pool;
-
 private:
 
 	struct Chunk {
 		// the number of rows in chunk
 		int count;
 		union Row {
-			const Item *item;
+			Item *item;
 			Chunk *link;  // link to the next chunk in chain
 		} rows[1];
 		// next rows are here