--- parser3/src/include/pa_array.h	2003/04/14 11:23:41	1.57.2.27.2.16
+++ parser3/src/include/pa_array.h	2006/04/09 13:38:47	1.68
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 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/04/14 11:23:41 $";
+static const char * const IDENT_ARRAY_Y="$Date: 2006/04/09 13:38:47 $";
 
 // includes
 
@@ -40,6 +40,41 @@ protected:
 	size_t fused;
 
 public:
+	struct Action_options {
+		size_t offset;
+		size_t limit; //< ARRAY_OPTION_LIMIT_ALL means 'all'. zero limit means 'nothing'
+		bool reverse;
+		bool defined;
+		
+		Action_options(
+			size_t aoffset=0, 
+			size_t alimit=ARRAY_OPTION_LIMIT_ALL, 
+			bool areverse=false): 
+			offset(aoffset), limit(alimit), reverse(areverse), 
+			defined(false) {}
+
+		bool adjust(size_t count) {
+			if(!count || !limit)
+				return false;
+			size_t row=offset;
+			if(row>=count)
+				return false;
+			// max(limit)
+			size_t m=reverse?
+				offset
+				:count-offset;
+			if(!m)
+				return false;
+			// fix limit
+			if(limit==ARRAY_OPTION_LIMIT_ALL || limit>m)
+				limit=m;
+
+			return true;
+		}
+
+		
+	};
+
 	typedef T element_type;
 
 	Array(size_t initial=3):
@@ -54,7 +89,7 @@ public:
 	/// append to array
 	Array& operator += (T src) {
 		if(is_full())
-			expand(2);
+			expand(+2);
 
 		felements[fused++]=src;
 
@@ -73,7 +108,7 @@ public:
 			return *this;
 		// max(limit)
 		size_t m=reverse?
-			offset
+			1+offset
 			:src_count-offset;
 		if(!m)
 			return *this;
@@ -90,7 +125,7 @@ public:
 		T* from=&src.felements[offset];
 		T* to=&felements[fused];
 		if(reverse) { // reverse
-			for(T* from_end=from-limit; from>=from_end; --from)
+			for(T* from_end=from-limit; from>from_end; --from)
 				*to++=*from;
 
 		} else { // forward
@@ -104,19 +139,19 @@ public:
 
 	/// get index-element
 	T get(size_t index) const {
-		assert(index>=0 && index<count());
+		assert(index<count());
 		return felements[index];
 	}
 
 	/// ref version of get
 	T& get_ref(size_t index) const {
-		assert(index>=0 && index<count());
+		assert(index<count());
 		return felements[index];
 	}
 
 	/// put index-element
 	void put(size_t index, T element) {
-		assert(index>=0 && index<count());
+		assert(index<count());
 		felements[index]=element;
 	}
 
@@ -129,6 +164,21 @@ public:
 			callback(*current, info);
 	}
 
+	/// iterate over all elements
+	template<typename I> void for_each(bool (*callback)(T, I), I info) const {
+		T *last=felements+fused;
+		for(T *current=felements; current<last; current++)
+			if(callback(*current, info))
+				return;
+	}
+
+	/// iterate over all elements
+	template<typename I> void for_each_ref(void (*callback)(T&, I), I info) {
+		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 {
 		T *last=felements+fused;
@@ -186,44 +236,9 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	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() {
+	T next() {
 		return *(fcurrent++);
 	}
 
 };
-*/
 #endif