--- parser3/src/include/pa_array.h	2003/01/23 17:05:33	1.57.2.5
+++ parser3/src/include/pa_array.h	2003/04/11 16:05:43	1.57.2.27.2.15
@@ -1,60 +1,60 @@
 /** @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 17:05:33 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/04/11 16:05:43 $";
 
-#include "pa_pool.h"
+// includes
+
+#include "pa_memory.h"
 #include "pa_exception.h"
 
+// forwards
+
 template<typename T> class Array_iterator;
 
-/**	
-	Simple Array.
+// defines
 
-*/
+#define ARRAY_OPTION_LIMIT_ALL ((size_t)-1)
+
+/// Simple Array
 template<typename T> class Array: public PA_Object {
 
-	friend class Array_iterator;
+	friend class Array_iterator<T>;
+
+protected:
+
+	/// elements[growing size] here
+	T *felements;
 
 	// allocated size
-	int fallocated;
+	size_t fallocated;
+
+	// array size
+	size_t fused;
 
 public:
 	typedef T element_type;
 
-	Array(int initial=3, int delta=1):
-		fallocated(initial?initial:3),
-		fdelta(delta),
+	Array(size_t initial=3):
+		fallocated(initial>3?initial:3),
 		fused(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;
+		felements=static_cast<T*>(malloc(fallocated*sizeof(T)));
 	}
 
 	/// how many items are in Array
-	int count() const { return fused; }
+	size_t count() const { return fused; }
 	/// append to array
 	Array& operator += (T src) {
 		if(is_full())
-			expand(fdelta);
+			expand(2);
 
 		felements[fused++]=src;
 
@@ -62,107 +62,101 @@ 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, 
-				Exception::undefined_source,
-				"Array::append(offset=%d) out of range [0..%d]", offset, src.count()-1);
-			//return 0; // never
-		}
+	Array& append(const Array& src, 
+		size_t offset=0, 
+		size_t limit=ARRAY_OPTION_LIMIT_ALL, //< negative limit means 'all'. zero limit means 'nothing'
+		bool reverse=false) {
 		// fix limit
 		{
-			int m=src.count()-offset;
-			if(!m || limit<0)
+			if(offset>src.count())
 				return *this;
-			if(!limit || limit>m)
+
+			size_t m=src.count()-offset;
+			if(!m || !limit)
+				return *this;
+			if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
 				limit=m;
 		}
 
-		int needed=limit-(fallocated-fused);
-		if(needed>0)
-			expand(needed);
-
-		memcpy(&felements[fused+=limit], &src.felements[offset], limit*sizeof(T));
+		ssize_t 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<count())) {
-			throw Exception(0, 
-				Exception::undefined_source,
-				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return 0; // never
-		}
+	T get(size_t index) const {
+		assert(index>=0 && index<count());
+		return felements[index];
+	}
 
+	/// ref version of get
+	T& get_ref(size_t index) const {
+		assert(index>=0 && index<count());
 		return felements[index];
 	}
 
 	/// put index-element
-	void put(int index, T element) {
-		if(!(index>=0 && index<size())) {
-			throw Exception(0, 
-				Exception::undefined_source, 
-				"Array::put(%d) out of range [0..%d]", index, size()-1);
-			return; // never
-		}
+	void put(size_t index, T element) {
+		assert(index>=0 && index<count());
 		felements[index]=element;
 	}
 
+	T operator [](size_t index) const { return get(index); }
 
 	/// 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);
 	}
 
 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) {
-		fallocated+=delta;
-		felements = (T *)pa_realloc(felements, fallocated*sizeof(T));
+	void expand(size_t delta) {
+		size_t new_allocated=fallocated+delta;
+		felements = (T *)realloc(felements, new_allocated*sizeof(T));
+		memset(&felements[fallocated], 0, delta*sizeof(T));
+		fallocated=new_allocated;
 	}
 
 private: //disabled
 
+	Array(const Array&) {}
 	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();
-	}
-};
-
-/// handy array iterator
+/** Array iterator, usage:
+	@code
+	// Array<T> a;
+	for(Array_iterator<T> i(a); i.has_next(); ) {
+		T& element=i.next();
+		...
+	}	
+	@endcode
+*/
 template<typename T> class Array_iterator {
 
 	const Array<T>& farray;
@@ -171,9 +165,9 @@ template<typename T> class Array_iterato
 
 public:
 
-	Array_iterator(const Array<T>& aarray) : farray(aarray) {
-		fcurrent(farray.felements);
-		flast=farray+farray.count();
+	Array_iterator(const Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements+farray.count();
 	}
 
 	/// there are still elements
@@ -182,10 +176,44 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	T next() {
-		return *(furrent++);
+	const T next() {
+		return *(fcurrent++);
 	}
 
 };
+/*
+/** Nonconst array iterator, usage:
+	@code
+	// Array<T> a;
+	for(Array_iterator<T> i(a); i.has_next(); ) {
+		T& element=i.next();
+		...
+	}	
+	@endcode
+* /
+template<typename T> class Array_modifing_iterator {
+
+	Array<T>& farray;
+	T *fcurrent;
+	T *flast;
+
+public:
+
+	Array_modifing_iterator(Array<T>& aarray): farray(aarray) {
+		fcurrent=farray.felements;
+		flast=farray.felements+farray.count();
+	}
 
+	/// there are still elements
+	bool has_next() {
+		return fcurrent<flast;
+	}
+
+	/// quickly extracts next Array element
+	T& next() {
+		return *(fcurrent++);
+	}
+
+};
+*/
 #endif