--- parser3/src/include/pa_array.h	2003/01/23 11:37:55	1.57.2.2
+++ parser3/src/include/pa_array.h	2003/02/21 10:55:43	1.57.2.25
@@ -1,56 +1,64 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_Y="$Date: 2003/01/23 11:37:55 $";
+static const char* IDENT_ARRAY_H="$Date: 2003/02/21 10:55:43 $";
 
-#include "pa_pool.h"
-//#include "pa_types.h"
+// includes
 
-class Array_iterator;
+#include "pa_memory.h"
+#include "pa_exception.h"
 
-/**	
-	Simple Array.
+// forwards
 
-*/
+template<typename T> class Array_iterator;
+
+/// Simple Array
 template<typename T> class Array: public PA_Object {
 
-	friend class Array_iterator;
+	friend class Array_iterator<T>;
+
+protected:
+
+	// default expand delta size
+	int fdelta;
 
 	/// elements[growing size] here
 	T *felements;
 
-	// array size
-	int fused;
-
 	// allocated size
 	int fallocated;
 
-	// default expand delta size
-	int fdelta;
+	// array size
+	int fused;
 
 public:
 	typedef T element_type;
 
-	Array(int initial=3, int delta=5):
+	Array(int initial=3, int delta=1):
 		fallocated(initial?initial:3),
 		fdelta(delta),
 		fused(0)
 	{
-		if(fallocated<=0 || fdelta<1) {
-			throw Exception(0, 0,
+		if(fallocated<=0 || fdelta<1)
+			throw Exception(0, 
+				Exception::undefined_source,
 				"Array::Array(%d, %d) too small", initial, delta);
 
-		felements=new T[fallocated];
+		felements=static_cast<T*>(calloc(fallocated*sizeof(T)));
 	}
 	override ~Array() {
-		delete felements;
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			current->~T(); // manually invoking destructors
+
+		free(felements);
 	}
 
 	/// how many items are in Array
@@ -67,10 +75,11 @@ public:
 
 	/// append other Array portion to this one. starting from offset
 	Array& append(const Array& src, int offset=0, int limit=0) {
-		if(!(offset>=0 && offset<src.count())) {
-			throw Exception(0, 0,
-				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
-			//return 0; // never
+		if(offset<0) {
+			throw Exception(0, 
+				Exception::undefined_source,
+				"Array::append(offset=%d) out <0", offset);
+			//return Nothing; // never
 		}
 		// fix limit
 		{
@@ -81,29 +90,40 @@ public:
 				limit=m;
 		}
 
-		int needed=limit-(fallocated-fused);
-		if(needed>0)
-			expand(needed);
-
-		memcpy(&felements[fused+=limit], &src.felements[offset], limit*sizeof(T));
+		int delta=limit-(fallocated-fused);
+		if(delta>0)
+			expand(delta);
+
+		T* from=&src.felements[offset];
+		T* to=&felements[fused];
+		T* from_end=from+limit;
+		while(from<from_end)
+			*to++=*from++;
+		
+		fused+=limit;
+		return *this;
 	}
 
 	/// get index-element
-	T get(int index) const {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0,
+	T& get(int index) const {
+		if(!(index>=0 && index<count())) {
+			throw Exception(0, 
+				Exception::undefined_source,
 				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return 0; // never
+			return felements[0]; // never
 		}
 
 		return felements[index];
 	}
 
+	T& operator [](int index) const { return get(index); }
+
 	/// put index-element
-	void put(int index, T element) {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0, 
-				"Array::put(%d) out of range [0..%d]", index, size()-1);
+	void put(int index, T& element) {
+		if(!(index>=0 && index<count())) {
+			throw Exception(0, 
+				Exception::undefined_source, 
+				"Array::put(%d) out of range [0..%d]", index, count()-1);
 			return; // never
 		}
 		felements[index]=element;
@@ -111,30 +131,31 @@ public:
 
 
 	/// iterate over all elements
-	template<typename I> void for_each(void callback(T, I), I info) const {
+	template<typename I> void for_each(void (*callback)(T, I), I info) const {
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
 			callback(*current, info);
 	}
 
 	/// iterate over all elements until condition becomes true, return that element
-	template<typename I> T *first_that(bool callback(T, I), I info) const {
+	template<typename I> T first_that(bool (*callback)(T, I), I info) const {
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
 			if(callback(*current, info))
 				return *current;
 
-		return 0;
+		return T(0);
 	}
 
-private:
+protected:
 
 	bool is_full() {
 		return fused == fallocated;
 	}
 	void expand(int delta) {
+		felements = (T *)realloc(felements, (fallocated+delta)*sizeof(T));
+		memset(&felements[fallocated], 0, delta*sizeof(T));
 		fallocated+=delta;
-		felements = (T *)pa_realloc(felements, fallocated*sizeof(T));
 	}
 
 private: //disabled
@@ -142,18 +163,19 @@ private: //disabled
 	Array& operator = (const Array&) { return *this; }
 };
 
+
 /// handy array iterator
 template<typename T> class Array_iterator {
 
-	const Array<T>& farray;
+	Array<T>& farray;
 	T *fcurrent;
 	T *flast;
 
 public:
 
-	Array_iterator(const Array<T>& aarray) : farray(aarray) {
-		fcurrent(farray.felements);
-		flast=farray+farray.count();
+	Array_iterator(Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements+farray.count();
 	}
 
 	/// there are still elements
@@ -162,8 +184,8 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	T next() {
-		return *(furrent++);
+	T& next() {
+		return *(fcurrent++);
 	}
 
 };