--- parser3/src/include/pa_array.h	2003/01/23 11:37:55	1.57.2.2
+++ parser3/src/include/pa_array.h	2003/01/27 15:07:47	1.57.2.9
@@ -8,12 +8,12 @@
 #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_Y="$Date: 2003/01/27 15:07:47 $";
 
 #include "pa_pool.h"
-//#include "pa_types.h"
+#include "pa_exception.h"
 
-class Array_iterator;
+template<typename T> class Array_iterator;
 
 /**	
 	Simple Array.
@@ -21,35 +21,31 @@ class Array_iterator;
 */
 template<typename T> class Array: public PA_Object {
 
-	friend class Array_iterator;
-
-	/// elements[growing size] here
-	T *felements;
-
-	// array size
-	int fused;
+	friend class Array_iterator<T>;
 
 	// allocated size
 	int fallocated;
 
-	// default expand delta size
-	int fdelta;
-
 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];
 	}
 	override ~Array() {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			delete current;
+
 		delete felements;
 	}
 
@@ -68,7 +64,8 @@ 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,
+			throw Exception(0, 
+				Exception::undefined_source,
 				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
 			//return 0; // never
 		}
@@ -86,12 +83,14 @@ public:
 			expand(needed);
 
 		memcpy(&felements[fused+=limit], &src.felements[offset], limit*sizeof(T));
+		return *this;
 	}
 
 	/// get index-element
 	T get(int index) const {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0,
+		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
 		}
@@ -102,7 +101,8 @@ public:
 	/// put index-element
 	void put(int index, T element) {
 		if(!(index>=0 && index<size())) {
-			throw Exception(0, 0, 
+			throw Exception(0, 
+				Exception::undefined_source, 
 				"Array::put(%d) out of range [0..%d]", index, size()-1);
 			return; // never
 		}
@@ -111,23 +111,32 @@ 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 0;//T(0);
 	}
 
-private:
+protected:
+
+	// default expand delta size
+	int fdelta;
+
+	/// elements[growing size] here
+	T *felements;
+
+	// array size
+	int fused;
 
 	bool is_full() {
 		return fused == fallocated;
@@ -142,18 +151,39 @@ private: //disabled
 	Array& operator = (const Array&) { return *this; }
 };
 
+typedef smart_ptr<char> CharPtr;
+
+class Pool: public Array<CharPtr> {
+public:
+	char *malloc(size_t size) {
+		CharPtr result=CharPtr(new char[size]);
+		*this += result;
+		return result.get();
+	}
+
+	char *malloc(const char *buf, size_t size) {
+		char *result=malloc(size);
+		memcpy(result, buf, size);
+		return result;
+	}
+};
+
+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
@@ -163,7 +193,7 @@ public:
 
 	/// quickly extracts next Array element
 	T next() {
-		return *(furrent++);
+		return *(fcurrent++);
 	}
 
 };