--- parser3/src/include/pa_array.h	2003/01/27 15:35:24	1.57.2.10
+++ parser3/src/include/pa_array.h	2003/03/19 12:22:35	1.57.2.27.2.1
@@ -1,52 +1,67 @@
 /** @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/27 15:35:24 $";
+static const char* IDENT_ARRAY_H="$Date: 2003/03/19 12:22:35 $";
 
-#include "pa_pool.h"
+// includes
+
+#include "pa_memory.h"
 #include "pa_exception.h"
 
-template<typename T> class Array_iterator;
+// forwards
 
-/**	
-	Simple Array.
+template<typename T> class Array_iterator;
 
-*/
+/// Simple Array
 template<typename T> class Array: public PA_Object {
 
 	friend class Array_iterator<T>;
 
+protected:
+
+	// default expand delta size
+	int fdelta;
+
+	/// elements[growing size] here
+	T *felements;
+
 	// allocated size
 	int fallocated;
 
+	// array size
+	int fused;
+
 public:
 	typedef T element_type;
 
 	Array(int initial=3, int delta=1):
-		fallocated(initial?initial:3),
+		fallocated(initial>3?initial:3),
 		fdelta(delta),
 		fused(0)
 	{
-		if(fallocated<=0 || fdelta<1)
+		if(fdelta<1)
 			throw Exception(0, 
 				Exception::undefined_source,
-				"Array::Array(%d, %d) too small", initial, delta);
+				"Array::Array(delta=%d) too small", delta);
 
-		felements=new T[fallocated];
+		// we can't use new(0) here[like we did in Hash] because we need to use realloc
+		// on MSVC new returns NOT pointer learned from pa_malloc, so we can't do new+realloc
+		felements=static_cast<T*>(calloc(fallocated*sizeof(T)));
 	}
 	override ~Array() {
+		// see comment in ctor
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
-			delete current;
+			current->~T(); // manually invoking destructors
 
-		delete felements;
+		free(felements);
 	}
 
 	/// how many items are in Array
@@ -63,11 +78,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())) {
+		if(offset<0) {
 			throw Exception(0, 
 				Exception::undefined_source,
-				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
-			//return 0; // never
+				"Array::append(offset=%d) out <0", offset);
+			//return Nothing; // never
 		}
 		// fix limit
 		{
@@ -78,32 +93,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 {
+	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())) {
+	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, size()-1);
+				"Array::put(%d) out of range [0..%d]", index, count()-1);
 			return; // never
 		}
 		felements[index]=element;
@@ -124,26 +147,18 @@ public:
 			if(callback(*current, info))
 				return *current;
 
-		return 0;//T(0);
+		return T(0);
 	}
 
 protected:
 
-	// default expand delta size
-	int fdelta;
-
-	/// elements[growing size] here
-	T *felements;
-
-	// array size
-	int fused;
-
 	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 *)realloc(felements, fallocated*sizeof(T));
 	}
 
 private: //disabled
@@ -151,29 +166,53 @@ private: //disabled
 	Array& operator = (const Array&) { return *this; }
 };
 
-typedef smart_ptr<char> CharPtr;
 
-class Pool: public Array<CharPtr> {
+/** Array iterator, usage:
+	@code
+	// Array<T> a;
+	Array_iterator<T> i(a);
+	while(i.has_next()) {
+		T& element=i.next();
+		...
+	}	
+	@endcode
+*/
+template<typename T> class Array_iterator {
+
+	const Array<T>& farray;
+	T *fcurrent;
+	T *flast;
+
 public:
-	char *malloc(size_t size) {
-		CharPtr result=CharPtr((char *)Array<CharPtr>::malloc(size));
-		*this += result;
-		return result.get();
+
+	Array_iterator(const Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements+farray.count();
 	}
 
-	char *malloc(const char *buf, size_t size) {
-		char *result=malloc(size);
-		memcpy(result, buf, size);
-		return result;
+	/// there are still elements
+	bool has_next() {
+		return fcurrent<flast;
 	}
-};
 
-void *operator new(size_t size, Pool& pool) { 
-	return pool.malloc(size);
-}
+	/// quickly extracts next Array element
+	const T& next() {
+		return *(fcurrent++);
+	}
 
-/// handy array iterator
-template<typename T> class Array_iterator {
+};
+
+/** Nonconst array iterator, usage:
+	@code
+	// Array<T> a;
+	Array_iterator<T> i(a);
+	while(i.has_next()) {
+		T& element=i.next();
+		...
+	}	
+	@endcode
+*/
+template<typename T> class Array_modifing_iterator {
 
 	Array<T>& farray;
 	T *fcurrent;
@@ -181,7 +220,7 @@ template<typename T> class Array_iterato
 
 public:
 
-	Array_iterator(Array<T>& aarray): farray(aarray) {
+	Array_modifing_iterator(Array<T>& aarray): farray(aarray) {
 		fcurrent=farray.felements;
 		flast=farray.felements+farray.count();
 	}
@@ -192,7 +231,7 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	T next() {
+	T& next() {
 		return *(fcurrent++);
 	}