--- parser3/src/include/pa_array.h	2003/01/24 11:33:02	1.57.2.7
+++ parser3/src/include/pa_array.h	2003/02/17 09:56:15	1.57.2.22
@@ -1,14 +1,14 @@
 /** @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/24 11:33:02 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/02/17 09:56:15 $";
 
 #include "pa_pool.h"
 #include "pa_exception.h"
@@ -21,11 +21,22 @@ template<typename T> class Array_iterato
 */
 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;
 
 	// allocated size
 	int fallocated;
 
+	// array size
+	int fused;
+
 public:
 	typedef T element_type;
 
@@ -39,14 +50,14 @@ public:
 				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() {
 		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
@@ -87,23 +98,25 @@ public:
 	}
 
 	/// 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 +137,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 *)pa_realloc(felements, fallocated*sizeof(T));
 	}
 
 private: //disabled
@@ -153,31 +158,44 @@ private: //disabled
 
 typedef smart_ptr<char> CharPtr;
 
+/** 
+	Pool mechanizm allows users not to free up allocated memory,
+	leaving that problem to 'pools'.
+*/
 class Pool: public Array<CharPtr> {
 public:
 	char *malloc(size_t size) {
-		CharPtr result=CharPtr(new char[size]);
+		CharPtr result=CharPtr((char *)Array<CharPtr>::malloc(size));
 		*this += result;
 		return result.get();
 	}
+
+	char *copy(const char* buf, size_t size=0) {
+		if(!size)
+			size=strlen(buf)+1;
+
+		char *result=malloc(size);
+		memcpy(result, buf, size);
+		return result;
+	}
 };
 
-void *operator new(size_t size, Pool& pool) { 
+inline void *operator new[] (size_t size, Pool& pool) {
 	return pool.malloc(size);
 }
 
 /// 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
@@ -186,8 +204,8 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	T next() {
-		return *(furrent++);
+	T& next() {
+		return *(fcurrent++);
 	}
 
 };