--- parser3/src/include/pa_array.h	2001/08/02 09:58:34	1.42
+++ parser3/src/include/pa_array.h	2002/02/08 08:30:12	1.53
@@ -1,17 +1,15 @@
 /** @file
 	Parser: Array & Array_iter classes decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_array.h,v 1.42 2001/08/02 09:58:34 parser Exp $
+	$Id: pa_array.h,v 1.53 2002/02/08 08:30:12 paf Exp $
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_types.h"
 #include "pa_string.h"
@@ -35,7 +33,7 @@ class Array_iter;
 */
 
 class Array : public Pooled {
-	friend Array_iter;
+	friend class Array_iter;
 public:
 
 	/// Array item type
@@ -47,12 +45,16 @@ public:
 
 	/// for_each iterator function type
 	typedef void (*For_each_func)(Item *value, void *info);
+	/*
+	/// for_each iterator function type, passing item storage address
+	typedef void (*For_each_func_storage)(Item ** value, void *info);
+	*/
 
 	/// first_that iterator function type, const info
-	typedef bool (*First_that_func_const)(Item *value, const void *info);
+	typedef void *(*Item_that_func_const)(Item *value, const void *info);
 
 	/// first_that iterator function type
-	typedef bool (*First_that_func)(Item *value, void *info);
+	typedef void *(*Item_that_func)(Item *value, void *info);
 
 	enum {
 		CR_INITIAL_ROWS_DEFAULT=3, ///< default preallocated row count
@@ -62,6 +64,7 @@ public:
 public:
 
 	Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+	Array(const Array& source, int offset=0);
 
 	/// size Array. how many items are in it
 	int size() const { return fused_rows; }
@@ -80,6 +83,7 @@ public:
 	int get_int(int index) const { return reinterpret_cast<int>(get(index)); }
 
 	void put(int index, Item *item);
+	void put_int(int index, int value) { put(index, reinterpret_cast<Item *>(value)); }
 	/// convinient way to get strings from Array. I long for Array<const String *>
 	const String *get_string(int index) const { 
 		return const_cast<const String *>(static_cast<String *>(get(index))); 
@@ -87,16 +91,25 @@ public:
 
 	/*/// iterate over all elements, const info
 	void for_each(For_each_func_const func, const void *info=0) const;
-	/*/
+	*/
 
 	/// iterate over all elements
 	void for_each(For_each_func func, void *info=0) const;
 
+	/*/// iterate over all elements, passing address of item storage
+	void for_each(For_each_func_storage func, void *info=0);
+	*/
+
 	/// iterate over all elements until condition, const info
-	void* first_that(First_that_func_const func, const void *info=0) const;
+	void* first_that(Item_that_func_const func, const void *info=0) const;
 
 	/// iterate over all elements until condition
-	void* first_that(First_that_func func, void *info=0) const;
+	void* first_that(Item_that_func func, void *info=0) const;
+
+private:
+
+	/// constructor helper
+	void construct_new(int initial_rows);
 
 private:
 
@@ -130,9 +143,6 @@ private:
 	// array size
 	int fused_rows;
 
-	mutable int cache_chunk_base;
-	mutable Chunk *cache_chunk;
-	
 private:
 
 	bool chunk_is_full() {