--- parser3/src/include/pa_array.h	2003/04/14 11:23:41	1.57.2.27.2.16
+++ parser3/src/include/pa_array.h	2003/11/07 13:59:21	1.60
@@ -8,7 +8,7 @@
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_Y="$Date: 2003/04/14 11:23:41 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/11/07 13:59:21 $";
 
 // 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):
@@ -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
@@ -127,6 +162,13 @@ public:
 		T *last=felements+fused;
 		for(T *current=felements; current<last; current++)
 			callback(*current, info);
+	}
+
+	/// 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