--- parser3/src/main/Attic/pa_array.C	2001/10/19 12:43:30	1.40
+++ parser3/src/main/Attic/pa_array.C	2002/02/07 11:55:30	1.45
@@ -2,9 +2,9 @@
 	Parser: array class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_array.C,v 1.40 2001/10/19 12:43:30 parser Exp $
+	$Id: pa_array.C,v 1.45 2002/02/07 11:55:30 paf Exp $
 */
 
 #include "pa_pool.h"
@@ -12,25 +12,28 @@
 #include "pa_exception.h"
 #include "pa_common.h"
 
-Array::Array(Pool& apool, int initial_rows) :
-	Pooled(apool) {
-	initial_rows=max(initial_rows, CR_INITIAL_ROWS_DEFAULT);
-
+void Array::construct_new(int initial_rows) {
 	head=tail=static_cast<Chunk *>(
-		malloc(sizeof(int)+sizeof(Chunk::Row)*initial_rows+sizeof(Chunk *)));
+		malloc(sizeof(int)+sizeof(Chunk::Row)*initial_rows+sizeof(Chunk *), 19));
 	head->count=initial_rows;
 	append_here=head->rows;
 	link_row=&head->rows[initial_rows];
 	link_row->link=0;
 	fused_rows=0;
+}
+
+Array::Array(Pool& apool, int initial_rows) : Pooled(apool) {
+	construct_new(max(initial_rows, CR_INITIAL_ROWS_DEFAULT));
+}
 
-	cache_chunk_base=0;
-	cache_chunk=head;
+Array::Array(const Array& source, int offset) : Pooled(source.pool()) {
+	construct_new(source.size());
+	append_array(source, offset);
 }
 
 void Array::expand(int chunk_rows) {
 	Chunk *chunk=tail=static_cast<Chunk *>(
-		malloc(sizeof(int)+sizeof(Chunk::Row)*chunk_rows+sizeof(Chunk *)));
+		malloc(sizeof(int)+sizeof(Chunk::Row)*chunk_rows+sizeof(Chunk *), 2));
 	chunk->count=chunk_rows;
 	link_row->link=chunk;
 	append_here=chunk->rows;
@@ -56,20 +59,17 @@ Array::Item *Array::get(int index) const
 		return 0; // never
 	}
 
-	// if they ask index to the left of cached position, forget cache
-	if(index<cache_chunk_base) {
-		cache_chunk_base=0;
-		cache_chunk=head;
-	}
+	int base=0;
+	Chunk *chunk=head;
 
 	// navigate to chunk with "index" row
-	while(!(index>=cache_chunk_base && index<cache_chunk_base+cache_chunk->count)) {
-		int count=cache_chunk->count;
-		cache_chunk_base+=count;
-		cache_chunk=cache_chunk->rows[count].link;
+	while(!(index>=base && index<base+chunk->count)) {
+		int count=chunk->count;
+		base+=count;
+		chunk=chunk->rows[count].link;
 	}
 
-	return cache_chunk->rows[index-cache_chunk_base].item;
+	return chunk->rows[index-base].item;
 }
 
 void Array::put(int index, Item *item) {
@@ -79,20 +79,17 @@ void Array::put(int index, Item *item) {
 		return; // never
 	}
 
-	// if they ask index to the left of cached position, forget cache
-	if(index<cache_chunk_base) {
-		cache_chunk_base=0;
-		cache_chunk=head;
-	}
+	int base=0;
+	Chunk *chunk=head;
 
 	// navigate to chunk with "index" row
-	while(!(index>=cache_chunk_base && index<cache_chunk_base+cache_chunk->count)) {
-		int count=cache_chunk->count;
-		cache_chunk_base+=count;
-		cache_chunk=cache_chunk->rows[count].link;
+	while(!(index>=base && index<base+chunk->count)) {
+		int count=chunk->count;
+		base+=count;
+		chunk=chunk->rows[count].link;
 	}
 
-	cache_chunk->rows[index-cache_chunk_base].item=item;
+	chunk->rows[index-base].item=item;
 }
 
 Array& Array::append_array(const Array& src, int offset) {
@@ -161,6 +158,23 @@ void Array::for_each(For_each_func func,
 	}
 }
 
+/*void Array::for_each(For_each_func_storage func, void *info) {
+	Chunk *chunk=head;
+	while(true) {
+		if(chunk==tail) { // last chunk?
+			for(Chunk::Row *row=chunk->rows; row!=append_here; row++)
+				(*func)(&row->item, info);
+			break;
+		} else {
+			int count=chunk->count;
+			for(int i=0; i<count; i++)
+				(*func)(&chunk->rows[i].item, info);
+			chunk=chunk->rows[count].link;
+		}
+	}
+}
+*/
+
 /*void Array::for_each(For_each_func_const func, const void *info) const {
 	Chunk *chunk=head;
 	while(true) {