--- parser3/src/include/pa_table.h	2003/03/24 13:43:41	1.48.2.11.2.5
+++ parser3/src/include/pa_table.h	2015/10/26 01:21:56	1.69
@@ -1,14 +1,14 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 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/03/24 13:43:41 $";
+#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.69 2015/10/26 01:21:56 moko Exp $"
 
 #include "pa_types.h"
 #include "pa_hash.h"
@@ -34,25 +34,38 @@ public:
 
 	Table(
 		columns_type acolumns,
-		int initial_rows=3);
-	Table(const Table& src, int offset=0, int limit=0);
+		size_t initial_rows=3);
+	Table(const Table& src, Action_options& options);
 
 	/// gets column names
 	columns_type columns() { return fcolumns; }
 
 	/// moves @a current pointer
-	void set_current(int acurrent) { fcurrent=acurrent; }
+	void set_current(size_t acurrent) {
+		assert(acurrent==0 || acurrent<count());
+
+		fcurrent=acurrent;
+	}
 	/// @return current pointer
-	int current() const { return fcurrent; }
+	size_t current() const { return fcurrent; }
 	void offset(bool absolute, int offset);
 
+	/// @return checks all rows to find maximum cells number
+	size_t 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;
 
 	/// @return item from @a column
-	const String* item(int 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) {
@@ -63,25 +76,72 @@ public:
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
-	bool locate(int column, const String& value);
-	bool locate(const String& column, const String& value);
+	template<typename I>
+	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
+			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
+			for(size_t to=row+o.limit; row<to; row++) {
+				set_current(row);
+
+				if(func(*this, info))
+					return true;
+			}
+		}
+		set_current(saved_current);
+
+		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
-	int fcurrent;
+	/// 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(int index) const { return index>=0 && index<count(); }
+	/// is that @c index falid?
+	bool valid(size_t index) const { return index<count(); }
 
 };