--- parser3/src/include/pa_table.h	2003/04/11 16:05:43	1.48.2.11.2.8
+++ parser3/src/include/pa_table.h	2015/08/04 21:10:17	1.67
@@ -1,14 +1,14 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-static const char* IDENT_TABLE_H="$Date: 2003/04/11 16:05:43 $";
+#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.67 2015/08/04 21:10:17 moko Exp $"
 
 #include "pa_types.h"
 #include "pa_hash.h"
@@ -32,17 +32,6 @@ class Table: public Array<ArrayString*>
 public:
 	typedef ArrayString* columns_type;
 
-	struct Action_options {
-	     size_t offset;
-	     size_t limit; //< negative limit means 'all'. zero limit means 'nothing'
-	     bool reverse;
-	     bool defined;
-
-	     Action_options(): 
-		offset(0), limit(ARRAY_OPTION_LIMIT_ALL), reverse(false), 
-		defined(false) {}
-	};
-
 	Table(
 		columns_type acolumns,
 		size_t initial_rows=3);
@@ -52,11 +41,19 @@ public:
 	columns_type columns() { return fcolumns; }
 
 	/// moves @a current pointer
-	void set_current(size_t acurrent);	/// @return current pointer
+	void set_current(size_t acurrent) {
+		assert(acurrent==0 || acurrent<count());
+
+		fcurrent=acurrent;
+	}
+	/// @return current pointer
 	size_t current() const { return fcurrent; }
 	void offset(bool absolute, int offset);
 
- 	/** @return column index from @a column_name. '<0' if no such column
+	/// @return checks all rows to find maximum cells number
+	int max_cells() const;
+
+	/** @return column index from @a column_name. '<0' if no such column
 		if no such - 'bark'
 	*/
 	int column_name2index(const String& column, bool bark) const;
@@ -64,6 +61,12 @@ public:
 	/// @return item from @a column
 	const String* item(size_t column);
 
+	/// sets @a column value
+	void put_item(size_t column, const String*);
+
+	/// removes current row
+	void remove_current();
+
 	/// @return item from @a column. '0' if no such column
 	const String* item(const String& column) {
 		int index=column_name2index(column, false);
@@ -74,26 +77,42 @@ public:
 	void save(bool nameless_save, const String& file_spec);
 
 	template<typename I>
-	bool locate(bool (*func)(Table& self, I* info), void* info, Action_options& o) {
-		size_t count=this->count();
-		if(!count || !o.limit)
-			return false;
-		if(o.limit==ARRAY_OPTION_LIMIT_ALL)
-			o.limit=count;
-		size_t row=o.offset;
+	void table_for_each(void (*func)(Table& self, I* info), I* info, Action_options& o) {
+		if(!o.adjust(count()))
+			return;
 
 		size_t saved_current=current();
+		size_t row=o.offset;
 		if(o.reverse) { // reverse
-			size_t to=row>o.limit?row-o.limit:0;
-			for(; row>=to; --row) {
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
+				func(*this, info);
+			}
+		} else { // forward
+			for(size_t to=row+o.limit; row<to; row++) {
 				set_current(row);
+				func(*this, info);
+			}
+		}
+		set_current(saved_current);
+	}
+
+	template<typename I>
+	bool table_first_that(bool (*func)(Table& self, I info), I info, Action_options& o) {
+		if(!o.adjust(count()))
+			return false;
+
+		size_t saved_current=current();
+		size_t row=o.offset;
+		if(o.reverse) { // reverse
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
 
 				if(func(*this, info))
 					return true;
 			}
 		} else { // forward
-			size_t to=min(row+o.limit, count);
-			for(; row<to; row++) {
+			for(size_t to=row+o.limit; row<to; row++) {
 				set_current(row);
 
 				if(func(*this, info))
@@ -105,25 +124,24 @@ public:
 		return false;
 	}
 
+
 	bool locate(int column, const String& value, Action_options& options);
 	bool locate(const String& column, const String& value, Action_options& options);
 
 private:
 	
-	// current row
+	/// current row
 	size_t fcurrent;
 
-	// columns
+	/// columns
 	columns_type fcolumns;
 
-	// column names are already referenced in fcolumns, no need to doublecheck references here
-	// column name->number lookup table
-	typedef Hash<const StringBody, int> name2number_hash_class;
+	/// column name->number lookup table
+	typedef HashString<int> name2number_hash_class;
 	name2number_hash_class* name2number;
 
-	// we own columns?
-
-	bool valid(size_t index) const { return index>=0 && index<count(); }
+	/// is that @c index falid?
+	bool valid(size_t index) const { return index<count(); }
 
 };